Create new build flag: rms-bugs. This flag does not guard anything at the moment but it will guard the changes necessary to resolve several reference mode store bugs.

PiperOrigin-RevId: 363547340

Author: Alice Johnson

java/arcs/core/storage/testutil/BUILD

@@ -37,6 +37,7 @@ arcs_kt_jvm_library(
         "//java/arcs/core/storage/referencemode",
         "//java/arcs/core/type",
         "//java/arcs/core/util/testutil",
+        "//java/arcs/flags/testing",
         "//java/arcs/jvm/util",
         "//third_party/java/junit:junit-android",
         "//third_party/java/truth:truth-android",

java/arcs/core/storage/testutil/ReferenceModeStoreTestBase.kt

@@ -33,6 +33,8 @@ import arcs.core.storage.referencemode.RefModeStoreOutput
 import arcs.core.storage.referencemode.ReferenceModeStorageKey
 import arcs.core.storage.toReference
 import arcs.core.util.testutil.LogRule
+import arcs.flags.testing.BuildFlagsRule
+import arcs.flags.testing.ParameterizedBuildFlags
 import com.google.common.truth.Truth.assertThat
 import kotlin.test.assertFailsWith
 import kotlinx.coroutines.CompletableDeferred
@@ -44,20 +46,25 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
 
 /**
  * Testing base class for [ReferenceModeStore] tests. Subclasses can override this class to run its
  * suite of tests for its own database backend.
  */
+@RunWith(Parameterized::class)
 @OptIn(ExperimentalCoroutinesApi::class)
-abstract class ReferenceModeStoreTestBase {
+abstract class ReferenceModeStoreTestBase(private val parameters: ParameterizedBuildFlags) {
   // TODO(b/171729186): Move all tests that are shared between ReferenceModeStoreTest,
   // ReferenceModeStoreDatabaseIntegrationTest and ReferenceModeStoreDatabaseImplIntegrationTest
   // here.
 
   @get:Rule
   val logRule = LogRule()
 
+  @get:Rule val rule = BuildFlagsRule.parameterized(parameters)
+
   protected abstract val TEST_KEY: ReferenceModeStorageKey
 
   protected abstract var driverFactory: DriverFactory

javatests/arcs/android/storage/ReferenceModeStoreDatabaseImplIntegrationTest.kt

@@ -26,13 +26,11 @@ import arcs.core.storage.driver.DatabaseDriverProvider
 import arcs.core.storage.keys.DatabaseStorageKey
 import arcs.core.storage.referencemode.ReferenceModeStorageKey
 import arcs.core.storage.testutil.ReferenceModeStoreTestBase
-import arcs.flags.testing.BuildFlagsRule
 import arcs.flags.testing.ParameterizedBuildFlags
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.After
 import org.junit.Before
-import org.junit.Rule
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
 
@@ -41,14 +39,15 @@ import org.robolectric.ParameterizedRobolectricTestRunner
 @RunWith(ParameterizedRobolectricTestRunner::class)
 class ReferenceModeStoreDatabaseImplIntegrationTest(
   private val parameters: ParameterizedBuildFlags
-) : ReferenceModeStoreTestBase() {
-
-  @get:Rule val rule = BuildFlagsRule.parameterized(parameters)
+) : ReferenceModeStoreTestBase(parameters) {
 
   companion object {
     @JvmStatic
     @ParameterizedRobolectricTestRunner.Parameters(name = "{0}")
-    fun params() = ParameterizedBuildFlags.of("STORAGE_STRING_REDUCTION").toList()
+    fun params() = ParameterizedBuildFlags.of(
+      "STORAGE_STRING_REDUCTION",
+      "REFERENCE_MODE_STORE_FIXES"
+    ).toList()
   }
 
   override val TEST_KEY = ReferenceModeStorageKey(

javatests/arcs/android/storage/ReferenceModeStoreDatabaseImplReducedStorageStringIntegrationTest.kt

@@ -11,6 +11,7 @@
 
 package arcs.android.storage
 
+import androidx.test.core.app.ApplicationProvider
 import arcs.android.storage.database.AndroidSqliteDatabaseManager
 import arcs.core.crdt.CrdtData
 import arcs.core.crdt.CrdtSet
@@ -26,17 +27,14 @@ import arcs.core.storage.keys.DatabaseStorageKey
 import arcs.core.storage.referencemode.ReferenceModeStorageKey
 import arcs.core.storage.testutil.ReferenceModeStoreTestBase
 import arcs.core.util.RandomBuilder
-import arcs.flags.testing.BuildFlagsRule
 import arcs.flags.testing.ParameterizedBuildFlags
-import androidx.test.core.app.ApplicationProvider
+import kotlin.random.Random
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.After
 import org.junit.Before
-import org.junit.Rule
 import org.junit.runner.RunWith
 import org.robolectric.ParameterizedRobolectricTestRunner
-import kotlin.random.Random
 
 /**
  * Implementation of [ReferenceModeStoreTestBase] that mirrors
@@ -48,14 +46,15 @@ import kotlin.random.Random
 @RunWith(ParameterizedRobolectricTestRunner::class)
 class ReferenceModeStoreDatabaseImplReducedStorageStringIntegrationTest(
   private val parameters: ParameterizedBuildFlags
-) : ReferenceModeStoreTestBase() {
-
-  @get:Rule val rule = BuildFlagsRule.parameterized(parameters)
+) : ReferenceModeStoreTestBase(parameters) {
 
   companion object {
     @JvmStatic
     @ParameterizedRobolectricTestRunner.Parameters(name = "{0}")
-    fun params() = ParameterizedBuildFlags.of("STORAGE_STRING_REDUCTION").toList()
+    fun params() = ParameterizedBuildFlags.of(
+      "STORAGE_STRING_REDUCTION",
+      "REFERENCE_MODE_STORE_FIXES"
+    ).toList()
   }
 
   override val TEST_KEY = ReferenceModeStorageKey(

javatests/arcs/core/storage/ReferenceModeStoreDatabaseIntegrationTest.kt

@@ -22,6 +22,7 @@ import arcs.core.storage.keys.DatabaseStorageKey
 import arcs.core.storage.referencemode.ReferenceModeStorageKey
 import arcs.core.storage.testutil.RefModeStoreHelper
 import arcs.core.storage.testutil.ReferenceModeStoreTestBase
+import arcs.flags.testing.ParameterizedBuildFlags
 import arcs.jvm.storage.database.testutil.FakeDatabaseManager
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -30,12 +31,20 @@ import kotlinx.coroutines.test.runBlockingTest
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
+import org.junit.runners.Parameterized
 
 @Suppress("UNCHECKED_CAST")
 @OptIn(ExperimentalCoroutinesApi::class)
-@RunWith(JUnit4::class)
-class ReferenceModeStoreDatabaseIntegrationTest : ReferenceModeStoreTestBase() {
+@RunWith(Parameterized::class)
+class ReferenceModeStoreDatabaseIntegrationTest(
+  private val parameters: ParameterizedBuildFlags
+) : ReferenceModeStoreTestBase(parameters) {
+
+  companion object {
+    @get:JvmStatic
+    @get:Parameterized.Parameters(name = "{0}")
+    val PARAMETERS = ParameterizedBuildFlags.of("REFERENCE_MODE_STORE_FIXES")
+  }
 
   override val TEST_KEY = ReferenceModeStorageKey(
     DatabaseStorageKey.Persistent("entities", HASH),

javatests/arcs/core/storage/ReferenceModeStoreTest.kt

@@ -21,14 +21,12 @@ import arcs.core.storage.testutil.FakeDriver
 import arcs.core.storage.testutil.FakeDriverVendor
 import arcs.core.storage.testutil.ReferenceModeStoreTestBase
 import arcs.core.storage.testutil.getStoredDataForTesting
-import arcs.flags.testing.BuildFlagsRule
 import arcs.flags.testing.ParameterizedBuildFlags
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.Before
 import org.junit.Ignore
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
@@ -39,16 +37,15 @@ import org.junit.runners.Parameterized
 @RunWith(Parameterized::class)
 class ReferenceModeStoreTest(
   private val parameters: ParameterizedBuildFlags
-) : ReferenceModeStoreTestBase() {
-
-  @get:Rule val rule = BuildFlagsRule.parameterized(parameters)
+) : ReferenceModeStoreTestBase(parameters) {
 
   companion object {
     @get:JvmStatic
     @get:Parameterized.Parameters(name = "{0}")
     val PARAMETERS = ParameterizedBuildFlags.of(
       "STORAGE_STRING_REDUCTION",
-      "BATCH_CONTAINER_STORE_OPS"
+      "BATCH_CONTAINER_STORE_OPS",
+      "REFERENCE_MODE_STORE_FIXES"
     )
   }
 

third_party/java/arcs/flags/flags.bzl

@@ -100,6 +100,15 @@ ARCS_BUILD_FLAGS = [
             "batch.?container.?store.?ops",
         ],
     ),
+    arcs_build_flag(
+        name = "reference_mode_store_fixes",
+        desc = "Resolve several reference mode store bugs",
+        bug_id = "b/176930336",
+        status = "NOT_READY",
+        stopwords = [
+            "reference.?mode.?store.?fixes",
+        ],
+    ),
 ]
 
 validate_flag_list(ARCS_BUILD_FLAGS)