Merge pull request #21 from bitPogo/feature/add-constraints

Add constraints
bitPogo · Feb 27, 2022 · 35ae125 · 35ae125
2 parents b921ddd + ee3b487
commit 35ae125
Show file tree

Hide file tree

Showing 61 changed files with 1,269 additions and 307 deletions.
diff --git a/.../src/commonTest/kotlin/tech/antibytes/kmock/example/SampleControllerAutoSpyFactorySpec.kt b/.../src/commonTest/kotlin/tech/antibytes/kmock/example/SampleControllerAutoSpyFactorySpec.kt
@@ -15,24 +15,24 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import tech.antibytes.kmock.MockCommon
-import tech.antibytes.kmock.NonfreezingVerifier
-import tech.antibytes.kmock.Verifier
 import tech.antibytes.kmock.example.contract.ExampleContract
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleDomainObject
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleLocalRepository
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleRemoteRepository
 import tech.antibytes.kmock.example.contract.SampleDomainObjectMock
 import tech.antibytes.kmock.example.contract.SampleLocalRepositoryMock
 import tech.antibytes.kmock.example.contract.SampleRemoteRepositoryMock
-import tech.antibytes.kmock.hasBeenCalledWith
-import tech.antibytes.kmock.hasBeenCalledWithout
-import tech.antibytes.kmock.hasBeenStrictlyCalledWith
-import tech.antibytes.kmock.verify
-import tech.antibytes.kmock.verifyOrder
-import tech.antibytes.kmock.verifyStrictOrder
-import tech.antibytes.kmock.wasGotten
-import tech.antibytes.kmock.wasSet
-import tech.antibytes.kmock.wasSetTo
+import tech.antibytes.kmock.verification.NonfreezingVerifier
+import tech.antibytes.kmock.verification.Verifier
+import tech.antibytes.kmock.verification.hasBeenCalledWith
+import tech.antibytes.kmock.verification.hasBeenCalledWithout
+import tech.antibytes.kmock.verification.hasBeenStrictlyCalledWith
+import tech.antibytes.kmock.verification.verify
+import tech.antibytes.kmock.verification.verifyOrder
+import tech.antibytes.kmock.verification.verifyStrictOrder
+import tech.antibytes.kmock.verification.wasGotten
+import tech.antibytes.kmock.verification.wasSet
+import tech.antibytes.kmock.verification.wasSetTo
 import tech.antibytes.util.test.coroutine.AsyncTestReturnValue
 import tech.antibytes.util.test.coroutine.clearBlockingTest
 import tech.antibytes.util.test.coroutine.defaultTestContext

diff --git a/...src/commonTest/kotlin/tech/antibytes/kmock/example/SampleControllerAutoStubFactorySpec.kt b/...src/commonTest/kotlin/tech/antibytes/kmock/example/SampleControllerAutoStubFactorySpec.kt
@@ -12,23 +12,23 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import tech.antibytes.kmock.MockCommon
-import tech.antibytes.kmock.Verifier
 import tech.antibytes.kmock.example.contract.ExampleContract
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleDomainObject
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleLocalRepository
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleRemoteRepository
 import tech.antibytes.kmock.example.contract.SampleDomainObjectMock
 import tech.antibytes.kmock.example.contract.SampleLocalRepositoryMock
 import tech.antibytes.kmock.example.contract.SampleRemoteRepositoryMock
