Use standard robolectric runner

PiperOrigin-RevId: 272906948
Change-Id: I6ab35452de7572f2233e5073dd9047d0e60b9d5f

15 files changed, 52 insertions, 32 deletions

diff --git a/common/tests/robotests/src/com/android/tv/common/TvContentRatingCacheTest.java b/common/tests/robotests/src/com/android/tv/common/TvContentRatingCacheTest.java
index 01bfdc4d..a0d72ade 100644
--- a/common/tests/robotests/src/com/android/tv/common/TvContentRatingCacheTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/TvContentRatingCacheTest.java
@@ -24,7 +24,7 @@ import android.media.tv.TvContentRating;
 import com.android.tv.testing.constants.ConfigConstants;
 import com.android.tv.testing.constants.TvContentRatingConstants;
 import com.google.common.collect.ImmutableList;
-import com.google.thirdparty.robolectric.GoogleRobolectricTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -32,7 +32,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 /** Test for {@link TvContentRatingCache}. */
-@RunWith(GoogleRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(sdk = ConfigConstants.SDK)
 public class TvContentRatingCacheTest {
     /** US_TV_MA and US_TV_Y7 in order */
diff --git a/common/tests/robotests/src/com/android/tv/common/actions/InputSetupActionUtilsTest.java b/common/tests/robotests/src/com/android/tv/common/actions/InputSetupActionUtilsTest.java
index 17d400ac..f27e93fd 100644
--- a/common/tests/robotests/src/com/android/tv/common/actions/InputSetupActionUtilsTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/actions/InputSetupActionUtilsTest.java
@@ -20,10 +20,13 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Intent;
 import android.os.Bundle;
+
 import com.android.tv.testing.constants.ConfigConstants;
+
+import org.robolectric.RobolectricTestRunner;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /** Tests for {@link InputSetupActionUtils} */
diff --git a/common/tests/robotests/src/com/android/tv/common/compat/TvInputInfoCompatTest.java b/common/tests/robotests/src/com/android/tv/common/compat/TvInputInfoCompatTest.java
index 93c04b95..de835ce0 100644
--- a/common/tests/robotests/src/com/android/tv/common/compat/TvInputInfoCompatTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/compat/TvInputInfoCompatTest.java
@@ -16,35 +16,37 @@
 package com.android.tv.common.compat;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static junit.framework.Assert.fail;
 
 import android.content.pm.ResolveInfo;
 import android.content.res.XmlResourceParser;
 import android.media.tv.TvInputInfo;
+
 import androidx.test.InstrumentationRegistry;
 
 import com.android.tv.testing.constants.ConfigConstants;
 import com.android.tv.testing.utils.TestUtils;
 
-import java.io.StringReader;
+import org.robolectric.RobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
 
-/**
- * Tests for {@link TvInputInfoCompat}.
- */
+import java.io.StringReader;
+
+/** Tests for {@link TvInputInfoCompat}. */
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = ConfigConstants.SDK)
 public class TvInputInfoCompatTest {
     private TvInputInfoCompat mTvInputInfoCompat;
     private String mInputXml;
+
     @Before
     public void setUp() throws Exception {
         ResolveInfo resolveInfo = TestUtils.createResolveInfo("test", "test");
@@ -52,16 +54,14 @@ public class TvInputInfoCompatTest {
                 TestUtils.createTvInputInfo(
                         resolveInfo, "test_input", "test1", TvInputInfo.TYPE_OTHER, false);
         mTvInputInfoCompat =
-                new TvInputInfoCompat(
-                        InstrumentationRegistry.getTargetContext(), info) {
+                new TvInputInfoCompat(InstrumentationRegistry.getTargetContext(), info) {
                     @Override
                     XmlPullParser getXmlResourceParser() {
                         XmlPullParser xpp = null;
                         try {
                             xpp = XmlPullParserFactory.newInstance().newPullParser();
                             xpp.setInput(new StringReader(mInputXml));
-                            xpp.setFeature(
-                                    XmlResourceParser.FEATURE_PROCESS_NAMESPACES, true);
+                            xpp.setFeature(XmlResourceParser.FEATURE_PROCESS_NAMESPACES, true);
                         } catch (XmlPullParserException e) {
                             fail("failed in setUp() " + e.getMessage());
                         }
@@ -101,7 +101,12 @@ public class TvInputInfoCompatTest {
                         + "          android:value=\"true\" />\n"
                         + "</tv-input>";
         assertThat(mTvInputInfoCompat.getExtras())
-                .containsExactly("otherAttr1", "false", "otherAttr2", "false",
-                        "com.android.tv.common.compat.tvinputinfocompat.audioOnly", "true");
+                .containsExactly(
+                        "otherAttr1",
+                        "false",
+                        "otherAttr2",
+                        "false",
+                        "com.android.tv.common.compat.tvinputinfocompat.audioOnly",
+                        "true");
     }
 }
diff --git a/common/tests/robotests/src/com/android/tv/common/compat/internal/PrivateCommandTest.java b/common/tests/robotests/src/com/android/tv/common/compat/internal/PrivateCommandTest.java
index 02705a4b..626bfb5c 100644
--- a/common/tests/robotests/src/com/android/tv/common/compat/internal/PrivateCommandTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/compat/internal/PrivateCommandTest.java
@@ -20,14 +20,16 @@ import static org.mockito.Mockito.verify;
 
 import com.android.tv.common.compat.api.SessionCompatCommands;
 import com.android.tv.testing.constants.ConfigConstants;
+
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.testing.mockito.Mocks;
+import org.robolectric.RobolectricTestRunner;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /**
diff --git a/common/tests/robotests/src/com/android/tv/common/compat/internal/PrivateRecordingCommandTest.java b/common/tests/robotests/src/com/android/tv/common/compat/internal/PrivateRecordingCommandTest.java
index 6d9949ff..e5690b78 100644
--- a/common/tests/robotests/src/com/android/tv/common/compat/internal/PrivateRecordingCommandTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/compat/internal/PrivateRecordingCommandTest.java
@@ -20,14 +20,16 @@ import static org.mockito.Mockito.verify;
 
 import com.android.tv.common.compat.api.RecordingSessionCompatCommands;
 import com.android.tv.testing.constants.ConfigConstants;
+
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.testing.mockito.Mocks;
+import org.robolectric.RobolectricTestRunner;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /**
diff --git a/common/tests/robotests/src/com/android/tv/common/compat/internal/RecordingSessionEventTest.java b/common/tests/robotests/src/com/android/tv/common/compat/internal/RecordingSessionEventTest.java
index b5bd0a01..6c2a7bc8 100644
--- a/common/tests/robotests/src/com/android/tv/common/compat/internal/RecordingSessionEventTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/compat/internal/RecordingSessionEventTest.java
@@ -20,14 +20,16 @@ import static org.mockito.Mockito.verify;
 
 import com.android.tv.common.compat.api.RecordingClientCallbackCompatEvents;
 import com.android.tv.testing.constants.ConfigConstants;
+
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.testing.mockito.Mocks;
+import org.robolectric.RobolectricTestRunner;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /**
diff --git a/common/tests/robotests/src/com/android/tv/common/compat/internal/SessionEventTest.java b/common/tests/robotests/src/com/android/tv/common/compat/internal/SessionEventTest.java
index 0cc300bb..81a04565 100644
--- a/common/tests/robotests/src/com/android/tv/common/compat/internal/SessionEventTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/compat/internal/SessionEventTest.java
@@ -20,14 +20,16 @@ import static org.mockito.Mockito.verify;
 
 import com.android.tv.common.compat.api.TvInputCallbackCompatEvents;
 import com.android.tv.testing.constants.ConfigConstants;
+
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.testing.mockito.Mocks;
+import org.robolectric.RobolectricTestRunner;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /**
diff --git a/common/tests/robotests/src/com/android/tv/common/dev/DeveloperPreferenceTest.java b/common/tests/robotests/src/com/android/tv/common/dev/DeveloperPreferenceTest.java
index a9c15ada..a53c1f0b 100644
--- a/common/tests/robotests/src/com/android/tv/common/dev/DeveloperPreferenceTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/dev/DeveloperPreferenceTest.java
@@ -19,9 +19,10 @@ import static com.google.common.truth.Truth.assertThat;
 
 import com.android.tv.testing.constants.ConfigConstants;
 
+import org.robolectric.RobolectricTestRunner;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
diff --git a/common/tests/robotests/src/com/android/tv/common/support/tis/BaseTvInputServiceTest.java b/common/tests/robotests/src/com/android/tv/common/support/tis/BaseTvInputServiceTest.java
index 7deef751..acbcf810 100644
--- a/common/tests/robotests/src/com/android/tv/common/support/tis/BaseTvInputServiceTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/support/tis/BaseTvInputServiceTest.java
@@ -11,7 +11,7 @@ import android.support.annotation.Nullable;
 import android.view.Surface;
 import com.android.tv.common.support.tis.TifSession.TifSessionCallbacks;
 import com.android.tv.common.support.tis.TifSession.TifSessionFactory;
-import com.google.thirdparty.robolectric.GoogleRobolectricTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -21,7 +21,7 @@ import org.robolectric.android.controller.ServiceController;
 import org.robolectric.annotation.Config;
 
 /** Tests for {@link BaseTvInputService}. */
-@RunWith(GoogleRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(minSdk = Build.VERSION_CODES.LOLLIPOP, maxSdk = Build.VERSION_CODES.P)
 public class BaseTvInputServiceTest {
 
diff --git a/common/tests/robotests/src/com/android/tv/common/support/tis/SimpleSessionManagerTest.java b/common/tests/robotests/src/com/android/tv/common/support/tis/SimpleSessionManagerTest.java
index 71ff199f..a8e5c778 100644
--- a/common/tests/robotests/src/com/android/tv/common/support/tis/SimpleSessionManagerTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/support/tis/SimpleSessionManagerTest.java
@@ -10,7 +10,7 @@ import android.support.annotation.Nullable;
 import android.view.Surface;
 import com.android.tv.common.support.tis.TifSession.TifSessionCallbacks;
 import com.android.tv.common.support.tis.TifSession.TifSessionFactory;
-import com.google.thirdparty.robolectric.GoogleRobolectricTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,7 +18,7 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 /** Tests for {@link SimpleSessionManager}. */
-@RunWith(GoogleRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(minSdk = Build.VERSION_CODES.LOLLIPOP, maxSdk = Build.VERSION_CODES.P)
 public class SimpleSessionManagerTest {
 
diff --git a/common/tests/robotests/src/com/android/tv/common/support/tis/TisSessionTest.java b/common/tests/robotests/src/com/android/tv/common/support/tis/TisSessionTest.java
index e3240172..965a6a2e 100644
--- a/common/tests/robotests/src/com/android/tv/common/support/tis/TisSessionTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/support/tis/TisSessionTest.java
@@ -15,7 +15,7 @@ import android.view.Surface;
 import android.view.View;
 import com.android.tv.common.support.tis.TifSession.TifSessionCallbacks;
 import com.google.common.collect.ImmutableList;
-import com.google.thirdparty.robolectric.GoogleRobolectricTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
@@ -23,7 +23,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 /** Tests for {@link TifSession}. */
-@RunWith(GoogleRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(minSdk = Build.VERSION_CODES.LOLLIPOP, maxSdk = Build.VERSION_CODES.P)
 public class TisSessionTest {
 
diff --git a/common/tests/robotests/src/com/android/tv/common/support/tis/WrappedSessionTest.java b/common/tests/robotests/src/com/android/tv/common/support/tis/WrappedSessionTest.java
index 6d095750..aff46164 100644
--- a/common/tests/robotests/src/com/android/tv/common/support/tis/WrappedSessionTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/support/tis/WrappedSessionTest.java
@@ -9,7 +9,7 @@ import android.os.Build;
 import android.view.View;
 import com.android.tv.common.support.tis.TifSession.TifSessionCallbacks;
 import com.android.tv.common.support.tis.TifSession.TifSessionFactory;
-import com.google.thirdparty.robolectric.GoogleRobolectricTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -20,7 +20,7 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 /** Tests for {@link WrappedSession}. */
-@RunWith(GoogleRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(minSdk = Build.VERSION_CODES.M, maxSdk = Build.VERSION_CODES.P)
 public class WrappedSessionTest {
 
diff --git a/common/tests/robotests/src/com/android/tv/common/support/tvprovider/TvContractCompatXTest.java b/common/tests/robotests/src/com/android/tv/common/support/tvprovider/TvContractCompatXTest.java
index db32be68..bec848a2 100644
--- a/common/tests/robotests/src/com/android/tv/common/support/tvprovider/TvContractCompatXTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/support/tvprovider/TvContractCompatXTest.java
@@ -19,10 +19,13 @@ package com.android.tv.common.support.tvprovider;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
+
 import com.android.tv.testing.constants.ConfigConstants;
+
+import org.robolectric.RobolectricTestRunner;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 /** Test for {@link TvContractCompatX}. */
diff --git a/common/tests/robotests/src/com/android/tv/common/util/CommonUtilsTest.java b/common/tests/robotests/src/com/android/tv/common/util/CommonUtilsTest.java
index 0b793dbc..a35594c1 100644
--- a/common/tests/robotests/src/com/android/tv/common/util/CommonUtilsTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/util/CommonUtilsTest.java
@@ -18,7 +18,7 @@ package com.android.tv.common.util;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.android.tv.testing.constants.ConfigConstants;
-import com.google.thirdparty.robolectric.GoogleRobolectricTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import java.io.File;
 import java.io.IOException;
 import org.junit.Test;
@@ -27,7 +27,7 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 /** Tests for {@link CommonUtils}. */
-@RunWith(GoogleRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(sdk = ConfigConstants.SDK)
 public class CommonUtilsTest {
 
diff --git a/common/tests/robotests/src/com/android/tv/common/util/ContentUriUtilsTest.java b/common/tests/robotests/src/com/android/tv/common/util/ContentUriUtilsTest.java
index be705a91..36bbc696 100644
--- a/common/tests/robotests/src/com/android/tv/common/util/ContentUriUtilsTest.java
+++ b/common/tests/robotests/src/com/android/tv/common/util/ContentUriUtilsTest.java
@@ -19,13 +19,13 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.net.Uri;
 import com.android.tv.testing.constants.ConfigConstants;
-import com.google.thirdparty.robolectric.GoogleRobolectricTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 /** Tests for {@link ContentUriUtils}. */
-@RunWith(GoogleRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(sdk = ConfigConstants.SDK)
 public class ContentUriUtilsTest {