Merge pull request #86 from algolia/feature/clean-indices-after

q-litzler · web-flow · commit 5a6aa9b60192 · 2019-07-10T13:31:31.000+02:00
Feature/clean indices after
diff --git a/src/commonTest/kotlin/suite/Extensions.kt b/src/commonTest/kotlin/suite/Extensions.kt
@@ -12,7 +12,6 @@ import com.algolia.search.model.response.ResponseVariant
 import com.algolia.search.serialize.JsonDebug
 import dayInMillis
 import io.ktor.client.features.ResponseException
-import io.ktor.http.HttpStatusCode
 import kotlinx.serialization.KSerializer
 import loadScratch
 import shouldEqual
@@ -33,33 +32,6 @@ internal fun compareVariant(actual: ResponseVariant, expected: Variant) {
     }
 }
 
-internal suspend fun cleanABTest(clientSearch: ClientSearch, suffix: String, now: Boolean = false) {
-    val regex = Regex("kotlin-(.*)-$username-$suffix")
-
-    clientAnalytics.browseAllABTests(hitsPerPage = 100).forEach {
-        it.abTests.forEach { abTest ->
-            val result = regex.find(abTest.variantA.indexName.raw)
-            val date = result?.groupValues?.get(1)
-
-            if (date != null) {
-                val difference = Time.getCurrentTimeMillis() - DateFormat.parse(date)
-
-                if (difference >= dayInMillis || now) {
-                    try {
-                        val deletion = clientAnalytics.deleteABTest(abTest.abTestID)
-
-                        clientSearch.initIndex(deletion.indexName).apply {
-                            deletion.wait()
-                        }
-                    } catch (exception : ResponseException) {
-                        println(exception.readContent())
-                    }
-                }
-            }
-        }
-    }
-}
-
 internal suspend fun cleanIndex(client: ClientSearch, suffix: String, now: Boolean = false) {
     client.listIndices().items.forEach {
         val indexName = it.indexName.raw
diff --git a/src/commonTest/kotlin/suite/TestSuiteAATest.kt b/src/commonTest/kotlin/suite/TestSuiteAATest.kt
@@ -16,7 +16,7 @@ import kotlinx.serialization.json.json
 import runBlocking
 import shouldEqual
 import shouldNotEqual
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -37,7 +37,7 @@ internal class TestSuiteAATest {
         )
     )
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteABTest.kt b/src/commonTest/kotlin/suite/TestSuiteABTest.kt
@@ -18,7 +18,7 @@ import shouldEqual
 import shouldFailWith
 import shouldNotBeNull
 import shouldNotEqual
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -38,7 +38,7 @@ internal class TestSuiteABTest {
         endAt = ClientDate(Time.getCurrentTimeMillis() + dayInMillis)
     )
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteAPIKey.kt b/src/commonTest/kotlin/suite/TestSuiteAPIKey.kt
@@ -17,7 +17,6 @@ import runBlocking
 import shouldBeTrue
 import shouldEqual
 import kotlin.test.AfterTest
-import kotlin.test.Test
 
 
 internal class TestSuiteAPIKey {
@@ -35,7 +34,7 @@ internal class TestSuiteAPIKey {
         validity = 600
     )
 
-    @Test
+    @AfterTest
     fun test() {
         runBlocking {
             clientAdmin1.apply {
diff --git a/src/commonTest/kotlin/suite/TestSuiteAccount.kt b/src/commonTest/kotlin/suite/TestSuiteAccount.kt
@@ -17,7 +17,7 @@ import runBlocking
 import shouldBeTrue
 import shouldEqual
 import shouldFailWith
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -37,7 +37,7 @@ internal class TestSuiteAccount {
         Settings(searchableAttributes = listOf(SearchableAttribute.Default("objectID".toAttribute())))
 
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix1)
diff --git a/src/commonTest/kotlin/suite/TestSuiteBatching.kt b/src/commonTest/kotlin/suite/TestSuiteBatching.kt
@@ -9,7 +9,7 @@ import kotlinx.serialization.list
 import loadScratch
 import runBlocking
 import shouldEqual
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -19,7 +19,7 @@ internal class TestSuiteBatching {
     private val indexName = testSuiteIndexName(suffix)
     private val index = clientAdmin1.initIndex(indexName)
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteBrowse.kt b/src/commonTest/kotlin/suite/TestSuiteBrowse.kt
@@ -11,7 +11,7 @@ import com.algolia.search.model.task.TaskStatus
 import kotlinx.serialization.json.json
 import runBlocking
 import shouldEqual
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -21,7 +21,7 @@ internal class TestSuiteBrowse {
     private val indexName = testSuiteIndexName(suffix)
     private val index = clientAdmin1.initIndex(indexName)
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteCopyIndex.kt b/src/commonTest/kotlin/suite/TestSuiteCopyIndex.kt
@@ -14,7 +14,7 @@ import kotlinx.serialization.json.json
 import runBlocking
 import shouldBeTrue
 import shouldEqual
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -42,7 +42,7 @@ internal class TestSuiteCopyIndex {
     )
     private val settings = Settings(attributesForFaceting = listOf(AttributeForFaceting.Default(company)))
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteDisjunctive.kt b/src/commonTest/kotlin/suite/TestSuiteDisjunctive.kt
@@ -16,7 +16,7 @@ import runBlocking
 import shouldBeTrue
 import shouldEqual
 import shouldNotBeNull
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -26,7 +26,7 @@ internal class TestSuiteDisjunctive {
     private val indexName = testSuiteIndexName(suffix)
     private val index = clientAdmin1.initIndex(indexName)
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteIndexing.kt b/src/commonTest/kotlin/suite/TestSuiteIndexing.kt
@@ -15,7 +15,7 @@ import kotlinx.serialization.json.json
 import runBlocking
 import shouldBeTrue
 import shouldEqual
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -53,7 +53,7 @@ internal class TestSuiteIndexing {
             }
     }
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteInsights.kt b/src/commonTest/kotlin/suite/TestSuiteInsights.kt
@@ -16,7 +16,7 @@ import io.ktor.http.HttpStatusCode
 import kotlinx.serialization.json.json
 import runBlocking
 import shouldEqual
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -41,7 +41,7 @@ internal class TestSuiteInsights {
         Filter.Facet(attribute, "bar")
     )
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteMultipleOperations.kt b/src/commonTest/kotlin/suite/TestSuiteMultipleOperations.kt
@@ -14,7 +14,7 @@ import kotlinx.serialization.json.json
 import runBlocking
 import shouldBeTrue
 import shouldEqual
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -27,7 +27,7 @@ internal class TestSuiteMultipleOperations {
     private val jimmie = "Jimmie"
     private val json = json { firstname to jimmie }
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteReplaceAll.kt b/src/commonTest/kotlin/suite/TestSuiteReplaceAll.kt
@@ -14,7 +14,7 @@ import runBlocking
 import shouldBeTrue
 import shouldEqual
 import shouldFailWith
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -26,7 +26,7 @@ class TestSuiteReplaceAll {
     private val objectIDOne = "one".toObjectID()
     private val objectIDTwo = "two".toObjectID()
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteRules.kt b/src/commonTest/kotlin/suite/TestSuiteRules.kt
@@ -15,7 +15,7 @@ import runBlocking
 import shouldEqual
 import shouldFailWith
 import shouldNotBeNull
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -26,7 +26,7 @@ internal class TestSuiteRules {
     private val brand = "brand".toAttribute()
     private val index = clientAdmin1.initIndex(indexName)
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteSearch.kt b/src/commonTest/kotlin/suite/TestSuiteSearch.kt
@@ -16,7 +16,7 @@ import shouldContain
 import shouldEqual
 import shouldNotBeEmpty
 import shouldNotBeNull
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -29,7 +29,7 @@ internal class TestSuiteSearch {
     private val index = clientAdmin1.initIndex(indexName)
     private val search = clientSearch.initIndex(indexName)
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteSettings.kt b/src/commonTest/kotlin/suite/TestSuiteSettings.kt
@@ -10,7 +10,7 @@ import com.algolia.search.model.settings.Settings
 import com.algolia.search.model.task.TaskStatus
 import runBlocking
 import shouldEqual
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -20,7 +20,7 @@ internal class TestSuiteSettings {
     private val indexName = testSuiteIndexName(suffix)
     private val index = clientAdmin1.initIndex(indexName)
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)
diff --git a/src/commonTest/kotlin/suite/TestSuiteSynonyms.kt b/src/commonTest/kotlin/suite/TestSuiteSynonyms.kt
@@ -16,7 +16,7 @@ import shouldBeTrue
 import shouldContain
 import shouldEqual
 import shouldFailWith
-import kotlin.test.BeforeTest
+import kotlin.test.AfterTest
 import kotlin.test.Test
 
 
@@ -45,7 +45,7 @@ internal class TestSuiteSynonyms {
     private val index = clientAdmin1.initIndex(indexName)
 
 
-    @BeforeTest
+    @AfterTest
     fun clean() {
         runBlocking {
             cleanIndex(clientAdmin1, suffix)

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import kotlinx.serialization.json.json`
`16`	`16`	`import runBlocking`
`17`	`17`	`import shouldEqual`
`18`	`18`	`import shouldNotEqual`
`19`		`-import kotlin.test.BeforeTest`
	`19`	`+import kotlin.test.AfterTest`
`20`	`20`	`import kotlin.test.Test`
`21`	`21`
`22`	`22`
`@@ -37,7 +37,7 @@ internal class TestSuiteAATest {`
`37`	`37`	`)`
`38`	`38`	`)`
`39`	`39`
`40`		`- @BeforeTest`
	`40`	`+ @AfterTest`
`41`	`41`	`fun clean() {`
`42`	`42`	`runBlocking {`
`43`	`43`	`cleanIndex(clientAdmin1, suffix)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import kotlinx.serialization.json.json`
`15`	`15`	`import runBlocking`
`16`	`16`	`import shouldBeTrue`
`17`	`17`	`import shouldEqual`
`18`		`-import kotlin.test.BeforeTest`
	`18`	`+import kotlin.test.AfterTest`
`19`	`19`	`import kotlin.test.Test`
`20`	`20`
`21`	`21`
`@@ -53,7 +53,7 @@ internal class TestSuiteIndexing {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- @BeforeTest`
	`56`	`+ @AfterTest`
`57`	`57`	`fun clean() {`
`58`	`58`	`runBlocking {`
`59`	`59`	`cleanIndex(clientAdmin1, suffix)`