Another pr fork

libs/SalesforceAnalytics/soemthing.txt

@@ -0,0 +1,4 @@
+asdfdsf
+
+
+asdfljsadfklnasdlf

libs/SalesforceAnalytics/src/com/salesforce/androidsdk/analytics/dummy.txt

@@ -0,0 +1 @@
+this is a dummy file for pr testing

libs/SalesforceHybrid/build.gradle

@@ -16,6 +16,8 @@ apply plugin: 'com.jfrog.bintray'
 dependencies {
   api project(':libs:SmartSync')
   api 'org.apache.cordova:framework:7.0.0'
+  androidTestApi 'com.android.support.test:runner:1.0.1'
+  androidTestApi 'com.android.support.test:rules:1.0.1'
 }
 
 android {
@@ -47,7 +49,7 @@ android {
   }
   defaultConfig {
     testApplicationId "com.salesforce.androidsdk.salesforcehybrid.tests"
-    testInstrumentationRunner "com.salesforce.androidsdk.analytics.util.test.JUnitReportTestRunner"
+    testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
   packagingOptions {
     exclude 'META-INF/LICENSE'

libs/SalesforceSDK/test.txt

@@ -0,0 +1 @@
+adfasdfsa dsaflnsdkfjlnasdlknfaslkd

libs/SmartStore/build.gradle

@@ -16,6 +16,9 @@ apply plugin: 'com.jfrog.bintray'
 dependencies {
     api project(':libs:SalesforceSDK')
     api 'net.zetetic:android-database-sqlcipher:3.5.7'
+    androidTestApi 'com.android.support.test:runner:1.0.1'
+    androidTestApi 'com.android.support.test:rules:1.0.1'
+    androidTestApi 'com.android.support.test.espresso:espresso-core:3.0.1'
 }
 
 android {
@@ -48,13 +51,14 @@ android {
   }
   defaultConfig {
     testApplicationId "com.salesforce.androidsdk.smartstore.tests"
-    testInstrumentationRunner "com.salesforce.androidsdk.analytics.util.test.JUnitReportTestRunner"
+    testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
   packagingOptions {
     exclude 'META-INF/LICENSE'
     exclude 'META-INF/LICENSE.txt'
     exclude 'META-INF/DEPENDENCIES'
     exclude 'META-INF/NOTICE'
+    pickFirst 'protobuf.meta'
   }
 
   lintOptions {

libs/SmartStore/src/com/salesforce/androidsdk/smartstore/mmmhmmmm.txt

@@ -0,0 +1 @@
+asdflnasdlkfnasndflkn

libs/SmartSync/build.gradle

@@ -15,6 +15,8 @@ apply plugin: 'com.jfrog.bintray'
 
 dependencies {
     api project(':libs:SmartStore')
+    androidTestApi 'com.android.support.test:runner:1.0.1'
+    androidTestApi 'com.android.support.test:rules:1.0.1'
 }
 
 android {
@@ -47,7 +49,7 @@ android {
   }
   defaultConfig {
     testApplicationId "com.salesforce.androidsdk.smartsync.tests"
-    testInstrumentationRunner "com.salesforce.androidsdk.analytics.util.test.JUnitReportTestRunner"
+    testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
   packagingOptions {
     exclude 'META-INF/LICENSE'

libs/test/SalesforceHybridTest/AndroidManifest.xml

@@ -2,34 +2,23 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.salesforce.androidsdk.phonegap"
-    android:versionCode="1"
     android:versionName="1.0">
 
-    <supports-screens android:largeScreens="true"
-        android:normalScreens="true"
-        android:smallScreens="true"
-        android:resizeable="true"
-        android:anyDensity="true" />
-
     <uses-sdk android:minSdkVersion="21"
         android:targetSdkVersion="27" />
 
     <application android:label="@string/app_name"
         android:name="com.salesforce.androidsdk.phonegap.app.SalesforceHybridTestApp"
-		android:icon="@drawable/sf__icon">
-
-		<uses-library android:name="android.test.runner" />        
+        android:manageSpaceActivity="com.salesforce.androidsdk.ui.ManageSpaceActivity">
 
         <!--  Main activity -->
-        <activity
-            android:label="@string/app_name"
-            android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceHybridTestActivity"
-            android:configChanges="orientation|keyboardHidden">
+        <activity android:label="@string/app_name"
+            android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceHybridTestActivity">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-
 </manifest>

libs/test/SalesforceHybridTest/src/com/salesforce/androidsdk/phonegap/ForceJSTest.java

@@ -26,69 +26,95 @@
  */
 package com.salesforce.androidsdk.phonegap;
 
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.Arrays;
 import java.util.List;
 
-import com.salesforce.androidsdk.phonegap.util.test.JSTestCase;
-
 /**
- * Running javascript tests for force.js library
+ * Running javascript tests for force.js.
  */
+@RunWith(AndroidJUnit4.class)
+@SmallTest
 public class ForceJSTest extends JSTestCase {
 
 	public ForceJSTest() {
 		super("ForceJSTestSuite");
 	}
 
+    @Before
+    public void setUp() throws Exception {
+	    super.setUp();
+    }
+
 	@Override
 	public List<String> getTestNames() {
 		return Arrays.asList(new String[] {
 				"testParseUrl",
 				"testComputeEndPointIfMissing",
-				"testOwnedFilesList", "testFilesInUsersGroups",
-				"testFilesSharedWithUser", "testFileDetails",
-				"testBatchFileDetails", "testFileShares", "testAddFileShare",
-				"testDeleteFileShare" });
+				"testOwnedFilesList",
+                "testFilesInUsersGroups",
+				"testFilesSharedWithUser",
+                "testFileDetails",
+				"testBatchFileDetails",
+                "testFileShares",
+                "testAddFileShare",
+				"testDeleteFileShare"
+		});
 	}
 
+    @Test
 	public void testParseUrl() {
 		runTest("testParseUrl");
 	}
 
+    @Test
 	public void testComputeEndPointIfMissing() {
 		runTest("testComputeEndPointIfMissing");
 	}
 
+    @Test
 	public void testOwnedFilesList() {
 		runTest("testOwnedFilesList");
 	}
 
+    @Test
 	public void testFilesInUsersGroups() {
 		runTest("testFilesInUsersGroups");
 	}
 
+    @Test
 	public void testFilesSharedWithUser() {
 		runTest("testFilesSharedWithUser");
 	}
 
+    @Test
 	public void testFileDetails() {
 		runTest("testFileDetails");
 	}
 
+    @Test
 	public void testBatchFileDetails() {
 		runTest("testBatchFileDetails");
 	}
-
+
+    @Test
 	public void testFileShares() {
 		runTest("testFileShares");
 	}
 
+    @Test
 	public void testAddFileShare() {
 		runTest("testAddFileShare");
 	}
 
+    @Test
 	public void testDeleteFileShare() {
 		runTest("testDeleteFileShare");
 	}
-
 }

libs/SalesforceHybrid/src/com/salesforce/androidsdk/phonegap/util/test/JSTestCase.java → libs/test/SalesforceHybridTest/src/com/salesforce/androidsdk/phonegap/JSTestCase.java

@@ -24,11 +24,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.salesforce.androidsdk.phonegap.util.test;
+package com.salesforce.androidsdk.phonegap;
 
 import android.app.Instrumentation;
 import android.content.Intent;
-import android.test.InstrumentationTestCase;
+import android.support.test.InstrumentationRegistry;
 
 import com.salesforce.androidsdk.app.SalesforceSDKManager;
 import com.salesforce.androidsdk.phonegap.plugin.TestRunnerPlugin;
@@ -38,6 +38,8 @@
 import com.salesforce.androidsdk.util.EventsObservable.EventType;
 import com.salesforce.androidsdk.util.test.EventsListenerQueue;
 
+import junit.framework.Assert;
+
 import org.apache.cordova.CordovaWebView;
 
 import java.util.HashMap;
@@ -46,28 +48,24 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * Extend this class to run tests written in JavaScript
+ * Extend this class to run tests written in JavaScript.
  */
-public abstract class JSTestCase extends InstrumentationTestCase {
+public abstract class JSTestCase {
 
 	private static final String TAG = "JSTestCase";
 
     private String jsSuite;
     private static Map<String, Map<String, TestResult>> testResults; 
-
-
+
     public JSTestCase(String jsSuite) {
     	this.jsSuite = jsSuite;
     }
-
-    @Override
+
     public void setUp() throws Exception {
-
     	if (testResults == null || !testResults.containsKey(jsSuite)) {
     		if (testResults == null) {
-    			testResults = new HashMap<String, Map<String, TestResult>>();
+    			testResults = new HashMap<>();
     		}
-
     		if (!testResults.containsKey(jsSuite)) {
     			testResults.put(jsSuite, new HashMap<String, TestResult>());
     		}
@@ -79,7 +77,7 @@ public void setUp() throws Exception {
 	        }
 
 			// Start main activity
-    		Instrumentation instrumentation = getInstrumentation();
+    		Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
 			final Intent intent = new Intent(Intent.ACTION_MAIN);
 			intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 			intent.setClassName(instrumentation.getTargetContext(), SalesforceSDKManager.getInstance().getMainActivityClass().getName());
@@ -102,7 +100,7 @@ public void run() {
                     });
 				}
                 SalesforceHybridLogger.i(TAG, "Running test: " + testName);
-		        
+
 		        // Block until test completes or times out
 		        TestResult result = null;
 	            int timeout = getMaxRuntimeInSecondsForTest(testName);
@@ -111,12 +109,11 @@ public void run() {
 		            if (result == null) {
 		            	result = new TestResult(testName, false, "Timeout (" + timeout + " seconds) exceeded", timeout);
 		            }
-		        }
-		        catch (Exception e) {
+		        } catch (Exception e) {
 	            	result = new TestResult(testName, false, "Test failed", timeout);
 		        }
                 SalesforceHybridLogger.i(TAG, "Finished running test: " + testName);
-		        
+
 		        // Save result
 		        testResults.get(jsSuite).put(testName, result);
 			}
@@ -147,7 +144,7 @@ protected int getMaxRuntimeInSecondsForTest(String testName) {
 	 */
     protected void runTest(String testName)  {
     	TestResult result = testResults.get(jsSuite).get(testName);
-        assertNotNull("No test result", result);
-        assertTrue(result.testName + " " + result.message, result.success);
+        Assert.assertNotNull("No test result", result);
+        Assert.assertTrue(result.testName + " " + result.message, result.success);
     }
 }