1 files changed, 29 insertions, 23 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