diff --git a/settings.gradle.kts b/settings.gradle.kts index 4e30ca7d33..d892bb19e3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -36,6 +36,7 @@ include("utbot-gradle") include("utbot-maven") include("utbot-summary-tests") include("utbot-framework-test") +include("utbot-testing") include("utbot-rd") include("utbot-android-studio") diff --git a/utbot-analytics/build.gradle b/utbot-analytics/build.gradle index 1023802c5b..a72b3b8b74 100644 --- a/utbot-analytics/build.gradle +++ b/utbot-analytics/build.gradle @@ -33,6 +33,7 @@ dependencies { implementation group: 'org.apache.commons', name: 'commons-text', version: '1.9' implementation group: 'com.github.javaparser', name: 'javaparser-core', version: '3.22.1' + testImplementation project(':utbot-testing') testImplementation project(':utbot-framework').sourceSets.test.output } diff --git a/utbot-analytics/src/main/kotlin/org/utbot/features/FeatureProcessorWithStatesRepetition.kt b/utbot-analytics/src/main/kotlin/org/utbot/features/FeatureProcessorWithStatesRepetition.kt index 62e7e398d3..4c80f18dda 100644 --- a/utbot-analytics/src/main/kotlin/org/utbot/features/FeatureProcessorWithStatesRepetition.kt +++ b/utbot-analytics/src/main/kotlin/org/utbot/features/FeatureProcessorWithStatesRepetition.kt @@ -107,7 +107,7 @@ class FeatureProcessorWithStatesRepetition( } } -internal class RewardEstimator { +class RewardEstimator { fun calculateRewards(testCases: List): Map { val rewards = mutableMapOf() diff --git a/utbot-analytics/src/test/kotlin/org/utbot/features/FeatureProcessorWithRepetitionTest.kt b/utbot-analytics/src/test/kotlin/org/utbot/features/FeatureProcessorWithRepetitionTest.kt index 8ab741488c..b2020d374b 100644 --- a/utbot-analytics/src/test/kotlin/org/utbot/features/FeatureProcessorWithRepetitionTest.kt +++ b/utbot-analytics/src/test/kotlin/org/utbot/features/FeatureProcessorWithRepetitionTest.kt @@ -5,9 +5,9 @@ import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.Test import org.utbot.analytics.EngineAnalyticsContext -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.testcheckers.eq import org.utbot.testcheckers.withFeaturePath +import org.utbot.testing.UtValueTestCaseChecker import java.io.File import java.io.FileInputStream diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/UtExecutionResult.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/UtExecutionResult.kt index cb6d6c9f61..fd58b9795f 100644 --- a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/UtExecutionResult.kt +++ b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/UtExecutionResult.kt @@ -102,11 +102,6 @@ inline fun UtExecutionResult.onFailure(action: (exception: Throwable) -> Unit): return this } -fun UtExecutionResult.getOrThrow(): UtModel = when (this) { - is UtExecutionSuccess -> model - is UtExecutionFailure -> throw exception -} - fun UtExecutionResult.exceptionOrNull(): Throwable? = when (this) { is UtExecutionFailure -> rootCauseException is UtExecutionSuccess -> null diff --git a/utbot-framework-test/build.gradle b/utbot-framework-test/build.gradle index 1d4167e128..b42815c1a7 100644 --- a/utbot-framework-test/build.gradle +++ b/utbot-framework-test/build.gradle @@ -22,6 +22,7 @@ configurations { dependencies { api project(':utbot-framework-api') + testImplementation project(':utbot-testing') api project(':utbot-fuzzers') api project(':utbot-instrumentation') diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt index d197e8a838..f826a1d413 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.algorithms -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException class BinarySearchTest : UtValueTestCaseChecker(testClass = BinarySearch::class,) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt index 02e9eae72a..30214225cd 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt @@ -1,18 +1,18 @@ package org.utbot.examples.algorithms -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.examples.algorithms.CorrectBracketSequences.isBracket -import org.utbot.examples.algorithms.CorrectBracketSequences.isOpen -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException -import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.junit.jupiter.api.Test +import org.utbot.examples.algorithms.CorrectBracketSequences.isBracket +import org.utbot.examples.algorithms.CorrectBracketSequences.isOpen import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException +import org.utbot.testing.keyMatch internal class CorrectBracketSequencesTest : UtValueTestCaseChecker( testClass = CorrectBracketSequences::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt index 71d13c4383..bf669b9c1e 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.algorithms -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException internal class GraphTest : UtValueTestCaseChecker(testClass = GraphExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt index 0df50b9009..4d5a8fb2ba 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt @@ -1,9 +1,5 @@ package org.utbot.examples.algorithms -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException -import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt @@ -12,7 +8,11 @@ import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq import org.utbot.testcheckers.ge -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException +import org.utbot.testing.keyMatch // TODO Kotlin mocks generics https://github.com/UnitTestBot/UTBotJava/issues/88 internal class SortTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt index 0b64573d0e..6ba1d8bf06 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.annotations -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker internal class NotNullAnnotationTest : UtValueTestCaseChecker(testClass = NotNullAnnotation::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithAnnotationsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithAnnotationsTest.kt index b2987df28c..b4c8097e10 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithAnnotationsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithAnnotationsTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.annotations.lombok import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker /** * Tests for Lombok annotations diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithoutAnnotationsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithoutAnnotationsTest.kt index 1aa631f627..c9977326d6 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithoutAnnotationsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithoutAnnotationsTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.annotations.lombok import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker internal class EnumWithoutAnnotationsTest : UtValueTestCaseChecker(testClass = EnumWithoutAnnotations::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/NotNullAnnotationsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/NotNullAnnotationsTest.kt index b73330d07c..1d3e95b33c 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/NotNullAnnotationsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/NotNullAnnotationsTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.annotations.lombok import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker /** * Tests for Lombok NonNull annotation diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt index 0e63fec970..4aa433b0b7 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt @@ -1,15 +1,15 @@ package org.utbot.examples.arrays import org.junit.jupiter.api.Disabled -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.atLeast import org.utbot.examples.casts.ColoredPoint import org.utbot.examples.casts.Point -import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.withoutMinimization +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast +import org.utbot.testing.ignoreExecutionsNumber @Suppress("NestedLambdaShadowedImplicitParameter") internal class ArrayOfArraysTest : UtValueTestCaseChecker(testClass = ArrayOfArrays::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt index 0f279c793a..a24d85220f 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt @@ -1,16 +1,16 @@ package org.utbot.examples.arrays -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.atLeast -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.ge -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast +import org.utbot.testing.between +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException // TODO failed Kotlin compilation SAT-1332 internal class ArrayOfObjectsTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayStoreExceptionExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayStoreExceptionExamplesTest.kt index 0d23117b75..0eabf7adad 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayStoreExceptionExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayStoreExceptionExamplesTest.kt @@ -4,10 +4,10 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.AtLeast -import org.utbot.tests.infrastructure.CodeGeneration -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.isException +import org.utbot.testing.AtLeast +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException class ArrayStoreExceptionExamplesTest : UtValueTestCaseChecker( testClass = ArrayStoreExceptionExamples::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt index 00f896bfe8..6f6f5f3b23 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.arrays -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker // TODO failed Kotlin compilation SAT-1332 class ArraysOverwriteValueTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt index e6cfd39049..55b0d37eed 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.arrays -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.junit.jupiter.api.Test +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber internal class FinalStaticFieldArrayTest : UtValueTestCaseChecker(testClass = FinalStaticFieldArray::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt index 158d2402fd..a68df2f63c 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.arrays import org.junit.jupiter.api.Disabled -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.ge -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException // TODO failed Kotlin compilation SAT-1332 internal class IntArrayBasicsTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt index f2009247aa..b1fc9d41db 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.arrays -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.atLeast -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast +import org.utbot.testing.isException // TODO failed Kotlin compilation SAT-1332 internal class PrimitiveArraysTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt index 78a2a8b548..0dda6a1d11 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.casts import org.junit.jupiter.api.Disabled -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker // TODO failed Kotlin compilation (generics) SAT-1332 //TODO: SAT-1487 calculate coverage for all methods of this test class diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastClassTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastClassTest.kt index 0de77bbb9d..220e11cc33 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastClassTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastClassTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.casts import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class CastClassTest : UtValueTestCaseChecker( testClass = CastClass::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt index 7206db0cea..57725ecd06 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.casts -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException // TODO failed Kotlin compilation SAT-1332 internal class CastExampleTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt index faa8f103f4..58b719cd1f 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.casts -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.between import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between // TODO failed Kotlin compilation SAT-1332 internal class GenericCastExampleTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt index 3120762937..ba85c0051d 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.casts -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.ge -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber // TODO failed Kotlin compilation SAT-1332 internal class InstanceOfExampleTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt index 0f9f32fdb7..71a4942631 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.codegen -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.Compilation -import org.utbot.tests.infrastructure.TestExecution +import org.utbot.testing.Compilation +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.TestExecution +import org.utbot.testing.UtValueTestCaseChecker @Suppress("INACCESSIBLE_TYPE") internal class ClassWithStaticAndInnerClassesTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt index ae342017f3..bd07565c1e 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.codegen -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.examples.mock.MockRandomExamples import kotlin.reflect.full.functions import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.withoutConcrete +import org.utbot.testing.UtValueTestCaseChecker internal class CodegenExampleTest : UtValueTestCaseChecker(testClass = CodegenExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/FileWithTopLevelFunctionsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/FileWithTopLevelFunctionsTest.kt index 307f143d91..6af41eb6d4 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/FileWithTopLevelFunctionsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/FileWithTopLevelFunctionsTest.kt @@ -2,7 +2,7 @@ package org.utbot.examples.codegen import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.testing.UtValueTestCaseChecker import kotlin.reflect.KFunction3 @Suppress("UNCHECKED_CAST") diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/JavaAssertTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/JavaAssertTest.kt index 9c18e0a1a1..2133cf2ef8 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/JavaAssertTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/JavaAssertTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.codegen import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.isException import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException class JavaAssertTest : UtValueTestCaseChecker( testClass = JavaAssert::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt index 2348360e27..42af7ff925 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt @@ -1,11 +1,9 @@ package org.utbot.examples.codegen -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test -import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.Compilation +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker class VoidStaticMethodsTest : UtValueTestCaseChecker( testClass = VoidStaticMethodsTestingClass::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithCrossReferenceRelationshipTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithCrossReferenceRelationshipTest.kt index d7ca1dc689..1e962818ed 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithCrossReferenceRelationshipTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithCrossReferenceRelationshipTest.kt @@ -3,9 +3,9 @@ package org.utbot.examples.codegen.deepequals import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker class ClassWithCrossReferenceRelationshipTest : UtValueTestCaseChecker( testClass = ClassWithCrossReferenceRelationship::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithNullableFieldTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithNullableFieldTest.kt index f39c394b4b..fd8b77b2e4 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithNullableFieldTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithNullableFieldTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.codegen.deepequals import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker class ClassWithNullableFieldTest : UtValueTestCaseChecker( testClass = ClassWithNullableField::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt index 398a7be8fc..045178471d 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.codegen.deepequals -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker // TODO failed Kotlin compilation (generics) SAT-1332 class DeepEqualsTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/modifiers/ClassWithPrivateMutableFieldOfPrivateTypeTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/modifiers/ClassWithPrivateMutableFieldOfPrivateTypeTest.kt index a31980f59e..200047ea44 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/modifiers/ClassWithPrivateMutableFieldOfPrivateTypeTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/modifiers/ClassWithPrivateMutableFieldOfPrivateTypeTest.kt @@ -7,8 +7,8 @@ import org.utbot.framework.plugin.api.FieldId import org.utbot.framework.plugin.api.util.id import org.utbot.framework.plugin.api.util.jField import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.Compilation -import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.testing.Compilation +import org.utbot.testing.UtValueTestCaseChecker // TODO failed Kotlin tests execution with non-nullable expected field class ClassWithPrivateMutableFieldOfPrivateTypeTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt index 33d51fcd0e..0ad601e153 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt @@ -1,16 +1,15 @@ package org.utbot.examples.collections -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.FieldId import org.utbot.framework.plugin.api.UtConcreteValue import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration -import org.utbot.tests.infrastructure.Compilation -import org.utbot.tests.infrastructure.TestExecution +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.TestExecution +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber internal class CustomerExamplesTest: UtValueTestCaseChecker( testClass = CustomerExamples::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/GenericListsExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/GenericListsExampleTest.kt index 6c541525ab..cadc6bd4bb 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/GenericListsExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/GenericListsExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.collections -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker // TODO disabled tests should be fixes with SAT-1441 internal class GenericListsExampleTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt index d8fa642c3f..d0190dc5ba 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.collections -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException // TODO failed Kotlin compilation (generics) SAT-1332 internal class LinkedListsTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt index 9e88ec075a..ef1083217e 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.collections -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.atLeast import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast // TODO failed Kotlin compilation SAT-1332 class ListAlgorithmsTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt index 153d845930..377e2d1f83 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.collections import org.junit.jupiter.api.Disabled -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage import kotlin.math.min import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber // TODO failed Kotlin compilation (generics) SAT-1332 internal class ListIteratorsTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt index 8916476ec9..956f243b90 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.collections import org.junit.jupiter.api.Disabled -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException // TODO failed Kotlin compilation ($ in function names, generics) SAT-1220 SAT-1332 @Disabled("Java 11 transition") diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart1Test.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart1Test.kt index cec153c583..397276453e 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart1Test.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart1Test.kt @@ -2,10 +2,10 @@ package org.utbot.examples.collections import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber // TODO failed Kotlin compilation SAT-1332 @Disabled diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart2Test.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart2Test.kt index 166e321fc1..621f95aedb 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart2Test.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart2Test.kt @@ -3,9 +3,9 @@ package org.utbot.examples.collections import org.junit.jupiter.api.Disabled import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.CodeGeneration -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber // TODO failed Kotlin compilation SAT-1332 @Disabled diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart3Test.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart3Test.kt index d02f176ed8..dc0fda4984 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart3Test.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart3Test.kt @@ -3,13 +3,13 @@ package org.utbot.examples.collections import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.isException import org.utbot.testcheckers.eq import org.utbot.testcheckers.ge -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between +import org.utbot.testing.isException // TODO failed Kotlin compilation SAT-1332 internal class ListsPart3Test : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt index eb468a4bac..4c2bd5556d 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt @@ -1,16 +1,16 @@ package org.utbot.examples.collections -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.ge import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete -import org.utbot.tests.infrastructure.CodeGeneration -import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException // TODO failed Kotlin compilation SAT-1332 class MapEntrySetTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt index 6f2a1f5f48..5ca5900240 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt @@ -1,18 +1,18 @@ package org.utbot.examples.collections -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.AtLeast -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.ge import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete import org.utbot.testcheckers.withoutMinimization -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.AtLeast +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException // TODO failed Kotlin compilation SAT-1332 class MapKeySetTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt index 7ac0205a89..69b05b5740 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt @@ -1,16 +1,16 @@ package org.utbot.examples.collections -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.AtLeast -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.ge import org.utbot.testcheckers.withoutMinimization -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.AtLeast +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException // TODO failed Kotlin compilation SAT-1332 class MapValuesTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart1Test.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart1Test.kt index 738e45f661..7dd3191123 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart1Test.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart1Test.kt @@ -1,11 +1,6 @@ package org.utbot.examples.collections import org.junit.jupiter.api.Tag -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.AtLeast -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.jupiter.api.Test @@ -14,7 +9,12 @@ import org.utbot.testcheckers.ge import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete import org.utbot.testcheckers.withoutConcrete import org.utbot.testcheckers.withoutMinimization -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.AtLeast +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between +import org.utbot.testing.ignoreExecutionsNumber // TODO failed Kotlin compilation ($ in names, generics) SAT-1220 SAT-1332 internal class MapsPart1Test : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart2Test.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart2Test.kt index b4ae041c13..30920238ec 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart2Test.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart2Test.kt @@ -1,14 +1,14 @@ package org.utbot.examples.collections -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.ge import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete import org.utbot.testcheckers.withoutMinimization -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException // TODO failed Kotlin compilation ($ in names, generics) SAT-1220 SAT-1332 internal class MapsPart2Test : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt index 964dd93f2c..e998fd27ad 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.collections -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException import java.util.* class OptionalsTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/QueueUsagesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/QueueUsagesTest.kt index 69dd432ada..8822b05365 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/QueueUsagesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/QueueUsagesTest.kt @@ -4,9 +4,9 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.isException +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException class QueueUsagesTest : UtValueTestCaseChecker( testClass = QueueUsages::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt index bdaa3d4f14..4d7d7f40e0 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.collections -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.ge -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException // TODO failed Kotlin compilation SAT-1332 class SetIteratorsTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt index 525e8e4126..335c0088e7 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt @@ -1,10 +1,5 @@ package org.utbot.examples.collections -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.AtLeast -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test @@ -12,7 +7,12 @@ import org.utbot.testcheckers.eq import org.utbot.testcheckers.ge import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete import org.utbot.testcheckers.withoutMinimization -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.AtLeast +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between +import org.utbot.testing.ignoreExecutionsNumber // TODO failed Kotlin compilation SAT-1332 internal class SetsTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt index c781994415..4466f6f369 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt @@ -1,15 +1,15 @@ package org.utbot.examples.controlflow -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.keyContain -import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.keyContain +import org.utbot.testing.keyMatch internal class ConditionsTest : UtValueTestCaseChecker(testClass = Conditions::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt index 4899e41931..b36cc8901e 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.controlflow -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.keyContain -import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.keyContain +import org.utbot.testing.keyMatch internal class CycleDependedConditionTest : UtValueTestCaseChecker(testClass = CycleDependedCondition::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt index f3d2d7d981..1ec3c1ed73 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt @@ -1,18 +1,18 @@ package org.utbot.examples.controlflow -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.atLeast -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException -import org.utbot.tests.infrastructure.keyContain -import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast +import org.utbot.testing.between +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException +import org.utbot.testing.keyContain +import org.utbot.testing.keyMatch internal class CyclesTest : UtValueTestCaseChecker(testClass = Cycles::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt index e503715393..1149872edf 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt @@ -1,8 +1,5 @@ package org.utbot.examples.controlflow -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.keyContain -import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt @@ -16,6 +13,9 @@ import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.ge import org.utbot.testcheckers.withoutMinimization +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.keyContain +import org.utbot.testing.keyMatch internal class SwitchTest : UtValueTestCaseChecker(testClass = Switch::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt index 8fb8b9b67b..21bd1f33bb 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt @@ -1,10 +1,7 @@ package org.utbot.examples.enums -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.enums.ClassWithEnum.StatusEnum.ERROR import org.utbot.examples.enums.ClassWithEnum.StatusEnum.READY -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.FieldId import org.utbot.framework.plugin.api.util.id import org.junit.jupiter.api.Disabled @@ -13,6 +10,9 @@ import org.utbot.framework.plugin.api.util.jField import org.utbot.testcheckers.eq import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete import org.utbot.testcheckers.withoutConcrete +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException class ClassWithEnumTest : UtValueTestCaseChecker(testClass = ClassWithEnum::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ComplexEnumExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ComplexEnumExamplesTest.kt index 7b8b064b0c..b4d969962e 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ComplexEnumExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ComplexEnumExamplesTest.kt @@ -2,15 +2,15 @@ package org.utbot.examples.enums import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.examples.enums.ComplexEnumExamples.Color import org.utbot.examples.enums.ComplexEnumExamples.Color.BLUE import org.utbot.examples.enums.ComplexEnumExamples.Color.GREEN import org.utbot.examples.enums.ComplexEnumExamples.Color.RED -import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber class ComplexEnumExamplesTest : UtValueTestCaseChecker( testClass = ComplexEnumExamples::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt index 53abd8bf53..4e67505768 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt @@ -1,8 +1,5 @@ package org.utbot.examples.exceptions -import org.utbot.tests.infrastructure.UtModelTestCaseChecker -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.primitiveValue import org.utbot.framework.plugin.api.UtExecutionSuccess import org.utbot.framework.plugin.api.UtExplicitlyThrownException import org.utbot.framework.plugin.api.UtImplicitlyThrownException @@ -10,6 +7,9 @@ import org.utbot.framework.plugin.api.UtModel import org.utbot.framework.plugin.api.UtTimeoutException import org.junit.jupiter.api.Test import org.utbot.testcheckers.ge +import org.utbot.testing.UtModelTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.primitiveValue internal class ExceptionClusteringChecker : UtModelTestCaseChecker(testClass = ExceptionClusteringExamples::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt index 461faf48b2..3895c2eafc 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.exceptions -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.atLeast -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.withoutConcrete -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException internal class ExceptionExamplesTest : UtValueTestCaseChecker( testClass = ExceptionExamples::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt index 2e654c4f06..6a9449d4f7 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.exceptions -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.withoutSandbox +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class JvmCrashExamplesTest : UtValueTestCaseChecker(testClass = JvmCrashExamples::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt index 4f8379a08e..5abc14bd7d 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.invokes -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException internal class InvokeExampleTest : UtValueTestCaseChecker(testClass = InvokeExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt index 1323697b42..f437801c68 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.invokes -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.atLeast -import org.utbot.tests.infrastructure.ignoreExecutionsNumber import kotlin.math.ln import kotlin.math.sqrt import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.ge +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast +import org.utbot.testing.ignoreExecutionsNumber internal class NativeExampleTest : UtValueTestCaseChecker(testClass = NativeExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt index 8b1fc9bec7..98e19a19b8 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.invokes -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker internal class SimpleInterfaceExampleTest : UtValueTestCaseChecker( testClass = SimpleInterfaceExample::class diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt index 34c54d5a29..5c75b0f0cb 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.invokes -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.between import kotlin.math.max import org.junit.jupiter.api.Test +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between internal class StaticInvokeExampleTest : UtValueTestCaseChecker(testClass = StaticInvokeExample::class) { // TODO: inline local variables when types inference bug in Kotlin fixed diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt index ba1ff4814a..57536896dc 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt @@ -2,12 +2,12 @@ package org.utbot.examples.invokes -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.isException import java.lang.Boolean import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException internal class VirtualInvokeExampleTest : UtValueTestCaseChecker(testClass = VirtualInvokeExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/CustomPredicateExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/CustomPredicateExampleTest.kt index c3b9692b3e..5653e43ca2 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/CustomPredicateExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/CustomPredicateExampleTest.kt @@ -3,10 +3,10 @@ package org.utbot.examples.lambda import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.isException +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException class CustomPredicateExampleTest : UtValueTestCaseChecker( testClass = CustomPredicateExample::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/PredicateNotExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/PredicateNotExampleTest.kt index 659b6a63cc..739cff5964 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/PredicateNotExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/PredicateNotExampleTest.kt @@ -3,7 +3,7 @@ package org.utbot.examples.lambda import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.testing.UtValueTestCaseChecker class PredicateNotExampleTest : UtValueTestCaseChecker(testClass = PredicateNotExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt index 32f83ef9e2..f3b2705124 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt @@ -3,10 +3,10 @@ package org.utbot.examples.lambda import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.isException +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException // TODO failed Kotlin compilation (generics) SAT-1332 class SimpleLambdaExamplesTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt index 63456488d6..2dde06a193 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt @@ -1,7 +1,5 @@ package org.utbot.examples.make.symbolic -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.MockStrategyApi import kotlin.math.abs @@ -10,7 +8,9 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.withoutConcrete -import org.utbot.tests.infrastructure.Compilation +import org.utbot.testing.Compilation +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker // This class is substituted with ComplicatedMethodsSubstitutionsStorage // but we cannot do in code generation. diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt index 7f9f63dbe6..a40a390fef 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.math -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.atLeast import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast internal class BitOperatorsTest : UtValueTestCaseChecker(testClass = BitOperators::class) { @Test @@ -37,7 +37,7 @@ internal class BitOperatorsTest : UtValueTestCaseChecker(testClass = BitOperator } @Test - @kotlin.ExperimentalStdlibApi + @ExperimentalStdlibApi fun testAnd() { check( BitOperators::and, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt index 8d8d8249a3..acd9124d5d 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.math -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException internal class DivRemExamplesTest : UtValueTestCaseChecker(testClass = DivRemExamples::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt index 0f1c0a7db1..a69f6565f2 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.math -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.isException import kotlin.math.abs import kotlin.math.hypot import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException @Suppress("SimplifyNegatedBinaryExpression") internal class DoubleFunctionsTest : UtValueTestCaseChecker(testClass = DoubleFunctions::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt index 625f195710..ad99f2e501 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt @@ -2,16 +2,16 @@ package org.utbot.examples.math import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.AtLeast import org.utbot.examples.algorithms.Sort -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq import org.utbot.testcheckers.withSolverTimeoutInMillis import org.utbot.testcheckers.withTreatingOverflowAsError -import org.utbot.tests.infrastructure.Compilation +import org.utbot.testing.AtLeast +import org.utbot.testing.Compilation +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException import kotlin.math.floor import kotlin.math.sqrt diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt index b751e01672..9655f9119a 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt @@ -1,7 +1,5 @@ package org.utbot.examples.mixed -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.UtConcreteValue import org.utbot.framework.plugin.api.UtInstrumentation @@ -10,7 +8,9 @@ import org.utbot.framework.plugin.api.UtStaticMethodInstrumentation import org.utbot.framework.plugin.api.isNull import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class LoggerExampleTest : UtValueTestCaseChecker( testClass = LoggerExample::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt index 92c29a00f1..09974c3c22 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.mixed -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.atLeast -import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.junit.jupiter.api.Test +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast +import org.utbot.testing.ignoreExecutionsNumber internal class MonitorUsageTest : UtValueTestCaseChecker(testClass = MonitorUsage::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt index 7bf7baa316..b6012d8d8b 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.mixed -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker internal class OverloadTest : UtValueTestCaseChecker(testClass = Overload::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt index 79662edf90..bb074326cb 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt @@ -1,11 +1,10 @@ package org.utbot.examples.mixed -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.Compilation +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class PrivateConstructorExampleTest : UtValueTestCaseChecker( testClass = PrivateConstructorExample::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt index a68bd75eef..8bddaa3e66 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.mixed -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker internal class SimpleNoConditionTest : UtValueTestCaseChecker(testClass = SimpleNoCondition::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt index c6358e1024..0c6b13aacd 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.mixed -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class SimplifierTest: UtValueTestCaseChecker(testClass = Simplifier::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt index 97d959117b..fd31bb20fe 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt @@ -3,8 +3,8 @@ package org.utbot.examples.mixed import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.examples.StaticInitializerExample -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker @Disabled("Unknown build failure") internal class StaticInitializerExampleTest : UtValueTestCaseChecker(testClass = StaticInitializerExample::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt index 34bbf5a7fe..7e71562964 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.mixed -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker internal class StaticMethodExamplesTest : UtValueTestCaseChecker(testClass = StaticMethodExamples::class) { // TODO: inline local variables when types inference bug in Kotlin fixed diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt index 36e997b811..00c1bcfd13 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt @@ -1,17 +1,17 @@ package org.utbot.examples.mock -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.isParameter import org.utbot.examples.mock.provider.Provider import org.utbot.examples.mock.service.impl.ExampleClass import org.utbot.examples.mock.service.impl.ServiceWithArguments -import org.utbot.tests.infrastructure.mocksMethod -import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between +import org.utbot.testing.isParameter +import org.utbot.testing.mocksMethod +import org.utbot.testing.value internal class ArgumentsMockTest : UtValueTestCaseChecker(testClass = ServiceWithArguments::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt index 0e5d1dc4f8..74054cfe05 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.mock -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class CommonMocksExampleTest: UtValueTestCaseChecker(testClass = CommonMocksExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt index 936eb2e353..f7c8a16741 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt @@ -1,19 +1,17 @@ package org.utbot.examples.mock -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.between import org.utbot.examples.mock.provider.Provider import org.utbot.examples.mock.service.impl.ExampleClass import org.utbot.examples.mock.service.impl.ServiceWithField -import org.utbot.tests.infrastructure.mocksMethod -import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.Compilation -import org.utbot.tests.infrastructure.TestExecution +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between +import org.utbot.testing.mocksMethod +import org.utbot.testing.value internal class FieldMockTest : UtValueTestCaseChecker( testClass = ServiceWithField::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt index f648affdce..30a746e0c1 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt @@ -1,15 +1,15 @@ package org.utbot.examples.mock -import org.utbot.tests.infrastructure.UtModelTestCaseChecker -import org.utbot.tests.infrastructure.primitiveValue import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.utbot.framework.plugin.api.UtModel -import org.utbot.framework.plugin.api.getOrThrow import org.utbot.framework.plugin.api.isMockModel import org.utbot.framework.plugin.api.isNotNull import org.utbot.framework.plugin.api.isNull import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtModelTestCaseChecker +import org.utbot.testing.getOrThrow +import org.utbot.testing.primitiveValue internal class InnerMockWithFieldChecker : UtModelTestCaseChecker(testClass = InnerMockWithFieldExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt index 0e844d275c..9513d520d7 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt @@ -1,16 +1,14 @@ package org.utbot.examples.mock -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.mock.others.FinalClass -import org.utbot.tests.infrastructure.singleMock -import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_CLASSES import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.ge -import org.utbot.tests.infrastructure.Compilation -import org.utbot.tests.infrastructure.TestExecution +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.singleMock +import org.utbot.testing.value internal class MockFinalClassTest : UtValueTestCaseChecker( testClass = MockFinalClassExample::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt index bdca4c5e46..15f2fbd08c 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt @@ -1,21 +1,20 @@ package org.utbot.examples.mock -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.isParameter -import org.utbot.tests.infrastructure.mockValues -import org.utbot.tests.infrastructure.mocksMethod -import org.utbot.tests.infrastructure.singleMock -import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.UtCompositeModel import org.utbot.framework.plugin.api.UtNewInstanceInstrumentation import java.util.Random import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration -import org.utbot.tests.infrastructure.Compilation -import org.utbot.tests.infrastructure.TestExecution +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.TestExecution +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isParameter +import org.utbot.testing.mockValues +import org.utbot.testing.mocksMethod +import org.utbot.testing.singleMock +import org.utbot.testing.value // TODO Kotlin mocks generics https://github.com/UnitTestBot/UTBotJava/issues/88 internal class MockRandomTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt index 446f5d25c6..51cd5f279b 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt @@ -1,17 +1,17 @@ package org.utbot.examples.mock import org.junit.jupiter.api.Disabled -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.mock.others.Generator import org.utbot.examples.mock.others.Locator -import org.utbot.tests.infrastructure.mockValue -import org.utbot.tests.infrastructure.singleMock -import org.utbot.tests.infrastructure.singleMockOrNull -import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.mockValue +import org.utbot.testing.singleMock +import org.utbot.testing.singleMockOrNull +import org.utbot.testing.value internal class MockReturnObjectExampleTest : UtValueTestCaseChecker(testClass = MockReturnObjectExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt index 907d9b5829..18bdabb472 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt @@ -1,11 +1,6 @@ package org.utbot.examples.mock -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.mock.others.Generator -import org.utbot.tests.infrastructure.singleMock -import org.utbot.tests.infrastructure.singleMockOrNull -import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.FieldMockTarget import org.utbot.framework.plugin.api.MockInfo import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES @@ -13,6 +8,11 @@ import kotlin.reflect.KClass import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.withoutConcrete +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.singleMock +import org.utbot.testing.singleMockOrNull +import org.utbot.testing.value internal class MockStaticFieldExampleTest : UtValueTestCaseChecker(testClass = MockStaticFieldExample::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt index fcdbf694ad..0d1ee02a73 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt @@ -1,7 +1,5 @@ package org.utbot.examples.mock -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.UtPrimitiveModel import org.utbot.framework.util.singleModel @@ -10,9 +8,11 @@ import org.utbot.framework.util.singleValue import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration -import org.utbot.tests.infrastructure.Compilation -import org.utbot.tests.infrastructure.TestExecution +import org.utbot.testing.CodeGeneration +import org.utbot.testing.Compilation +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.TestExecution +import org.utbot.testing.UtValueTestCaseChecker // TODO Kotlin mocks generics https://github.com/UnitTestBot/UTBotJava/issues/88 internal class MockStaticMethodExampleTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt index ac185f2b82..397981d54e 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt @@ -1,14 +1,14 @@ package org.utbot.examples.mock -import org.utbot.tests.infrastructure.UtModelTestCaseChecker -import org.utbot.tests.infrastructure.primitiveValue import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.utbot.framework.plugin.api.UtModel -import org.utbot.framework.plugin.api.getOrThrow import org.utbot.framework.plugin.api.isMockModel import org.utbot.framework.plugin.api.isNull import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtModelTestCaseChecker +import org.utbot.testing.getOrThrow +import org.utbot.testing.primitiveValue internal class MockWithFieldChecker : UtModelTestCaseChecker(testClass = MockWithFieldExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt index 5b234c9e0f..bb31390546 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.mock -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException internal class MockWithSideEffectExampleTest : UtValueTestCaseChecker(testClass = MockWithSideEffectExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt index 4207e1585c..e963a1e6b6 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt @@ -1,16 +1,15 @@ package org.utbot.examples.mock -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.mock.provider.Provider import org.utbot.examples.mock.service.impl.ExampleClass import org.utbot.examples.mock.service.impl.ServiceWithStaticField -import org.utbot.tests.infrastructure.mocksMethod -import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq - +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.mocksMethod +import org.utbot.testing.value internal class StaticFieldMockTest : UtValueTestCaseChecker(testClass = ServiceWithStaticField::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt index acff778b01..772990f206 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt @@ -1,14 +1,12 @@ package org.utbot.examples.mock -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.UtConcreteValue import org.junit.jupiter.api.Test -import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.Compilation +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException internal class UseNetworkTest : UtValueTestCaseChecker(testClass = UseNetwork::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt index 6177ac7922..6efcdf3089 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.mock.aliasing -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class AliasingInParamsExampleTest : UtValueTestCaseChecker(testClass = AliasingInParamsExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt index 25cd7d4d88..07fb1ae337 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt @@ -2,14 +2,14 @@ package org.utbot.examples.mock.model import org.utbot.examples.mock.provider.impl.ProviderImpl import org.utbot.examples.mock.service.impl.ServiceWithField -import org.utbot.tests.infrastructure.primitiveValue import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.utbot.framework.plugin.api.UtModel import org.utbot.framework.plugin.api.isNotNull import org.utbot.framework.plugin.api.isNull import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.UtModelTestCaseChecker import org.utbot.testcheckers.eq +import org.utbot.testing.UtModelTestCaseChecker +import org.utbot.testing.primitiveValue internal class FieldMockChecker : UtModelTestCaseChecker(testClass = ServiceWithField::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt index 063c199216..b405533f6c 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.mock.model -import org.utbot.tests.infrastructure.UtModelTestCaseChecker import org.utbot.examples.mock.UseNetwork import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.UtCompositeModel import org.utbot.framework.plugin.api.UtVoidModel import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtModelTestCaseChecker internal class UseNetworkModelBasedTest : UtModelTestCaseChecker(testClass = UseNetwork::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt index 271d950301..cb2556af49 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt @@ -1,6 +1,5 @@ package org.utbot.examples.models -import org.utbot.tests.infrastructure.UtModelTestCaseChecker import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.FieldId import org.utbot.framework.plugin.api.UtAssembleModel @@ -9,7 +8,8 @@ import org.utbot.framework.plugin.api.UtModel import org.utbot.framework.plugin.api.UtReferenceModel import org.junit.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtModelTestCaseChecker internal class CompositeModelMinimizationChecker : UtModelTestCaseChecker( testClass = CompositeModelMinimizationExample::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt index eea119bcbc..b61abdc554 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt @@ -1,6 +1,5 @@ package org.utbot.examples.models -import org.utbot.tests.infrastructure.UtModelTestCaseChecker import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.UtArrayModel import org.utbot.framework.plugin.api.UtAssembleModel @@ -9,7 +8,8 @@ import org.utbot.framework.plugin.api.UtExecutionSuccess import org.utbot.framework.plugin.api.UtReferenceModel import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtModelTestCaseChecker // TODO failed Kotlin compilation SAT-1332 internal class ModelsIdEqualityChecker : UtModelTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt index 5c3d4da5ab..a84604cb6e 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.natives -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq import org.utbot.testcheckers.ge import org.utbot.testcheckers.withSolverTimeoutInMillis -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker // TODO Kotlin mocks generics https://github.com/UnitTestBot/UTBotJava/issues/88 internal class NativeExamplesTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt index 6b7b74a045..de11689275 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.Full -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.Compilation -import org.utbot.tests.infrastructure.TestExecution +import org.utbot.testing.Compilation +import org.utbot.testing.Full +import org.utbot.testing.TestExecution +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException class AnonymousClassesExampleTest : UtValueTestCaseChecker( testClass = AnonymousClassesExample::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt index 31297e978e..7e7aa33bb8 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt @@ -2,8 +2,6 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.atLeast import org.utbot.framework.plugin.api.CodegenLanguage import java.lang.Boolean import kotlin.Array @@ -11,7 +9,9 @@ import kotlin.Suppress import kotlin.arrayOf import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast internal class ClassRefTest : UtValueTestCaseChecker( testClass = ClassRef::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt index 7770fbf977..9b6bb39343 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.withoutConcrete -import org.utbot.tests.infrastructure.CodeGeneration -import org.utbot.tests.infrastructure.Compilation +import org.utbot.testing.CodeGeneration +import org.utbot.testing.Compilation +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException // TODO Kotlin compilation SAT-1332 // Code generation executions fail due we cannot analyze strings properly for now diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldAccessModifiersTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldAccessModifiersTest.kt index 84820fb0d2..c9ef29e55e 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldAccessModifiersTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldAccessModifiersTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker internal class HiddenFieldAccessModifiersTest : UtValueTestCaseChecker(testClass = HiddenFieldAccessModifiersExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt index 8f8ebf7771..5aa703df56 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class HiddenFieldExampleTest : UtValueTestCaseChecker(testClass = HiddenFieldExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt index 1752e2b7cd..658f834229 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class ModelMinimizationExamplesTest : UtValueTestCaseChecker(testClass = ModelMinimizationExamples::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt index ec219a7022..82c272f572 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.singleValue import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.singleValue class ObjectWithFinalStaticTest : UtValueTestCaseChecker( testClass = ObjectWithFinalStatic::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt index ef9b11d1c5..6cc5aa08e3 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import kotlin.reflect.KFunction0 import kotlin.reflect.KFunction3 import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class ObjectWithPrimitivesClassTest : UtValueTestCaseChecker(testClass = ObjectWithPrimitivesClass::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt index e2eff5b8e8..c712d08715 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.atLeast -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException internal class ObjectWithPrimitivesExampleTest : UtValueTestCaseChecker(testClass = ObjectWithPrimitivesExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt index d85212e204..af99f58ec1 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.atLeast -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException internal class ObjectWithRefFieldsExampleTest : UtValueTestCaseChecker(testClass = ObjectWithRefFieldExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt index 6717bd4d3d..dcd1e9955a 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.findByName -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.singleValue import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.findByName +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.singleValue internal class ObjectWithStaticFieldsExampleTest : UtValueTestCaseChecker(testClass = ObjectWithStaticFieldsExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt index 45f999e00d..297bf4c932 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import kotlin.reflect.KFunction2 import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class ObjectWithThrowableConstructorTest : UtValueTestCaseChecker(testClass = ObjectWithThrowableConstructor::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt index 08c26a5c40..a32d8036cb 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt @@ -1,10 +1,9 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq - +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException internal class PrivateFieldsTest : UtValueTestCaseChecker(testClass = PrivateFields::class) { @Test fun testAccessWithGetter() { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt index 44e7c9cee3..e1dc21ad88 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class RecursiveTypeTest : UtValueTestCaseChecker(testClass = RecursiveType::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt index ed71ca4e24..c74f263988 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt @@ -1,17 +1,17 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.isException -import org.utbot.tests.infrastructure.keyContain -import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between +import org.utbot.testing.isException +import org.utbot.testing.keyContain +import org.utbot.testing.keyMatch internal class SimpleClassExampleTest : UtValueTestCaseChecker(testClass = SimpleClassExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt index bb7ddc71af..7ba04d569a 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt @@ -1,11 +1,9 @@ package org.utbot.examples.objects -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.Test -import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.Compilation +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class SimpleClassMultiInstanceExampleTest : UtValueTestCaseChecker(testClass = SimpleClassMultiInstanceExample::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt index d418b38e89..4b709e11f5 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.primitives -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker internal class ByteExamplesTest : UtValueTestCaseChecker(testClass = ByteExamples::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt index d3621440be..c93b615eb9 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.primitives -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException internal class CharExamplesTest : UtValueTestCaseChecker(testClass = CharExamples::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt index 4318c6ef2c..157d5be275 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.primitives -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker @Suppress("SimplifyNegatedBinaryExpression") internal class DoubleExamplesTest : UtValueTestCaseChecker(testClass = DoubleExamples::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt index 390714174a..87baa7a2a3 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.primitives -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker internal class FloatExamplesTest : UtValueTestCaseChecker(testClass = FloatExamples::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt index 07e0b463fc..baa6ded345 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt @@ -2,8 +2,8 @@ package org.utbot.examples.primitives import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker @Suppress("ConvertTwoComparisonsToRangeCheck") internal class IntExamplesTest : UtValueTestCaseChecker(testClass = IntExamples::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt index ec2746f191..1bcc154443 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt @@ -1,11 +1,5 @@ package org.utbot.examples.recursion -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.atLeast -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.isException -import org.utbot.tests.infrastructure.keyContain -import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt @@ -16,7 +10,13 @@ import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq import org.utbot.testcheckers.ge -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast +import org.utbot.testing.between +import org.utbot.testing.isException +import org.utbot.testing.keyContain +import org.utbot.testing.keyMatch // TODO Kotlin mocks generics https://github.com/UnitTestBot/UTBotJava/issues/88 internal class RecursionTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt index 4b495cc750..ff5c014a68 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.statics.substitution -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.withoutSubstituteStaticsWithSymbolicVariable +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker class StaticsSubstitutionTest : UtValueTestCaseChecker(testClass = StaticSubstitutionExamples::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt index 1e04bb4799..af887d6c4c 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt @@ -3,10 +3,10 @@ package org.utbot.examples.stdlib import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.isException import org.utbot.testcheckers.eq import org.utbot.testcheckers.withUsingReflectionForMaximizingCoverage +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException import java.util.Date @Disabled("Java 11 transition -- these tests seems to take too much time and memory") diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt index ff0407947e..700f39ff83 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt @@ -3,18 +3,18 @@ package org.utbot.examples.stream import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.Full -import org.utbot.tests.infrastructure.FullWithAssumptions -import org.utbot.tests.infrastructure.StaticsType -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq import org.utbot.testcheckers.withoutConcrete -import org.utbot.tests.infrastructure.AtLeast -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.AtLeast +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.Full +import org.utbot.testing.FullWithAssumptions +import org.utbot.testing.StaticsType +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException import java.util.Optional import java.util.stream.Stream import kotlin.streams.toList diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/DoubleStreamExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/DoubleStreamExampleTest.kt index 53216b306f..505238faa5 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/DoubleStreamExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/DoubleStreamExampleTest.kt @@ -6,7 +6,13 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq import org.utbot.testcheckers.withPathSelectorStepsLimit import org.utbot.testcheckers.withoutConcrete -import org.utbot.tests.infrastructure.* +import org.utbot.testing.AtLeast +import org.utbot.testing.CodeGeneration +import org.utbot.testing.Full +import org.utbot.testing.FullWithAssumptions +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException import java.util.OptionalDouble import java.util.stream.DoubleStream import kotlin.streams.toList diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/IntStreamExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/IntStreamExampleTest.kt index 5aef3eb609..55cb1ff1f4 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/IntStreamExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/IntStreamExampleTest.kt @@ -6,7 +6,13 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq import org.utbot.testcheckers.withPathSelectorStepsLimit import org.utbot.testcheckers.withoutConcrete -import org.utbot.tests.infrastructure.* +import org.utbot.testing.AtLeast +import org.utbot.testing.CodeGeneration +import org.utbot.testing.Full +import org.utbot.testing.FullWithAssumptions +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException import java.util.OptionalDouble import java.util.OptionalInt import java.util.stream.IntStream diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/LongStreamExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/LongStreamExampleTest.kt index 0ac7785d6c..9f41fe552d 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/LongStreamExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/LongStreamExampleTest.kt @@ -6,7 +6,13 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq import org.utbot.testcheckers.withPathSelectorStepsLimit import org.utbot.testcheckers.withoutConcrete -import org.utbot.tests.infrastructure.* +import org.utbot.testing.AtLeast +import org.utbot.testing.CodeGeneration +import org.utbot.testing.Full +import org.utbot.testing.FullWithAssumptions +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException import java.util.OptionalDouble import java.util.OptionalLong import java.util.stream.LongStream diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/StreamsAsMethodResultExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/StreamsAsMethodResultExampleTest.kt index 54706bb9bb..a6ca53482e 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/StreamsAsMethodResultExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/StreamsAsMethodResultExampleTest.kt @@ -4,10 +4,10 @@ import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.visible.UtStreamConsumingException import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration -import org.utbot.tests.infrastructure.FullWithAssumptions -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.isException +import org.utbot.testing.CodeGeneration +import org.utbot.testing.FullWithAssumptions +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException import kotlin.streams.toList // TODO 1 instruction is always uncovered https://github.com/UnitTestBot/UTBotJava/issues/193 diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings/GenericExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings/GenericExamplesTest.kt index f08a69c94a..c7cc3d8401 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings/GenericExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings/GenericExamplesTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.strings -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.isException -import org.utbot.tests.infrastructure.CodeGeneration import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.CodeGeneration +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.isException @Disabled("TODO: Fails and takes too long") internal class GenericExamplesTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt index 0b9e8500f2..75f58922ce 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt @@ -1,12 +1,5 @@ package org.utbot.examples.strings -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.atLeast -import org.utbot.tests.infrastructure.between -import org.utbot.tests.infrastructure.ignoreExecutionsNumber -import org.utbot.tests.infrastructure.isException -import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test @@ -15,7 +8,14 @@ import org.utbot.testcheckers.ge import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete import org.utbot.testcheckers.withSolverTimeoutInMillis import org.utbot.testcheckers.withoutMinimization -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast +import org.utbot.testing.between +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException +import org.utbot.testing.keyMatch internal class StringExamplesTest : UtValueTestCaseChecker( testClass = StringExamples::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings11/StringConcatTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings11/StringConcatTest.kt index 10359f3b04..ec0fe35670 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings11/StringConcatTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings11/StringConcatTest.kt @@ -4,7 +4,11 @@ import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq import org.utbot.testcheckers.withoutConcrete -import org.utbot.tests.infrastructure.* +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber +import org.utbot.testing.isException class StringConcatTest : UtValueTestCaseChecker( testClass = StringConcat::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt index d28e3ecbe0..dd405f15b0 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.structures -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.junit.jupiter.api.Test +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.ignoreExecutionsNumber internal class HeapTest : UtValueTestCaseChecker(testClass = Heap::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt index 42a7a77913..f391339671 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.structures -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.between import kotlin.math.min import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.between internal class MinStackExampleTest : UtValueTestCaseChecker(testClass = MinStackExample::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt index 7287a964c6..1a600e0c13 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt @@ -1,9 +1,5 @@ package org.utbot.examples.structures -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.keyContain -import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt @@ -14,7 +10,11 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.keyContain +import org.utbot.testing.keyMatch internal class StandardStructuresTest : UtValueTestCaseChecker( testClass = StandardStructures::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt index 54a24c8124..fc7658c50d 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.thirdparty.numbers -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker // example from Apache common-numbers internal class ArithmeticUtilsTest : UtValueTestCaseChecker(testClass = ArithmeticUtils::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt index a30bcb4f39..1cc939a373 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.types -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker @Suppress("SimplifyNegatedBinaryExpression") internal class CastExamplesTest : UtValueTestCaseChecker(testClass = CastExamples::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt index a379e4518b..a2251d00c4 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.types -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.atLeast import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker +import org.utbot.testing.atLeast internal class TypeBordersTest : UtValueTestCaseChecker(testClass = TypeBorders::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt index 1b0735f765..4a3f8d3c76 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.types -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker @Suppress("SimplifyNegatedBinaryExpression") internal class TypeMatchesTest : UtValueTestCaseChecker(testClass = TypeMatches::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeOperationsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeOperationsTest.kt index 5995993cee..03d29c8eab 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeOperationsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeOperationsTest.kt @@ -4,8 +4,8 @@ import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.testcheckers.eq import org.utbot.testcheckers.withoutSandbox -import org.utbot.tests.infrastructure.DoNotCalculate -import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class UnsafeOperationsTest : UtValueTestCaseChecker(testClass = UnsafeOperations::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt index 919c0da3cf..4b486a3d23 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.unsafe -import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.UtValueTestCaseChecker internal class UnsafeWithFieldTest: UtValueTestCaseChecker(UnsafeWithField::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt index 649735906f..6f97af67d6 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.wrappers -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class BooleanWrapperTest : UtValueTestCaseChecker(testClass = BooleanWrapper::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt index c8db0cbec7..489e04fcf7 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.wrappers -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class ByteWrapperTest : UtValueTestCaseChecker(testClass = ByteWrapper::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt index 3d81e52688..7236297e16 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.wrappers -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker // TODO failed Kotlin compilation internal class CharacterWrapperTest : UtValueTestCaseChecker( diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt index 3c7cb5f2f1..d355ca86ac 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.wrappers -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker @Suppress("SimplifyNegatedBinaryExpression") internal class DoubleWrapperTest : UtValueTestCaseChecker(testClass = DoubleWrapper::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt index 2265aa1bda..fcb3eeae52 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.wrappers -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker @Suppress("SimplifyNegatedBinaryExpression") internal class FloatWrapperTest : UtValueTestCaseChecker(testClass = FloatWrapper::class) { diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt index 29231c1b1a..f9e360c352 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.wrappers -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class IntegerWrapperTest : UtValueTestCaseChecker(testClass = IntegerWrapper::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt index 990367c628..8cac4bc66e 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.wrappers -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq import org.utbot.testcheckers.withoutMinimization -import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.testing.CodeGeneration +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class LongWrapperTest : UtValueTestCaseChecker( testClass = LongWrapper::class, diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt index a8b179d805..ec4e0498e2 100644 --- a/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.wrappers -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.testcheckers.eq +import org.utbot.testing.DoNotCalculate +import org.utbot.testing.UtValueTestCaseChecker internal class ShortWrapperTest : UtValueTestCaseChecker(testClass = ShortWrapper::class) { @Test diff --git a/utbot-summary-tests/build.gradle b/utbot-summary-tests/build.gradle index 376fc6af1b..5be71747e1 100644 --- a/utbot-summary-tests/build.gradle +++ b/utbot-summary-tests/build.gradle @@ -10,6 +10,7 @@ dependencies { implementation(project(':utbot-instrumentation')) testImplementation project(':utbot-sample') testImplementation group: 'junit', name: 'junit', version: junit4Version + testImplementation project(':utbot-testing') testImplementation project(':utbot-framework').sourceSets.test.output } diff --git a/utbot-summary-tests/src/test/kotlin/examples/SummaryTestCaseGeneratorTest.kt b/utbot-summary-tests/src/test/kotlin/examples/SummaryTestCaseGeneratorTest.kt index fcdc5d4b30..b1d6bfb564 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/SummaryTestCaseGeneratorTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/SummaryTestCaseGeneratorTest.kt @@ -3,8 +3,6 @@ package examples import org.junit.jupiter.api.* import org.utbot.common.WorkaroundReason import org.utbot.common.workaround -import org.utbot.tests.infrastructure.UtValueTestCaseChecker -import org.utbot.tests.infrastructure.CoverageMatcher import org.utbot.framework.UtSettings.checkNpeInNestedMethods import org.utbot.framework.UtSettings.checkNpeInNestedNotPrivateMethods import org.utbot.framework.UtSettings.checkSolverTimeoutMillis @@ -13,11 +11,12 @@ import org.utbot.framework.plugin.api.util.UtContext import org.utbot.framework.plugin.api.util.executableId import org.utbot.summary.comment.nextSynonyms import org.utbot.summary.summarize -import org.utbot.tests.infrastructure.TestExecution +import org.utbot.testing.CoverageMatcher +import org.utbot.testing.TestExecution +import org.utbot.testing.UtValueTestCaseChecker import kotlin.reflect.KClass import kotlin.reflect.KFunction - private const val NEW_LINE = "\n" private const val POINT_IN_THE_LIST = " * " private const val COMMENT_SEPARATOR = "-------------------------------------------------------------" diff --git a/utbot-summary-tests/src/test/kotlin/examples/algorithms/SummaryArrayQuickSortExampleTest.kt b/utbot-summary-tests/src/test/kotlin/examples/algorithms/SummaryArrayQuickSortExampleTest.kt index 2187f50f4d..45c4717763 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/algorithms/SummaryArrayQuickSortExampleTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/algorithms/SummaryArrayQuickSortExampleTest.kt @@ -4,9 +4,9 @@ import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test import org.utbot.examples.algorithms.ArraysQuickSort -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.UtClusterInfo +import org.utbot.testing.DoNotCalculate @Tag("slow") class SummaryArrayQuickSortExampleTest : SummaryTestCaseGeneratorTest( diff --git a/utbot-summary-tests/src/test/kotlin/examples/algorithms/SummaryReturnExampleTest.kt b/utbot-summary-tests/src/test/kotlin/examples/algorithms/SummaryReturnExampleTest.kt index d52bc5a02f..ac60b7d8ea 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/algorithms/SummaryReturnExampleTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/algorithms/SummaryReturnExampleTest.kt @@ -3,8 +3,8 @@ package examples.algorithms import examples.SummaryTestCaseGeneratorTest import org.utbot.examples.algorithms.ReturnExample import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi +import org.utbot.testing.DoNotCalculate class SummaryReturnExampleTest : SummaryTestCaseGeneratorTest( ReturnExample::class, diff --git a/utbot-summary-tests/src/test/kotlin/examples/collections/SummaryListWrapperReturnsVoidTest.kt b/utbot-summary-tests/src/test/kotlin/examples/collections/SummaryListWrapperReturnsVoidTest.kt index 787c630847..bfcd70b2d7 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/collections/SummaryListWrapperReturnsVoidTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/collections/SummaryListWrapperReturnsVoidTest.kt @@ -2,9 +2,9 @@ package examples.collections import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.collections.ListWrapperReturnsVoidExample import org.utbot.framework.plugin.api.MockStrategyApi +import org.utbot.testing.DoNotCalculate /** * Tests verify that the previously discovered bug is not reproducible anymore. diff --git a/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryConditionsTest.kt b/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryConditionsTest.kt index 239951a80c..8cc88851c3 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryConditionsTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryConditionsTest.kt @@ -4,7 +4,7 @@ import examples.CustomJavaDocTagsEnabler import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith -import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.testing.DoNotCalculate import org.utbot.examples.controlflow.Conditions import org.utbot.framework.plugin.api.MockStrategyApi diff --git a/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryCycleTest.kt b/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryCycleTest.kt index 1f37c2db2b..63c2b84457 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryCycleTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryCycleTest.kt @@ -2,9 +2,9 @@ package examples.controlflow import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.controlflow.Cycles import org.utbot.framework.plugin.api.MockStrategyApi +import org.utbot.testing.DoNotCalculate class SummaryCycleTest : SummaryTestCaseGeneratorTest( Cycles::class, diff --git a/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummarySwitchTest.kt b/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummarySwitchTest.kt index 13d377a1d1..52fce1f26a 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummarySwitchTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummarySwitchTest.kt @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.utbot.examples.controlflow.Switch import org.utbot.framework.plugin.api.MockStrategyApi -import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.testing.DoNotCalculate @ExtendWith(CustomJavaDocTagsEnabler::class) class SummarySwitchTest : SummaryTestCaseGeneratorTest( diff --git a/utbot-summary-tests/src/test/kotlin/examples/enums/ComplexEnumExampleTest.kt b/utbot-summary-tests/src/test/kotlin/examples/enums/ComplexEnumExampleTest.kt index 0c879dd7ee..5d737b81c5 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/enums/ComplexEnumExampleTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/enums/ComplexEnumExampleTest.kt @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.utbot.examples.enums.ComplexEnumExamples import org.utbot.framework.plugin.api.MockStrategyApi -import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.testing.DoNotCalculate @ExtendWith(CustomJavaDocTagsEnabler::class) class ComplexEnumExampleTest : SummaryTestCaseGeneratorTest( diff --git a/utbot-summary-tests/src/test/kotlin/examples/exceptions/SummaryExceptionClusteringExamplesTest.kt b/utbot-summary-tests/src/test/kotlin/examples/exceptions/SummaryExceptionClusteringExamplesTest.kt index f2a7ede1ab..4ad6bfc6ff 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/exceptions/SummaryExceptionClusteringExamplesTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/exceptions/SummaryExceptionClusteringExamplesTest.kt @@ -4,7 +4,7 @@ import examples.CustomJavaDocTagsEnabler import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith -import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.testing.DoNotCalculate import org.utbot.examples.exceptions.ExceptionClusteringExamples import org.utbot.framework.plugin.api.MockStrategyApi diff --git a/utbot-summary-tests/src/test/kotlin/examples/exceptions/SummaryExceptionExampleTest.kt b/utbot-summary-tests/src/test/kotlin/examples/exceptions/SummaryExceptionExampleTest.kt index 5dfca3db48..79d815a72d 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/exceptions/SummaryExceptionExampleTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/exceptions/SummaryExceptionExampleTest.kt @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.utbot.examples.exceptions.ExceptionExamples import org.utbot.framework.plugin.api.MockStrategyApi -import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.testing.DoNotCalculate @ExtendWith(CustomJavaDocTagsEnabler::class) class SummaryExceptionExampleTest : SummaryTestCaseGeneratorTest( diff --git a/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryInnerCallsTest.kt b/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryInnerCallsTest.kt index d264d2c3f6..f992dd73b1 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryInnerCallsTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryInnerCallsTest.kt @@ -2,9 +2,9 @@ package examples.inner import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.inner.InnerCalls import org.utbot.framework.plugin.api.MockStrategyApi +import org.utbot.testing.DoNotCalculate class SummaryInnerCallsTest : SummaryTestCaseGeneratorTest( InnerCalls::class, diff --git a/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryNestedCallsTest.kt b/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryNestedCallsTest.kt index 19e14e9b41..93216593e4 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryNestedCallsTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryNestedCallsTest.kt @@ -2,9 +2,9 @@ package examples.inner import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.inner.NestedCalls import org.utbot.framework.plugin.api.MockStrategyApi +import org.utbot.testing.DoNotCalculate class SummaryNestedCallsTest : SummaryTestCaseGeneratorTest( NestedCalls::class, diff --git a/utbot-summary-tests/src/test/kotlin/examples/recursion/SummaryRecursionTest.kt b/utbot-summary-tests/src/test/kotlin/examples/recursion/SummaryRecursionTest.kt index 283d49141a..1eb049c229 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/recursion/SummaryRecursionTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/recursion/SummaryRecursionTest.kt @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.utbot.examples.recursion.Recursion import org.utbot.framework.plugin.api.MockStrategyApi -import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.testing.DoNotCalculate @ExtendWith(CustomJavaDocTagsEnabler::class) class SummaryRecursionTest : SummaryTestCaseGeneratorTest( diff --git a/utbot-summary-tests/src/test/kotlin/examples/structures/SummaryMinStackTest.kt b/utbot-summary-tests/src/test/kotlin/examples/structures/SummaryMinStackTest.kt index 0b8d9f35f5..e5061bc8e8 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/structures/SummaryMinStackTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/structures/SummaryMinStackTest.kt @@ -4,10 +4,9 @@ import examples.CustomJavaDocTagsEnabler import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.structures.MinStack import org.utbot.framework.plugin.api.MockStrategyApi - +import org.utbot.testing.DoNotCalculate @ExtendWith(CustomJavaDocTagsEnabler::class) class SummaryMinStackTest : SummaryTestCaseGeneratorTest( MinStack::class diff --git a/utbot-summary-tests/src/test/kotlin/examples/ternary/SummaryTernaryTest.kt b/utbot-summary-tests/src/test/kotlin/examples/ternary/SummaryTernaryTest.kt index cf8c456096..03e11cdf83 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/ternary/SummaryTernaryTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/ternary/SummaryTernaryTest.kt @@ -2,10 +2,9 @@ package examples.ternary import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.ternary.Ternary import org.utbot.framework.plugin.api.MockStrategyApi - +import org.utbot.testing.DoNotCalculate class SummaryTernaryTest : SummaryTestCaseGeneratorTest( Ternary::class, ) { diff --git a/utbot-summary-tests/src/test/kotlin/examples/unsafe/UnsafeWithFieldTest.kt b/utbot-summary-tests/src/test/kotlin/examples/unsafe/UnsafeWithFieldTest.kt index b085657a9a..ad0c12c0ff 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/unsafe/UnsafeWithFieldTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/unsafe/UnsafeWithFieldTest.kt @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.utbot.examples.unsafe.UnsafeWithField import org.utbot.framework.plugin.api.MockStrategyApi -import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.testing.DoNotCalculate @ExtendWith(CustomJavaDocTagsEnabler::class) class UnsafeWithFieldTest : SummaryTestCaseGeneratorTest( diff --git a/utbot-summary-tests/src/test/kotlin/math/SummaryIntMathTest.kt b/utbot-summary-tests/src/test/kotlin/math/SummaryIntMathTest.kt index 6eb31b4504..a5e4319e12 100644 --- a/utbot-summary-tests/src/test/kotlin/math/SummaryIntMathTest.kt +++ b/utbot-summary-tests/src/test/kotlin/math/SummaryIntMathTest.kt @@ -3,10 +3,9 @@ package math import examples.SummaryTestCaseGeneratorTest import guava.examples.math.IntMath import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.UtClusterInfo - +import org.utbot.testing.DoNotCalculate class SummaryIntMathTest : SummaryTestCaseGeneratorTest( IntMath::class, ) { diff --git a/utbot-summary-tests/src/test/kotlin/math/SummaryOfMathTest.kt b/utbot-summary-tests/src/test/kotlin/math/SummaryOfMathTest.kt index 50b84e1c05..ca96cad820 100644 --- a/utbot-summary-tests/src/test/kotlin/math/SummaryOfMathTest.kt +++ b/utbot-summary-tests/src/test/kotlin/math/SummaryOfMathTest.kt @@ -4,9 +4,9 @@ import examples.SummaryTestCaseGeneratorTest import guava.examples.math.Stats import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.UtClusterInfo +import org.utbot.testing.DoNotCalculate /** * It runs test generation for the poor analogue of the Stats.of method ported from the guava-26.0 framework diff --git a/utbot-testing/build.gradle b/utbot-testing/build.gradle new file mode 100644 index 0000000000..50c4a6f432 --- /dev/null +++ b/utbot-testing/build.gradle @@ -0,0 +1,51 @@ +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"] + } +} + +dependencies { + api project(':utbot-framework-api') + + api project(':utbot-fuzzers') + api project(':utbot-instrumentation') + api project(':utbot-summary') + + implementation(project(":utbot-framework")) + testImplementation project(':utbot-sample') + testImplementation project(":utbot-framework").sourceSets.test.output + testImplementation project(":utbot-core").sourceSets.test.output + + implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") { + exclude group:'com.google.guava', module:'guava' + } + + implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: jacksonVersion + implementation group: 'org.sosy-lab', name: 'javasmt-solver-z3', version: javasmtSolverZ3Version + implementation group: 'com.github.curious-odd-man', name: 'rgxgen', version: rgxgenVersion + implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: log4j2Version + implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion + implementation group: 'org.jacoco', name: 'org.jacoco.report', version: jacocoVersion + implementation group: 'org.apache.commons', name: 'commons-text', version: apacheCommonsTextVersion + // we need this for construction mocks from composite models + implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0' + + // To use JUnit4, comment out JUnit5 and uncomment JUnit4 dependencies here. Please also check "test" section + // testImplementation group: 'junit', name: 'junit', version: '4.13.1' + implementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.1' + implementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.1' + + // used for testing code generation + testImplementation group: 'commons-io', name: 'commons-io', version: commonsIoVersion + testImplementation group: 'junit', name: 'junit', version: junit4Version + testImplementation group: 'org.junit.platform', name: 'junit-platform-console-standalone', version: junit4PlatformVersion + testImplementation group: 'org.antlr', name: 'antlr4', version: antlrVersion + testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion + testImplementation group: 'org.testng', name: 'testng', version: testNgVersion + testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockitoInlineVersion + testImplementation group: 'com.google.guava', name: 'guava', version: guavaVersion + + testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockitoInlineVersion + testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j2Version +} \ No newline at end of file diff --git a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CheckersUtil.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/CheckersUtil.kt similarity index 99% rename from utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CheckersUtil.kt rename to utbot-testing/src/main/kotlin/org/utbot/testing/CheckersUtil.kt index a59fa685f3..91535184a7 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CheckersUtil.kt +++ b/utbot-testing/src/main/kotlin/org/utbot/testing/CheckersUtil.kt @@ -1,4 +1,4 @@ -package org.utbot.tests.infrastructure +package org.utbot.testing import org.utbot.framework.codegen.ForceStaticMocking import org.utbot.framework.codegen.Junit4 diff --git a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CodeGenerationIntegrationTest.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/CodeGenerationIntegrationTest.kt similarity index 98% rename from utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CodeGenerationIntegrationTest.kt rename to utbot-testing/src/main/kotlin/org/utbot/testing/CodeGenerationIntegrationTest.kt index fd0333d5c0..fa35e08052 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CodeGenerationIntegrationTest.kt +++ b/utbot-testing/src/main/kotlin/org/utbot/testing/CodeGenerationIntegrationTest.kt @@ -1,4 +1,4 @@ -package org.utbot.tests.infrastructure +package org.utbot.testing import org.utbot.common.FileUtil import org.utbot.common.withAccessibility @@ -135,7 +135,8 @@ abstract class CodeGenerationIntegrationTest( ) } - val config = TestCodeGeneratorPipeline.defaultTestFrameworkConfiguration(language, parameterizationMode) + val config = + TestCodeGeneratorPipeline.defaultTestFrameworkConfiguration(language, parameterizationMode) TestCodeGeneratorPipeline(config).runClassesCodeGenerationTests(classStages) } catch (e: RuntimeException) { pipelineErrors.add(e.message) diff --git a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CompilationAndRunUtils.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/CompilationAndRunUtils.kt similarity index 98% rename from utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CompilationAndRunUtils.kt rename to utbot-testing/src/main/kotlin/org/utbot/testing/CompilationAndRunUtils.kt index 151d34b1ec..7c508b13af 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CompilationAndRunUtils.kt +++ b/utbot-testing/src/main/kotlin/org/utbot/testing/CompilationAndRunUtils.kt @@ -1,10 +1,9 @@ -package org.utbot.tests.infrastructure +package org.utbot.testing import org.utbot.framework.plugin.api.CodegenLanguage import java.io.File import java.nio.file.Path import org.utbot.common.FileUtil -import org.utbot.engine.logger import org.utbot.framework.codegen.Junit5 import org.utbot.framework.codegen.TestFramework diff --git a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestCodeGeneratorPipeline.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/TestCodeGeneratorPipeline.kt similarity index 99% rename from utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestCodeGeneratorPipeline.kt rename to utbot-testing/src/main/kotlin/org/utbot/testing/TestCodeGeneratorPipeline.kt index fec4ed43bb..4da5ba2975 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestCodeGeneratorPipeline.kt +++ b/utbot-testing/src/main/kotlin/org/utbot/testing/TestCodeGeneratorPipeline.kt @@ -1,4 +1,4 @@ -package org.utbot.tests.infrastructure +package org.utbot.testing import mu.KotlinLogging import org.junit.jupiter.api.Assertions.assertTrue @@ -26,7 +26,7 @@ import java.io.File import java.nio.file.Path import kotlin.reflect.KClass -private val logger = KotlinLogging.logger {} +internal val logger = KotlinLogging.logger {} class TestCodeGeneratorPipeline(private val testFrameworkConfiguration: TestFrameworkConfiguration) { diff --git a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestSpecificTestCaseGenerator.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/TestSpecificTestCaseGenerator.kt similarity index 98% rename from utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestSpecificTestCaseGenerator.kt rename to utbot-testing/src/main/kotlin/org/utbot/testing/TestSpecificTestCaseGenerator.kt index 2a77280aff..ea3c761f54 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestSpecificTestCaseGenerator.kt +++ b/utbot-testing/src/main/kotlin/org/utbot/testing/TestSpecificTestCaseGenerator.kt @@ -1,4 +1,4 @@ -package org.utbot.tests.infrastructure +package org.utbot.testing import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking diff --git a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/UtModelTestCaseChecker.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/UtModelTestCaseChecker.kt similarity index 98% rename from utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/UtModelTestCaseChecker.kt rename to utbot-testing/src/main/kotlin/org/utbot/testing/UtModelTestCaseChecker.kt index e47675135a..cb76ef0cbc 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/UtModelTestCaseChecker.kt +++ b/utbot-testing/src/main/kotlin/org/utbot/testing/UtModelTestCaseChecker.kt @@ -1,6 +1,6 @@ @file:Suppress("NestedLambdaShadowedImplicitParameter") -package org.utbot.tests.infrastructure +package org.utbot.testing import org.junit.jupiter.api.Assertions.assertTrue import org.utbot.common.ClassLocation @@ -25,7 +25,6 @@ import org.utbot.framework.plugin.api.UtExecutionResult import org.utbot.framework.plugin.api.UtMethodTestSet import org.utbot.framework.plugin.api.UtModel import org.utbot.framework.plugin.api.exceptionOrNull -import org.utbot.framework.plugin.api.getOrThrow import org.utbot.framework.plugin.api.util.UtContext import org.utbot.framework.plugin.api.util.declaringClazz import org.utbot.framework.plugin.api.util.defaultValueModel diff --git a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/UtValueTestCaseChecker.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/UtValueTestCaseChecker.kt similarity index 99% rename from utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/UtValueTestCaseChecker.kt rename to utbot-testing/src/main/kotlin/org/utbot/testing/UtValueTestCaseChecker.kt index 1cd5467b06..190d76654d 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/UtValueTestCaseChecker.kt +++ b/utbot-testing/src/main/kotlin/org/utbot/testing/UtValueTestCaseChecker.kt @@ -1,6 +1,6 @@ @file:Suppress("NestedLambdaShadowedImplicitParameter") -package org.utbot.tests.infrastructure +package org.utbot.testing import org.junit.jupiter.api.Assertions.assertTrue import org.utbot.common.ClassLocation diff --git a/utbot-testing/src/main/kotlin/org/utbot/testing/Utils.kt b/utbot-testing/src/main/kotlin/org/utbot/testing/Utils.kt new file mode 100644 index 0000000000..6c927d85b6 --- /dev/null +++ b/utbot-testing/src/main/kotlin/org/utbot/testing/Utils.kt @@ -0,0 +1,11 @@ +package org.utbot.testing + +import org.utbot.framework.plugin.api.UtExecutionFailure +import org.utbot.framework.plugin.api.UtExecutionResult +import org.utbot.framework.plugin.api.UtExecutionSuccess +import org.utbot.framework.plugin.api.UtModel + +fun UtExecutionResult.getOrThrow(): UtModel = when (this) { + is UtExecutionSuccess -> model + is UtExecutionFailure -> throw exception +} \ No newline at end of file