Fixed instrumentation tests

Author: ashwinraghav

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

@@ -14,12 +14,19 @@
 
 package com.google.android.datatransport.runtime.scheduling.persistence;
 
+import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_CONTEXTS_SQL_V1;
+import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_CONTEXT_BACKEND_PRIORITY_INDEX_V1;
+import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_EVENTS_SQL_V1;
+import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_EVENT_BACKEND_INDEX_V1;
+import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_EVENT_METADATA_SQL_V1;
 import static org.mockito.Mockito.spy;
 
 import com.google.android.datatransport.runtime.synchronization.SynchronizationGuard;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
+
+import javax.inject.Named;
 import javax.inject.Singleton;
 
 @Module
@@ -37,4 +44,34 @@ static EventStore eventStore(SQLiteEventStore store) {
 
   @Binds
   abstract SynchronizationGuard synchronizationGuard(SQLiteEventStore store);
+
+  @Provides
+  @Named("CREATE_EVENTS_SQL")
+  static String createEventsSql() {
+    return CREATE_EVENTS_SQL_V1;
+  }
+
+  @Provides
+  @Named("CREATE_EVENT_METADATA_SQL")
+  static String createEventMetadataSql() {
+    return CREATE_EVENT_METADATA_SQL_V1;
+  }
+
+  @Provides
+  @Named("CREATE_CONTEXTS_SQL")
+  static String createContextsSql() {
+    return CREATE_CONTEXTS_SQL_V1;
+  }
+
+  @Provides
+  @Named("CREATE_EVENT_BACKEND_INDEX")
+  static String getCreateEventBackendIndex() {
+    return CREATE_EVENT_BACKEND_INDEX_V1;
+  }
+
+  @Provides
+  @Named("CREATE_CONTEXT_BACKEND_PRIORITY_INDEX")
+  static String createEventBackendPriorityIndex() {
+    return CREATE_CONTEXT_BACKEND_PRIORITY_INDEX_V1;
+  }
 }

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

@@ -15,10 +15,19 @@
 package com.google.android.datatransport.runtime.scheduling.persistence;
 
 import com.google.android.datatransport.runtime.synchronization.SynchronizationGuard;
+
+import javax.inject.Named;
+
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 
+import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_CONTEXTS_SQL_V1;
+import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_CONTEXT_BACKEND_PRIORITY_INDEX_V1;
+import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_EVENTS_SQL_V1;
+import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_EVENT_BACKEND_INDEX_V1;
+import static com.google.android.datatransport.runtime.scheduling.persistence.EventStoreModule.CREATE_EVENT_METADATA_SQL_V1;
+
 @Module
 public abstract class TestEventStoreModule {
   private static final long MAX_DB_STORAGE_SIZE_IN_BYTES = 10 * 1024 * 1024;
@@ -40,4 +49,34 @@ static EventStoreConfig storeConfig() {
 
   @Binds
   abstract SynchronizationGuard synchronizationGuard(SQLiteEventStore store);
+
+  @Provides
+  @Named("CREATE_EVENTS_SQL")
+  static String createEventsSql() {
+    return CREATE_EVENTS_SQL_V1;
+  }
+
+  @Provides
+  @Named("CREATE_EVENT_METADATA_SQL")
+  static String createEventMetadataSql() {
+    return CREATE_EVENT_METADATA_SQL_V1;
+  }
+
+  @Provides
+  @Named("CREATE_CONTEXTS_SQL")
+  static String createContextsSql() {
+    return CREATE_CONTEXTS_SQL_V1;
+  }
+
+  @Provides
+  @Named("CREATE_EVENT_BACKEND_INDEX")
+  static String getCreateEventBackendIndex() {
+    return CREATE_EVENT_BACKEND_INDEX_V1;
+  }
+
+  @Provides
+  @Named("CREATE_CONTEXT_BACKEND_PRIORITY_INDEX")
+  static String createEventBackendPriorityIndex() {
+    return CREATE_CONTEXT_BACKEND_PRIORITY_INDEX_V1;
+  }
 }