Rearrange tests in default and compatibility folders

whyoleg · Sep 9, 2024 · 8b7eefe · 8b7eefe
1 parent 164a3a1
commit 8b7eefe
Show file tree

Hide file tree

Showing 27 changed files with 66 additions and 68 deletions.
diff --git a/build-logic/src/main/kotlin/ckbuild/tests/GenerateProviderTestsTask.kt b/build-logic/src/main/kotlin/ckbuild/tests/GenerateProviderTestsTask.kt
@@ -55,8 +55,7 @@ abstract class GenerateProviderTestsTask : DefaultTask() {
 
         appendLine("private val CRYPTOGRAPHY_PROVIDER = $providerInitialization").appendLine()
 
-        testClasses.forEach {
-            val testClassName = it.substringAfterLast(".")
+        testClasses.forEach { testClassName ->
             appendLine("class ${providerClassifier}_$testClassName : $testClassName(CRYPTOGRAPHY_PROVIDER)")
         }
         appendLine()
@@ -66,49 +65,48 @@ abstract class GenerateProviderTestsTask : DefaultTask() {
         private val defaultImports = listOf(
             "dev.whyoleg.cryptography.*",
             "dev.whyoleg.cryptography.providers.tests.*",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.*",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric.*",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.digest.*",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.symmetric.*",
+            "dev.whyoleg.cryptography.providers.tests.compatibility.*",
+            "dev.whyoleg.cryptography.providers.tests.default.*",
         )
 
         private val testClasses = listOf(
-            "dev.whyoleg.cryptography.providers.tests.algorithms.SupportedAlgorithmsTest",
-
-            "dev.whyoleg.cryptography.providers.tests.algorithms.Pbkdf2CompatibilityTest",
-
-            "dev.whyoleg.cryptography.providers.tests.algorithms.digest.DigestTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.digest.Md5CompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.digest.Sha1CompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.digest.Sha224CompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.digest.Sha256CompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.digest.Sha384CompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.digest.Sha512CompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.digest.Sha3B224CompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.digest.Sha3B256CompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.digest.Sha3B384CompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.digest.Sha3B512CompatibilityTest",
-
-            "dev.whyoleg.cryptography.providers.tests.algorithms.symmetric.AesCbcTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.symmetric.AesCbcCompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.symmetric.AesCtrCompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.symmetric.AesEcbCompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.symmetric.AesGcmTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.symmetric.AesGcmCompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.symmetric.HmacTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.symmetric.HmacCompatibilityTest",
-
-            "dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric.EcdsaTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric.EcdsaCompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric.EcdhCompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric.RsaOaepTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric.RsaOaepCompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric.RsaPkcs1Test",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric.RsaPkcs1CompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric.RsaPkcs1EsCompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric.RsaPssTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric.RsaPssCompatibilityTest",
-            "dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric.RsaRawCompatibilityTest",
+            "SupportedAlgorithmsTest",
+            "Pbkdf2CompatibilityTest",
+
+            "DigestTest",
+            "Md5CompatibilityTest",
+            "Sha1CompatibilityTest",
+            "Sha224CompatibilityTest",
+            "Sha256CompatibilityTest",
+            "Sha384CompatibilityTest",
+            "Sha512CompatibilityTest",
+            "Sha3B224CompatibilityTest",
+            "Sha3B256CompatibilityTest",
+            "Sha3B384CompatibilityTest",
+            "Sha3B512CompatibilityTest",
+
+            "AesCbcTest",
+            "AesCbcCompatibilityTest",
+            "AesCtrCompatibilityTest",
+            "AesEcbCompatibilityTest",
+            "AesGcmTest",
+            "AesGcmCompatibilityTest",
+
+            "HmacTest",
+            "HmacCompatibilityTest",
+
+            "EcdsaTest",
+            "EcdsaCompatibilityTest",
+            "EcdhCompatibilityTest",
+
+            "RsaOaepTest",
+            "RsaOaepCompatibilityTest",
+            "RsaPkcs1Test",
+            "RsaPkcs1CompatibilityTest",
+            "RsaPkcs1EsCompatibilityTest",
+            "RsaPssTest",
+            "RsaPssCompatibilityTest",
+            "RsaRawCompatibilityTest",
         )
     }
 }
diff --git a/...ms/symmetric/AesBasedCompatibilityTest.kt → ...ompatibility/AesBasedCompatibilityTest.kt b/...ms/symmetric/AesBasedCompatibilityTest.kt → ...ompatibility/AesBasedCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...thms/symmetric/AesCbcCompatibilityTest.kt → .../compatibility/AesCbcCompatibilityTest.kt b/...thms/symmetric/AesCbcCompatibilityTest.kt → .../compatibility/AesCbcCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...thms/symmetric/AesCtrCompatibilityTest.kt → .../compatibility/AesCtrCompatibilityTest.kt b/...thms/symmetric/AesCtrCompatibilityTest.kt → .../compatibility/AesCtrCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...thms/symmetric/AesEcbCompatibilityTest.kt → .../compatibility/AesEcbCompatibilityTest.kt b/...thms/symmetric/AesEcbCompatibilityTest.kt → .../compatibility/AesEcbCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...thms/symmetric/AesGcmCompatibilityTest.kt → .../compatibility/AesGcmCompatibilityTest.kt b/...thms/symmetric/AesGcmCompatibilityTest.kt → .../compatibility/AesGcmCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits

diff --git a/...orithms/digest/DigestCompatibilityTest.kt → .../compatibility/DigestCompatibilityTest.kt b/...orithms/digest/DigestCompatibilityTest.kt → .../compatibility/DigestCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.digest
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...orithms/asymmetric/EcCompatibilityTest.kt → ...tlin/compatibility/EcCompatibilityTest.kt b/...orithms/asymmetric/EcCompatibilityTest.kt → ...tlin/compatibility/EcCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...ithms/asymmetric/EcdhCompatibilityTest.kt → ...in/compatibility/EcdhCompatibilityTest.kt b/...ithms/asymmetric/EcdhCompatibilityTest.kt → ...in/compatibility/EcdhCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...thms/asymmetric/EcdsaCompatibilityTest.kt → ...n/compatibility/EcdsaCompatibilityTest.kt b/...thms/asymmetric/EcdsaCompatibilityTest.kt → ...n/compatibility/EcdsaCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...rithms/symmetric/HmacCompatibilityTest.kt → ...in/compatibility/HmacCompatibilityTest.kt b/...rithms/symmetric/HmacCompatibilityTest.kt → ...in/compatibility/HmacCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...lin/algorithms/Pbkdf2CompatibilityTest.kt → .../compatibility/Pbkdf2CompatibilityTest.kt b/...lin/algorithms/Pbkdf2CompatibilityTest.kt → .../compatibility/Pbkdf2CompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bytes

diff --git a/...s/asymmetric/RsaBasedCompatibilityTest.kt → ...ompatibility/RsaBasedCompatibilityTest.kt b/...s/asymmetric/RsaBasedCompatibilityTest.kt → ...ompatibility/RsaBasedCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...ms/asymmetric/RsaOaepCompatibilityTest.kt → ...compatibility/RsaOaepCompatibilityTest.kt b/...ms/asymmetric/RsaOaepCompatibilityTest.kt → ...compatibility/RsaOaepCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits

diff --git a/...s/asymmetric/RsaPkcs1CompatibilityTest.kt → ...ompatibility/RsaPkcs1CompatibilityTest.kt b/...s/asymmetric/RsaPkcs1CompatibilityTest.kt → ...ompatibility/RsaPkcs1CompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...asymmetric/RsaPkcs1EsCompatibilityTest.kt → ...patibility/RsaPkcs1EsCompatibilityTest.kt b/...asymmetric/RsaPkcs1EsCompatibilityTest.kt → ...patibility/RsaPkcs1EsCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits

diff --git a/...hms/asymmetric/RsaPssCompatibilityTest.kt → .../compatibility/RsaPssCompatibilityTest.kt b/...hms/asymmetric/RsaPssCompatibilityTest.kt → .../compatibility/RsaPssCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bytes

diff --git a/...hms/asymmetric/RsaRawCompatibilityTest.kt → .../compatibility/RsaRawCompatibilityTest.kt b/...hms/asymmetric/RsaRawCompatibilityTest.kt → .../compatibility/RsaRawCompatibilityTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.compatibility
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits

diff --git a/...tlin/algorithms/symmetric/AesBasedTest.kt → ...commonMain/kotlin/default/AesBasedTest.kt b/...tlin/algorithms/symmetric/AesBasedTest.kt → ...commonMain/kotlin/default/AesBasedTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
+package dev.whyoleg.cryptography.providers.tests.default
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...kotlin/algorithms/symmetric/AesCbcTest.kt → ...c/commonMain/kotlin/default/AesCbcTest.kt b/...kotlin/algorithms/symmetric/AesCbcTest.kt → ...c/commonMain/kotlin/default/AesCbcTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
+package dev.whyoleg.cryptography.providers.tests.default
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...kotlin/algorithms/symmetric/AesGcmTest.kt → ...c/commonMain/kotlin/default/AesGcmTest.kt b/...kotlin/algorithms/symmetric/AesGcmTest.kt → ...c/commonMain/kotlin/default/AesGcmTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
+package dev.whyoleg.cryptography.providers.tests.default
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bits

diff --git a/...in/kotlin/algorithms/digest/DigestTest.kt → ...c/commonMain/kotlin/default/DigestTest.kt b/...in/kotlin/algorithms/digest/DigestTest.kt → ...c/commonMain/kotlin/default/DigestTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.digest
+package dev.whyoleg.cryptography.providers.tests.default
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...kotlin/algorithms/asymmetric/EcdsaTest.kt → ...rc/commonMain/kotlin/default/EcdsaTest.kt b/...kotlin/algorithms/asymmetric/EcdsaTest.kt → ...rc/commonMain/kotlin/default/EcdsaTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.default
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...n/kotlin/algorithms/symmetric/HmacTest.kt → ...src/commonMain/kotlin/default/HmacTest.kt b/...n/kotlin/algorithms/symmetric/HmacTest.kt → ...src/commonMain/kotlin/default/HmacTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.symmetric
+package dev.whyoleg.cryptography.providers.tests.default
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...tlin/algorithms/asymmetric/RsaOaepTest.kt → .../commonMain/kotlin/default/RsaOaepTest.kt b/...tlin/algorithms/asymmetric/RsaOaepTest.kt → .../commonMain/kotlin/default/RsaOaepTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.default
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...lin/algorithms/asymmetric/RsaPkcs1Test.kt → ...commonMain/kotlin/default/RsaPkcs1Test.kt b/...lin/algorithms/asymmetric/RsaPkcs1Test.kt → ...commonMain/kotlin/default/RsaPkcs1Test.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.default
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.algorithms.*

diff --git a/...otlin/algorithms/asymmetric/RsaPssTest.kt → ...c/commonMain/kotlin/default/RsaPssTest.kt b/...otlin/algorithms/asymmetric/RsaPssTest.kt → ...c/commonMain/kotlin/default/RsaPssTest.kt
@@ -2,7 +2,7 @@
  * Copyright (c) 2023-2024 Oleg Yukhnevich. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.whyoleg.cryptography.providers.tests.algorithms.asymmetric
+package dev.whyoleg.cryptography.providers.tests.default
 
 import dev.whyoleg.cryptography.*
 import dev.whyoleg.cryptography.BinarySize.Companion.bytes