fixed a crash when there are no testInstrumentationRunnerArguments, a…

…pp can now be init from Android Studio
wix · Jul 27, 2017 · 7653381 · 7653381
1 parent 6184f6e
commit 7653381
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/detox/android/detox/src/main/java/com/wix/detox/DetoxManager.java b/detox/android/detox/src/main/java/com/wix/detox/DetoxManager.java
@@ -39,7 +39,10 @@ class DetoxManager implements WebSocketClient.ActionHandler {
         handler = new Handler();
 
         Bundle arguments = InstrumentationRegistry.getArguments();
-        detoxServerUrl = arguments.getString(DETOX_SERVER_ARG_KEY).replace(Environment.DEVICE_LOCALHOST, Environment.getServerHost());
+        detoxServerUrl = arguments.getString(DETOX_SERVER_ARG_KEY);
+        if (detoxServerUrl != null) {
+            detoxServerUrl = detoxServerUrl.replace(Environment.DEVICE_LOCALHOST, Environment.getServerHost());
+        }
         detoxSessionId = arguments.getString(DETOX_SESSION_ID_ARG_KEY);
 
         if (detoxServerUrl == null || detoxSessionId == null) {

diff --git a/detox/test/android/app/build.gradle b/detox/test/android/app/build.gradle
@@ -16,10 +16,10 @@ android {
             abiFilters "armeabi-v7a", "x86"
         }
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-//        testInstrumentationRunnerArguments = [
-//                'detoxServer': 'ws://localhost:8099',
-//                'detoxSessionId': 'test'
-//        ]
+        testInstrumentationRunnerArguments = [
+                'detoxServer': 'ws://localhost:8099',
+                'detoxSessionId': 'test'
+        ]
 
     }