-import tech.antibytes.kmock.hasBeenCalledWith
-import tech.antibytes.kmock.hasBeenCalledWithout
-import tech.antibytes.kmock.hasBeenStrictlyCalledWith
-import tech.antibytes.kmock.verify
-import tech.antibytes.kmock.verifyOrder
-import tech.antibytes.kmock.verifyStrictOrder
-import tech.antibytes.kmock.wasGotten
-import tech.antibytes.kmock.wasSet
-import tech.antibytes.kmock.wasSetTo
+import tech.antibytes.kmock.verification.Verifier
+import tech.antibytes.kmock.verification.hasBeenCalledWith
+import tech.antibytes.kmock.verification.hasBeenCalledWithout
+import tech.antibytes.kmock.verification.hasBeenStrictlyCalledWith
+import tech.antibytes.kmock.verification.verify
+import tech.antibytes.kmock.verification.verifyOrder
+import tech.antibytes.kmock.verification.verifyStrictOrder
+import tech.antibytes.kmock.verification.wasGotten
+import tech.antibytes.kmock.verification.wasSet
+import tech.antibytes.kmock.verification.wasSetTo
 import tech.antibytes.util.test.coroutine.AsyncTestReturnValue
 import tech.antibytes.util.test.coroutine.clearBlockingTest
 import tech.antibytes.util.test.coroutine.defaultTestContext

diff --git a/...src/commonTest/kotlin/tech/antibytes/kmock/example/SampleControllerAutoStubRelaxedSpec.kt b/...src/commonTest/kotlin/tech/antibytes/kmock/example/SampleControllerAutoStubRelaxedSpec.kt
@@ -13,23 +13,23 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import tech.antibytes.kmock.MockCommon
 import tech.antibytes.kmock.Relaxer
-import tech.antibytes.kmock.Verifier
 import tech.antibytes.kmock.example.contract.ExampleContract
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleDomainObject
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleLocalRepository
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleRemoteRepository
 import tech.antibytes.kmock.example.contract.SampleDomainObjectMock
 import tech.antibytes.kmock.example.contract.SampleLocalRepositoryMock
 import tech.antibytes.kmock.example.contract.SampleRemoteRepositoryMock
-import tech.antibytes.kmock.hasBeenCalledWith
-import tech.antibytes.kmock.hasBeenCalledWithout
-import tech.antibytes.kmock.hasBeenStrictlyCalledWith
-import tech.antibytes.kmock.verify
-import tech.antibytes.kmock.verifyOrder
-import tech.antibytes.kmock.verifyStrictOrder
-import tech.antibytes.kmock.wasGotten
-import tech.antibytes.kmock.wasSet
-import tech.antibytes.kmock.wasSetTo
+import tech.antibytes.kmock.verification.Verifier
+import tech.antibytes.kmock.verification.hasBeenCalledWith
+import tech.antibytes.kmock.verification.hasBeenCalledWithout
+import tech.antibytes.kmock.verification.hasBeenStrictlyCalledWith
+import tech.antibytes.kmock.verification.verify
+import tech.antibytes.kmock.verification.verifyOrder
+import tech.antibytes.kmock.verification.verifyStrictOrder
+import tech.antibytes.kmock.verification.wasGotten
+import tech.antibytes.kmock.verification.wasSet
+import tech.antibytes.kmock.verification.wasSetTo
 import tech.antibytes.util.test.coroutine.AsyncTestReturnValue
 import tech.antibytes.util.test.coroutine.clearBlockingTest
 import tech.antibytes.util.test.coroutine.defaultTestContext

diff --git a/examples/src/commonTest/kotlin/tech/antibytes/kmock/example/SampleControllerAutoStubSpec.kt b/examples/src/commonTest/kotlin/tech/antibytes/kmock/example/SampleControllerAutoStubSpec.kt
@@ -12,23 +12,23 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import tech.antibytes.kmock.MockCommon
-import tech.antibytes.kmock.Verifier
 import tech.antibytes.kmock.example.contract.ExampleContract
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleDomainObject
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleLocalRepository
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleRemoteRepository
 import tech.antibytes.kmock.example.contract.SampleDomainObjectMock
 import tech.antibytes.kmock.example.contract.SampleLocalRepositoryMock
 import tech.antibytes.kmock.example.contract.SampleRemoteRepositoryMock
