diff --git a/build.gradle b/build.gradle index d3d302f0f..361e47c52 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { dependencies { classpath 'com.google.guava:guava:19.0' - classpath 'com.android.tools.build:gradle:2.2.0-beta2' + classpath 'com.android.tools.build:gradle:2.2.0-beta3' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.2' } } diff --git a/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java b/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java index e59b40316..dbd38f71e 100644 --- a/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java +++ b/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java @@ -14,7 +14,6 @@ import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.test.DatabaseTestCase; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.tasks.injection.TestComponent; @@ -99,7 +98,6 @@ public class MetadataDaoTests extends DatabaseTestCase { /** * Test metadata bound to task */ - @Ignore @Test public void testMetadataConditions() { // create "happy" diff --git a/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java b/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java index 0a10241d9..1299e45fe 100644 --- a/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java +++ b/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java @@ -14,7 +14,6 @@ import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.test.DatabaseTestCase; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.tasks.injection.TestComponent; @@ -42,7 +41,6 @@ public class TaskDaoTests extends DatabaseTestCase { /** * Test basic task creation, fetch, and save */ - @Ignore @Test public void testTaskCreation() { assertEquals(0, taskDao.toList(Query.select(IDS)).size()); @@ -80,7 +78,6 @@ public class TaskDaoTests extends DatabaseTestCase { /** * Test various task fetch conditions */ - @Ignore @Test public void testTaskConditions() { // create normal task @@ -131,7 +128,6 @@ public class TaskDaoTests extends DatabaseTestCase { /** * Test task deletion */ - @Ignore @Test public void testTDeletion() { assertEquals(0, taskDao.toList(Query.select(IDS)).size()); @@ -151,7 +147,6 @@ public class TaskDaoTests extends DatabaseTestCase { /** * Test save without prior create doesn't work */ - @Ignore @Test public void testSaveWithoutCreate() { // try to save task "happy" @@ -167,7 +162,6 @@ public class TaskDaoTests extends DatabaseTestCase { /** * Test passing invalid task indices to various things */ - @Ignore @Test public void testInvalidIndex() { assertEquals(0, taskDao.toList(Query.select(IDS)).size()); diff --git a/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java b/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java index ccc5a6b34..9c955d141 100644 --- a/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java +++ b/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java @@ -14,7 +14,6 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.reminders.ReminderService.AlarmScheduler; import org.junit.After; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.tasks.injection.InjectingTestCase; @@ -91,7 +90,6 @@ public class ReminderServiceTest extends InjectingTestCase { assertTrue(((AlarmExpected) reminderService.getScheduler()).alarmCreated); } - @Ignore @Test public void testRandom() { // test random diff --git a/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java b/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java index 1c1ae860e..505b82ba9 100644 --- a/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java +++ b/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java @@ -101,7 +101,6 @@ public class NewRepeatTests extends DatabaseTestCase { * Tests for no sync */ - @Ignore @Test public void testNoRepeat() { Task t = new Task(); diff --git a/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java b/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java index 0b9a7a9fb..8a926b3d3 100644 --- a/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java +++ b/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java @@ -6,7 +6,6 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.service.TaskService; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.tasks.injection.TestComponent; @@ -59,7 +58,6 @@ public class SubtasksHelperTest extends SubtasksTestCase { // Default order: "[-1, [1, 2, [3, 4]], 5, 6]" private static String EXPECTED_REMOTE = "[\"-1\", [\"6\", \"4\", [\"3\", \"1\"]], \"2\", \"5\"]".replaceAll("\\s", ""); - @Ignore @Test public void testLocalToRemoteIdMapping() { String mapped = SubtasksHelper.convertTreeToRemoteIds(taskService, DEFAULT_SERIALIZED_TREE).replaceAll("\\s", ""); diff --git a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java b/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java index f0cb85832..aeba045a2 100644 --- a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java +++ b/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java @@ -14,7 +14,6 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.test.DatabaseTestCase; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.tasks.injection.TestComponent; @@ -95,7 +94,6 @@ public class GtasksIndentActionTest extends DatabaseTestCase { thenExpectIndentationLevel(0); } - @Ignore @Test public void testIndentWithChildren() { taskWithMetadata(0, 0); @@ -132,7 +130,6 @@ public class GtasksIndentActionTest extends DatabaseTestCase { thenExpectIndentationLevel(sibling, 0); } - @Ignore @Test public void testIndentWithChildrensChildren() { taskWithMetadata(0, 0); diff --git a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java b/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java index 1f6168e5d..264273f7c 100644 --- a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java +++ b/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java @@ -52,7 +52,6 @@ public class GtasksTaskListUpdaterTest extends DatabaseTestCase { thenExpectParent(tasks[4], null); } - @Ignore @Test public void testBasicSiblingComputation() { Task[] tasks = givenTasksABCDE(); @@ -78,7 +77,6 @@ public class GtasksTaskListUpdaterTest extends DatabaseTestCase { thenExpectMetadataParent(tasks[4], null); } - @Ignore @Test public void testMetadataOrderComputation() { Task[] tasks = givenTasksABCDE(); diff --git a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java b/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java index c7f8f563b..e7921c6f1 100644 --- a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java +++ b/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java @@ -14,7 +14,6 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.test.DatabaseTestCase; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.tasks.injection.TestComponent; @@ -52,7 +51,6 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { * F */ - @Ignore @Test public void testMoveDownFromListBottom() { givenTasksABCDEF(); @@ -63,7 +61,6 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { thenExpectMetadataOrderAndIndent(F, 5, 0); } - @Ignore @Test public void testMoveDownToListBottom() { givenTasksABCDEF(); @@ -74,7 +71,6 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { thenExpectMetadataOrderAndIndent(F, 4, 0); } - @Ignore @Test public void testMoveUpSimple() { givenTasksABCDEF(); @@ -85,7 +81,6 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { thenExpectMetadataOrderAndIndent(F, 4, 0); } - @Ignore @Test public void testMoveUpWithSubtasks() { givenTasksABCDEF(); @@ -105,7 +100,6 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { thenExpectMetadataOrderAndIndent(D, 2, 2); } - @Ignore @Test public void testMoveDownThroughSubtasks() { givenTasksABCDEF(); @@ -126,7 +120,6 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { thenExpectMetadataOrderAndIndent(D, 2, 2); } - @Ignore @Test public void testMoveUpAboveParent() { givenTasksABCDEF(); @@ -147,7 +140,6 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { thenExpectMetadataOrderAndIndent(C, 2, 1); } - @Ignore @Test public void testMoveDownWithChildren() { givenTasksABCDEF(); @@ -170,7 +162,6 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { thenExpectMetadataOrderAndIndent(E, 2, 0); } - @Ignore @Test public void testMoveDownIndentingTwice() { givenTasksABCDEF(); @@ -192,7 +183,6 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { thenExpectMetadataOrderAndIndent(E, 3, 0); } - @Ignore @Test public void testMoveUpMultiple() { givenTasksABCDEF(); @@ -212,7 +202,6 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { thenExpectMetadataOrderAndIndent(D, 1, 1); } - @Ignore @Test public void testMoveUpIntoSublist() { givenTasksABCDEF(); @@ -235,7 +224,6 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { thenExpectMetadataOrderAndIndent(F, 3, 2); } - @Ignore @Test public void testMoveDownMultiple() { givenTasksABCDEF(); diff --git a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java b/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java index 6357aa5ba..b52f0ea08 100644 --- a/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java +++ b/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java @@ -4,7 +4,6 @@ import android.support.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.tasks.time.DateTime; @@ -60,7 +59,6 @@ public class GtasksApiUtilitiesTest { unixTimeToGtasksDueDate(now.getMillis()).getValue()); } - @Ignore @Test public void testConvertGoogleDueDateToUnixTime() { com.google.api.client.util.DateTime googleDueDate =