Merge pull request #760 from BranchMetrics/Staging

Release v4.1.2

Author: bklastaitis-branch

Branch-SDK-TestBed/.classpath

@@ -9,7 +9,7 @@ dependencies {
         exclude module: 'support-v4'
     }
 
-    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -36,31 +36,6 @@ android {
             signingConfig signingConfigs.release
         }
     }
-    
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-
-            androidTest {
-                java.srcDirs = ['androidTest']
-            }
-        }
-
-        // 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
-        // conflict with src/ being used by the main source set.
-        // Adding new build types or product flavors should be accompanied
-        // by a similar customization.
-        debug.setRoot('build-types/debug')
-        release.setRoot('build-types/release')
-    }
 }
 
 File propFile = file('signing.properties');

Branch-SDK-TestBed/.project

@@ -102,7 +102,7 @@ private static boolean doLinkCreationTest(Context context, BranchUniversalObject
         boolean isLinkTestPassed = false;
         String url = buo.getShortUrl(context, new LinkProperties());
         try {
-            JSONObject linkdata = new URLContentViewer().execute(url, PrefHelper.getInstance(context).readBranchKey(!BranchUtil.isTestModeEnabled(context))).get();
+            JSONObject linkdata = new URLContentViewer().execute(url, BranchUtil.readBranchKey(context)).get();
             isLinkTestPassed = checkIfIdenticalJson(buo.convertToJson(), linkdata.optJSONObject("data"), true);
             if (isLinkTestPassed) {
                 isLinkTestPassed = checkIfIdenticalJson(BranchUniversalObject.createInstance(linkdata).convertToJson(), linkdata.optJSONObject("data"), true);

Branch-SDK-TestBed/build.gradle

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -32,7 +32,7 @@ public class BranchSDKTests {
 
     @Before
     public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
+        mContext = InstrumentationRegistry.getContext();
         branch = Branch.getInstance(mContext);
         prefHelper = PrefHelper.getInstance(mContext);
     }