Enable excluded RoboTests

Test: make RunTvRoboTests ROBOTEST_FILTER=MainActivityRoboTest
Test: make RunTvRoboTests ROBOTEST_FILTER=ProgramTableAdapterTest
Test: make RunTvRoboTests ROBOTEST_FILTER=TvActivityTest
Bug: 142106564
Change-Id: Iac07ed5c9b76bbef1774e4e8208a40c515477738

5 files changed, 17 insertions, 13 deletions

diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index d5c51b57..2a6bdd15 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -9,7 +9,6 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
 BASE_DIR = src/com/android/tv
 EXCLUDE_FILES := \
-    $(BASE_DIR)/TvActivityTest.java \
     $(BASE_DIR)/data/epg/EpgFetcherImplTest.java \
     $(BASE_DIR)/guide/ProgramItemViewTest.java \
 
@@ -22,10 +21,13 @@ LOCAL_JAVA_LIBRARIES := \
     robolectric_android-all-stub \
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    tv-lib-dagger
+    tv-lib-dagger \
+    tv-lib-truth \
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
+    androidx.leanback_leanback-nodeps \
     androidx.test.core \
+    androidx.test.ext.truth \
     tv-lib-dagger-android \
     tv-test-common \
     tv-test-common-robo \
@@ -51,11 +53,8 @@ LOCAL_MODULE := RunTvRoboTests
 
 BASE_DIR = com/android/tv
 EXCLUDE_FILES := \
-    $(BASE_DIR)/MainActivityRoboTest.java \
-    $(BASE_DIR)/TvActivityTest.java \
     $(BASE_DIR)/data/epg/EpgFetcherImplTest.java \
     $(BASE_DIR)/guide/ProgramItemViewTest.java \
-    $(BASE_DIR)/guide/ProgramTableAdapterTest.java \
 
 LOCAL_ROBOTEST_FILES := $(call find-files-in-subdirs,$(LOCAL_PATH)/src,*Test.java,.)
 LOCAL_ROBOTEST_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_ROBOTEST_FILES))
@@ -65,7 +64,6 @@ LOCAL_JAVA_LIBRARIES := \
     TvRoboTests \
     mockito-robolectric-prebuilt \
     robolectric_android-all-stub \
-    tv-lib-truth \
     tv-test-common \
     tv-test-common-robo \
 
diff --git a/tests/robotests/src/com/android/tv/MainActivityRoboTest.java b/tests/robotests/src/com/android/tv/MainActivityRoboTest.java
index be7ae06b..931ec1ad 100644
--- a/tests/robotests/src/com/android/tv/MainActivityRoboTest.java
+++ b/tests/robotests/src/com/android/tv/MainActivityRoboTest.java
@@ -26,6 +26,7 @@ import com.android.tv.common.flags.impl.DefaultLegacyFlags;
 import com.android.tv.data.ProgramDataManager;
 import com.android.tv.data.StreamInfo;
 import com.android.tv.testing.TestSingletonApp;
+import com.android.tv.testing.TvRobolectricTestRunner;
 import com.android.tv.testing.constants.ConfigConstants;
 import com.android.tv.ui.TunableTvView;
 import com.android.tv.util.TvInputManagerHelper;
@@ -34,7 +35,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
@@ -42,7 +42,7 @@ import org.robolectric.shadow.api.Shadow;
 import java.util.Arrays;
 
 /** Tests for {@link TunableTvView} */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(TvRobolectricTestRunner.class)
 @Config(
         sdk = ConfigConstants.SDK,
         application = TestSingletonApp.class,
diff --git a/tests/robotests/src/com/android/tv/TvActivityTest.java b/tests/robotests/src/com/android/tv/TvActivityTest.java
index c153de8a..70e0c76b 100644
--- a/tests/robotests/src/com/android/tv/TvActivityTest.java
+++ b/tests/robotests/src/com/android/tv/TvActivityTest.java
@@ -16,12 +16,13 @@
 
 package com.android.tv;
 
+import static androidx.test.ext.truth.content.IntentSubject.assertThat;
+
 import android.content.Intent;
 
 import com.android.tv.testing.constants.ConfigConstants;
 import com.android.tv.util.Utils;
 
-import com.google.android.libraries.testing.truth.IntentSubject;
 import com.google.common.truth.Truth;
 
 import org.junit.Test;
@@ -42,7 +43,7 @@ public class TvActivityTest {
         Truth.assertThat(activity.isFinishing()).isTrue();
 
         Intent nextStartedActivity = ShadowApplication.getInstance().getNextStartedActivity();
-        IntentSubject.assertThat(nextStartedActivity).hasComponentClass(MainActivity.class);
-        IntentSubject.assertThat(nextStartedActivity).hasExtra(Utils.EXTRA_KEY_FROM_LAUNCHER, true);
+        assertThat(nextStartedActivity).hasComponentClass(MainActivity.class);
+        assertThat(nextStartedActivity).extras().bool(Utils.EXTRA_KEY_FROM_LAUNCHER).isTrue();
     }
 }
diff --git a/tests/robotests/src/com/android/tv/guide/ProgramTableAdapterTest.java b/tests/robotests/src/com/android/tv/guide/ProgramTableAdapterTest.java
index 52072748..094bc41b 100644
--- a/tests/robotests/src/com/android/tv/guide/ProgramTableAdapterTest.java
+++ b/tests/robotests/src/com/android/tv/guide/ProgramTableAdapterTest.java
@@ -28,6 +28,7 @@ import com.android.tv.data.ProgramImpl;
 import com.android.tv.data.api.Channel;
 import com.android.tv.data.api.Program;
 import com.android.tv.testing.TestSingletonApp;
+import com.android.tv.testing.TvRobolectricTestRunner;
 import com.android.tv.testing.constants.ConfigConstants;
 
 import org.junit.Before;
@@ -36,7 +37,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
@@ -45,7 +45,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 /** Tests for {@link ProgramTableAdapter}. */
-@RunWith(RobolectricTestRunner.class)
+@RunWith(TvRobolectricTestRunner.class)
 @Config(sdk = ConfigConstants.SDK, application = TestSingletonApp.class)
 public class ProgramTableAdapterTest {
 
diff --git a/tests/robotests/src/com/android/tv/testing/TvRobolectricTestRunner.java b/tests/robotests/src/com/android/tv/testing/TvRobolectricTestRunner.java
index 445fab26..93813c08 100644
--- a/tests/robotests/src/com/android/tv/testing/TvRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/tv/testing/TvRobolectricTestRunner.java
@@ -80,5 +80,10 @@ public class TvRobolectricTestRunner extends RobolectricTestRunner {
                         null,
                         Fs.fileFromPath("./packages/apps/TV/material_res"),
                         null));
+	paths.add(
+                new ResourcePath(
+                        null,
+                        Fs.fileFromPath("./prebuilts/sdk/current/support/v17/leanback/res"),
+                        null));
     }
 }