Move option parsing to InstrumentationArguments

friederbluemle · friederbluemle · commit 88a04513eddd · 2013-10-21T01:12:40.000-07:00
This removes some code duplication in CucumberInstrumentation and
InstrumentationArguments.
diff --git a/android/src/main/java/cucumber/api/android/CucumberInstrumentation.java b/android/src/main/java/cucumber/api/android/CucumberInstrumentation.java
@@ -44,34 +44,20 @@ public class CucumberInstrumentation extends Instrumentation {
     public static final String TAG = "cucumber-android";
 
     private final Bundle results = new Bundle();
-    private boolean justCount;
     private int testCount;
-    private boolean coverage;
-    private String coverageFilePath;
 
     private RuntimeOptions runtimeOptions;
     private ResourceLoader resourceLoader;
     private ClassLoader classLoader;
     private Runtime runtime;
-    private boolean debug;
     private List<CucumberFeature> cucumberFeatures;
+    InstrumentationArguments instrumentationArguments;
 
     @Override
     public void onCreate(Bundle arguments) {
         super.onCreate(arguments);
 
-        if (arguments != null) {
-            debug = getBooleanArgument(arguments, "debug");
-            boolean logOnly = getBooleanArgument(arguments, "log");
-            if (logOnly && arguments.getString("dryRun") == null) {
-                arguments.putString("dryRun", "true");
-            }
-            justCount = getBooleanArgument(arguments, "count");
-            coverage = getBooleanArgument(arguments, "coverage");
-            coverageFilePath = arguments.getString("coverageFile");
-        }
-
-        InstrumentationArguments instrumentationArguments = new InstrumentationArguments(arguments);
+        instrumentationArguments = new InstrumentationArguments(arguments);
 
         Context context = getContext();
         classLoader = context.getClassLoader();
@@ -126,12 +112,12 @@ private DexFile newDexFile(String apkPath) {
     public void onStart() {
         Looper.prepare();
 
-        if (justCount) {
+        if (instrumentationArguments.isCountEnabled()) {
             results.putString(Instrumentation.REPORT_KEY_IDENTIFIER, REPORT_VALUE_ID);
             results.putInt(REPORT_KEY_NUM_TOTAL, testCount);
             finish(Activity.RESULT_OK, results);
         } else {
-            if (debug) {
+            if (instrumentationArguments.isDebugEnabled()) {
                 Debug.waitForDebugger();
             }
 
@@ -150,7 +136,7 @@ public void onStart() {
 
             printSummary();
 
-            if (coverage) {
+            if (instrumentationArguments.isCoverageEnabled()) {
                 generateCoverageReport();
             }
 
@@ -168,11 +154,6 @@ private void printSummary() {
         }
     }
 
-    private boolean getBooleanArgument(Bundle arguments, String tag) {
-        String tagString = arguments.getString(tag);
-        return tagString != null && Boolean.parseBoolean(tagString);
-    }
-
     private void generateCoverageReport() {
         // use reflection to call emma dump coverage method, to avoid
         // always statically compiling against emma jar
@@ -209,6 +190,7 @@ private void generateCoverageReport() {
     }
 
     private String getCoverageFilePath() {
+        String coverageFilePath = instrumentationArguments.getCoverageFilePath();
         if (coverageFilePath == null) {
             return getTargetContext().getFilesDir().getAbsolutePath() + File.separator +
                    DEFAULT_COVERAGE_FILE_NAME;
diff --git a/android/src/main/java/cucumber/runtime/android/InstrumentationArguments.java b/android/src/main/java/cucumber/runtime/android/InstrumentationArguments.java
@@ -7,6 +7,11 @@
  * when the instrumentation was started.
  */
 public final class InstrumentationArguments {
+    private static final String KEY_DEBUG = "debug";
+    private static final String KEY_LOG = "log";
+    private static final String KEY_COUNT = "count";
+    private static final String KEY_COVERAGE = "coverage";
+    private static final String KEY_COVERAGE_FILE_PATH = "coverageFile";
     private static final String VALUE_SEPARATOR = "--";
 
     private Bundle arguments;
@@ -56,6 +61,8 @@ public String getCucumberOptionsString() {
                 appendOption(sb, "--name", arguments.getString(key));
             } else if ("dryRun".equals(key) && getBooleanArgument(key)) {
                 appendOption(sb, "--dry-run", "");
+            } else if ("log".equals(key) && getBooleanArgument(key)) {
+                appendOption(sb, "--dry-run", "");
             } else if ("noDryRun".equals(key) && getBooleanArgument(key)) {
                 appendOption(sb, "--no-dry-run", "");
             } else if ("monochrome".equals(key) && getBooleanArgument(key)) {
@@ -79,4 +86,24 @@ public String getCucumberOptionsString() {
         appendOption(sb, "", features);
         return sb.toString();
     }
+
+    public boolean isDebugEnabled() {
+        return getBooleanArgument(KEY_DEBUG);
+    }
+
+    public boolean isLogEnabled() {
+        return getBooleanArgument(KEY_LOG);
+    }
+
+    public boolean isCountEnabled() {
+        return getBooleanArgument(KEY_COUNT);
+    }
+
+    public boolean isCoverageEnabled() {
+        return getBooleanArgument(KEY_COVERAGE);
+    }
+
+    public String getCoverageFilePath() {
+        return arguments.getString(KEY_COVERAGE_FILE_PATH);
+    }
 }
