aboutsummaryrefslogtreecommitdiff
path: root/tests/unit/src/com/android/tv/data
diff options
context:
space:
mode:
Diffstat (limited to 'tests/unit/src/com/android/tv/data')
-rw-r--r--tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java52
-rw-r--r--tests/unit/src/com/android/tv/data/ChannelImplTest.java48
2 files changed, 50 insertions, 50 deletions
diff --git a/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java b/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java
index ecae18a2..71ccaf35 100644
--- a/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java
+++ b/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java
@@ -56,7 +56,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatchers;
+import org.mockito.Matchers;
import org.mockito.Mockito;
/**
@@ -92,29 +92,35 @@ public class ChannelDataManagerTest {
mContentResolver = new FakeContentResolver();
mContentResolver.addProvider(TvContract.AUTHORITY, mContentProvider);
mListener = new TestChannelDataManagerListener();
- getInstrumentation()
- .runOnMainSync(
- new Runnable() {
- @Override
- public void run() {
- TvInputManagerHelper mockHelper = Mockito.mock(TvInputManagerHelper.class);
- Mockito.when(mockHelper.hasTvInputInfo(ArgumentMatchers.anyString()))
- .thenReturn(true);
- Context mockContext = Mockito.mock(Context.class);
- Mockito.when(mockContext.getContentResolver()).thenReturn(mContentResolver);
- Mockito.when(mockContext.checkSelfPermission(ArgumentMatchers.anyString()))
- .thenAnswer(
- invocation -> {
- Object[] args = invocation.getArguments();
- return getTargetContext().checkSelfPermission(((String) args[0]));
+ getInstrumentation()
+ .runOnMainSync(
+ new Runnable() {
+ @Override
+ public void run() {
+ TvInputManagerHelper mockHelper =
+ Mockito.mock(TvInputManagerHelper.class);
+ Mockito.when(mockHelper.hasTvInputInfo(Matchers.anyString()))
+ .thenReturn(true);
+ Context mockContext = Mockito.mock(Context.class);
+ Mockito.when(mockContext.getContentResolver())
+ .thenReturn(mContentResolver);
+ Mockito.when(mockContext.checkSelfPermission(Matchers.anyString()))
+ .thenAnswer(
+ invocation -> {
+ Object[] args = invocation.getArguments();
+ return getTargetContext()
+ .checkSelfPermission(((String) args[0]));
+ });
+
+ mChannelDataManager =
+ new ChannelDataManager(
+ mockContext,
+ mockHelper,
+ AsyncTask.SERIAL_EXECUTOR,
+ mContentResolver);
+ mChannelDataManager.addListener(mListener);
+ }
});
-
- mChannelDataManager =
- new ChannelDataManager(
- mockContext, mockHelper, AsyncTask.SERIAL_EXECUTOR, mContentResolver);
- mChannelDataManager.addListener(mListener);
- }
- });
}
@After
diff --git a/tests/unit/src/com/android/tv/data/ChannelImplTest.java b/tests/unit/src/com/android/tv/data/ChannelImplTest.java
index df2f1a1f..86cfab66 100644
--- a/tests/unit/src/com/android/tv/data/ChannelImplTest.java
+++ b/tests/unit/src/com/android/tv/data/ChannelImplTest.java
@@ -25,24 +25,20 @@ import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
-
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
-
import com.android.tv.data.api.Channel;
import com.android.tv.testing.ComparatorTester;
import com.android.tv.util.TvInputManagerHelper;
-
+import java.util.Comparator;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatchers;
+import org.mockito.Matchers;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import java.util.Comparator;
-
/** Tests for {@link ChannelImpl}. */
@SmallTest
@RunWith(AndroidJUnit4.class)
@@ -50,7 +46,7 @@ public class ChannelImplTest {
// Used for testing TV inputs with invalid input package. This could happen when a TV input is
// uninstalled while drawing an app link card.
private static final String INVALID_TV_INPUT_PACKAGE_NAME = "com.android.tv.invalid_tv_input";
- // Used for testing TV inputs defined inside of TV app.
+ // Used for testing TV inputs defined inside of Live TV.
private static final String LIVE_CHANNELS_PACKAGE_NAME = "com.android.tv";
// Used for testing a TV input which doesn't have its leanback launcher activity.
private static final String NONE_LEANBACK_TV_INPUT_PACKAGE_NAME =
@@ -119,7 +115,7 @@ public class ChannelImplTest {
}
})
.when(mockPackageManager)
- .getActivityInfo(ArgumentMatchers.<ComponentName>any(), ArgumentMatchers.anyInt());
+ .getActivityInfo(Mockito.<ComponentName>any(), Mockito.anyInt());
mMockContext = Mockito.mock(Context.class);
Mockito.when(mMockContext.getApplicationContext()).thenReturn(mMockContext);
@@ -257,7 +253,7 @@ public class ChannelImplTest {
@Test
public void testComparator() {
TvInputManagerHelper manager = Mockito.mock(TvInputManagerHelper.class);
- Mockito.when(manager.isPartnerInput(ArgumentMatchers.anyString()))
+ Mockito.when(manager.isPartnerInput(Matchers.anyString()))
.thenAnswer(
new Answer<Boolean>() {
@Override
@@ -267,18 +263,17 @@ public class ChannelImplTest {
}
});
Comparator<Channel> comparator = new TestChannelComparator(manager);
- ComparatorTester comparatorTester =
- new ComparatorTester(comparator).permitInconsistencyWithEquals();
- comparatorTester.addEqualityGroup(
+ ComparatorTester<Channel> comparatorTester = ComparatorTester.withoutEqualsTest(comparator);
+ comparatorTester.addComparableGroup(
new ChannelImpl.Builder().setInputId(PARTNER_INPUT_ID).build());
- comparatorTester.addEqualityGroup(new ChannelImpl.Builder().setInputId("1").build());
- comparatorTester.addEqualityGroup(
+ comparatorTester.addComparableGroup(new ChannelImpl.Builder().setInputId("1").build());
+ comparatorTester.addComparableGroup(
new ChannelImpl.Builder().setInputId("1").setDisplayNumber("2").build());
- comparatorTester.addEqualityGroup(
+ comparatorTester.addComparableGroup(
new ChannelImpl.Builder().setInputId("2").setDisplayNumber("1.0").build());
// display name does not affect comparator
- comparatorTester.addEqualityGroup(
+ comparatorTester.addComparableGroup(
new ChannelImpl.Builder()
.setInputId("2")
.setDisplayNumber("1.62")
@@ -294,12 +289,12 @@ public class ChannelImplTest {
.setDisplayNumber("1.62")
.setDisplayName("test3")
.build());
- comparatorTester.addEqualityGroup(
+ comparatorTester.addComparableGroup(
new ChannelImpl.Builder().setInputId("2").setDisplayNumber("2.0").build());
// Numeric display number sorting
- comparatorTester.addEqualityGroup(
+ comparatorTester.addComparableGroup(
new ChannelImpl.Builder().setInputId("2").setDisplayNumber("12.2").build());
- comparatorTester.testCompare();
+ comparatorTester.test();
}
/**
@@ -311,7 +306,7 @@ public class ChannelImplTest {
@Test
public void testComparatorLabel() {
TvInputManagerHelper manager = Mockito.mock(TvInputManagerHelper.class);
- Mockito.when(manager.isPartnerInput(ArgumentMatchers.anyString()))
+ Mockito.when(manager.isPartnerInput(Matchers.anyString()))
.thenAnswer(
new Answer<Boolean>() {
@Override
@@ -321,21 +316,20 @@ public class ChannelImplTest {
}
});
Comparator<Channel> comparator = new ChannelComparatorWithDescriptionAsLabel(manager);
- ComparatorTester comparatorTester =
- new ComparatorTester(comparator).permitInconsistencyWithEquals();
+ ComparatorTester<Channel> comparatorTester = ComparatorTester.withoutEqualsTest(comparator);
- comparatorTester.addEqualityGroup(
+ comparatorTester.addComparableGroup(
new ChannelImpl.Builder().setInputId(PARTNER_INPUT_ID).setDescription("A").build());
// The description is used as a label for this test.
- comparatorTester.addEqualityGroup(
+ comparatorTester.addComparableGroup(
new ChannelImpl.Builder().setDescription("A").setInputId("1").build());
- comparatorTester.addEqualityGroup(
+ comparatorTester.addComparableGroup(
new ChannelImpl.Builder().setDescription("A").setInputId("2").build());
- comparatorTester.addEqualityGroup(
+ comparatorTester.addComparableGroup(
new ChannelImpl.Builder().setDescription("B").setInputId("1").build());
- comparatorTester.testCompare();
+ comparatorTester.test();
}
@Test
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 06:09:17 +0000