From db6d11539edd5b962670a1a9ed898f7a925326fd Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Mon, 27 Sep 2010 11:21:22 -0700
Subject: [PATCH] Astrid unit tests: use zutubi junit xml reporter to generate
 junit xml. also use emma xml reporter to generate emma xml

---
 tests/.classpath                          |   1 +
 tests/.gitignore                          |   1 +
 tests/AndroidManifest.xml                 |   2 +-
 tests/build.properties                    |   5 ++
 tests/build.xml                           |  65 ++++++++++++++++++++--
 tests/libs/android-junit-report-1.0.3.jar | Bin 0 -> 5608 bytes
 6 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 tests/libs/android-junit-report-1.0.3.jar

diff --git a/tests/.classpath b/tests/.classpath
index 1f0940313..33c1872af 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/astrid"/>
+	<classpathentry kind="lib" path="libs/android-junit-report-1.0.3.jar"/>
 	<classpathentry kind="output" path="ecbuild"/>
 </classpath>
diff --git a/tests/.gitignore b/tests/.gitignore
index 6a4fa7410..6f60917b0 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -2,3 +2,4 @@ bin/
 instrumented/
 coverage.em
 coverage/
+reports/
\ No newline at end of file
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 78e3d25bd..af07d58d8 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -19,7 +19,7 @@
     the package of the parent app.  To run the tests use the command:
     "adb shell am instrument -w com.xxx.xxx.tests/android.test.InstrumentationTestRunner"
     -->
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
+    <instrumentation android:name="com.zutubi.android.junitreport.JUnitReportTestRunner"
                      android:targetPackage="com.timsu.astrid"
                      android:label="Tests for Astrid"/>
 </manifest>
diff --git a/tests/build.properties b/tests/build.properties
index bfacee704..dd82656f6 100644
--- a/tests/build.properties
+++ b/tests/build.properties
@@ -24,3 +24,8 @@ out.dir=bin
 # because we pull in from multiple source folders
 source.dir=${out.dir}/source
 
+# test runner: junit report test runner
+test.runner=com.zutubi.android.junitreport.JUnitReportTestRunner
+
+# reports output directory
+reports.dir=reports
\ No newline at end of file
diff --git a/tests/build.xml b/tests/build.xml
index af5e730b2..b30dfbcff 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -64,7 +64,14 @@
     -->
     <setup />
 
-    <target name="coverage">
+    <target name="coverage" depends="-prepare-coverage-source">
+      <antcall target="android-coverage">
+        <param name="source.dir" value="bin/source" />
+      </antcall>
+      <antcall target="pull-junit" />
+    </target>
+
+    <target name="-prepare-coverage-source">
       <subant target="help">
         <fileset file="${tested.project.absolute.dir}/build.xml" />
       </subant>
@@ -77,9 +84,59 @@
       <copy todir="${source.dir}">
         <fileset dir="src" />
       </copy>
-      <antcall target="android_test_rules.coverage">
-        <param name="source.dir" value="bin/source" />
-      </antcall>
     </target>
 
+    <target name="pull-junit">
+      <exec executable="${adb}" failonerror="true">
+        <arg line="${adb.device.arg}"/>
+        <arg value="pull" />
+        <arg value="/data/data/${tested.manifest.package}/files/junit-report.xml" />
+        <arg value="${reports.dir}/junit-report.xml" />
+      </exec>
+    </target>
+
+    <!-- clone of android coverage target with extra purposes:
+         1. generate emma xml report
+         2. use adb device arg to pull coverage file
+      -->
+    <target name="android-coverage" depends="-set-coverage-classpath, -install-instrumented, install"
+                description="Runs the tests against the instrumented code and generates
+                            code coverage report">
+        <run-tests-helper emma.enabled="true">
+            <extra-instrument-args>
+                <arg value="-e" />
+                   <arg value="coverageFile" />
+                   <arg value="${emma.dump.file}" />
+            </extra-instrument-args>
+        </run-tests-helper>
+        <echo>Downloading coverage file into project directory...</echo>
+        <exec executable="${adb}" failonerror="true">
+          <arg line="${adb.device.arg}"/>
+          <arg value="pull" />
+          <arg value="${emma.dump.file}" />
+          <arg value="coverage.ec" />
+        </exec>
+        <echo>Extracting coverage report...</echo>
+        <mkdir dir="${reports.dir}" />
+        <emma>
+            <report sourcepath="${tested.project.absolute.dir}/${source.dir}"
+                              verbosity="${verbosity}">
+                <!-- TODO: report.dir or something like should be introduced if necessary -->
+                <infileset dir=".">
+                    <include name="coverage.ec" />
+                    <include name="coverage.em" />
+                </infileset>
+                <!-- TODO: reports in other, indicated by user formats -->
+                <html outfile="${reports.dir}/coverage.html" />
+                <xml outfile="${reports.dir}/coverage.xml" />
+           </report>
+        </emma>
+        <echo>Cleaning up temporary files...</echo>
+        <delete dir="${instrumentation.absolute.dir}" />
+        <delete file="coverage.ec" />
+        <delete file="coverage.em" />
+        <echo>Saving the report file in ${basedir}/coverage/coverage.html</echo>
+    </target>
+
+
 </project>
diff --git a/tests/libs/android-junit-report-1.0.3.jar b/tests/libs/android-junit-report-1.0.3.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a4146976f7e6b9741d368c88b10f7c144569af05
GIT binary patch
literal 5608
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
Dup_Ue

literal 0
HcmV?d00001