From dd772f717b13f4365582720d9564fab50ea929eb Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 3 Jun 2014 14:42:29 -0500 Subject: [PATCH] Remove TodorooTestCase --- .../todoroo/andlib/test/TodorooTestCase.java | 60 ------------------- .../todoroo/andlib/test/TranslationTests.java | 28 ++++++++- .../astrid/reminders/NotificationTests.java | 7 +++ .../astrid/reminders/NotificationsTest.java | 5 +- .../reminders/NotifyAtDeadlineTest.java | 4 +- .../astrid/reminders/ReminderServiceTest.java | 1 - .../astrid/repeats/AdvancedRepeatTest.java | 6 +- .../astrid/test/AstridTranslationTest.java | 1 - .../todoroo/astrid/test/DatabaseTestCase.java | 1 - .../java/org/tasks/TestUtilities.java | 10 ++++ .../tasks/injection/InjectingTestCase.java | 8 ++- 11 files changed, 56 insertions(+), 75 deletions(-) delete mode 100644 astrid/src/androidTest/java/com/todoroo/andlib/test/TodorooTestCase.java diff --git a/astrid/src/androidTest/java/com/todoroo/andlib/test/TodorooTestCase.java b/astrid/src/androidTest/java/com/todoroo/andlib/test/TodorooTestCase.java deleted file mode 100644 index ad133b678..000000000 --- a/astrid/src/androidTest/java/com/todoroo/andlib/test/TodorooTestCase.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.andlib.test; - -import android.content.res.Configuration; -import android.test.AndroidTestCase; -import android.util.DisplayMetrics; - -import com.todoroo.andlib.service.ContextManager; - -import java.util.Locale; - -/** - * Base test case for Astrid tests - * - * @author Tim Su - * - */ -public abstract class TodorooTestCase extends AndroidTestCase { - - @Override - protected void setUp() { - // for mockito: https://code.google.com/p/dexmaker/issues/detail?id=2 - System.setProperty("dexmaker.dexcache", getContext().getCacheDir().toString()); - - ContextManager.setContext(getContext()); - setLocale(Locale.ENGLISH); - } - - @Override - protected void tearDown() { - setLocale(Locale.getDefault()); - } - - /** - * Sets locale - */ - private void setLocale(Locale locale) { - Locale.setDefault(locale); - Configuration config = new Configuration(); - config.locale = locale; - DisplayMetrics metrics = getContext().getResources().getDisplayMetrics(); - getContext().getResources().updateConfiguration(config, metrics); - } - - /** - * Loop through each locale and call runnable - */ - public void forEachLocale(Runnable r) { - Locale[] locales = Locale.getAvailableLocales(); - for(Locale locale : locales) { - setLocale(locale); - - r.run(); - } - } -} diff --git a/astrid/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java b/astrid/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java index 5d3be1f31..b43085324 100644 --- a/astrid/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java +++ b/astrid/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java @@ -6,7 +6,10 @@ package com.todoroo.andlib.test; +import android.content.res.Configuration; import android.content.res.Resources; +import android.test.AndroidTestCase; +import android.util.DisplayMetrics; import org.tasks.R; @@ -27,7 +30,7 @@ import static org.tasks.date.DateTimeUtils.newDate; * @author Tim Su * */ -abstract public class TranslationTests extends TodorooTestCase { +abstract public class TranslationTests extends AndroidTestCase { // --- abstract methods @@ -48,6 +51,29 @@ abstract public class TranslationTests extends TodorooTestCase { // --- tests + /** + * Sets locale + */ + private void setLocale(Locale locale) { + Locale.setDefault(locale); + Configuration config = new Configuration(); + config.locale = locale; + DisplayMetrics metrics = getContext().getResources().getDisplayMetrics(); + getContext().getResources().updateConfiguration(config, metrics); + } + + /** + * Loop through each locale and call runnable + */ + protected void forEachLocale(Runnable r) { + Locale[] locales = Locale.getAvailableLocales(); + for(Locale locale : locales) { + setLocale(locale); + + r.run(); + } + } + private static final class FormatStringData { private static final char[] scratch = new char[10]; diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java index f860d45ea..63da0f4dd 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java @@ -28,6 +28,7 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.tasks.TestUtilities.initializeMockito; public class NotificationTests extends DatabaseTestCase { @@ -51,6 +52,12 @@ public class NotificationTests extends DatabaseTestCase { @Inject NotificationManager notificationManager; @Inject Broadcaster broadcaster; + @Override + public void setUp() { + initializeMockito(getContext()); + super.setUp(); + } + @Override protected void tearDown() { super.tearDown(); diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationsTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationsTest.java index 576adb028..f1e20274b 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationsTest.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationsTest.java @@ -1,8 +1,7 @@ package com.todoroo.astrid.reminders; import android.annotation.SuppressLint; - -import com.todoroo.andlib.test.TodorooTestCase; +import android.test.AndroidTestCase; import org.joda.time.DateTime; import org.tasks.R; @@ -14,7 +13,7 @@ import static com.todoroo.astrid.reminders.ShowNotificationReceiver.isQuietHours import static org.tasks.Freeze.freezeAt; import static org.tasks.Freeze.thaw; -public class NotificationsTest extends TodorooTestCase{ +public class NotificationsTest extends AndroidTestCase { @SuppressLint("NewApi") private static final int MILLIS_PER_HOUR = (int) TimeUnit.HOURS.toMillis(1); diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java index 69bfdf5fc..b4848f0e2 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java @@ -1,8 +1,8 @@ package com.todoroo.astrid.reminders; import android.annotation.SuppressLint; +import android.test.AndroidTestCase; -import com.todoroo.andlib.test.TodorooTestCase; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.data.Task; @@ -17,7 +17,7 @@ import static org.tasks.Freeze.freezeAt; import static org.tasks.Freeze.thaw; import static org.tasks.date.DateTimeUtils.newDate; -public class NotifyAtDeadlineTest extends TodorooTestCase { +public class NotifyAtDeadlineTest extends AndroidTestCase { @SuppressLint("NewApi") private static final int MILLIS_PER_HOUR = (int) TimeUnit.HOURS.toMillis(1); diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java index 03926fc89..4bee917aa 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java @@ -33,7 +33,6 @@ public class ReminderServiceTest extends InjectingTestCase { @Override public void tearDown() { - super.tearDown(); thaw(); } diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java index 4fefec305..95a546bd2 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java @@ -5,11 +5,12 @@ */ package com.todoroo.astrid.repeats; +import android.test.AndroidTestCase; + import com.google.ical.values.Frequency; import com.google.ical.values.RRule; import com.google.ical.values.Weekday; import com.google.ical.values.WeekdayNum; -import com.todoroo.andlib.test.TodorooTestCase; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.data.Task; @@ -20,7 +21,7 @@ import java.util.Date; import static org.tasks.date.DateTimeUtils.newDate; -public class AdvancedRepeatTest extends TodorooTestCase { +public class AdvancedRepeatTest extends AndroidTestCase { private static final int PREV_PREV = -2; private static final int PREV = -1; @@ -34,7 +35,6 @@ public class AdvancedRepeatTest extends TodorooTestCase { @Override public void setUp() { - super.setUp(); task = new Task(); task.setCompletionDate(DateUtilities.now()); rrule = new RRule(); diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/test/AstridTranslationTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/test/AstridTranslationTest.java index bc48d6f1f..af778e3a0 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/test/AstridTranslationTest.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/test/AstridTranslationTest.java @@ -60,7 +60,6 @@ public class AstridTranslationTest extends TranslationTests { contains(r, R.string.CFC_tag_text, failures, "?"); contains(r, R.string.CFC_tag_contains_text, failures, "?"); contains(r, R.string.CFC_title_contains_text, failures, "?"); - contains(r, R.string.CFC_importance_text, failures, "?"); contains(r, R.string.CFC_dueBefore_text, failures, "?"); } }); diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java b/astrid/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java index e7417a39c..59e6dc53e 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java @@ -26,6 +26,5 @@ public abstract class DatabaseTestCase extends InjectingTestCase { @Override protected void tearDown() { database.close(); - super.tearDown(); } } diff --git a/astrid/src/androidTest/java/org/tasks/TestUtilities.java b/astrid/src/androidTest/java/org/tasks/TestUtilities.java index 92e93c994..6bc092e30 100644 --- a/astrid/src/androidTest/java/org/tasks/TestUtilities.java +++ b/astrid/src/androidTest/java/org/tasks/TestUtilities.java @@ -5,6 +5,16 @@ import android.content.Context; import org.tasks.preferences.Preferences; public class TestUtilities { + private static boolean mockitoInitialized; + + public static void initializeMockito(Context context) { + if (!mockitoInitialized) { + // for mockito: https://code.google.com/p/dexmaker/issues/detail?id=2 + System.setProperty("dexmaker.dexcache", context.getCacheDir().toString()); + mockitoInitialized = true; + } + } + public static void clearPreferences(Context context) { new Preferences(context).clear(); } diff --git a/astrid/src/androidTest/java/org/tasks/injection/InjectingTestCase.java b/astrid/src/androidTest/java/org/tasks/injection/InjectingTestCase.java index 3602e62be..3829036f6 100644 --- a/astrid/src/androidTest/java/org/tasks/injection/InjectingTestCase.java +++ b/astrid/src/androidTest/java/org/tasks/injection/InjectingTestCase.java @@ -1,14 +1,16 @@ package org.tasks.injection; -import com.todoroo.andlib.test.TodorooTestCase; +import android.test.AndroidTestCase; + +import com.todoroo.andlib.service.ContextManager; import dagger.ObjectGraph; -public abstract class InjectingTestCase extends TodorooTestCase { +public abstract class InjectingTestCase extends AndroidTestCase { @Override protected void setUp() { - super.setUp(); + ContextManager.setContext(getContext()); ObjectGraph objectGraph = ObjectGraph.create(new TestModule(getContext())); Object extension = getModule();