Fix tests

Author: vkryachko

transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/TestRuntimeComponent.java

@@ -20,11 +20,13 @@
 import com.google.android.datatransport.runtime.scheduling.jobscheduling.SchedulerConfig;
 import com.google.android.datatransport.runtime.scheduling.jobscheduling.Uploader;
 import com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule;
+import com.google.android.datatransport.runtime.scheduling.persistence.SQLiteEventStore;
 import com.google.android.datatransport.runtime.time.Clock;
 import com.google.android.datatransport.runtime.time.Monotonic;
 import com.google.android.datatransport.runtime.time.WallTime;
 import dagger.BindsInstance;
 import dagger.Component;
+import java.io.IOException;
 import javax.inject.Singleton;
 
 @Component(
@@ -38,6 +40,14 @@ abstract class TestRuntimeComponent extends TransportRuntimeComponent {
 
   abstract TransportRuntime getTransportRuntime();
 
+  abstract SQLiteEventStore getEventStore();
+
+  @Override
+  public void close() throws IOException {
+    getEventStore().clearDb();
+    super.close();
+  }
+
   @Component.Builder
   interface Builder {
     @BindsInstance

transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/TestSchedulingModule.java

@@ -14,14 +14,27 @@
 
 package com.google.android.datatransport.runtime;
 
+import static org.mockito.Mockito.spy;
+
 import com.google.android.datatransport.runtime.scheduling.DefaultScheduler;
 import com.google.android.datatransport.runtime.scheduling.Scheduler;
+import com.google.android.datatransport.runtime.scheduling.jobscheduling.Uploader;
+import com.google.android.datatransport.runtime.scheduling.jobscheduling.WorkScheduler;
 import dagger.Binds;
 import dagger.Module;
+import dagger.Provides;
+import javax.inject.Provider;
+import javax.inject.Singleton;
 
 @Module
 abstract class TestSchedulingModule {
 
   @Binds
   abstract Scheduler scheduler(DefaultScheduler scheduler);
+
+  @Provides
+  @Singleton
+  static WorkScheduler workScheduler(Provider<Uploader> uploader) {
+    return spy(new TestWorkScheduler(uploader));
+  }
 }

transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/TestWorkScheduler.java

@@ -14,23 +14,23 @@
 
 package com.google.android.datatransport.runtime;
 
-import android.content.Context;
+import com.google.android.datatransport.runtime.scheduling.jobscheduling.Uploader;
 import com.google.android.datatransport.runtime.scheduling.jobscheduling.WorkScheduler;
+import javax.inject.Provider;
 
 public class TestWorkScheduler implements WorkScheduler {
 
-  private final Context context;
+  private final Provider<Uploader> uploader;
 
-  public TestWorkScheduler(Context applicationContext) {
-    this.context = applicationContext;
+  TestWorkScheduler(Provider<Uploader> uploader) {
+    this.uploader = uploader;
   }
 
   @Override
   public void schedule(TransportContext transportContext, int attemptNumber) {
     if (attemptNumber > 2) {
       return;
     }
-    TransportRuntime.initialize(context);
-    TransportRuntime.getInstance().getUploader().upload(transportContext, attemptNumber, () -> {});
+    uploader.get().upload(transportContext, attemptNumber, () -> {});
   }
 }

transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/UploaderIntegrationTest.java

@@ -19,7 +19,6 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -53,17 +52,17 @@ public class UploaderIntegrationTest {
   private final TransportBackend mockBackend = mock(TransportBackend.class);
   private final BackendRegistry mockRegistry = mock(BackendRegistry.class);
   private final Context context = InstrumentationRegistry.getInstrumentation().getContext();
-  private final WorkScheduler spyScheduler = spy(new TestWorkScheduler(context));
 
-  private final TransportRuntimeComponent component =
+  private final UploaderTestRuntimeComponent component =
       DaggerUploaderTestRuntimeComponent.builder()
           .setApplicationContext(context)
           .setBackendRegistry(mockRegistry)
-          .setWorkScheduler(spyScheduler)
           .setEventClock(() -> 3)
           .setUptimeClock(() -> 1)
           .build();
 
+  private final WorkScheduler spyScheduler = component.getWorkScheduler();
+
   @Rule public final TransportRuntimeRule runtimeRule = new TransportRuntimeRule(component);
 
   @Before

transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/UploaderTestRuntimeComponent.java

@@ -17,13 +17,14 @@
 import android.content.Context;
 import com.google.android.datatransport.runtime.backends.BackendRegistry;
 import com.google.android.datatransport.runtime.scheduling.jobscheduling.WorkScheduler;
-import com.google.android.datatransport.runtime.scheduling.persistence.EventStore;
+import com.google.android.datatransport.runtime.scheduling.persistence.SQLiteEventStore;
 import com.google.android.datatransport.runtime.scheduling.persistence.SpyEventStoreModule;
 import com.google.android.datatransport.runtime.time.Clock;
 import com.google.android.datatransport.runtime.time.Monotonic;
 import com.google.android.datatransport.runtime.time.WallTime;
 import dagger.BindsInstance;
 import dagger.Component;
+import java.io.IOException;
 import javax.inject.Singleton;
 
 @Component(
@@ -37,16 +38,21 @@ abstract class UploaderTestRuntimeComponent extends TransportRuntimeComponent {
 
   abstract TransportRuntime getTransportRuntime();
 
-  abstract EventStore getEventStore();
+  abstract SQLiteEventStore getEventStore();
+
+  abstract WorkScheduler getWorkScheduler();
+
+  @Override
+  public void close() throws IOException {
+    getEventStore().clearDb();
+    super.close();
+  }
 
   @Component.Builder
   interface Builder {
     @BindsInstance
     Builder setApplicationContext(Context applicationContext);
 
-    @BindsInstance
-    Builder setWorkScheduler(WorkScheduler workScheduler);
-
     @BindsInstance
     Builder setBackendRegistry(BackendRegistry registry);
 

transport/transport-runtime/src/androidTest/java/com/google/android/datatransport/runtime/scheduling/persistence/SpyEventStoreModule.java

@@ -17,6 +17,9 @@
 import static org.mockito.Mockito.spy;
 
 import com.google.android.datatransport.runtime.synchronization.SynchronizationGuard;
+import com.google.android.datatransport.runtime.time.Clock;
+import com.google.android.datatransport.runtime.time.Monotonic;
+import com.google.android.datatransport.runtime.time.WallTime;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
@@ -32,10 +35,17 @@ static EventStoreConfig storeConfig() {
 
   @Provides
   @Singleton
-  static EventStore eventStore(SQLiteEventStore store) {
-    return spy(store);
+  static SQLiteEventStore sqliteEventStore(
+      @WallTime Clock wallClock,
+      @Monotonic Clock clock,
+      EventStoreConfig config,
+      SchemaManager schemaManager) {
+    return spy(new SQLiteEventStore(wallClock, clock, config, schemaManager));
   }
 
+  @Binds
+  abstract EventStore eventStore(SQLiteEventStore store);
+
   @Binds
   abstract SynchronizationGuard synchronizationGuard(SQLiteEventStore store);
 

transport/transport-runtime/src/main/java/com/google/android/datatransport/runtime/scheduling/persistence/SQLiteEventStore.java

@@ -308,6 +308,16 @@ public void close() {
     schemaManager.close();
   }
 
+  @VisibleForTesting
+  public void clearDb() {
+    inTransaction(
+        db -> {
+          db.delete("events", null, new String[] {});
+          db.delete("transport_contexts", null, new String[] {});
+          return null;
+        });
+  }
+
   private static byte[] maybeBase64Decode(@Nullable String value) {
     if (value == null) {
       return null;