Allow specifcation of sdcard-based coverage.ec, for pull from unroote…

…d devices
simpligility · Mar 12, 2012 · f0c661a · f0c661a
1 parent 8c2d0d1
commit f0c661a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/src/main/java/com/jayway/maven/plugins/android/AbstractInstrumentationMojo.java b/src/main/java/com/jayway/maven/plugins/android/AbstractInstrumentationMojo.java
@@ -97,6 +97,7 @@ public abstract class AbstractInstrumentationMojo extends AbstractAndroidMojo {
      *   &lt;instrumentationRunner&gt;className&lt;/instrumentationRunner&gt;
      *   &lt;debug&gt;true|false&lt;/debug&gt;
      *   &lt;coverage&gt;true|false&lt;/coverage&gt;
+     *   &lt;coverageFile&gt;&lt;/coverageFile&gt;
      *   &lt;logOnly&gt;true|false&lt;/logOnly&gt;  avd
      *   &lt;testSize&gt;small|medium|large&lt;/testSize&gt;
      *   &lt;createReport&gt;true|false&lt;/createReport&gt;
@@ -159,6 +160,15 @@ public abstract class AbstractInstrumentationMojo extends AbstractAndroidMojo {
      */
     private Boolean testCoverage;
 
+    /**
+     * Location on device into which coverage should be stored (blank for
+     * Android default /data/data/your.package.here/files/coverage.ec).
+     *
+     * @optional
+     * @parameter default-value= expression="${android.test.coverageFile}"
+     */
+    private String testCoverageFile;
+
     /**
      * Enable this flag to run a log only and not execute the tests.
      *
@@ -245,6 +255,7 @@ public abstract class AbstractInstrumentationMojo extends AbstractAndroidMojo {
     private List<String> parsedPackages;
     private String parsedTestSize;
     private Boolean parsedCoverage;
+    private String parsedCoverageFile;
     private Boolean parsedDebug;
     private Boolean parsedLogOnly;
     private Boolean parsedCreateReport;
@@ -296,6 +307,9 @@ public void doWithDevice(final IDevice device) throws MojoExecutionException, Mo
 
                 remoteAndroidTestRunner.setDebug(parsedDebug);
                 remoteAndroidTestRunner.setCoverage(parsedCoverage);
+                if (! "".equals(parsedCoverageFile)) {
+                    remoteAndroidTestRunner.addInstrumentationArg("coverageFile", parsedCoverageFile);
+                }
                 remoteAndroidTestRunner.setLogOnly(parsedLogOnly);
 
                 if (StringUtils.isNotBlank(parsedTestSize)) {
@@ -374,6 +388,11 @@ private void parseConfiguration() {
             } else {
                 parsedCoverage = testCoverage;
             }
+            if (test.getCoverageFile() != null) {
+                parsedCoverageFile = test.getCoverageFile();
+            } else {
+                parsedCoverageFile = "";
+            }
             if (test.isDebug() != null) {
                 parsedDebug = test.isDebug();
             } else {
@@ -398,8 +417,9 @@ private void parseConfiguration() {
             parsedClasses = testClasses;
             parsedPackages = testPackages;
             parsedTestSize = testTestSize;
-            parsedCoverage= testCoverage;
-            parsedDebug= testDebug;
+            parsedCoverage = testCoverage;
+            parsedCoverageFile = testCoverageFile;
+            parsedDebug = testDebug;
             parsedLogOnly = testLogOnly;
             parsedCreateReport = testCreateReport;
         }

diff --git a/src/main/java/com/jayway/maven/plugins/android/configuration/Test.java b/src/main/java/com/jayway/maven/plugins/android/configuration/Test.java
@@ -30,6 +30,10 @@ public class Test {
       * Mirror of {@link com.jayway.maven.plugins.android.AbstractInstrumentationMojo#testCoverage}
       */
     private Boolean coverage;
+    /**
+      * Mirror of {@link com.jayway.maven.plugins.android.AbstractInstrumentationMojo#testCoverageFile}
+      */
+    private String coverageFile;
     /**
       * Mirror of {@link com.jayway.maven.plugins.android.AbstractInstrumentationMojo#testLogOnly}
       */
@@ -71,6 +75,10 @@ public Boolean isCoverage() {
         return coverage;
     }
 
+    public String getCoverageFile() {
+        return coverageFile;
+    }
+
     public Boolean isLogOnly() {
         return logOnly;
     }

diff --git a/src/test/resources/manifest-tests/test-project/plugin-config.xml b/src/test/resources/manifest-tests/test-project/plugin-config.xml
@@ -35,6 +35,7 @@
             <skip>false</skip>
             <debug>true</debug>
             <coverage>false</coverage>
+            <coverageFile></coverageFile>
             <logOnly>false</logOnly>
             <classes><class>foo</class></classes>
           </test>