diff options
| author | Umang Saini <umang.saini@ittiam.com> | 2019-10-30 15:11:06 +0530 |
|---|---|---|
| committer | Umang Saini <umang.saini@ittiam.com> | 2019-11-06 19:17:05 +0530 |
| commit | 8ab0ffb0a2261f8888df662347228a25128e5d7a (patch) | |
| tree | 37d78c3c66a6d2be808fc02c109af0f9d8be7648 | |
| parent | 206876d1bfd51e1ad9a62622c0a66c02ae307c6c (diff) | |
| download | TV-8ab0ffb0a2261f8888df662347228a25128e5d7a.tar.gz | |
Update Robolectric Mockito dependency
Test: make RunTvRoboTests
Bug: 142106564
Change-Id: I63e20cab4f97c120aa55111c21d367e137e8c517
| -rw-r--r-- | tests/common/Android.bp | 2 | ||||
| -rw-r--r-- | tests/common/Android.mk | 2 | ||||
| -rw-r--r-- | tests/robotests/Android.mk | 15 | ||||
| -rw-r--r-- | tests/unit/Android.mk | 2 | ||||
| -rw-r--r-- | tuner/tests/testing/Android.mk | 2 |
5 files changed, 7 insertions, 16 deletions
diff --git a/tests/common/Android.bp b/tests/common/Android.bp index a3b6bb2b..1abaaf76 100644 --- a/tests/common/Android.bp +++ b/tests/common/Android.bp @@ -28,7 +28,7 @@ android_library { "androidx.test.runner", "androidx.test.rules", "tv-guava-android-jar", - "mockito-target", + "mockito-robolectric-prebuilt", "tv-lib-truth", "ub-uiautomator", "Robolectric_all-target", diff --git a/tests/common/Android.mk b/tests/common/Android.mk index 0c81d062..e434e124 100644 --- a/tests/common/Android.mk +++ b/tests/common/Android.mk @@ -12,7 +12,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_STATIC_JAVA_LIBRARIES := \ robolectric_android-all-stub \ Robolectric_all-target \ - mockito-target \ + mockito-robolectric-prebuilt \ tv-test-common \ LOCAL_INSTRUMENTATION_FOR := LiveTv diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk index c2a91486..d5c51b57 100644 --- a/tests/robotests/Android.mk +++ b/tests/robotests/Android.mk @@ -18,16 +18,14 @@ LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES)) LOCAL_JAVA_LIBRARIES := \ Robolectric_all-target \ - androidx.test.core \ - mockito-target \ + mockito-robolectric-prebuilt \ robolectric_android-all-stub \ LOCAL_STATIC_JAVA_LIBRARIES := \ tv-lib-dagger LOCAL_STATIC_ANDROID_LIBRARIES := \ - androidx.leanback_leanback-preference \ - androidx.leanback_leanback \ + androidx.test.core \ tv-lib-dagger-android \ tv-test-common \ tv-test-common-robo \ @@ -54,15 +52,8 @@ LOCAL_MODULE := RunTvRoboTests BASE_DIR = com/android/tv EXCLUDE_FILES := \ $(BASE_DIR)/MainActivityRoboTest.java \ - $(BASE_DIR)/SetupPassthroughActivityTest.java \ $(BASE_DIR)/TvActivityTest.java \ - $(BASE_DIR)/data/TvInputNewComparatorTest.java \ $(BASE_DIR)/data/epg/EpgFetcherImplTest.java \ - $(BASE_DIR)/dvr/provider/DvrDbSyncTest.java \ - $(BASE_DIR)/dvr/recorder/InputTaskSchedulerTest.java \ - $(BASE_DIR)/dvr/recorder/ScheduledProgramReaperTest.java \ - $(BASE_DIR)/dvr/recorder/SchedulerTest.java \ - $(BASE_DIR)/dvr/recorder/RecordingTaskTest.java \ $(BASE_DIR)/guide/ProgramItemViewTest.java \ $(BASE_DIR)/guide/ProgramTableAdapterTest.java \ @@ -72,7 +63,7 @@ LOCAL_ROBOTEST_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_ROBOTEST_FILES)) LOCAL_JAVA_LIBRARIES := \ Robolectric_all-target \ TvRoboTests \ - mockito-target \ + mockito-robolectric-prebuilt \ robolectric_android-all-stub \ tv-lib-truth \ tv-test-common \ diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk index 5ea7ccd8..80dbfeef 100644 --- a/tests/unit/Android.mk +++ b/tests/unit/Android.mk @@ -9,7 +9,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ androidx.test.runner \ - mockito-target \ + mockito-robolectric-prebuilt \ tv-test-common \ LOCAL_JAVA_LIBRARIES := \ diff --git a/tuner/tests/testing/Android.mk b/tuner/tests/testing/Android.mk index 79e35e5a..864f5f3e 100644 --- a/tuner/tests/testing/Android.mk +++ b/tuner/tests/testing/Android.mk @@ -10,7 +10,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-annotations \ androidx.test.runner \ tv-guava-android-jar \ - mockito-target \ + mockito-robolectric-prebuilt \ tv-lib-truth \ ub-uiautomator \ |