From 5d94340a7041feac3ebe464e083a6a7b3a3c7136 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Sat, 29 May 2010 01:03:21 -0700 Subject: [PATCH] Fix for no astrid dependency injection in static block. 2.14.1 --- astrid/AndroidManifest.xml | 2 +- .../timsu/astrid/provider/TasksProvider.java | 5 +++++ .../astrid/service/UpgradeService.java | 14 ++++++------- .../astrid/provider/TaskProviderTests.java | 21 +++++++++++++++++++ .../todoroo/astrid/test/DatabaseTestCase.java | 3 +++ 5 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 tests/src/com/todoroo/astrid/provider/TaskProviderTests.java diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index 28a695f87..7dc63a8fa 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="132" android:versionName="2.14.1"> diff --git a/astrid/src-legacy/com/timsu/astrid/provider/TasksProvider.java b/astrid/src-legacy/com/timsu/astrid/provider/TasksProvider.java index c57e2edd1..0f50b6432 100644 --- a/astrid/src-legacy/com/timsu/astrid/provider/TasksProvider.java +++ b/astrid/src-legacy/com/timsu/astrid/provider/TasksProvider.java @@ -17,9 +17,14 @@ import com.timsu.astrid.data.tag.TagIdentifier; import com.timsu.astrid.data.tag.TagModelForView; import com.timsu.astrid.data.task.TaskController; import com.timsu.astrid.data.task.TaskModelForProvider; +import com.todoroo.astrid.service.AstridDependencyInjector; public class TasksProvider extends ContentProvider { + static { + AstridDependencyInjector.initialize(); + } + private static final String TAG = "MessageProvider"; private static final boolean LOGD = false; diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index 3b3251b70..e00ff8dd0 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -84,17 +84,15 @@ public final class UpgradeService { public void showChangeLog(int from, int to) { StringBuilder changeLog = new StringBuilder(""); - switch(from) { - default: - // came from earlier version - - case 130: - newVersionString(changeLog, "2.14.0", new String[] { + if(from <= 130) + newVersionString(changeLog, "2.14.0 (5/24/10)", new String[] { "Pick a calendar to 'Add to Calendar' (in Settings menu)", "RTM: archived lists are ignored", "Fixed user-reported crashes!"}); - - } + if(from <= 131) + newVersionString(changeLog, "2.14.1 (5/29/10)", new String[] { + "Fixed crash while using PureCalendar widget", + }); changeLog.append(""); diff --git a/tests/src/com/todoroo/astrid/provider/TaskProviderTests.java b/tests/src/com/todoroo/astrid/provider/TaskProviderTests.java new file mode 100644 index 000000000..1d18f1a2f --- /dev/null +++ b/tests/src/com/todoroo/astrid/provider/TaskProviderTests.java @@ -0,0 +1,21 @@ +package com.todoroo.astrid.provider; + +import android.content.ContentResolver; +import android.database.Cursor; +import android.net.Uri; + +import com.timsu.astrid.provider.TasksProvider; +import com.todoroo.andlib.test.TodorooTestCase; + +public class TaskProviderTests extends TodorooTestCase { + + /** test that we can start things up and query for tasks */ + public void testSimpleTaskQuery() { + ContentResolver resolver = getContext().getContentResolver(); + + Uri tasks = Uri.withAppendedPath(TasksProvider.CONTENT_URI, "tasks"); + Cursor c = resolver.query(tasks, new String[] { "name" }, null, null, null); + assertTrue(c.getCount() >= 0); + } + +} diff --git a/tests/src/com/todoroo/astrid/test/DatabaseTestCase.java b/tests/src/com/todoroo/astrid/test/DatabaseTestCase.java index f108f73a9..72e0812a1 100644 --- a/tests/src/com/todoroo/astrid/test/DatabaseTestCase.java +++ b/tests/src/com/todoroo/astrid/test/DatabaseTestCase.java @@ -7,6 +7,7 @@ import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.TestDependencyInjector; import com.todoroo.andlib.test.TodorooTestCase; import com.todoroo.astrid.dao.Database; +import com.todoroo.astrid.service.AstridDependencyInjector; /** * Test case that automatically sets up and tears down a test database @@ -26,6 +27,8 @@ public class DatabaseTestCase extends TodorooTestCase { public Database database; static { + AstridDependencyInjector.initialize(); + // initialize test dependency injector TestDependencyInjector injector = TestDependencyInjector.initialize("db"); injector.addInjectable("tasksTable", TASKS_TEST);