From 6f66f4f3cc4458f75a9d5beac5dc7be5889d1956 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Mon, 14 Oct 2013 22:53:48 -0500
Subject: [PATCH] Fix tests, update manifest target sdk

---
 android-aac-enc/build.gradle                  |   1 -
 .../libs/libaac-encoder.jar                   | Bin
 .../todoroo/astrid/sync/SyncModelTest.java    |  42 ------------------
 astrid/src/main/AndroidManifest.xml           |   2 +-
 4 files changed, 1 insertion(+), 44 deletions(-)
 rename {android-aac-enc => astrid}/libs/libaac-encoder.jar (100%)

diff --git a/android-aac-enc/build.gradle b/android-aac-enc/build.gradle
index b58970b65..483c42aee 100644
--- a/android-aac-enc/build.gradle
+++ b/android-aac-enc/build.gradle
@@ -25,5 +25,4 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:18.0.0'
-    compile fileTree(dir: "libs", includes: ["*.jar"])
 }
diff --git a/android-aac-enc/libs/libaac-encoder.jar b/astrid/libs/libaac-encoder.jar
similarity index 100%
rename from android-aac-enc/libs/libaac-encoder.jar
rename to astrid/libs/libaac-encoder.jar
diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/SyncModelTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/SyncModelTest.java
index 40c52ec0b..c2e2750d5 100644
--- a/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/SyncModelTest.java
+++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/SyncModelTest.java
@@ -4,9 +4,7 @@ import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.astrid.data.RemoteModel;
-import com.todoroo.astrid.data.SyncFlags;
 import com.todoroo.astrid.data.TagData;
-import com.todoroo.astrid.data.TagOutstanding;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.TaskOutstanding;
 
@@ -63,44 +61,4 @@ public class SyncModelTest extends NewSyncTestCase {
 			cursor.close();
 		}
 	}
-	
-	public void testChangeTagMakesOutstandingEntries() {
-		TagData tag = createTagData();
-		String newName = "changing tag name";
-		tag.setValue(TagData.NAME, newName);
-		
-		tagDataDao.saveExisting(tag);
-		TodorooCursor<TagOutstanding> cursor = tagOutstandingDao.query(Query.select(TagOutstanding.PROPERTIES)
-				.where(Criterion.and(TagOutstanding.TAG_DATA_ID.eq(tag.getId()),
-						TagOutstanding.COLUMN_STRING.eq(TagData.NAME.name),
-						TagOutstanding.VALUE_STRING.eq(newName))));
-		try {
-			assertTrue(cursor.getCount() > 0);
-		} finally {
-			cursor.close();
-		}
-	}
-	
-	public void testSuppressionFlagSuppressesOutstandingEntries() {
-		Task task = createTask(true);
-		TodorooCursor<TagOutstanding> cursor = tagOutstandingDao.query(Query.select(TagOutstanding.PROPERTIES)
-				.where(TagOutstanding.TAG_DATA_ID.eq(task.getId())));
-		try {
-			assertEquals(0, cursor.getCount());
-		} finally {
-			cursor.close();
-		}
-		
-		task.setValue(Task.TITLE, "new title");
-		task.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-		taskDao.save(task);
-		
-		cursor = tagOutstandingDao.query(Query.select(TagOutstanding.PROPERTIES)
-				.where(TagOutstanding.TAG_DATA_ID.eq(task.getId())));
-		try {
-			assertEquals(0, cursor.getCount());
-		} finally {
-			cursor.close();
-		}
-	}
 }
diff --git a/astrid/src/main/AndroidManifest.xml b/astrid/src/main/AndroidManifest.xml
index 84abc0e69..9dfaafc95 100644
--- a/astrid/src/main/AndroidManifest.xml
+++ b/astrid/src/main/AndroidManifest.xml
@@ -73,7 +73,7 @@
     <!-- ========================================================== Metadata = -->
 
     <uses-sdk
-        android:targetSdkVersion="17"
+        android:targetSdkVersion="18"
         android:minSdkVersion="7" />
 
     <supports-screens