[Android] Enable usage of custom instrumentation test runners

detox/src/devices/AndroidDriver.js

@@ -60,6 +60,13 @@ class AndroidDriver extends DeviceDriverBase {
     }
   }
 
+  async getInstrumentationRunner(deviceId, bundleId) {
+    const instrumentationRunners = await this.adb.listInstrumentation(deviceId);
+    const expr = new RegExp(`^instrumentation:(.*) \\(target=${bundleId.replace(new RegExp('\\.', 'g'), "\\.")}\\)$`, 'gm');
+    const regexRes = expr.exec(instrumentationRunners);
+    return regexRes[1];
+  }
+
   async launch(deviceId, bundleId, launchArgs) {
     const args = [];
     _.forEach(launchArgs, (value, key) => {
@@ -72,6 +79,8 @@ class AndroidDriver extends DeviceDriverBase {
       return this.instrumentationProcess.pid;
     }
 
+    const testRunner = await this.adb.getInstrumentationRunner(deviceId, bundleId)
+
     this.instrumentationProcess = spawn(this.adb.adbBin, [`-s`, `${deviceId}`, `shell`, `am`, `instrument`, `-w`, `-r`, `${args.join(' ')}`, `-e`, `debug`,
       `false`, `${bundleId}.test/android.support.test.runner.AndroidJUnitRunner`]);
     log.verbose(this.instrumentationProcess.spawnargs.join(" "));
@@ -96,7 +105,7 @@ class AndroidDriver extends DeviceDriverBase {
       const call = invoke.call(invoke.Android.Class("com.wix.detox.Detox"), 'startActivityFromUrl', invoke.Android.String(params.url));
       await this.invocationManager.execute(call);
     }
-    
+
     //The other types are not yet supported.
   }
 
@@ -171,7 +180,7 @@ class AndroidDriver extends DeviceDriverBase {
       landscape: 1, // top at left side landscape
       portrait: 0 // non-reversed portrait.
     };
-    
+
     const call = invoke.call(invoke.Android.Class(EspressoDetox), 'changeOrientation', invoke.Android.Integer(orientationMapping[orientation]));
     await this.invocationManager.execute(call);
   }

detox/src/devices/AndroidDriver.test.js

@@ -0,0 +1,37 @@
+describe("AndroidDriver", () => {
+	let mockClient;
+	let driver;
+	let ADB;
+
+	beforeEach(() => {
+		jest.mock("npmlog");
+
+		jest.mock("./android/ADB");
+		ADB = require("./android/ADB");
+
+		const AndroidDriver = require("./AndroidDriver");
+
+		driver = new AndroidDriver(jest.fn());
+	});
+
+	it("getInstrumentationRunner", async () => {
+		const adbShellPmListInstrumentationOutput =
+			"instrumentation:com.android.emulator.smoketests/android.support.test.runner.AndroidJUnitRunner (target=com.android.emulator.smoketests)\n" +
+			"instrumentation:com.android.smoketest.tests/com.android.smoketest.SmokeTestRunner (target=com.android.smoketest)\n" +
+			"instrumentation:com.example.android.apis/.app.LocalSampleInstrumentation (target=com.example.android.apis)\n" +
+			"instrumentation:org.chromium.webview_shell/.WebViewLayoutTestRunner (target=org.chromium.webview_shell)\n";
+
+		const adbMockInstance = ADB.mock.instances[0];
+		adbMockInstance.listInstrumentation.mockReturnValue(
+			Promise.resolve(adbShellPmListInstrumentationOutput)
+		);
+
+		const result = await driver.getInstrumentationRunner(
+			"deviceId",
+			"com.example.android.apis"
+		);
+		expect(result).toEqual(
+			"com.example.android.apis/.app.LocalSampleInstrumentation"
+		);
+	});
+});

detox/src/devices/android/ADB.js

@@ -54,7 +54,7 @@ class ADB {
       await this.adbCmd(deviceId, `install -r -g ${apkPath}`);
     } else {
       await this.adbCmd(deviceId, `install -rg ${apkPath}`);
-    }    
+    }
   }
 
   async uninstall(deviceId, appId) {
@@ -102,6 +102,10 @@ class ADB {
   async sleep(ms = 0) {
     return new Promise((resolve, reject) => setTimeout(resolve, ms));
   }
+
+  async listInstrumentation(deviceId) {
+    return await this.shell(deviceId, 'pm list instrumentation');
+  }
 }
 
 module.exports = ADB;

detox/src/devices/android/ADB.test.js

@@ -55,5 +55,10 @@ xdescribe('ADB', () => {
     await adb.unlockScreen('deviceId');
     expect(exec).toHaveBeenCalledTimes(1);
   });
+
+  it('listInstrumentation', async () => {
+    await adb.listInstrumentation('deviceId');
+    expect(exec).toHaveBeenCalledTimes(1);
+  });
 });