Rename ClockBackedFakeMainThreadRunner to FakeMainThreadRunner.
PiperOrigin-RevId: 242453663
Change-Id: Iafcf71c833806fc3df37f8137e2f2c6064dac429
diff --git a/src/main/java/com/google/android/libraries/feed/common/concurrent/MainThreadRunner.java b/src/main/java/com/google/android/libraries/feed/common/concurrent/MainThreadRunner.java
index 5f6e9d8..2c96530 100644
--- a/src/main/java/com/google/android/libraries/feed/common/concurrent/MainThreadRunner.java
+++ b/src/main/java/com/google/android/libraries/feed/common/concurrent/MainThreadRunner.java
@@ -20,9 +20,7 @@
import java.util.concurrent.Executor;
/** Executes a task on the main thread (UI thread) with optional delay. */
-/*@DoNotMock(
- "Use com.google.android.libraries.feed.common.concurrent.ClockBackedFakeMainThreadRunner"
- + " instead")*/
+/*@DoNotMock("Use com.google.android.libraries.feed.common.concurrent.FakeMainThreadRunner instead")*/
public class MainThreadRunner {
private static final String TAG = "MainThreadRunner";
private static final Handler handler = new Handler(Looper.getMainLooper());
diff --git a/src/main/java/com/google/android/libraries/feed/common/concurrent/testing/ClockBackedFakeMainThreadRunner.java b/src/main/java/com/google/android/libraries/feed/common/concurrent/testing/FakeMainThreadRunner.java
similarity index 88%
rename from src/main/java/com/google/android/libraries/feed/common/concurrent/testing/ClockBackedFakeMainThreadRunner.java
rename to src/main/java/com/google/android/libraries/feed/common/concurrent/testing/FakeMainThreadRunner.java
index 7c6b620..bf62e43 100644
--- a/src/main/java/com/google/android/libraries/feed/common/concurrent/testing/ClockBackedFakeMainThreadRunner.java
+++ b/src/main/java/com/google/android/libraries/feed/common/concurrent/testing/FakeMainThreadRunner.java
@@ -29,7 +29,7 @@
* A {@link MainThreadRunner} which listens to a {@link FakeClock} to determine when to execute
* delayed tasks. This class can optionally execute tasks immediately and enforce thread checks.
*/
-public final class ClockBackedFakeMainThreadRunner extends MainThreadRunner {
+public final class FakeMainThreadRunner extends MainThreadRunner {
private final FakeClock fakeClock;
private final FakeThreadUtils fakeThreadUtils;
@@ -43,31 +43,31 @@
private int completedTaskCount = 0;
- public static ClockBackedFakeMainThreadRunner create(FakeClock fakeClock) {
- return new ClockBackedFakeMainThreadRunner(
+ public static FakeMainThreadRunner create(FakeClock fakeClock) {
+ return new FakeMainThreadRunner(
fakeClock,
new FakeThreadUtils(/* enforceThreadChecks= */ false),
/* shouldQueueTasks= */ false);
}
- public static ClockBackedFakeMainThreadRunner runTasksImmediately() {
+ public static FakeMainThreadRunner runTasksImmediately() {
return create(new FakeClock());
}
- public static ClockBackedFakeMainThreadRunner runTasksImmediatelyWithThreadChecks(
+ public static FakeMainThreadRunner runTasksImmediatelyWithThreadChecks(
FakeThreadUtils fakeThreadUtils) {
- return new ClockBackedFakeMainThreadRunner(
+ return new FakeMainThreadRunner(
new FakeClock(), fakeThreadUtils, /* shouldQueueTasks= */ false);
}
- public static ClockBackedFakeMainThreadRunner queueAllTasks() {
- return new ClockBackedFakeMainThreadRunner(
+ public static FakeMainThreadRunner queueAllTasks() {
+ return new FakeMainThreadRunner(
new FakeClock(),
new FakeThreadUtils(/* enforceThreadChecks= */ false),
/* shouldQueueTasks= */ true);
}
- private ClockBackedFakeMainThreadRunner(
+ private FakeMainThreadRunner(
FakeClock fakeClock, FakeThreadUtils fakeThreadUtils, boolean shouldQueueTasks) {
this.fakeClock = fakeClock;
this.fakeThreadUtils = fakeThreadUtils;
diff --git a/src/main/java/com/google/android/libraries/feed/common/concurrent/testing/FakeTaskQueue.java b/src/main/java/com/google/android/libraries/feed/common/concurrent/testing/FakeTaskQueue.java
index 379e7e9..1816161 100644
--- a/src/main/java/com/google/android/libraries/feed/common/concurrent/testing/FakeTaskQueue.java
+++ b/src/main/java/com/google/android/libraries/feed/common/concurrent/testing/FakeTaskQueue.java
@@ -38,7 +38,7 @@
super(
new FakeBasicLoggingApi(),
executor,
- ClockBackedFakeMainThreadRunner.runTasksImmediately(),
+ FakeMainThreadRunner.runTasksImmediately(),
clock,
/* checkStarvation= */ false);
this.fakeThreadUtils = fakeThreadUtils;
diff --git a/src/main/java/com/google/android/libraries/feed/common/testing/InfrastructureIntegrationScope.java b/src/main/java/com/google/android/libraries/feed/common/testing/InfrastructureIntegrationScope.java
index 9f208b0..5f7581c 100644
--- a/src/main/java/com/google/android/libraries/feed/common/testing/InfrastructureIntegrationScope.java
+++ b/src/main/java/com/google/android/libraries/feed/common/testing/InfrastructureIntegrationScope.java
@@ -22,7 +22,7 @@
import com.google.android.libraries.feed.api.sessionmanager.SessionManager;
import com.google.android.libraries.feed.common.concurrent.MainThreadRunner;
import com.google.android.libraries.feed.common.concurrent.TaskQueue;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.concurrent.testing.FakeThreadUtils;
import com.google.android.libraries.feed.common.protoextensions.FeedExtensionRegistry;
import com.google.android.libraries.feed.common.time.Clock;
@@ -113,7 +113,7 @@
new TaskQueue(
fakeBasicLoggingApi,
executorService,
- ClockBackedFakeMainThreadRunner.runTasksImmediately(),
+ FakeMainThreadRunner.runTasksImmediately(),
clock,
false);
store =
diff --git a/src/main/java/com/google/android/libraries/feed/feedstore/testing/AbstractClearableFeedStoreTest.java b/src/main/java/com/google/android/libraries/feed/feedstore/testing/AbstractClearableFeedStoreTest.java
index 5c73479..adbed35 100644
--- a/src/main/java/com/google/android/libraries/feed/feedstore/testing/AbstractClearableFeedStoreTest.java
+++ b/src/main/java/com/google/android/libraries/feed/feedstore/testing/AbstractClearableFeedStoreTest.java
@@ -21,7 +21,7 @@
import com.google.android.libraries.feed.api.common.SemanticPropertiesWithId;
import com.google.android.libraries.feed.api.store.LocalActionMutation.ActionType;
import com.google.android.libraries.feed.common.Result;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.feedstore.internal.ClearableStore;
import com.google.android.libraries.feed.host.storage.CommitResult;
import com.google.protobuf.ByteString;
@@ -77,8 +77,7 @@
@Test
public void clearAll() {
- ClearableStore store =
- (ClearableStore) getStore(ClockBackedFakeMainThreadRunner.runTasksImmediately());
+ ClearableStore store = (ClearableStore) getStore(FakeMainThreadRunner.runTasksImmediately());
/*
SETUP
diff --git a/src/main/java/com/google/android/libraries/feed/feedstore/testing/AbstractFeedStoreTest.java b/src/main/java/com/google/android/libraries/feed/feedstore/testing/AbstractFeedStoreTest.java
index 86754d4..778f220 100644
--- a/src/main/java/com/google/android/libraries/feed/feedstore/testing/AbstractFeedStoreTest.java
+++ b/src/main/java/com/google/android/libraries/feed/feedstore/testing/AbstractFeedStoreTest.java
@@ -26,7 +26,7 @@
import com.google.android.libraries.feed.api.store.Store;
import com.google.android.libraries.feed.common.Result;
import com.google.android.libraries.feed.common.concurrent.MainThreadRunner;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.testing.RunnableSubject;
import com.google.android.libraries.feed.common.time.TimingUtils;
import com.google.android.libraries.feed.common.time.testing.FakeClock;
@@ -82,8 +82,7 @@
.setStreamStructure(STREAM_STRUCTURE)
.setStreamPayload(STREAM_PAYLOAD)
.build();
- private final MainThreadRunner mainThreadRunner =
- ClockBackedFakeMainThreadRunner.runTasksImmediately();
+ private final MainThreadRunner mainThreadRunner = FakeMainThreadRunner.runTasksImmediately();
/**
* Provides an instance of the store
diff --git a/src/main/java/com/google/android/libraries/feed/testing/store/FakeStore.java b/src/main/java/com/google/android/libraries/feed/testing/store/FakeStore.java
index cd46c51..786f061 100644
--- a/src/main/java/com/google/android/libraries/feed/testing/store/FakeStore.java
+++ b/src/main/java/com/google/android/libraries/feed/testing/store/FakeStore.java
@@ -20,7 +20,7 @@
import com.google.android.libraries.feed.api.store.UploadableActionMutation;
import com.google.android.libraries.feed.common.Result;
import com.google.android.libraries.feed.common.concurrent.TaskQueue;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.concurrent.testing.FakeThreadUtils;
import com.google.android.libraries.feed.common.protoextensions.FeedExtensionRegistry;
import com.google.android.libraries.feed.common.time.Clock;
@@ -55,7 +55,7 @@
taskQueue,
clock,
new FakeBasicLoggingApi(),
- ClockBackedFakeMainThreadRunner.runTasksImmediately());
+ FakeMainThreadRunner.runTasksImmediately());
this.fakeThreadUtils = fakeThreadUtils;
}
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/BasicStreamTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/BasicStreamTest.java
index c9b1e73..1204cb4 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/BasicStreamTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/BasicStreamTest.java
@@ -63,7 +63,7 @@
import com.google.android.libraries.feed.basicstream.internal.scroll.ScrollRestorer;
import com.google.android.libraries.feed.basicstream.internal.viewloggingupdater.ViewLoggingUpdater;
import com.google.android.libraries.feed.common.concurrent.MainThreadRunner;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.functional.Consumer;
import com.google.android.libraries.feed.common.time.Clock;
import com.google.android.libraries.feed.common.time.testing.FakeClock;
@@ -161,7 +161,7 @@
private Context context;
private FakeClock clock;
private BasicStreamForTest basicStream;
- private ClockBackedFakeMainThreadRunner mainThreadRunner;
+ private FakeMainThreadRunner mainThreadRunner;
private List<Header> headers;
@Before
@@ -195,7 +195,7 @@
context = Robolectric.buildActivity(Activity.class).get();
clock = new FakeClock();
- mainThreadRunner = ClockBackedFakeMainThreadRunner.create(clock);
+ mainThreadRunner = FakeMainThreadRunner.create(clock);
layoutManager = new LinearLayoutManagerWithFakePositioning(context);
basicStream = createBasicStream(layoutManager);
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriverTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriverTest.java
index c9a04d7..266fcce 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriverTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriverTest.java
@@ -31,7 +31,7 @@
import com.google.android.libraries.feed.api.stream.ContentChangedListener;
import com.google.android.libraries.feed.basicstream.internal.pendingdismiss.ClusterPendingDismissHelper;
import com.google.android.libraries.feed.basicstream.internal.viewloggingupdater.ViewLoggingUpdater;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.host.action.ActionApi;
import com.google.android.libraries.feed.host.config.Configuration;
import com.google.android.libraries.feed.host.logging.BasicLoggingApi;
@@ -91,8 +91,7 @@
@Mock private TooltipApi tooltipApi;
private final Configuration configuration = new Configuration.Builder().build();
- private final ClockBackedFakeMainThreadRunner mainThreadRunner =
- ClockBackedFakeMainThreadRunner.queueAllTasks();
+ private final FakeMainThreadRunner mainThreadRunner = FakeMainThreadRunner.queueAllTasks();
private CardDriverForTest cardDriver;
private FakeModelCursor cardCursor;
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriverTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriverTest.java
index 6af36fd..0883b6f 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriverTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriverTest.java
@@ -30,7 +30,7 @@
import com.google.android.libraries.feed.api.stream.ContentChangedListener;
import com.google.android.libraries.feed.basicstream.internal.pendingdismiss.PendingDismissHandler;
import com.google.android.libraries.feed.basicstream.internal.viewloggingupdater.ViewLoggingUpdater;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.host.action.ActionApi;
import com.google.android.libraries.feed.host.config.Configuration;
import com.google.android.libraries.feed.host.logging.BasicLoggingApi;
@@ -67,8 +67,7 @@
@Mock private TooltipApi tooltipApi;
private final Configuration configuration = new Configuration.Builder().build();
- private final ClockBackedFakeMainThreadRunner mainThreadRunner =
- ClockBackedFakeMainThreadRunner.queueAllTasks();
+ private final FakeMainThreadRunner mainThreadRunner = FakeMainThreadRunner.queueAllTasks();
private ClusterDriverForTest clusterDriver;
@Before
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java
index bc7295d..5b22fa2 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java
@@ -39,7 +39,7 @@
import com.google.android.libraries.feed.basicstream.internal.pendingdismiss.ClusterPendingDismissHelper;
import com.google.android.libraries.feed.basicstream.internal.viewholders.PietViewHolder;
import com.google.android.libraries.feed.basicstream.internal.viewloggingupdater.ViewLoggingUpdater;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.functional.Consumer;
import com.google.android.libraries.feed.common.functional.Supplier;
import com.google.android.libraries.feed.common.time.testing.FakeClock;
@@ -169,8 +169,7 @@
@Captor private ArgumentCaptor<Consumer<Boolean>> offlineConsumerCaptor;
private ContentDriver contentDriver;
private final FakeClock clock = new FakeClock();
- private final ClockBackedFakeMainThreadRunner mainThreadRunner =
- ClockBackedFakeMainThreadRunner.create(clock);
+ private final FakeMainThreadRunner mainThreadRunner = FakeMainThreadRunner.create(clock);
private final Configuration configuration =
new Configuration.Builder().put(ConfigKey.VIEW_MIN_TIME_MS, VIEW_MIN_TIME_MS).build();
private ViewLoggingUpdater viewLoggingUpdater;
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriverTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriverTest.java
index cc52c71..383c40f 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriverTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriverTest.java
@@ -46,7 +46,7 @@
import com.google.android.libraries.feed.basicstream.internal.drivers.testing.FakeLeafFeatureDriver;
import com.google.android.libraries.feed.basicstream.internal.scroll.ScrollRestorer;
import com.google.android.libraries.feed.basicstream.internal.viewloggingupdater.ViewLoggingUpdater;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.time.Clock;
import com.google.android.libraries.feed.common.time.testing.FakeClock;
import com.google.android.libraries.feed.host.action.ActionApi;
@@ -139,8 +139,7 @@
private Context context;
private Clock clock;
private ThreadUtils threadUtils;
- private final ClockBackedFakeMainThreadRunner mainThreadRunner =
- ClockBackedFakeMainThreadRunner.queueAllTasks();
+ private final FakeMainThreadRunner mainThreadRunner = FakeMainThreadRunner.queueAllTasks();
private final ViewLoggingUpdater viewLoggingUpdater = new ViewLoggingUpdater();
private static FakeModelChild createFakeClusterModelChild() {
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/scroll/BasicStreamScrollTrackerTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/scroll/BasicStreamScrollTrackerTest.java
index c9ed19b..ab9e350 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/scroll/BasicStreamScrollTrackerTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/scroll/BasicStreamScrollTrackerTest.java
@@ -19,7 +19,7 @@
import static org.mockito.MockitoAnnotations.initMocks;
import com.google.android.libraries.feed.api.stream.ScrollListener;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.time.testing.FakeClock;
import com.google.android.libraries.feed.host.logging.ScrollType;
import com.google.android.libraries.feed.sharedstream.scroll.ScrollLogger;
@@ -38,8 +38,7 @@
@Mock private StreamScrollMonitor scrollMonitor;
private final FakeClock clock = new FakeClock();
- private final ClockBackedFakeMainThreadRunner mainThreadRunner =
- ClockBackedFakeMainThreadRunner.queueAllTasks();
+ private final FakeMainThreadRunner mainThreadRunner = FakeMainThreadRunner.queueAllTasks();
private BasicStreamScrollTracker scrollTracker;
@Before
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java
index efa8f7d..1f04183 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java
@@ -38,7 +38,7 @@
import com.google.android.libraries.feed.api.actionparser.ActionSourceConverter;
import com.google.android.libraries.feed.api.stream.ContentChangedListener;
import com.google.android.libraries.feed.basicstream.internal.actions.StreamActionApiImpl;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.functional.Supplier;
import com.google.android.libraries.feed.host.config.Configuration;
import com.google.android.libraries.feed.host.logging.BasicLoggingApi;
@@ -106,8 +106,7 @@
initMocks(this);
streamScrollMonitor =
new StreamScrollMonitor(
- mock(ContentChangedListener.class),
- ClockBackedFakeMainThreadRunner.runTasksImmediately());
+ mock(ContentChangedListener.class), FakeMainThreadRunner.runTasksImmediately());
cardConfiguration = new FakeCardConfiguration();
context = Robolectric.buildActivity(Activity.class).get();
frameLayout = new FrameLayout(context);
diff --git a/src/test/java/com/google/android/libraries/feed/common/concurrent/TaskQueueTest.java b/src/test/java/com/google/android/libraries/feed/common/concurrent/TaskQueueTest.java
index a6389ee..01895cf 100644
--- a/src/test/java/com/google/android/libraries/feed/common/concurrent/TaskQueueTest.java
+++ b/src/test/java/com/google/android/libraries/feed/common/concurrent/TaskQueueTest.java
@@ -18,7 +18,7 @@
import static org.mockito.MockitoAnnotations.initMocks;
import com.google.android.libraries.feed.common.concurrent.TaskQueue.TaskType;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.time.testing.FakeClock;
import com.google.android.libraries.feed.host.logging.InternalFeedError;
import com.google.android.libraries.feed.testing.host.logging.FakeBasicLoggingApi;
@@ -36,8 +36,7 @@
private final FakeBasicLoggingApi fakeBasicLoggingApi = new FakeBasicLoggingApi();
private final FakeClock fakeClock = new FakeClock();
private final List<Integer> callOrder = new ArrayList<>();
- private final ClockBackedFakeMainThreadRunner fakeMainThreadRunner =
- ClockBackedFakeMainThreadRunner.create(fakeClock);
+ private final FakeMainThreadRunner fakeMainThreadRunner = FakeMainThreadRunner.create(fakeClock);
private final TaskQueue taskQueue =
new TaskQueue(
fakeBasicLoggingApi,
diff --git a/src/test/java/com/google/android/libraries/feed/feedactionmanager/FeedActionManagerImplTest.java b/src/test/java/com/google/android/libraries/feed/feedactionmanager/FeedActionManagerImplTest.java
index 2263fa7..33a511a 100644
--- a/src/test/java/com/google/android/libraries/feed/feedactionmanager/FeedActionManagerImplTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedactionmanager/FeedActionManagerImplTest.java
@@ -28,7 +28,7 @@
import com.google.android.libraries.feed.api.store.LocalActionMutation.ActionType;
import com.google.android.libraries.feed.api.store.Store;
import com.google.android.libraries.feed.common.Result;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.concurrent.testing.FakeTaskQueue;
import com.google.android.libraries.feed.common.concurrent.testing.FakeThreadUtils;
import com.google.android.libraries.feed.common.functional.Consumer;
@@ -60,8 +60,8 @@
private static final String SESSION_ID = "session";
private final FakeClock fakeClock = new FakeClock();
- private final ClockBackedFakeMainThreadRunner fakeMainThreadRunner =
- ClockBackedFakeMainThreadRunner.runTasksImmediately();
+ private final FakeMainThreadRunner fakeMainThreadRunner =
+ FakeMainThreadRunner.runTasksImmediately();
private final FakeThreadUtils fakeThreadUtils = new FakeThreadUtils();
@Mock private SessionManager sessionManager;
diff --git a/src/test/java/com/google/android/libraries/feed/feedknowncontent/FeedKnownContentApiTest.java b/src/test/java/com/google/android/libraries/feed/feedknowncontent/FeedKnownContentApiTest.java
index 0b4794f..3ae2f6d 100644
--- a/src/test/java/com/google/android/libraries/feed/feedknowncontent/FeedKnownContentApiTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedknowncontent/FeedKnownContentApiTest.java
@@ -28,7 +28,7 @@
import com.google.android.libraries.feed.api.knowncontent.KnownContentApi.KnownContentListener;
import com.google.android.libraries.feed.api.sessionmanager.SessionManager;
import com.google.android.libraries.feed.common.Result;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.functional.Consumer;
import com.google.android.libraries.feed.common.functional.Function;
import com.google.search.now.feed.client.StreamDataProto.StreamFeature;
@@ -63,8 +63,7 @@
@Mock private Consumer<List<ContentMetadata>> knownContentConsumer;
@Mock private ThreadUtils threadUtils;
- private final ClockBackedFakeMainThreadRunner mainThreadRunner =
- ClockBackedFakeMainThreadRunner.runTasksImmediately();
+ private final FakeMainThreadRunner mainThreadRunner = FakeMainThreadRunner.runTasksImmediately();
@Captor
private ArgumentCaptor<Function<StreamPayload, ContentMetadata>> knownContentFunctionCaptor;
@@ -176,8 +175,7 @@
@Test
public void testGetKnownContent_offMainThread() {
- ClockBackedFakeMainThreadRunner fakeMainThreadRunner =
- ClockBackedFakeMainThreadRunner.queueAllTasks();
+ FakeMainThreadRunner fakeMainThreadRunner = FakeMainThreadRunner.queueAllTasks();
when(threadUtils.isMainThread()).thenReturn(false);
knownContentApi = new FeedKnownContentApi(sessionManager, fakeMainThreadRunner, threadUtils);
diff --git a/src/test/java/com/google/android/libraries/feed/feedmodelprovider/FeedModelProviderFactoryTest.java b/src/test/java/com/google/android/libraries/feed/feedmodelprovider/FeedModelProviderFactoryTest.java
index 88317fa..a050d67 100644
--- a/src/test/java/com/google/android/libraries/feed/feedmodelprovider/FeedModelProviderFactoryTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedmodelprovider/FeedModelProviderFactoryTest.java
@@ -22,7 +22,7 @@
import com.google.android.libraries.feed.api.sessionmanager.SessionManager;
import com.google.android.libraries.feed.common.concurrent.MainThreadRunner;
import com.google.android.libraries.feed.common.concurrent.TaskQueue;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.time.TimingUtils;
import com.google.android.libraries.feed.host.config.Configuration;
import com.google.android.libraries.feed.host.config.Configuration.ConfigKey;
@@ -48,7 +48,7 @@
public void setUp() {
initMocks(this);
- mainThreadRunner = ClockBackedFakeMainThreadRunner.queueAllTasks();
+ mainThreadRunner = FakeMainThreadRunner.queueAllTasks();
when(config.getValueOrDefault(ConfigKey.INITIAL_NON_CACHED_PAGE_SIZE, 0)).thenReturn(0);
when(config.getValueOrDefault(ConfigKey.NON_CACHED_PAGE_SIZE, 0)).thenReturn(0);
diff --git a/src/test/java/com/google/android/libraries/feed/feedmodelprovider/FeedModelProviderTest.java b/src/test/java/com/google/android/libraries/feed/feedmodelprovider/FeedModelProviderTest.java
index 0ecff7e..b89869f 100644
--- a/src/test/java/com/google/android/libraries/feed/feedmodelprovider/FeedModelProviderTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedmodelprovider/FeedModelProviderTest.java
@@ -46,7 +46,7 @@
import com.google.android.libraries.feed.api.sessionmanager.SessionManager;
import com.google.android.libraries.feed.common.Result;
import com.google.android.libraries.feed.common.concurrent.TaskQueue;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.functional.Consumer;
import com.google.android.libraries.feed.common.time.TimingUtils;
import com.google.android.libraries.feed.feedmodelprovider.FeedModelProvider.InitializeModel;
@@ -93,7 +93,7 @@
private ModelChild continuationToken = null;
private TimingUtils timingUtils = new TimingUtils();
- private ClockBackedFakeMainThreadRunner fakeMainThreadRunner;
+ private FakeMainThreadRunner fakeMainThreadRunner;
private List<PayloadWithId> childBindings = new ArrayList<>();
@@ -111,7 +111,7 @@
})
.when(sessionManager)
.getStreamFeatures(any(), any());
- fakeMainThreadRunner = ClockBackedFakeMainThreadRunner.runTasksImmediately();
+ fakeMainThreadRunner = FakeMainThreadRunner.runTasksImmediately();
}
@Test
@@ -351,7 +351,7 @@
@Test
public void testInvalidate_unregister() {
- fakeMainThreadRunner = ClockBackedFakeMainThreadRunner.queueAllTasks();
+ fakeMainThreadRunner = FakeMainThreadRunner.queueAllTasks();
FeedModelProvider modelProvider = createFeedModelProviderWithConfig();
fakeMainThreadRunner.runAllTasks();
diff --git a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedActionUploadRequestManagerTest.java b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedActionUploadRequestManagerTest.java
index 3d692a2..486cf57 100644
--- a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedActionUploadRequestManagerTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedActionUploadRequestManagerTest.java
@@ -21,7 +21,7 @@
import android.os.Build.VERSION_CODES;
import android.util.Base64;
import com.google.android.libraries.feed.common.Result;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.concurrent.testing.FakeTaskQueue;
import com.google.android.libraries.feed.common.concurrent.testing.FakeThreadUtils;
import com.google.android.libraries.feed.common.protoextensions.FeedExtensionRegistry;
@@ -91,7 +91,7 @@
private ExtensionRegistryLite registry;
private FakeActionReader fakeActionReader;
- private ClockBackedFakeMainThreadRunner fakeMainThreadRunner;
+ private FakeMainThreadRunner fakeMainThreadRunner;
private FakeNetworkClient fakeNetworkClient;
private FakeProtocolAdapter fakeProtocolAdapter;
private FakeStore fakeStore;
@@ -108,7 +108,7 @@
fakeActionReader = new FakeActionReader();
fakeThreadUtils = new FakeThreadUtils();
fakeMainThreadRunner =
- ClockBackedFakeMainThreadRunner.runTasksImmediatelyWithThreadChecks(fakeThreadUtils);
+ FakeMainThreadRunner.runTasksImmediatelyWithThreadChecks(fakeThreadUtils);
fakeNetworkClient = new FakeNetworkClient(fakeThreadUtils);
fakeTaskQueue = new FakeTaskQueue(MoreExecutors.directExecutor(), fakeClock, fakeThreadUtils);
fakeProtocolAdapter = new FakeProtocolAdapter();
diff --git a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedRequestManagerTest.java b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedRequestManagerTest.java
index a56657c..d8164ac 100644
--- a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedRequestManagerTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedRequestManagerTest.java
@@ -28,7 +28,7 @@
import android.util.Base64;
import com.google.android.libraries.feed.api.common.DismissActionWithSemanticProperties;
import com.google.android.libraries.feed.common.Result;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.concurrent.testing.FakeTaskQueue;
import com.google.android.libraries.feed.common.concurrent.testing.FakeThreadUtils;
import com.google.android.libraries.feed.common.locale.LocaleUtils;
@@ -120,7 +120,7 @@
private ExtensionRegistryLite registry;
private FeedRequestManager requestManager;
private FakeActionReader fakeActionReader;
- private ClockBackedFakeMainThreadRunner fakeMainThreadRunner;
+ private FakeMainThreadRunner fakeMainThreadRunner;
private FakeProtocolAdapter fakeProtocolAdapter;
private FakeThreadUtils fakeThreadUtils;
private FakeTaskQueue fakeTaskQueue;
@@ -144,7 +144,7 @@
fakeBasicLoggingApi = new FakeBasicLoggingApi();
fakeThreadUtils = new FakeThreadUtils();
fakeMainThreadRunner =
- ClockBackedFakeMainThreadRunner.runTasksImmediatelyWithThreadChecks(fakeThreadUtils);
+ FakeMainThreadRunner.runTasksImmediatelyWithThreadChecks(fakeThreadUtils);
fakeNetworkClient = new FakeNetworkClient(fakeThreadUtils);
fakeNetworkClient.setDefaultResponse(
createHttpResponse(/* responseCode= */ 200, Response.getDefaultInstance()));
diff --git a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerTest.java b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerTest.java
index 026f2a0..8c0c799 100644
--- a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerTest.java
@@ -31,7 +31,7 @@
import com.google.android.libraries.feed.api.modelprovider.ModelProvider;
import com.google.android.libraries.feed.api.modelprovider.ModelProviderFactory;
import com.google.android.libraries.feed.common.Result;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.concurrent.testing.FakeTaskQueue;
import com.google.android.libraries.feed.common.concurrent.testing.FakeThreadUtils;
import com.google.android.libraries.feed.common.functional.Consumer;
@@ -110,7 +110,7 @@
private final TimingUtils timingUtils = new TimingUtils();
private FakeActionUploadRequestManager fakeActionUploadRequestManager;
- private ClockBackedFakeMainThreadRunner fakeMainThreadRunner;
+ private FakeMainThreadRunner fakeMainThreadRunner;
private FakeProtocolAdapter fakeProtocolAdapter;
private FakeRequestManager fakeRequestManager;
private FakeStore fakeStore;
@@ -124,7 +124,7 @@
initMocks(this);
fakeThreadUtils = new FakeThreadUtils();
fakeMainThreadRunner =
- ClockBackedFakeMainThreadRunner.runTasksImmediatelyWithThreadChecks(fakeThreadUtils);
+ FakeMainThreadRunner.runTasksImmediatelyWithThreadChecks(fakeThreadUtils);
fakeTaskQueue = new FakeTaskQueue(MoreExecutors.directExecutor(), fakeClock, fakeThreadUtils);
appLifecycleListener = new FeedAppLifecycleListener(fakeThreadUtils);
fakeActionUploadRequestManager = new FakeActionUploadRequestManager(fakeThreadUtils);
diff --git a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionManagerMutationTest.java b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionManagerMutationTest.java
index cb7cdf8..7895f06 100644
--- a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionManagerMutationTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionManagerMutationTest.java
@@ -37,7 +37,7 @@
import com.google.android.libraries.feed.api.modelprovider.ModelProvider.State;
import com.google.android.libraries.feed.api.store.Store;
import com.google.android.libraries.feed.common.Result;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.concurrent.testing.FakeTaskQueue;
import com.google.android.libraries.feed.common.concurrent.testing.FakeThreadUtils;
import com.google.android.libraries.feed.common.functional.Supplier;
@@ -115,7 +115,7 @@
fakeTaskQueue,
fakeClock,
fakeBasicLoggingApi,
- ClockBackedFakeMainThreadRunner.runTasksImmediately());
+ FakeMainThreadRunner.runTasksImmediately());
storeSpy = spy(new DelegatingStore(store));
SessionFactory sessionFactory =
new SessionFactory(storeSpy, fakeTaskQueue, timingUtils, fakeThreadUtils, configuration);
diff --git a/src/test/java/com/google/android/libraries/feed/feedstore/FeedStoreTest.java b/src/test/java/com/google/android/libraries/feed/feedstore/FeedStoreTest.java
index 5acadb6..3bd65f2 100644
--- a/src/test/java/com/google/android/libraries/feed/feedstore/FeedStoreTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedstore/FeedStoreTest.java
@@ -28,7 +28,7 @@
import com.google.android.libraries.feed.api.store.Store;
import com.google.android.libraries.feed.api.store.StoreListener;
import com.google.android.libraries.feed.common.concurrent.MainThreadRunner;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.concurrent.testing.FakeTaskQueue;
import com.google.android.libraries.feed.common.concurrent.testing.FakeThreadUtils;
import com.google.android.libraries.feed.common.protoextensions.FeedExtensionRegistry;
@@ -89,7 +89,7 @@
@Mock private BasicLoggingApi basicLoggingApi;
@Mock private Configuration configuration;
@Mock private StoreListener listener;
- private ClockBackedFakeMainThreadRunner mainThreadRunner;
+ private FakeMainThreadRunner mainThreadRunner;
private FakeTaskQueue taskQueue;
@Before
@@ -98,7 +98,7 @@
when(configuration.getValueOrDefault(ConfigKey.USE_DIRECT_STORAGE, false)).thenReturn(false);
taskQueue = new FakeTaskQueue(MoreExecutors.directExecutor(), fakeClock, fakeThreadUtils);
taskQueue.initialize(() -> {});
- mainThreadRunner = ClockBackedFakeMainThreadRunner.runTasksImmediately();
+ mainThreadRunner = FakeMainThreadRunner.runTasksImmediately();
fakeThreadUtils.enforceMainThread(false);
}
diff --git a/src/test/java/com/google/android/libraries/feed/feedstore/internal/PersistentFeedStoreTest.java b/src/test/java/com/google/android/libraries/feed/feedstore/internal/PersistentFeedStoreTest.java
index e219b03..98b70d9 100644
--- a/src/test/java/com/google/android/libraries/feed/feedstore/internal/PersistentFeedStoreTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedstore/internal/PersistentFeedStoreTest.java
@@ -29,7 +29,7 @@
import com.google.android.libraries.feed.api.store.Store;
import com.google.android.libraries.feed.common.Result;
import com.google.android.libraries.feed.common.concurrent.MainThreadRunner;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.protoextensions.FeedExtensionRegistry;
import com.google.android.libraries.feed.feedstore.testing.AbstractClearableFeedStoreTest;
import com.google.android.libraries.feed.feedstore.testing.DelegatingContentStorage;
@@ -69,12 +69,12 @@
private final FeedExtensionRegistry extensionRegistry = new FeedExtensionRegistry(ArrayList::new);
private final ContentStorageDirect contentStorage = new InMemoryContentStorage();
private final JournalStorageDirect journalStorage = new InMemoryJournalStorage();
- private ClockBackedFakeMainThreadRunner mainThreadRunner;
+ private FakeMainThreadRunner mainThreadRunner;
@Before
public void setUp() throws Exception {
initMocks(this);
- mainThreadRunner = ClockBackedFakeMainThreadRunner.runTasksImmediately();
+ mainThreadRunner = FakeMainThreadRunner.runTasksImmediately();
}
@Override
diff --git a/src/test/java/com/google/android/libraries/feed/hostimpl/network/NetworkClientWrapperTest.java b/src/test/java/com/google/android/libraries/feed/hostimpl/network/NetworkClientWrapperTest.java
index 77a7303..7990406 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/network/NetworkClientWrapperTest.java
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/network/NetworkClientWrapperTest.java
@@ -21,7 +21,7 @@
import android.net.Uri;
import com.google.android.libraries.feed.api.common.ThreadUtils;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.functional.Consumer;
import com.google.android.libraries.feed.host.network.HttpRequest;
import com.google.android.libraries.feed.host.network.HttpRequest.HttpMethod;
@@ -43,8 +43,7 @@
@Mock private Consumer<HttpResponse> responseConsumer;
private HttpRequest request;
- private final ClockBackedFakeMainThreadRunner mainThreadRunner =
- ClockBackedFakeMainThreadRunner.queueAllTasks();
+ private final FakeMainThreadRunner mainThreadRunner = FakeMainThreadRunner.queueAllTasks();
@Before
public void setup() {
diff --git a/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/SchedulerApiWrapperTest.java b/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/SchedulerApiWrapperTest.java
index 16439b9..5cf0718 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/SchedulerApiWrapperTest.java
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/SchedulerApiWrapperTest.java
@@ -21,7 +21,7 @@
import static org.mockito.MockitoAnnotations.initMocks;
import com.google.android.libraries.feed.api.common.ThreadUtils;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.host.scheduler.SchedulerApi;
import com.google.android.libraries.feed.host.scheduler.SchedulerApi.SessionManagerState;
import org.junit.After;
@@ -39,8 +39,7 @@
@Mock private SchedulerApi schedulerApi;
private SessionManagerState sessionManagerState;
- private final ClockBackedFakeMainThreadRunner mainThreadRunner =
- ClockBackedFakeMainThreadRunner.runTasksImmediately();
+ private final FakeMainThreadRunner mainThreadRunner = FakeMainThreadRunner.runTasksImmediately();
@Before
public void setup() {
diff --git a/src/test/java/com/google/android/libraries/feed/mocknetworkclient/MockServerNetworkClientTest.java b/src/test/java/com/google/android/libraries/feed/mocknetworkclient/MockServerNetworkClientTest.java
index 8d5c856..e52db1d 100644
--- a/src/test/java/com/google/android/libraries/feed/mocknetworkclient/MockServerNetworkClientTest.java
+++ b/src/test/java/com/google/android/libraries/feed/mocknetworkclient/MockServerNetworkClientTest.java
@@ -27,7 +27,7 @@
import com.google.android.libraries.feed.api.protocoladapter.ProtocolAdapter;
import com.google.android.libraries.feed.common.Result;
import com.google.android.libraries.feed.common.concurrent.MainThreadRunner;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.concurrent.testing.FakeTaskQueue;
import com.google.android.libraries.feed.common.concurrent.testing.FakeThreadUtils;
import com.google.android.libraries.feed.common.functional.Consumer;
@@ -96,7 +96,7 @@
initMocks(this);
context = Robolectric.buildActivity(Activity.class).get();
applicationInfo = new ApplicationInfo.Builder(context).setVersionString("0").build();
- mainThreadRunner = ClockBackedFakeMainThreadRunner.runTasksImmediately();
+ mainThreadRunner = FakeMainThreadRunner.runTasksImmediately();
MockServer mockServer = MockServer.getDefaultInstance();
networkClient = new MockServerNetworkClient(context, mockServer, /* responseDelayMillis= */ 0L);
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/BUILD
index d13fdc7..78bcaf7 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/BUILD
@@ -49,7 +49,6 @@
"//src/main/java/com/google/android/libraries/feed/common/time/testing",
"//src/main/java/com/google/android/libraries/feed/sharedstream/scroll",
"@com_google_protobuf_javalite//:protobuf_java_lite",
- "@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
"@robolectric//bazel:robolectric",
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/ScrollTrackerTest.java b/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/ScrollTrackerTest.java
index 7c3ff35..a8afa0e 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/ScrollTrackerTest.java
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/ScrollTrackerTest.java
@@ -17,7 +17,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.MockitoAnnotations.initMocks;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import com.google.android.libraries.feed.common.time.testing.FakeClock;
import java.util.ArrayList;
import org.junit.Before;
@@ -31,8 +31,7 @@
private static final long AGGREGATE_TIME_MS = 200L;
private final FakeClock clock = new FakeClock();
private ScrollTrackerForTest scrollTracker;
- private final ClockBackedFakeMainThreadRunner mainThreadRunner =
- ClockBackedFakeMainThreadRunner.create(clock);
+ private final FakeMainThreadRunner mainThreadRunner = FakeMainThreadRunner.create(clock);
@Before
public void setUp() {
@@ -104,7 +103,7 @@
static class ScrollTrackerForTest extends ScrollTracker {
public ArrayList<Integer> scrollAmounts;
- ScrollTrackerForTest(ClockBackedFakeMainThreadRunner mainThreadRunner, FakeClock clock) {
+ ScrollTrackerForTest(FakeMainThreadRunner mainThreadRunner, FakeClock clock) {
super(mainThreadRunner, clock);
scrollAmounts = new ArrayList<>();
}
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/StreamScrollMonitorTest.java b/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/StreamScrollMonitorTest.java
index 3f6d5fd..d3a002f 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/StreamScrollMonitorTest.java
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/StreamScrollMonitorTest.java
@@ -27,7 +27,7 @@
import com.google.android.libraries.feed.api.stream.ContentChangedListener;
import com.google.android.libraries.feed.api.stream.ScrollListener;
import com.google.android.libraries.feed.api.stream.ScrollListener.ScrollState;
-import com.google.android.libraries.feed.common.concurrent.testing.ClockBackedFakeMainThreadRunner;
+import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,7 +45,7 @@
private StreamScrollMonitor streamScrollMonitor;
private RecyclerView recyclerView;
- private ClockBackedFakeMainThreadRunner mainThreadRunner;
+ private FakeMainThreadRunner mainThreadRunner;
@Before
public void setUp() {
@@ -53,7 +53,7 @@
Context context = Robolectric.buildActivity(Activity.class).get();
recyclerView = new RecyclerView(context);
- mainThreadRunner = ClockBackedFakeMainThreadRunner.queueAllTasks();
+ mainThreadRunner = FakeMainThreadRunner.queueAllTasks();
streamScrollMonitor = new StreamScrollMonitor(contentChangedListener, mainThreadRunner);
streamScrollMonitor.addScrollListener(scrollListener1);