-import tech.antibytes.kmock.hasBeenCalledWith
-import tech.antibytes.kmock.hasBeenCalledWithout
-import tech.antibytes.kmock.hasBeenStrictlyCalledWith
-import tech.antibytes.kmock.verify
-import tech.antibytes.kmock.verifyOrder
-import tech.antibytes.kmock.verifyStrictOrder
-import tech.antibytes.kmock.wasGotten
-import tech.antibytes.kmock.wasSet
-import tech.antibytes.kmock.wasSetTo
+import tech.antibytes.kmock.verification.Verifier
+import tech.antibytes.kmock.verification.hasBeenCalledWith
+import tech.antibytes.kmock.verification.hasBeenCalledWithout
+import tech.antibytes.kmock.verification.hasBeenStrictlyCalledWith
+import tech.antibytes.kmock.verification.verify
+import tech.antibytes.kmock.verification.verifyOrder
+import tech.antibytes.kmock.verification.verifyStrictOrder
+import tech.antibytes.kmock.verification.wasGotten
+import tech.antibytes.kmock.verification.wasSet
+import tech.antibytes.kmock.verification.wasSetTo
 import tech.antibytes.util.test.coroutine.AsyncTestReturnValue
 import tech.antibytes.util.test.coroutine.clearBlockingTest
 import tech.antibytes.util.test.coroutine.defaultTestContext

diff --git a/examples/src/commonTest/kotlin/tech/antibytes/kmock/example/SampleControllerSpec.kt b/examples/src/commonTest/kotlin/tech/antibytes/kmock/example/SampleControllerSpec.kt
@@ -11,25 +11,25 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import tech.antibytes.kmock.AsyncFunMockery
 import tech.antibytes.kmock.KMockContract.Collector
-import tech.antibytes.kmock.PropertyMockery
-import tech.antibytes.kmock.SyncFunMockery
-import tech.antibytes.kmock.Verifier
-import tech.antibytes.kmock.assertHadBeenCalledStrictlyWith
 import tech.antibytes.kmock.example.contract.ExampleContract
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleDomainObject
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleLocalRepository
 import tech.antibytes.kmock.example.contract.ExampleContract.SampleRemoteRepository
-import tech.antibytes.kmock.hasBeenCalledWith
-import tech.antibytes.kmock.hasBeenCalledWithout
-import tech.antibytes.kmock.hasBeenStrictlyCalledWith
-import tech.antibytes.kmock.verify
-import tech.antibytes.kmock.verifyOrder
-import tech.antibytes.kmock.verifyStrictOrder
-import tech.antibytes.kmock.wasGotten
-import tech.antibytes.kmock.wasSet
-import tech.antibytes.kmock.wasSetTo
+import tech.antibytes.kmock.mock.AsyncFunMockery
+import tech.antibytes.kmock.mock.PropertyMockery
+import tech.antibytes.kmock.mock.SyncFunMockery
+import tech.antibytes.kmock.verification.Verifier
+import tech.antibytes.kmock.verification.assertHasBeenCalledStrictlyWith
+import tech.antibytes.kmock.verification.hasBeenCalledWith
+import tech.antibytes.kmock.verification.hasBeenCalledWithout
+import tech.antibytes.kmock.verification.hasBeenStrictlyCalledWith
+import tech.antibytes.kmock.verification.verify
+import tech.antibytes.kmock.verification.verifyOrder
+import tech.antibytes.kmock.verification.verifyStrictOrder
+import tech.antibytes.kmock.verification.wasGotten
+import tech.antibytes.kmock.verification.wasSet
+import tech.antibytes.kmock.verification.wasSetTo
 import tech.antibytes.util.test.coroutine.AsyncTestReturnValue
 import tech.antibytes.util.test.coroutine.clearBlockingTest
 import tech.antibytes.util.test.coroutine.defaultTestContext
