Merge pull request cucumber#613 from fluxtah/master

Added debug wait to make sure eclipse attaches debugger appropriately

Author: SierraGolf

android/src/main/java/cucumber/api/android/CucumberInstrumentation.java

@@ -4,6 +4,7 @@
 import android.app.Instrumentation;
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Debug;
 import android.os.Looper;
 import android.util.Log;
 import cucumber.api.CucumberOptions;
@@ -37,6 +38,7 @@ public class CucumberInstrumentation extends Instrumentation {
     private ResourceLoader resourceLoader;
     private ClassLoader classLoader;
     private Runtime runtime;
+    private boolean debug;
 
     @Override
     public void onCreate(Bundle arguments) {
@@ -45,6 +47,9 @@ public void onCreate(Bundle arguments) {
         if (arguments == null) {
             throw new CucumberException("No arguments");
         }
+        
+        debug = getBooleanArgument(arguments, "debug");
+        
         Context context = getContext();
         classLoader = context.getClassLoader();
 
@@ -88,6 +93,10 @@ private DexFile newDexFile(String apkPath) {
     @Override
     public void onStart() {
         Looper.prepare();
+        
+        if (debug) {
+            Debug.waitForDebugger();
+        }
 
         final List<CucumberFeature> cucumberFeatures = runtimeOptions.cucumberFeatures(resourceLoader);
         final int numberOfTests = TestCaseCounter.countTestCasesOf(cucumberFeatures);
@@ -119,4 +128,9 @@ private void printSummary() {
             Log.w(TAG, s);
         }
     }
+    
+    private boolean getBooleanArgument(Bundle arguments, String tag) {
+        String tagString = arguments.getString(tag);
+        return tagString != null && Boolean.parseBoolean(tagString);
+    }
 }