archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix tests

Browse Source
pull/618/head
Alex Baker 6 years ago
parent c499064e3e
commit cb1136fc00
17 changed files with 53 additions and 85 deletions
Show Stats Download Patch File Download Diff File

4
app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmServiceTest.java
Unescape Escape View File

@ -6,13 +6,13 @@ import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import org.tasks.jobs.Alarm;
import org.tasks.jobs.JobQueue;
@ -28,7 +28,7 @@ import static org.tasks.makers.TaskMaker.REMINDER_LAST;
import static org.tasks.makers.TaskMaker.newTask;
@RunWith(AndroidJUnit4.class)
public class AlarmServiceTest extends DatabaseTestCase {
public class AlarmServiceTest extends InjectingTestCase {
@Inject MetadataDao metadataDao;
@Inject TaskDao taskDao;

4
app/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java
Unescape Escape View File

@ -12,10 +12,10 @@ import com.todoroo.andlib.sql.Query;
import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import java.util.List;
@ -30,7 +30,7 @@ import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
@RunWith(AndroidJUnit4.class)
public class MetadataDaoTests extends DatabaseTestCase {
public class MetadataDaoTests extends InjectingTestCase {
@Inject MetadataDao metadataDao;
@Inject TaskDao taskDao;

4
app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java
Unescape Escape View File

@ -12,10 +12,10 @@ import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import java.util.List;
@ -29,7 +29,7 @@ import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.assertTrue;
@RunWith(AndroidJUnit4.class)
public class TaskDaoTests extends DatabaseTestCase {
public class TaskDaoTests extends InjectingTestCase {
public static Property<?>[] IDS = new Property<?>[] { Task.ID };

4
app/src/androidTest/java/com/todoroo/astrid/repeats/RepeatTaskHelperTest.java
Unescape Escape View File

@ -8,7 +8,6 @@ import com.todoroo.astrid.alarms.AlarmService;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gcal.GCalHelper;
import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.After;
import org.junit.Before;
@ -16,6 +15,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.tasks.LocalBroadcastManager;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import org.tasks.time.DateTime;
@ -37,7 +37,7 @@ import static org.tasks.makers.TaskMaker.newTask;
@SuppressLint("NewApi")
@RunWith(AndroidJUnit4.class)
public class RepeatTaskHelperTest extends DatabaseTestCase {
public class RepeatTaskHelperTest extends InjectingTestCase {
@Inject TaskDao taskDao;

4
app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java
Unescape Escape View File

@ -8,10 +8,10 @@ package com.todoroo.astrid.service;
import android.support.test.runner.AndroidJUnit4;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import java.util.ArrayList;
@ -23,7 +23,7 @@ import javax.inject.Inject;
import static junit.framework.Assert.assertEquals;
@RunWith(AndroidJUnit4.class)
public class QuickAddMarkupTest extends DatabaseTestCase {
public class QuickAddMarkupTest extends InjectingTestCase {
@Inject TaskCreator taskCreator;

4
app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java
Unescape Escape View File

@ -12,12 +12,12 @@ import com.google.ical.values.RRule;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.tags.TagService;
import com.todoroo.astrid.test.DatabaseTestCase;
import com.todoroo.astrid.utility.TitleParser;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.tasks.R;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import org.tasks.preferences.Preferences;
import org.tasks.time.DateTime;
@ -34,7 +34,7 @@ import static junit.framework.Assert.assertTrue;
import static org.tasks.date.DateTimeUtils.newDateTime;
@RunWith(AndroidJUnit4.class)
public class TitleParserTest extends DatabaseTestCase {
public class TitleParserTest extends InjectingTestCase {
@Inject TaskDao taskDao;
@Inject TagService tagService;

4
app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java
Unescape Escape View File

@ -6,8 +6,8 @@ import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskListMetadataDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.subtasks.SubtasksFilterUpdater.Node;
import com.todoroo.astrid.test.DatabaseTestCase;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import org.tasks.preferences.Preferences;
@ -22,7 +22,7 @@ import static junit.framework.Assert.assertNotNull;
* @author Sam
*
*/
public class SubtasksTestCase extends DatabaseTestCase {
public class SubtasksTestCase extends InjectingTestCase {
@Inject TaskListMetadataDao taskListMetadataDao;
@Inject TaskDao taskDao;

4
app/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java
Unescape Escape View File

@ -4,13 +4,13 @@ import com.todoroo.astrid.dao.TagDataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.test.DatabaseTestCase;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import javax.inject.Inject;
public class NewSyncTestCase extends DatabaseTestCase {
public class NewSyncTestCase extends InjectingTestCase {
@Inject TaskDao taskDao;
@Inject TagDataDao tagDataDao;

34
app/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java
Unescape Escape View File

@ -1,34 +0,0 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.test;
import com.todoroo.astrid.dao.Database;
import org.junit.After;
import org.tasks.injection.InjectingTestCase;
import static android.support.test.InstrumentationRegistry.getTargetContext;
public abstract class DatabaseTestCase extends InjectingTestCase {
protected Database database;
@Override
public void setUp() {
super.setUp();
database = component.getDatabase();
database.close();
getTargetContext().deleteDatabase(database.getName());
database.openForWriting();
}
@After
public void tearDown() {
database.close();
}
}

38
app/src/androidTest/java/org/tasks/injection/TestModule.java
Unescape Escape View File

@ -4,8 +4,11 @@ import android.arch.persistence.room.Room;
import android.content.Context;
import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.dao.TagDataDao;
import com.todoroo.astrid.dao.TaskListMetadataDao;
import com.todoroo.astrid.dao.UserActivityDao;
import org.tasks.analytics.Tracker;
import org.tasks.db.Migrations;
import org.tasks.notifications.NotificationDao;
import org.tasks.preferences.PermissionChecker;
import org.tasks.preferences.PermissivePermissionChecker;
@ -13,8 +16,6 @@ import org.tasks.preferences.PermissivePermissionChecker;
import dagger.Module;
import dagger.Provides;
import static org.mockito.Mockito.mock;
@Module
public class TestModule {
private Context context;
@ -23,26 +24,33 @@ public class TestModule {
this.context = context;
}
@ApplicationScope
@Provides
@ApplicationScope
public Database getDatabase() {
return new Database(context, mock(Tracker.class)) {
@Override
public String getName() {
return "databasetest";
}
};
return Room.inMemoryDatabaseBuilder(context, Database.class)
.fallbackToDestructiveMigration()
.addCallback(Migrations.ON_CREATE)
.build();
}
@Provides
@ApplicationScope
public AppDatabase getAppDatabase() {
return Room.databaseBuilder(context, AppDatabase.class, "test-app-database").build();
public NotificationDao getNotificationDao(Database appDatabase) {
return appDatabase.notificationDao();
}
@Provides
public NotificationDao getNotificationDao(AppDatabase appDatabase) {
return appDatabase.notificationDao();
public TagDataDao getTagDataDao(Database database) {
return database.getTagDataDao();
}
@Provides
public UserActivityDao getUserActivityDao(Database database) {
return database.getUserActivityDao();
}
@Provides
public TaskListMetadataDao getTaskListMetadataDao(Database database) {
return database.getTaskListMetadataDao();
}
@ApplicationScope

9
app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.java
Unescape Escape View File

@ -11,12 +11,13 @@ import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.backup.TasksXmlExporter;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.tasks.R;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import org.tasks.preferences.Preferences;
import org.tasks.scheduling.AlarmManager;
@ -35,7 +36,7 @@ import static org.tasks.date.DateTimeUtils.newDateTime;
import static org.tasks.time.DateTimeUtils.currentTimeMillis;
@RunWith(AndroidJUnit4.class)
public class BackupServiceTests extends DatabaseTestCase {
public class BackupServiceTests extends InjectingTestCase {
private static final long BACKUP_WAIT_TIME = 500L;
@ -73,10 +74,8 @@ public class BackupServiceTests extends DatabaseTestCase {
component.inject(this);
}
@Override
@After
public void tearDown() {
super.tearDown();
if (temporaryDirectory != null) {
for (File file : temporaryDirectory.listFiles())
file.delete();

4
app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
Unescape Escape View File

@ -12,10 +12,10 @@ import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import java.util.ArrayList;
@ -28,7 +28,7 @@ import static junit.framework.Assert.assertTrue;
@SuppressWarnings("nls")
@RunWith(AndroidJUnit4.class)
public class GtasksIndentActionTest extends DatabaseTestCase {
public class GtasksIndentActionTest extends InjectingTestCase {
@Inject GtasksListService gtasksListService;
@Inject GtasksTaskListUpdater gtasksTaskListUpdater;

4
app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java
Unescape Escape View File

@ -8,12 +8,12 @@ import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.StoreObjectDao;
import com.todoroo.astrid.service.TaskDeleter;
import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.tasks.LocalBroadcastManager;
import org.tasks.data.TaskListDataProvider;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import org.tasks.makers.RemoteGtaskListMaker;
@ -35,7 +35,7 @@ import static org.tasks.makers.RemoteGtaskListMaker.newRemoteList;
import static org.tasks.time.DateTimeUtils.currentTimeMillis;
@RunWith(AndroidJUnit4.class)
public class GtasksListServiceTest extends DatabaseTestCase {
public class GtasksListServiceTest extends InjectingTestCase {
@Inject Database database;
@Inject TaskListDataProvider taskListDataProvider;

4
app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
Unescape Escape View File

@ -12,10 +12,10 @@ import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import org.tasks.preferences.Preferences;
@ -31,7 +31,7 @@ import static junit.framework.Assert.assertNull;
@SuppressWarnings("nls")
@RunWith(AndroidJUnit4.class)
public class GtasksMetadataServiceTest extends DatabaseTestCase {
public class GtasksMetadataServiceTest extends InjectingTestCase {
@Module
public class GtasksMetadataServiceTestModule {

4
app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java
Unescape Escape View File

@ -12,11 +12,11 @@ import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskDao;
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.InjectingTestCase;
import org.tasks.injection.TestComponent;
import java.util.ArrayList;
@ -29,7 +29,7 @@ import static junit.framework.Assert.assertNotNull;
@SuppressWarnings("nls")
@RunWith(AndroidJUnit4.class)
public class GtasksTaskListUpdaterTest extends DatabaseTestCase {
public class GtasksTaskListUpdaterTest extends InjectingTestCase {
private static final int VALUE_UNSET = -1;

4
app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java
Unescape Escape View File

@ -12,10 +12,10 @@ import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.test.DatabaseTestCase;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
import java.util.ArrayList;
@ -28,7 +28,7 @@ import static junit.framework.Assert.assertNotNull;
@SuppressWarnings("nls")
@RunWith(AndroidJUnit4.class)
public class GtasksTaskMovingTest extends DatabaseTestCase {
public class GtasksTaskMovingTest extends InjectingTestCase {
private static final int VALUE_UNSET = -1;

5
app/src/androidTestGoogleplay/java/org/tasks/injection/TestComponent.java
Unescape Escape View File

@ -1,7 +1,6 @@
package org.tasks.injection;
import com.todoroo.astrid.alarms.AlarmServiceTest;
import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.dao.MetadataDaoTests;
import com.todoroo.astrid.dao.TaskDaoTests;
import com.todoroo.astrid.gtasks.GtasksIndentActionTest;
@ -37,8 +36,6 @@ public interface TestComponent {
void inject(GtasksTaskListUpdaterTest gtasksTaskListUpdaterTest);
Database getDatabase();
void inject(ReminderServiceTest reminderServiceTest);
void inject(TaskTest taskTest);
@ -47,8 +44,6 @@ public interface TestComponent {
void inject(MetadataDaoTests metadataDaoTests);
void inject(Astrid3ProviderTests astrid3ProviderTests);
void inject(NewSyncTestCase newSyncTestCase);
void inject(SubtasksTestCase subtasksTestCase);

Write Preview
Loading…
Cancel
Save