@@ -143,9 +143,9 @@ class SampleControllerSpec {
 
             delay(20)
 
-            local.contains.assertHadBeenCalledStrictlyWith(1, idOrg)
-            local.fetch.assertHadBeenCalledStrictlyWith(1, id)
-            remote.find.assertHadBeenCalledStrictlyWith(1, idOrg)
+            local.contains.assertHasBeenCalledStrictlyWith(1, idOrg)
+            local.fetch.assertHasBeenCalledStrictlyWith(1, id)
+            remote.find.assertHasBeenCalledStrictlyWith(1, idOrg)
 
             verifier.verifyStrictOrder {
                 local.contains.hasBeenStrictlyCalledWith(idOrg)

diff --git a/kmock-processor/src/main/kotlin/tech/antibytes/kmock/processor/ProcessorContract.kt b/kmock-processor/src/main/kotlin/tech/antibytes/kmock/processor/ProcessorContract.kt
@@ -10,13 +10,13 @@ import com.google.devtools.ksp.symbol.KSAnnotated
 import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.KSFile
 import com.squareup.kotlinpoet.ClassName
-import tech.antibytes.kmock.AsyncFunMockery
 import tech.antibytes.kmock.KMockContract
 import tech.antibytes.kmock.KMockContract.Collector
 import tech.antibytes.kmock.Mock
 import tech.antibytes.kmock.MockCommon
-import tech.antibytes.kmock.PropertyMockery
-import tech.antibytes.kmock.SyncFunMockery
+import tech.antibytes.kmock.mock.AsyncFunMockery
+import tech.antibytes.kmock.mock.PropertyMockery
+import tech.antibytes.kmock.mock.SyncFunMockery
 
 internal interface ProcessorContract {
     data class Relaxer(
@@ -81,7 +81,7 @@ internal interface ProcessorContract {
         )
 
         val UNIT_RELAXER = ClassName(
-            KMockContract::class.java.packageName,
+            SyncFunMockery::class.java.packageName,
             "relaxVoidFunction"
         )
 

diff --git a/kmock-processor/src/test/resources/generatorTest/AsyncFunctionCommonExpected.kt b/kmock-processor/src/test/resources/generatorTest/AsyncFunctionCommonExpected.kt
@@ -5,12 +5,12 @@ import kotlin.Any
 import kotlin.Boolean
 import kotlin.Int
 import kotlin.Unit
-import tech.antibytes.kmock.AsyncFunMockery
 import tech.antibytes.kmock.KMockContract
 import tech.antibytes.kmock.KMockContract.Collector
-import tech.antibytes.kmock.PropertyMockery
-import tech.antibytes.kmock.SyncFunMockery
-import tech.antibytes.kmock.relaxVoidFunction
+import tech.antibytes.kmock.mock.AsyncFunMockery
+import tech.antibytes.kmock.mock.PropertyMockery
+import tech.antibytes.kmock.mock.SyncFunMockery
+import tech.antibytes.kmock.mock.relaxVoidFunction
 
 internal class AsyncFunctionCommonMock(
     verifier: KMockContract.Collector = Collector { _, _ -> Unit },

diff --git a/kmock-processor/src/test/resources/generatorTest/AsyncFunctionPlatformExpected.kt b/kmock-processor/src/test/resources/generatorTest/AsyncFunctionPlatformExpected.kt
@@ -4,12 +4,12 @@ import kotlin.Any
 import kotlin.Boolean
 import kotlin.Int
 import kotlin.Unit
-import tech.antibytes.kmock.AsyncFunMockery
 import tech.antibytes.kmock.KMockContract
 import tech.antibytes.kmock.KMockContract.Collector
-import tech.antibytes.kmock.PropertyMockery
-import tech.antibytes.kmock.SyncFunMockery
-import tech.antibytes.kmock.relaxVoidFunction
+import tech.antibytes.kmock.mock.AsyncFunMockery
+import tech.antibytes.kmock.mock.PropertyMockery
+import tech.antibytes.kmock.mock.SyncFunMockery
+import tech.antibytes.kmock.mock.relaxVoidFunction
 
 internal class AsyncFunctionPlatformMock(
     verifier: KMockContract.Collector = Collector { _, _ -> Unit },

diff --git a/kmock-processor/src/test/resources/generatorTest/FunctionOverloadExpected.kt b/kmock-processor/src/test/resources/generatorTest/FunctionOverloadExpected.kt
@@ -6,12 +6,12 @@ import kotlin.Function1
 import kotlin.Int
 import kotlin.String
 import kotlin.Unit
-import tech.antibytes.kmock.AsyncFunMockery
 import tech.antibytes.kmock.KMockContract
 import tech.antibytes.kmock.KMockContract.Collector
-import tech.antibytes.kmock.PropertyMockery
-import tech.antibytes.kmock.SyncFunMockery
-import tech.antibytes.kmock.relaxVoidFunction
+import tech.antibytes.kmock.mock.AsyncFunMockery
+import tech.antibytes.kmock.mock.PropertyMockery
+import tech.antibytes.kmock.mock.SyncFunMockery
+import tech.antibytes.kmock.mock.relaxVoidFunction
 
 internal class SyncFunctionOverloadMock(
     verifier: KMockContract.Collector = Collector { _, _ -> Unit },

diff --git a/kmock-processor/src/test/resources/generatorTest/GenericsExpected.kt b/kmock-processor/src/test/resources/generatorTest/GenericsExpected.kt
@@ -2,12 +2,12 @@ package generatorTest
 
 import kotlin.Boolean
 import kotlin.Unit
-import tech.antibytes.kmock.AsyncFunMockery
 import tech.antibytes.kmock.KMockContract
 import tech.antibytes.kmock.KMockContract.Collector
-import tech.antibytes.kmock.PropertyMockery
-import tech.antibytes.kmock.SyncFunMockery
-import tech.antibytes.kmock.relaxVoidFunction
+import tech.antibytes.kmock.mock.AsyncFunMockery
+import tech.antibytes.kmock.mock.PropertyMockery
+import tech.antibytes.kmock.mock.SyncFunMockery
+import tech.antibytes.kmock.mock.relaxVoidFunction
 
 internal class GenericsMock<K : Any, L>(
     verifier: KMockContract.Collector = Collector { _, _ -> Unit },

diff --git a/kmock-processor/src/test/resources/generatorTest/PropertyCommonExpected.kt b/kmock-processor/src/test/resources/generatorTest/PropertyCommonExpected.kt
@@ -5,12 +5,12 @@ import kotlin.Any
 import kotlin.Boolean
 import kotlin.String
 import kotlin.Unit
-import tech.antibytes.kmock.AsyncFunMockery
 import tech.antibytes.kmock.KMockContract
 import tech.antibytes.kmock.KMockContract.Collector
-import tech.antibytes.kmock.PropertyMockery
-import tech.antibytes.kmock.SyncFunMockery
-import tech.antibytes.kmock.relaxVoidFunction
+import tech.antibytes.kmock.mock.AsyncFunMockery
+import tech.antibytes.kmock.mock.PropertyMockery
+import tech.antibytes.kmock.mock.SyncFunMockery
+import tech.antibytes.kmock.mock.relaxVoidFunction
 
 internal class PropertyCommonMock(
     verifier: KMockContract.Collector = Collector { _, _ -> Unit },

diff --git a/kmock-processor/src/test/resources/generatorTest/PropertyPlatformExpected.kt b/kmock-processor/src/test/resources/generatorTest/PropertyPlatformExpected.kt
@@ -4,12 +4,12 @@ import kotlin.Any
 import kotlin.Boolean
 import kotlin.String
 import kotlin.Unit
-import tech.antibytes.kmock.AsyncFunMockery
 import tech.antibytes.kmock.KMockContract
 import tech.antibytes.kmock.KMockContract.Collector
-import tech.antibytes.kmock.PropertyMockery
-import tech.antibytes.kmock.SyncFunMockery
-import tech.antibytes.kmock.relaxVoidFunction
+import tech.antibytes.kmock.mock.AsyncFunMockery
+import tech.antibytes.kmock.mock.PropertyMockery
+import tech.antibytes.kmock.mock.SyncFunMockery
+import tech.antibytes.kmock.mock.relaxVoidFunction
 
 internal class PropertyPlatformMock(
     verifier: KMockContract.Collector = Collector { _, _ -> Unit },

diff --git a/kmock-processor/src/test/resources/generatorTest/RelaxedExpected.kt b/kmock-processor/src/test/resources/generatorTest/RelaxedExpected.kt
@@ -5,12 +5,12 @@ import kotlin.Any
 import kotlin.Boolean
 import kotlin.String
 import kotlin.Unit
-import tech.antibytes.kmock.AsyncFunMockery
 import tech.antibytes.kmock.KMockContract
 import tech.antibytes.kmock.KMockContract.Collector
-import tech.antibytes.kmock.PropertyMockery
-import tech.antibytes.kmock.SyncFunMockery
-import tech.antibytes.kmock.relaxVoidFunction
+import tech.antibytes.kmock.mock.AsyncFunMockery
+import tech.antibytes.kmock.mock.PropertyMockery
+import tech.antibytes.kmock.mock.SyncFunMockery
+import tech.antibytes.kmock.mock.relaxVoidFunction
 
 internal class RelaxedMock(
     verifier: KMockContract.Collector = Collector { _, _ -> Unit },

diff --git a/kmock-processor/src/test/resources/generatorTest/SyncFunctionCommonExpected.kt b/kmock-processor/src/test/resources/generatorTest/SyncFunctionCommonExpected.kt
@@ -5,12 +5,12 @@ import kotlin.Any
 import kotlin.Boolean
 import kotlin.Int
 import kotlin.Unit
-import tech.antibytes.kmock.AsyncFunMockery
 import tech.antibytes.kmock.KMockContract
 import tech.antibytes.kmock.KMockContract.Collector
-import tech.antibytes.kmock.PropertyMockery
-import tech.antibytes.kmock.SyncFunMockery
-import tech.antibytes.kmock.relaxVoidFunction
+import tech.antibytes.kmock.mock.AsyncFunMockery
+import tech.antibytes.kmock.mock.PropertyMockery
+import tech.antibytes.kmock.mock.SyncFunMockery
+import tech.antibytes.kmock.mock.relaxVoidFunction
 
 internal class SyncFunctionCommonMock(
     verifier: KMockContract.Collector = Collector { _, _ -> Unit },

diff --git a/kmock-processor/src/test/resources/generatorTest/SyncFunctionPlatformExpected.kt b/kmock-processor/src/test/resources/generatorTest/SyncFunctionPlatformExpected.kt
@@ -4,12 +4,12 @@ import kotlin.Any
 import kotlin.Boolean
 import kotlin.Int
 import kotlin.Unit
-import tech.antibytes.kmock.AsyncFunMockery
 import tech.antibytes.kmock.KMockContract
 import tech.antibytes.kmock.KMockContract.Collector
-import tech.antibytes.kmock.PropertyMockery
-import tech.antibytes.kmock.SyncFunMockery
-import tech.antibytes.kmock.relaxVoidFunction
+import tech.antibytes.kmock.mock.AsyncFunMockery
+import tech.antibytes.kmock.mock.PropertyMockery
+import tech.antibytes.kmock.mock.SyncFunMockery
+import tech.antibytes.kmock.mock.relaxVoidFunction
 
 internal class SyncFunctionPlatformMock(
     verifier: KMockContract.Collector = Collector { _, _ -> Unit },

diff --git a/kmock/build.gradle.kts b/kmock/build.gradle.kts
@@ -53,6 +53,13 @@ kotlin {
             ).contains(sourceSet.name)
         }
 
+        all {
+            languageSettings.apply {
+                optIn("kotlin.ExperimentalUnsignedTypes")
+                optIn("kotlin.RequiresOptIn")
+            }
+        }
+
         val commonMain by getting {
             dependencies {
                 implementation(Dependency.multiplatform.kotlin.common)