From 8aa4bb8fa18994ba0a9a4195daa3f8a6e7e31f74 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Thu, 2 Feb 2012 03:32:57 -0800
Subject: [PATCH] Fix for tests. Now you can run the test suite in eclipse as
 well as from ant. Had to work around Android bug 23365

---
 astrid/.classpath                              |  2 +-
 astrid/AndroidManifest.xml                     |  6 +++---
 tests/build.xml                                | 18 +++++-------------
 tests/project.properties                       |  1 -
 .../astrid/reminders/NotificationTests.java    |  6 ++++++
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/astrid/.classpath b/astrid/.classpath
index 7485dd131..1307ffbce 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry excluding="com/todoroo/astrid/rmilk/EditOperationExposer.java|com/todoroo/astrid/rmilk/MilkEditActivity.java|com/todoroo/astrid/actfm/TaskFields.java|com/todoroo/astrid/actfm/ShowProjectExposer.java|com/todoroo/astrid/actfm/ProjectDetailExposer.java|com/todoroo/astrid/actfm/ProjectListActivity.java" kind="src" path="plugin-src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="src" path="rmilk-src"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="lib" path="libs/annotations.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/commons-codec-1.3.jar"/>
diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 03b1f1981..d21efd802 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -166,9 +166,9 @@
     <receiver android:name="com.todoroo.astrid.reminders.Notifications" />
     
     <receiver android:name="com.todoroo.astrid.reminders.Notifications$ShowNotificationReceiver">
-        <intent-filter>
-            <action android:name="com.timsu.astrid.IN_APP_NOTIFY"/>
-        </intent-filter>
+      <intent-filter> 
+        <action android:name="com.timsu.astrid.IN_APP_NOTIFY"/>
+      </intent-filter>
     </receiver>
     
     <!-- widgets -->
diff --git a/tests/build.xml b/tests/build.xml
index 8d3e6fc99..69e4e749a 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -45,22 +45,14 @@
             unless="sdk.dir"
     />
 
-    <!-- build and install an instrumented build -->
-    <target name="install-instrumented">
-      <property name="tested.project.absolute.dir" location="${tested.project.dir}" />
-      <subant target="instrument">
-        <fileset file="${tested.project.absolute.dir}/build.xml" />
-      </subant>
-      <subant target="installi">
-        <fileset file="${tested.project.absolute.dir}/build.xml" />
-      </subant>
-      <copy todir="." file="${tested.project.absolute.dir}/coverage.em" />
+    <target name="-pre-build">
+      <!-- copy library project jars -->
+      <unzip src="../api/bin/classes.jar" dest="${tested.project.absolute.dir}/bin/classes" />
     </target>
 
     <!-- override coverage target with custom reporting and rules -->    
-    <target name="coverage" depends="-test-project-check"
-                description="Runs the tests against the instrumented code and generates
-                            code coverage report">
+    <target name="coverage"
+                description="Runs the tests against the instrumented code and generates emma code coverage report">
 
       <property name="tested.project.absolute.dir" location="${tested.project.dir}" />
       <property name="test.runner" value="com.zutubi.android.junitreport.JUnitReportTestRunner" />
diff --git a/tests/project.properties b/tests/project.properties
index 9971607fc..730e911f2 100644
--- a/tests/project.properties
+++ b/tests/project.properties
@@ -9,4 +9,3 @@
 
 # Project target.
 target=android-14
-android.library.reference.1=../api
diff --git a/tests/src/com/todoroo/astrid/reminders/NotificationTests.java b/tests/src/com/todoroo/astrid/reminders/NotificationTests.java
index be35b2a7c..0c269e04f 100644
--- a/tests/src/com/todoroo/astrid/reminders/NotificationTests.java
+++ b/tests/src/com/todoroo/astrid/reminders/NotificationTests.java
@@ -23,6 +23,12 @@ public class NotificationTests extends DatabaseTestCase {
         boolean value = false;
     }
 
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        fail("fix me! i crash a lot.");
+    }
+
     @Override
     protected void tearDown() throws Exception {
         Notifications.setNotificationManager(null);