use latest coroutines and ktor

whyoleg · Jul 31, 2023 · a7acd5a · a7acd5a
1 parent 20604ee
commit a7acd5a
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 3 deletions.
diff --git a/cryptography-providers-tests/compatibility/src/commonTest/kotlin/api/CompatibilityTest.kt b/cryptography-providers-tests/compatibility/src/commonTest/kotlin/api/CompatibilityTest.kt
@@ -5,6 +5,7 @@
 package dev.whyoleg.cryptography.providers.tests.compatibility.api
 
 import dev.whyoleg.cryptography.*
+import dev.whyoleg.cryptography.providers.tests.compatibility.*
 import dev.whyoleg.cryptography.providers.tests.support.*
 import kotlin.test.*
 
@@ -16,6 +17,7 @@ abstract class CompatibilityTest<A : CryptographyAlgorithm>(
 
     @Test
     fun generateStep() = runTest {
+        disableConsoleLogging()
         runCompatibilityTestStep(
             tag = "GENERATE",
             api = { ServerApi(algorithmId.name, context, logger) },
@@ -25,6 +27,7 @@ abstract class CompatibilityTest<A : CryptographyAlgorithm>(
 
     @Test
     fun validateStep() = runTest {
+        disableConsoleLogging()
         runCompatibilityTestStep(
             tag = "VALIDATE",
             api = { ServerApi(algorithmId.name, context, logger) },

diff --git a/cryptography-providers-tests/compatibility/src/commonTest/kotlin/utils.kt b/cryptography-providers-tests/compatibility/src/commonTest/kotlin/utils.kt
@@ -49,3 +49,5 @@ fun digest(name: String): CryptographyAlgorithmId<Digest> = when (name) {
     SHA512.name -> SHA512
     else        -> error("Unknown digest: $name")
 }
+
+expect fun disableConsoleLogging()
diff --git a/cryptography-providers-tests/compatibility/src/jsTest/kotlin/utils.js.kt b/cryptography-providers-tests/compatibility/src/jsTest/kotlin/utils.js.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2023 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.whyoleg.cryptography.providers.tests.compatibility
+
+actual fun disableConsoleLogging() {
+    eval("console.debug = function(){}")
+}
diff --git a/cryptography-providers-tests/compatibility/src/nonJsTest/kotlin/utils.nonJs.kt b/cryptography-providers-tests/compatibility/src/nonJsTest/kotlin/utils.nonJs.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2023 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.whyoleg.cryptography.providers.tests.compatibility
+
+actual fun disableConsoleLogging() {
+    //no-op, needed only for JS
+}
diff --git a/cryptography-providers-tests/support/src/commonMain/kotlin/runner.kt b/cryptography-providers-tests/support/src/commonMain/kotlin/runner.kt
@@ -6,6 +6,7 @@ package dev.whyoleg.cryptography.providers.tests.support
 
 import dev.whyoleg.cryptography.*
 import kotlinx.coroutines.test.*
+import kotlin.time.Duration.Companion.minutes
 
 private const val enableLogsGlobal = false
 
@@ -26,7 +27,7 @@ fun runTest(
     rootTag: String? = null,
     enableLogs: Boolean = enableLogsGlobal,
     block: suspend TestScope.() -> Unit,
-): TestResult = runTest(dispatchTimeoutMs = Long.MAX_VALUE) {
+): TestResult = runTest(timeout = 10.minutes) {
     val logger = TestLogger(enableLogs, rootTag)
     logger.print("PLATFORM: $currentTestPlatform")
     TestScope(logger).block()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ android = "8.0.2"
 # test dependencies
 
 kotlinx-serialization = "1.5.1"
-kotlinx-coroutines = "1.6.4"
+kotlinx-coroutines = "1.7.3"
 
 bouncycastle = "1.75"
 

diff --git a/gradle/plugins/build-logic/src/main/kotlin/buildx-multiplatform.gradle.kts b/gradle/plugins/build-logic/src/main/kotlin/buildx-multiplatform.gradle.kts
@@ -20,6 +20,11 @@ kotlin {
                 withWasm()
                 withNative()
             }
+            group("nonJs") {
+                withJvm()
+                withWasm()
+                withNative()
+            }
         }
     }
 

diff --git a/testtool/libs.versions.toml b/testtool/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 
 # don't update ktor because of issue with andoormous amount of logging
-ktor = "2.2.2"
+ktor = "2.3.2"
 logback = "1.2.11"
 
 [libraries]