Fix tests

pull/848/head
Alex Baker 5 years ago
parent 6e95a809d0
commit d412a95da0

@ -3,8 +3,9 @@ sudo: required
jdk: oraclejdk8 jdk: oraclejdk8
env: env:
global: global:
- TARGET_API=28 - TARGET_API=29
- BUILD_TOOLS=28.0.3 - BUILD_TOOLS=29.0.2
- ADB_INSTALL_TIMEOUT=10
matrix: matrix:
- EMULATOR_API=21 ANDROID_ABI=armeabi-v7a - EMULATOR_API=21 ANDROID_ABI=armeabi-v7a
android: android:
@ -12,7 +13,6 @@ android:
- tools # https://github.com/travis-ci/travis-ci/issues/5049 - tools # https://github.com/travis-ci/travis-ci/issues/5049
- tools # https://github.com/travis-ci/travis-ci/issues/6040 - tools # https://github.com/travis-ci/travis-ci/issues/6040
- android-$TARGET_API - android-$TARGET_API
- android-27 # dav4android, ical4android
- android-$EMULATOR_API - android-$EMULATOR_API
- sys-img-$ANDROID_ABI-android-$EMULATOR_API - sys-img-$ANDROID_ABI-android-$EMULATOR_API
- platform-tools - platform-tools
@ -21,6 +21,7 @@ android:
- extra-google-m2repository - extra-google-m2repository
before_install: before_install:
- yes | sdkmanager "platforms;android-28" # ical4android
- echo no | android create avd --force -n test -t android-$EMULATOR_API --abi $ANDROID_ABI - echo no | android create avd --force -n test -t android-$EMULATOR_API --abi $ANDROID_ABI
- emulator -avd test -no-skin -no-audio -no-window & - emulator -avd test -no-skin -no-audio -no-window &
- ./.wait_for_emulator.sh - ./.wait_for_emulator.sh

@ -17,9 +17,11 @@ import com.todoroo.astrid.data.Task;
import javax.inject.Inject; import javax.inject.Inject;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.tasks.injection.InjectingTestCase;
import org.tasks.injection.TestComponent;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class CaldavDaoTests { public class CaldavDaoTests extends InjectingTestCase {
@Inject TaskDao taskDao; @Inject TaskDao taskDao;
@Inject TagDao tagDao; @Inject TagDao tagDao;
@Inject TagDataDao tagDataDao; @Inject TagDataDao tagDataDao;
@ -60,4 +62,9 @@ public class CaldavDaoTests {
assertTrue(caldavDao.getTasksWithTags().isEmpty()); assertTrue(caldavDao.getTasksWithTags().isEmpty());
} }
@Override
protected void inject(TestComponent component) {
component.inject(this);
}
} }

@ -13,6 +13,7 @@ import com.todoroo.astrid.subtasks.SubtasksHelperTest;
import com.todoroo.astrid.subtasks.SubtasksMovingTest; import com.todoroo.astrid.subtasks.SubtasksMovingTest;
import com.todoroo.astrid.sync.NewSyncTestCase; import com.todoroo.astrid.sync.NewSyncTestCase;
import dagger.Component; import dagger.Component;
import org.tasks.data.CaldavDaoTests;
import org.tasks.data.DeletionDaoTests; import org.tasks.data.DeletionDaoTests;
import org.tasks.data.GoogleTaskDaoTests; import org.tasks.data.GoogleTaskDaoTests;
import org.tasks.data.TagDataDaoTest; import org.tasks.data.TagDataDaoTest;
@ -53,4 +54,6 @@ public interface TestComponent extends ApplicationComponent {
void inject(GoogleTaskDaoTests googleTaskDaoTests); void inject(GoogleTaskDaoTests googleTaskDaoTests);
void inject(TagDataDaoTest tagDataDaoTest); void inject(TagDataDaoTest tagDataDaoTest);
void inject(CaldavDaoTests caldavDaoTests);
} }

Loading…
Cancel
Save