Merge branch 'main' into dconeybe/dataconnect/ProtoStructListValueArbRefactor

Author: dconeybe

firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/core/DataConnectOperationFailureResponseImplUnitTest.kt

@@ -51,7 +51,11 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 private val propTestConfig =
-  PropTestConfig(iterations = 20, edgeConfig = EdgeConfig(edgecasesGenerationProbability = 0.25))
+  PropTestConfig(
+    iterations = 20,
+    edgeConfig = EdgeConfig(edgecasesGenerationProbability = 0.25),
+    maxDiscardPercentage = 80,
+  )
 
 /** Unit tests for [DataConnectOperationFailureResponseImpl] */
 class DataConnectOperationFailureResponseImplUnitTest {

firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/RandomSeedTestRule.kt

@@ -36,8 +36,8 @@ class RandomSeedTestRule(val rs: Lazy<RandomSource>) : TestRule {
         result.onFailure {
           if (rs.isInitialized()) {
             println(
-              "55negqf33k Test ${description.displayName} failed using " +
-                "RandomSource with seed=${rs.value.seed}"
+              "WARNING[55negqf33k]: RandomSeedTestRule: Test failed using " +
+                "RandomSource with seed=${rs.value.seed}: ${description.displayName}"
             )
           }
         }

firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/property/arbitrary/misc.kt

@@ -18,10 +18,7 @@ package com.google.firebase.dataconnect.testutil.property.arbitrary
 
 import com.google.firebase.dataconnect.testutil.withNullAppended
 import io.kotest.property.Arb
-import io.kotest.property.EdgeConfig
 import io.kotest.property.Exhaustive
-import io.kotest.property.PropertyContext
-import io.kotest.property.Sample
 import io.kotest.property.arbitrary.arbitrary
 import io.kotest.property.arbitrary.filterNot
 import io.kotest.property.arbitrary.flatMap
@@ -89,11 +86,6 @@ private fun pow10(n: Int): Int {
   return result
 }
 
-fun <T> PropertyContext.sampleFromArb(arb: Arb<T>, edgeCaseProbability: Double): Sample<T> {
-  val edgeConfig = EdgeConfig(edgecasesGenerationProbability = edgeCaseProbability)
-  return arb.generate(randomSource(), edgeConfig).first()
-}
-
 /**
  * Creates and returns a new [Exhaustive] whose values are all of the values of [T] and also `null`.
  */

firebase-dataconnect/testutil/src/test/kotlin/com/google/firebase/dataconnect/testutil/ListContainingNullUnitTest.kt

@@ -17,7 +17,7 @@
 package com.google.firebase.dataconnect.testutil
 
 import com.google.firebase.dataconnect.testutil.property.arbitrary.listContainingNull
-import com.google.firebase.dataconnect.testutil.property.arbitrary.sampleFromArb
+import com.google.firebase.dataconnect.testutil.property.arbitrary.next
 import io.kotest.assertions.asClue
 import io.kotest.assertions.assertSoftly
 import io.kotest.assertions.withClue
@@ -40,8 +40,8 @@ class ListContainingNullUnitTest {
   fun `listContainingNull generates values with lengths in the given range`() = runTest {
     checkAll(NUM_ITERATIONS, listLengthsArb) { lengthRange ->
       val arb = Arb.listContainingNull(valuesGen, lengthRange)
-      val sample = sampleFromArb(arb, edgeCaseProbability = 0.5)
-      sample.value.asClue {
+      val value = arb.next(randomSource(), edgeCaseProbability = 0.5f)
+      value.asClue {
         assertSoftly {
           it.size shouldBeGreaterThanOrEqual lengthRange.first
           it.size shouldBeLessThanOrEqual lengthRange.last
@@ -54,8 +54,8 @@ class ListContainingNullUnitTest {
   fun `listContainingNull generates values from the given arb`() = runTest {
     checkAll(NUM_ITERATIONS, listLengthsArb) { lengthRange ->
       val arb = Arb.listContainingNull(valuesGen, lengthRange)
-      val sample = sampleFromArb(arb, edgeCaseProbability = 0.5)
-      sample.value.asClue {
+      val value = arb.next(randomSource(), edgeCaseProbability = 0.5f)
+      value.asClue {
         assertSoftly {
           it.forEachIndexed { index, value ->
             if (value !== null) {
@@ -71,8 +71,8 @@ class ListContainingNullUnitTest {
   fun `listContainingNull generates lists that always contain null`() = runTest {
     checkAll(NUM_ITERATIONS, listLengthsArb) { lengthRange ->
       val arb = Arb.listContainingNull(valuesGen, lengthRange)
-      val sample = sampleFromArb(arb, edgeCaseProbability = 0.5)
-      sample.value.asClue { it shouldContain null }
+      val value = arb.next(randomSource(), edgeCaseProbability = 0.5f)
+      value.asClue { it shouldContain null }
     }
   }