ViewClient: Added .bat to monkeyrunner for you know what OS

dtmilano · dtmilano · commit 62d5626e5427 · 2013-05-06T01:00:21.000-04:00
diff --git a/AndroidViewClient/src/com/dtmilano/android/viewclient/ViewClient.java b/AndroidViewClient/src/com/dtmilano/android/viewclient/ViewClient.java
@@ -189,11 +189,10 @@ public int execute() throws IOException, InterruptedException {
             cmdList.add(mJar.getName());
         }
         else {
-            final String os = System.getProperty("os.name");
-            if (os.toUpperCase().contains("WINDOWS")) {
+            if (isWindows()) {
                 fatal(String.format(
                         "%s was not found and %s does not support shebang in scripts. Aborting.",
-                        MONKEYRUNNER, os));
+                        MONKEYRUNNER, System.getProperty("os.name")));
             }
         }
         cmdList.add(mDest.getAbsolutePath());
@@ -226,6 +225,14 @@ public int execute() throws IOException, InterruptedException {
         throw new RuntimeException("Couldn't create process");
     }
 
+    /**
+     * @return
+     */
+    private static boolean isWindows() {
+        final String os = System.getProperty("os.name");
+        return os.toUpperCase().contains("WINDOWS");
+    }
+
     /**
      * Locates <code>monkeyrunner</code> executable in path.
      * 
@@ -237,7 +244,10 @@ private static String locateMonkeyRunner() {
                 File.pathSeparator);
         while (tokenizer.hasMoreTokens()) {
             final String dir = tokenizer.nextToken();
-            File monkeyrunner = new File(dir + File.separator + MONKEYRUNNER);
+            File monkeyrunner = new File(dir + File.separator + MONKEYRUNNER + (isWindows() ? ".bat" : ""));
+            if (DEBUG) {
+                System.err.println("searching for " + monkeyrunner + "    exist? " + monkeyrunner.exists());
+            }
             if (monkeyrunner.exists()) {
                 return monkeyrunner.getAbsolutePath();
             }
