From 0b2dcd074f928a0a3676c3d63b65950bab26613b Mon Sep 17 00:00:00 2001 From: LaurenNguyen14 Date: Wed, 24 Aug 2022 13:19:39 -0700 Subject: [PATCH 1/3] 8.14 Half of Replicator Tests --- .../test/java/com/couchbase/lite/BaseCollectionTest.kt | 9 +++++++++ .../test/java/com/couchbase/lite/BaseReplicatorTest.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/test/java/com/couchbase/lite/BaseCollectionTest.kt b/common/test/java/com/couchbase/lite/BaseCollectionTest.kt index f3bbd776f..8f6fda90b 100644 --- a/common/test/java/com/couchbase/lite/BaseCollectionTest.kt +++ b/common/test/java/com/couchbase/lite/BaseCollectionTest.kt @@ -78,6 +78,15 @@ open class BaseCollectionTest : BaseDbTest() { assertEquals(n.toLong(), testCollection.count) } + protected fun createDocsInCustomizedCollection(n: Int, col: Collection) { + for (i in 0 until n) { + val doc = MutableDocument(String.format(Locale.US, "%s_%s_doc_%03d", col.database.name, col.name, i)) + doc.setValue("key", i) + saveDocInCollection(doc, col) + } + assertEquals(n.toLong(), col.count) + } + @Throws(IOException::class, JSONException::class) protected fun loadJSONResourceIntoCollection(name: String, collection: Collection) { BufferedReader(InputStreamReader(PlatformUtils.getAsset(name))).use { diff --git a/common/test/java/com/couchbase/lite/BaseReplicatorTest.java b/common/test/java/com/couchbase/lite/BaseReplicatorTest.java index 890ec6283..2a27b8ec6 100644 --- a/common/test/java/com/couchbase/lite/BaseReplicatorTest.java +++ b/common/test/java/com/couchbase/lite/BaseReplicatorTest.java @@ -72,7 +72,7 @@ public void awaitAndValidate() { } } -public abstract class BaseReplicatorTest extends BaseDbTest { +public abstract class BaseReplicatorTest extends BaseCollectionTest { // Don't let the NetworkConnectivityManager confuse tests public static Replicator testReplicator(ReplicatorConfiguration config) { return new Replicator(null, config); } From bbaf7299e381925d3610bc48edec13d0e0f3cae2 Mon Sep 17 00:00:00 2001 From: LaurenNguyen14 Date: Wed, 31 Aug 2022 13:14:48 -0700 Subject: [PATCH 2/3] Address feedback --- .../test/java/com/couchbase/lite/BaseCollectionTest.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/common/test/java/com/couchbase/lite/BaseCollectionTest.kt b/common/test/java/com/couchbase/lite/BaseCollectionTest.kt index 8f6fda90b..48bb86ba6 100644 --- a/common/test/java/com/couchbase/lite/BaseCollectionTest.kt +++ b/common/test/java/com/couchbase/lite/BaseCollectionTest.kt @@ -26,7 +26,6 @@ import org.junit.Before import java.io.BufferedReader import java.io.IOException import java.io.InputStreamReader -import java.util.* open class BaseCollectionTest : BaseDbTest() { protected lateinit var testCollection: Collection @@ -71,16 +70,16 @@ open class BaseCollectionTest : BaseDbTest() { @Throws(CouchbaseLiteException::class) protected fun createDocsInTestCollection(n: Int) { for (i in 0 until n) { - val doc = MutableDocument(String.format(Locale.US, "doc_%03d", i)) + val doc = MutableDocument("doc_${i}") doc.setValue("key", i) saveDocInTestCollection(doc) } assertEquals(n.toLong(), testCollection.count) } - protected fun createDocsInCustomizedCollection(n: Int, col: Collection) { + protected fun createDocsInCollection(n: Int, col: Collection) { for (i in 0 until n) { - val doc = MutableDocument(String.format(Locale.US, "%s_%s_doc_%03d", col.database.name, col.name, i)) + val doc = MutableDocument("${col.database.name}_${col.name}_doc_${i}") doc.setValue("key", i) saveDocInCollection(doc, col) } @@ -95,7 +94,7 @@ open class BaseCollectionTest : BaseDbTest() { if (l.trim().isEmpty()) { return } - val doc = MutableDocument(String.format(Locale.ENGLISH, "doc-%03d", n++)) + val doc = MutableDocument("doc-${n++}") doc.setData(JSONUtils.fromJSON(JSONObject(l))) saveDocInCollection(doc, collection) From 59e844d643cb72d3ff02cc08c80012d303c4c277 Mon Sep 17 00:00:00 2001 From: LaurenNguyen14 Date: Thu, 1 Sep 2022 11:22:11 -0700 Subject: [PATCH 3/3] Refactor --- common/test/java/com/couchbase/lite/BaseCollectionTest.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/test/java/com/couchbase/lite/BaseCollectionTest.kt b/common/test/java/com/couchbase/lite/BaseCollectionTest.kt index 48bb86ba6..01ec4851e 100644 --- a/common/test/java/com/couchbase/lite/BaseCollectionTest.kt +++ b/common/test/java/com/couchbase/lite/BaseCollectionTest.kt @@ -79,13 +79,17 @@ open class BaseCollectionTest : BaseDbTest() { protected fun createDocsInCollection(n: Int, col: Collection) { for (i in 0 until n) { - val doc = MutableDocument("${col.database.name}_${col.name}_doc_${i}") + val doc = MutableDocument(generateDocID(col.database.name, col.name, i)) doc.setValue("key", i) saveDocInCollection(doc, col) } assertEquals(n.toLong(), col.count) } + protected fun generateDocID(dbName: String, colName: String, idNum: Int): String { + return "${dbName}_${colName}_doc_${idNum}" + } + @Throws(IOException::class, JSONException::class) protected fun loadJSONResourceIntoCollection(name: String, collection: Collection) { BufferedReader(InputStreamReader(PlatformUtils.getAsset(name))).use {