From d412a95da0525f27b7112d71f2449a73b3e80b00 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sat, 21 Sep 2019 16:51:26 -0500
Subject: [PATCH] Fix tests

---
 .travis.yml                                              | 7 ++++---
 .../androidTest/java/org/tasks/data/CaldavDaoTests.java  | 9 ++++++++-
 .../java/org/tasks/injection/TestComponent.java          | 3 +++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f127f78fb..31b72de86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,9 @@ sudo: required
 jdk: oraclejdk8
 env:
   global:
-    - TARGET_API=28
-    - BUILD_TOOLS=28.0.3
+    - TARGET_API=29
+    - BUILD_TOOLS=29.0.2
+    - ADB_INSTALL_TIMEOUT=10
   matrix:
     - EMULATOR_API=21 ANDROID_ABI=armeabi-v7a
 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/6040
     - android-$TARGET_API
-    - android-27 # dav4android, ical4android
     - android-$EMULATOR_API
     - sys-img-$ANDROID_ABI-android-$EMULATOR_API
     - platform-tools
@@ -21,6 +21,7 @@ android:
     - extra-google-m2repository
 
 before_install:
+  - yes | sdkmanager "platforms;android-28" # ical4android
   - echo no | android create avd --force -n test -t android-$EMULATOR_API --abi $ANDROID_ABI
   - emulator -avd test -no-skin -no-audio -no-window &
   - ./.wait_for_emulator.sh
diff --git a/app/src/androidTest/java/org/tasks/data/CaldavDaoTests.java b/app/src/androidTest/java/org/tasks/data/CaldavDaoTests.java
index 725f90457..7a2c1aeac 100644
--- a/app/src/androidTest/java/org/tasks/data/CaldavDaoTests.java
+++ b/app/src/androidTest/java/org/tasks/data/CaldavDaoTests.java
@@ -17,9 +17,11 @@ import com.todoroo.astrid.data.Task;
 import javax.inject.Inject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.tasks.injection.InjectingTestCase;
+import org.tasks.injection.TestComponent;
 
 @RunWith(AndroidJUnit4.class)
-public class CaldavDaoTests {
+public class CaldavDaoTests extends InjectingTestCase {
   @Inject TaskDao taskDao;
   @Inject TagDao tagDao;
   @Inject TagDataDao tagDataDao;
@@ -60,4 +62,9 @@ public class CaldavDaoTests {
 
     assertTrue(caldavDao.getTasksWithTags().isEmpty());
   }
+
+  @Override
+  protected void inject(TestComponent component) {
+    component.inject(this);
+  }
 }
diff --git a/app/src/androidTest/java/org/tasks/injection/TestComponent.java b/app/src/androidTest/java/org/tasks/injection/TestComponent.java
index 1a863771c..8d565c6a4 100644
--- a/app/src/androidTest/java/org/tasks/injection/TestComponent.java
+++ b/app/src/androidTest/java/org/tasks/injection/TestComponent.java
@@ -13,6 +13,7 @@ import com.todoroo.astrid.subtasks.SubtasksHelperTest;
 import com.todoroo.astrid.subtasks.SubtasksMovingTest;
 import com.todoroo.astrid.sync.NewSyncTestCase;
 import dagger.Component;
+import org.tasks.data.CaldavDaoTests;
 import org.tasks.data.DeletionDaoTests;
 import org.tasks.data.GoogleTaskDaoTests;
 import org.tasks.data.TagDataDaoTest;
@@ -53,4 +54,6 @@ public interface TestComponent extends ApplicationComponent {
   void inject(GoogleTaskDaoTests googleTaskDaoTests);
 
   void inject(TagDataDaoTest tagDataDaoTest);
+
+  void inject(CaldavDaoTests caldavDaoTests);
 }