Rollback the package change for parameter generators

JetBrains · May 31, 2023 · 1b457a7 · 1b457a7
1 parent 56b9dbb
commit 1b457a7
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 11 deletions.
diff --git a/src/jvm/main/org/jetbrains/kotlinx/lincheck/CTestStructure.java b/src/jvm/main/org/jetbrains/kotlinx/lincheck/CTestStructure.java
@@ -12,6 +12,7 @@
 
 import org.jetbrains.kotlinx.lincheck.annotations.*;
 import org.jetbrains.kotlinx.lincheck.execution.*;
+import org.jetbrains.kotlinx.lincheck.paramgen.*;
 import org.jetbrains.kotlinx.lincheck.strategy.stress.*;
 
 import java.lang.reflect.*;

diff --git a/src/jvm/main/org/jetbrains/kotlinx/lincheck/annotations/Param.java b/src/jvm/main/org/jetbrains/kotlinx/lincheck/annotations/Param.java
@@ -17,8 +17,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.jetbrains.kotlinx.lincheck.DummyParameterGenerator;
-import org.jetbrains.kotlinx.lincheck.ParameterGenerator;
+import org.jetbrains.kotlinx.lincheck.paramgen.DummyParameterGenerator;
+import org.jetbrains.kotlinx.lincheck.paramgen.ParameterGenerator;
 
 /**
  * Use this annotation to specify parameter generators.

diff --git a/src/jvm/main/org/jetbrains/kotlinx/lincheck/execution/ActorGenerator.kt b/src/jvm/main/org/jetbrains/kotlinx/lincheck/execution/ActorGenerator.kt
@@ -10,6 +10,8 @@
 package org.jetbrains.kotlinx.lincheck.execution
 
 import org.jetbrains.kotlinx.lincheck.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
+import org.jetbrains.kotlinx.lincheck.paramgen.THREAD_ID_TOKEN
 import java.lang.reflect.*
 import java.util.Random
 

diff --git a/...s/kotlinx/lincheck/ParameterGenerators.kt → .../lincheck/paramgen/ParameterGenerators.kt b/...s/kotlinx/lincheck/ParameterGenerators.kt → .../lincheck/paramgen/ParameterGenerators.kt
@@ -8,10 +8,11 @@
  * with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-package org.jetbrains.kotlinx.lincheck
+package org.jetbrains.kotlinx.lincheck.paramgen
 
-import org.jetbrains.kotlinx.lincheck.ExpandingRangeIntGenerator.NextExpansionDirection.*
+import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.ExpandingRangeIntGenerator.NextExpansionDirection.*
 import java.util.*
 
 /**

diff --git a/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/PromptCancellationTest.kt b/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/PromptCancellationTest.kt
@@ -15,6 +15,7 @@ import kotlinx.coroutines.*
 import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
 import org.jetbrains.kotlinx.lincheck.annotations.Operation
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 import org.jetbrains.kotlinx.lincheck.strategy.*
 import kotlin.coroutines.*
 import kotlin.reflect.*

diff --git a/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/ResultAsParameterTest.java b/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/ResultAsParameterTest.java
@@ -15,7 +15,7 @@
 import org.jetbrains.kotlinx.lincheck.annotations.OpGroupConfig;
 import org.jetbrains.kotlinx.lincheck.annotations.Operation;
 import org.jetbrains.kotlinx.lincheck.annotations.Param;
-import org.jetbrains.kotlinx.lincheck.IntGen;
+import org.jetbrains.kotlinx.lincheck.paramgen.IntGen;
 import org.jetbrains.kotlinx.lincheck.strategy.stress.StressCTest;
 import org.jetbrains.kotlinx.lincheck.verifier.VerifierState;
 import org.junit.Test;

diff --git a/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/ThreadIdTest.kt b/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/ThreadIdTest.kt
@@ -10,8 +10,8 @@
   package org.jetbrains.kotlinx.lincheck.test
 
 import kotlinx.atomicfu.*
-import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 
 class ThreadIdTest : AbstractLincheckTest() {
     private val balances = IntArray(5)

diff --git a/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/generator/ExpandingRangeGeneratorTest.kt b/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/generator/ExpandingRangeGeneratorTest.kt
@@ -13,7 +13,7 @@ package org.jetbrains.kotlinx.lincheck.test.generator
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.slot
-import org.jetbrains.kotlinx.lincheck.ExpandingRangeIntGenerator
+import org.jetbrains.kotlinx.lincheck.paramgen.ExpandingRangeIntGenerator
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.util.Random

diff --git a/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/generator/ParamGeneratorsTests.kt b/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/generator/ParamGeneratorsTests.kt
@@ -14,6 +14,7 @@ package org.jetbrains.kotlinx.lincheck.test.generator
 import junit.framework.Assert.*
 import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 import org.jetbrains.kotlinx.lincheck.strategy.managed.modelchecking.*
 import org.junit.*
 

diff --git a/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/transformation/SerializableValueTests.kt b/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/transformation/SerializableValueTests.kt
@@ -11,6 +11,7 @@ package org.jetbrains.kotlinx.lincheck.test.transformation
 
 import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 import org.jetbrains.kotlinx.lincheck.strategy.*
 import org.jetbrains.kotlinx.lincheck.test.*
 import org.junit.*

diff --git a/.../test/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/BufferedChannelTest.kt b/.../test/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/BufferedChannelTest.kt
@@ -13,6 +13,7 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
 import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 import org.jetbrains.kotlinx.lincheck.test.*
 
 @InternalCoroutinesApi

diff --git a/.../test/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/ConcurrentDequeTest.kt b/.../test/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/ConcurrentDequeTest.kt
@@ -11,6 +11,7 @@ package org.jetbrains.kotlinx.lincheck.test.verifier.linearizability
 
 import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 import org.jetbrains.kotlinx.lincheck.test.*
 import java.util.concurrent.*
 

diff --git a/...est/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/ConcurrentHashMapTest.kt b/...est/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/ConcurrentHashMapTest.kt
@@ -11,6 +11,7 @@ package org.jetbrains.kotlinx.lincheck.test.verifier.linearizability
 
 import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 import org.jetbrains.kotlinx.lincheck.strategy.managed.modelchecking.*
 import org.jetbrains.kotlinx.lincheck.test.*
 import java.util.concurrent.*

diff --git a/...org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/ConcurrentLinkedQueueTest.kt b/...org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/ConcurrentLinkedQueueTest.kt
@@ -9,8 +9,8 @@
  */
 package org.jetbrains.kotlinx.lincheck.test.verifier.linearizability
 
