1 files changed, 24 insertions, 33 deletions

diff --git a/tests/unit/src/com/android/tv/util/TvInputManagerHelperTest.java b/tests/unit/src/com/android/tv/util/TvInputManagerHelperTest.java
index ab3c5e79..7e35d76b 100644
--- a/tests/unit/src/com/android/tv/util/TvInputManagerHelperTest.java
+++ b/tests/unit/src/com/android/tv/util/TvInputManagerHelperTest.java
@@ -20,24 +20,19 @@ import static androidx.test.InstrumentationRegistry.getContext;
 
 import android.content.pm.ResolveInfo;
 import android.media.tv.TvInputInfo;
-
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
-
 import com.android.tv.testing.ComparatorTester;
 import com.android.tv.testing.utils.TestUtils;
-
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
 /** Test for {@link TvInputManagerHelper} */
 @SmallTest
 @RunWith(AndroidJUnit4.class)
@@ -92,13 +87,13 @@ public class TvInputManagerHelperTest {
 
         TvInputManagerHelper manager = createMockTvInputManager();
 
-        ComparatorTester comparatorTester =
-                new ComparatorTester(new TvInputManagerHelper.InputComparatorInternal(manager))
-                        .permitInconsistencyWithEquals();
+        ComparatorTester<TvInputInfo> comparatorTester =
+                ComparatorTester.withoutEqualsTest(
+                        new TvInputManagerHelper.InputComparatorInternal(manager));
         for (TvInputInfo input : inputs) {
-            comparatorTester.addEqualityGroup(input);
+            comparatorTester.addComparableGroup(input);
         }
-        comparatorTester.testCompare();
+        comparatorTester.test();
     }
 
     @Test
@@ -148,17 +143,15 @@ public class TvInputManagerHelperTest {
 
         TvInputManagerHelper manager = createMockTvInputManager();
 
-        ComparatorTester comparatorTester =
-                new ComparatorTester(
-                                new TvInputManagerHelper.HardwareInputComparator(
-                                        getContext(), manager))
-                        .permitInconsistencyWithEquals();
+        ComparatorTester<TvInputInfo> comparatorTester =
+                ComparatorTester.withoutEqualsTest(
+                        new TvInputManagerHelper.HardwareInputComparator(getContext(), manager));
         comparatorTester
-                .addEqualityGroup(hdmi3)
-                .addEqualityGroup(hdmi2)
-                .addEqualityGroup(hdmi1)
-                .addEqualityGroup(hdmi4)
-                .testCompare();
+                .addComparableGroup(hdmi3)
+                .addComparableGroup(hdmi2)
+                .addComparableGroup(hdmi1)
+                .addComparableGroup(hdmi4)
+                .test();
     }
 
     @Test
@@ -209,12 +202,10 @@ public class TvInputManagerHelperTest {
 
         TvInputManagerHelper manager = createMockTvInputManager();
 
-        ComparatorTester comparatorTester =
-                new ComparatorTester(
-                                new TvInputManagerHelper.HardwareInputComparator(
-                                        getContext(), manager))
-                        .permitInconsistencyWithEquals();
-        comparatorTester.addEqualityGroup(cec1).addEqualityGroup(cec2).testCompare();
+        ComparatorTester<TvInputInfo> comparatorTester =
+                ComparatorTester.withoutEqualsTest(
+                        new TvInputManagerHelper.HardwareInputComparator(getContext(), manager));
+        comparatorTester.addComparableGroup(cec1).addComparableGroup(cec2).test();
     }
 
     private TvInputManagerHelper createMockTvInputManager() {
@@ -228,7 +219,7 @@ public class TvInputManagerHelperTest {
                             }
                         })
                 .when(manager)
-                .isPartnerInput(ArgumentMatchers.<TvInputInfo>any());
+                .isPartnerInput(Mockito.<TvInputInfo>any());
         Mockito.doAnswer(
                         new Answer<String>() {
                             @Override
@@ -238,7 +229,7 @@ public class TvInputManagerHelperTest {
                             }
                         })
                 .when(manager)
-                .loadLabel(ArgumentMatchers.<TvInputInfo>any());
+                .loadLabel(Mockito.<TvInputInfo>any());
         Mockito.doAnswer(
                         new Answer<String>() {
                             @Override
@@ -248,7 +239,7 @@ public class TvInputManagerHelperTest {
                             }
                         })
                 .when(manager)
-                .loadCustomLabel(ArgumentMatchers.<TvInputInfo>any());
+                .loadCustomLabel(Mockito.<TvInputInfo>any());
         Mockito.doAnswer(
                         new Answer<TvInputInfo>() {
                             @Override
@@ -260,7 +251,7 @@ public class TvInputManagerHelperTest {
                             }
                         })
                 .when(manager)
-                .getTvInputInfo(ArgumentMatchers.<String>any());
+                .getTvInputInfo(Mockito.<String>any());
         return manager;
     }