Merge pull request #674 from BranchMetrics/revert-673-INTENG-4632/anr_exception

Revert "INTENG-4632 -- Fix ANR Exception"

Author: apeterson-branch

Branch-SDK/androidTest/io/branch/referral/BranchEventTest.java

@@ -15,13 +15,6 @@ dependencies {
     implementation 'com.google.firebase:firebase-appindexing:17.1.0'
     implementation 'com.android.installreferrer:installreferrer:1.0'
 
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-
-    // Unit tests with Google Ads
-    androidTestImplementation 'com.google.android.gms:play-services-ads:16.0.0'
 }
 
 android {
@@ -33,8 +26,6 @@ android {
         versionName project.VERSION_NAME
         versionCode Integer.parseInt(project.VERSION_CODE)
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_MINIMUM)
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     sourceSets {
@@ -46,12 +37,11 @@ android {
             renderscript.srcDirs = ['src']
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
-
-            androidTest {
-                java.srcDirs = ['androidTest']
-            }
         }
 
+        // Move the tests to tests/java, tests/res, etc...
+        androidTest.setRoot('tests')
+
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
         // This moves them out of them default location under src/<type>/... which would

Branch-SDK/androidTest/io/branch/referral/BranchTest.java

@@ -774,45 +774,7 @@ public static Branch getAutoTestInstance(@NonNull Context context, boolean isRef
     private static Branch initInstance(@NonNull Context context) {
         return new Branch(context.getApplicationContext());
     }
-
-    // Package Private
-    // For Unit Testing, we need to reset the Branch state
-    static void shutDown() {
-        ServerRequestQueue.shutDown();
-
-        // BranchStrongMatchHelper.shutDown();
-        // BranchViewHandler.shutDown();
-        // DeepLinkRoutingValidator.shutDown();
-        // DeviceInfo.shutDown();
-        // InstallListener.shutDown();
-        // InstantAppUtil.shutDown();
-        // IntegrationValidator.shutDown();
-        // PrefHelper.shutDown();
-        // ShareLinkManager.shutDown();
-        // UniversalResourceAnalyser.shutDown();
-
-        // Release these contexts immediately.
-        if (branchReferral_ != null) {
-            branchReferral_.context_ = null;
-            branchReferral_.currentActivityReference_ = null;
-        }
-
-        // Reset all of the statics.
-        branchReferral_ = null;
-        customReferrableSettings_ = CUSTOM_REFERRABLE_SETTINGS.USE_DEFAULT;
-        bypassCurrentActivityIntentState_ = false;
-        disableInstantDeepLinking = false;
-        isActivityLifeCycleCallbackRegistered_ = false;
-        isAutoSessionMode_ = false;
-
-        isLogging_ = null;
-        isForcedSession_ = false;
-        isSimulatingInstalls_ = false;
-
-        checkInstallReferrer_ = true;
-    }
-
-
+    
     /**
      * <p>Manually sets the {@link Boolean} value, that indicates that the Branch API connection has
      * been initialised, to false - forcing re-initialisation.</p>