-import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 import org.jetbrains.kotlinx.lincheck.test.*
 import java.util.concurrent.*
 

diff --git a/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/HashMapTest.kt b/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/HashMapTest.kt
@@ -9,8 +9,8 @@
  */
 package org.jetbrains.kotlinx.lincheck.test.verifier.linearizability
 
-import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 import org.jetbrains.kotlinx.lincheck.strategy.*
 import org.jetbrains.kotlinx.lincheck.test.*
 import java.util.*

diff --git a/...vm/test/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/LockBasedSetTests.kt b/...vm/test/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/LockBasedSetTests.kt
@@ -9,8 +9,8 @@
  */
 package org.jetbrains.kotlinx.lincheck.test.verifier.linearizability
 
-import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 import org.jetbrains.kotlinx.lincheck.test.*
 import java.util.concurrent.atomic.*
 import java.util.concurrent.locks.*

diff --git a/...est/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/RendezvousChannelTest.kt b/...est/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/RendezvousChannelTest.kt
@@ -13,6 +13,7 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
 import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 import org.jetbrains.kotlinx.lincheck.test.*
 
 @ExperimentalCoroutinesApi

diff --git a/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/SkipListMapTest.kt b/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/verifier/linearizability/SkipListMapTest.kt
@@ -9,8 +9,8 @@
  */
 package org.jetbrains.kotlinx.lincheck.test.verifier.linearizability
 
-import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 import org.jetbrains.kotlinx.lincheck.test.*
 import java.util.concurrent.*
 

diff --git a/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/verifier/quiescent/LockFreeTaskQueueTest.kt b/src/jvm/test/org/jetbrains/kotlinx/lincheck/test/verifier/quiescent/LockFreeTaskQueueTest.kt
@@ -13,6 +13,7 @@ package org.jetbrains.kotlinx.lincheck.test.verifier.quiescent
 import kotlinx.coroutines.internal.*
 import org.jetbrains.kotlinx.lincheck.*
 import org.jetbrains.kotlinx.lincheck.annotations.*
+import org.jetbrains.kotlinx.lincheck.paramgen.*
 import org.jetbrains.kotlinx.lincheck.test.*
 import org.jetbrains.kotlinx.lincheck.verifier.quiescent.*