Align Volley empty config tests

Author: charlesoj6205

approov-service/src/main/java/io/approov/service/volley/ApproovService.java

@@ -20,6 +20,8 @@
 import android.util.Log;
 import android.content.Context;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.volley.AuthFailureError;
 import com.android.volley.Request;
 import com.android.volley.toolbox.BaseHttpStack;
@@ -229,6 +231,23 @@ public static synchronized boolean isApproovEnabled() {
         return isInitialized && (configString != null) && !configString.isEmpty();
     }
 
+    /**
+     * Resets the ApproovService state. This should only be used for testing.
+     */
+    @VisibleForTesting
+    static synchronized void reset() {
+        hurlStack = null;
+        isInitialized = false;
+        configString = null;
+        useApproovStatusIfNoToken = false;
+        approovTokenHeader = null;
+        approovTokenPrefix = null;
+        approovTraceIDHeader = null;
+        bindingHeader = null;
+        exclusionURLRegexs = null;
+        serviceMutator = ApproovServiceMutator.DEFAULT;
+    }
+
    /**
      * Sets a development key indicating that the app is a development version and it should
      * pass attestation even if the app is not registered or it is running on an emulator. The

approov-service/src/test/java/io/approov/service/volley/ApproovServiceMiniSdkTest.java

@@ -73,8 +73,12 @@ public void testInitializeIgnoresSameConfigAndRejectsDifferentConfig() {
     public void testInitializeWithEmptyConfigBuildsPlainClient() throws Exception {
         reinitializeService(scenarioJson(uniqueCaseName("empty-config"),
             "\"protectedDomains\": [\"" + getTargetHost() + "\"]"));
+        ApproovService.reset();
         ApproovService.initialize(context, "", "reinit-empty-config");
 
+        assertTrue(ApproovService.isInitialized());
+        assertFalse(ApproovService.isApproovEnabled());
+
         StringRequest request = new StringRequest(Request.Method.GET, getTargetURL(), null, null);
         JSONObject reply = executeRequest(request);
 
@@ -86,8 +90,12 @@ public void testInitializeWithEmptyConfigBuildsPlainClient() throws Exception {
     public void testInitializeWithEmptyConfigCanLaterEnableApproov() throws Exception {
         reinitializeService(scenarioJson(uniqueCaseName("empty-then-valid"),
             "\"protectedDomains\": [\"" + getTargetHost() + "\"]"));
+        ApproovService.reset();
         ApproovService.initialize(context, "", "reinit-empty-config");
 
+        assertTrue(ApproovService.isInitialized());
+        assertFalse(ApproovService.isApproovEnabled());
+
         StringRequest request1 = new StringRequest(Request.Method.GET, getTargetURL(), null, null);
         JSONObject reply1 = executeRequest(request1);
         assertNull(getHeader(reply1, "Approov-Token"));