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 9fe546a8f3..1db5c55fd9 100644 --- a/utbot-analytics/src/test/kotlin/org/utbot/features/FeatureProcessorWithRepetitionTest.kt +++ b/utbot-analytics/src/test/kotlin/org/utbot/features/FeatureProcessorWithRepetitionTest.kt @@ -5,13 +5,13 @@ 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.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.withFeaturePath import java.io.File import java.io.FileInputStream -class FeatureProcessorWithRepetitionTest : UtTestCaseChecker(OnePath::class, false) { +class FeatureProcessorWithRepetitionTest : UtValueTestCaseChecker(OnePath::class, false) { companion object { const val featureDir = "src/test/resources/features" fun reward(coverage: Double, time: Double) = RewardEstimator.reward(coverage, time) diff --git a/utbot-cli/src/main/kotlin/org/utbot/cli/BunchTestGeneratorCommand.kt b/utbot-cli/src/main/kotlin/org/utbot/cli/BunchTestGeneratorCommand.kt index f4b8e2e852..ead479b168 100644 --- a/utbot-cli/src/main/kotlin/org/utbot/cli/BunchTestGeneratorCommand.kt +++ b/utbot-cli/src/main/kotlin/org/utbot/cli/BunchTestGeneratorCommand.kt @@ -99,7 +99,7 @@ class BunchTestGeneratorCommand : GenerateTestsAbstractCommand( initializeEngine(workingDirectory) - // utContext is used in `generateTestCases`, `generateTest`, `generateReport` + // utContext is used in `generate`, `generateTest`, `generateReport` withUtContext(UtContext(classLoader)) { val testClassName = "${classUnderTest.simpleName}Test" diff --git a/utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt b/utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt index 5a77dbbaee..8bcb4ee154 100644 --- a/utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt +++ b/utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt @@ -159,7 +159,7 @@ abstract class GenerateTestsAbstractCommand(name: String, help: String) : searchDirectory: Path, chosenClassesToMockAlways: Set ): List = - TestCaseGenerator.generateTestCases( + TestCaseGenerator.generate( targetMethods, mockStrategy, chosenClassesToMockAlways, diff --git a/utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsCommand.kt b/utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsCommand.kt index 0380efaa7b..c7ff55033b 100644 --- a/utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsCommand.kt +++ b/utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsCommand.kt @@ -97,7 +97,7 @@ class GenerateTestsCommand : if (targetMethods.isEmpty()) { throw Exception("Nothing to process. No methods were provided") } - // utContext is used in `generateTestCases`, `generateTest`, `generateReport` + // utContext is used in `generate`, `generateTest`, `generateReport` withUtContext(UtContext(targetMethods.first().clazz.java.classLoader)) { val testClassName = output?.toPath()?.toFile()?.nameWithoutExtension diff --git a/utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt b/utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt index f1bae2fb82..8c94862f84 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt @@ -127,7 +127,7 @@ object UtBotJavaApi { FileUtil.isolateClassFiles(classUnderTest.kotlin).toPath(), classpath, dependencyClassPath ) } - .generateTestCases( + .generate( methodsForAutomaticGeneration.map { toUtMethod( it.methodToBeTestedFromUserInput, @@ -191,7 +191,7 @@ object UtBotJavaApi { init( FileUtil.isolateClassFiles(classUnderTest.kotlin).toPath(), classpath, dependencyClassPath ) - }.generateTestCases( + }.generate( methodsForAutomaticGeneration.map { toUtMethod( it.methodToBeTestedFromUserInput, diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestCaseGenerator.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestCaseGenerator.kt index 542a39f6c8..653637d947 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestCaseGenerator.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestCaseGenerator.kt @@ -125,7 +125,7 @@ object TestCaseGenerator { } @Throws(CancellationException::class) - fun generateTestCasesAsync( + fun generateAsync( controller: EngineController, method: UtMethod<*>, mockStrategy: MockStrategyApi, @@ -136,7 +136,7 @@ object TestCaseGenerator { return createDefaultFlow(engine) } - fun generateTestCases( + fun generate( methods: List>, mockStrategy: MockStrategyApi, chosenClassesToMockAlways: Set = Mocker.javaDefaultClasses.mapTo(mutableSetOf()) { it.id }, diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/sarif/GenerateTestsAndSarifReportFacade.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/sarif/GenerateTestsAndSarifReportFacade.kt index 5b4bb5bab0..d4f3363d0b 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/sarif/GenerateTestsAndSarifReportFacade.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/framework/plugin/sarif/GenerateTestsAndSarifReportFacade.kt @@ -70,7 +70,7 @@ class GenerateTestsAndSarifReportFacade( } private fun generateTestCases(targetClass: TargetClassWrapper, workingDirectory: Path): List = - TestCaseGenerator.generateTestCases( + TestCaseGenerator.generate( targetClass.targetMethods(), sarifProperties.mockStrategy, sarifProperties.classesToMockAlways, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/TestSpecificTestCaseGenerator.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/TestSpecificTestCaseGenerator.kt index 692ee02d77..0359fadbab 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/TestSpecificTestCaseGenerator.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/TestSpecificTestCaseGenerator.kt @@ -5,6 +5,7 @@ import mu.KotlinLogging import org.utbot.common.runBlockingWithCancellationPredicate import org.utbot.common.runIgnoringCancellationException import org.utbot.engine.EngineController +import org.utbot.engine.UtBotSymbolicEngine import org.utbot.framework.UtSettings import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.TestCaseGenerator @@ -13,10 +14,22 @@ import org.utbot.framework.plugin.api.UtExecution import org.utbot.framework.plugin.api.UtMethod import org.utbot.framework.plugin.api.UtTestCase import org.utbot.framework.util.jimpleBody +import java.nio.file.Path +/** + * Special [UtTestCase] generator for test methods that has a correct + * wrapper for suspend function [TestCaseGenerator.generateAsync]. + */ object TestSpecificTestCaseGenerator { private val logger = KotlinLogging.logger {} + fun init(buildDir: Path, + classpath: String?, + dependencyPaths: String, + engineActions: MutableList<(UtBotSymbolicEngine) -> Unit> = mutableListOf(), + isCanceled: () -> Boolean = { false }, + ) = TestCaseGenerator.init(buildDir, classpath, dependencyPaths, engineActions, isCanceled) + fun generate(method: UtMethod<*>, mockStrategy: MockStrategyApi): UtTestCase { logger.trace { "UtSettings:${System.lineSeparator()}" + UtSettings.toString() } @@ -27,7 +40,7 @@ object TestSpecificTestCaseGenerator { runIgnoringCancellationException { runBlockingWithCancellationPredicate(TestCaseGenerator.isCanceled) { - TestCaseGenerator.generateTestCasesAsync(EngineController(), method, mockStrategy).collect { + TestCaseGenerator.generateAsync(EngineController(), method, mockStrategy).collect { when (it) { is UtExecution -> executions += it is UtError -> errors.merge(it.description, 1, Int::plus) diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/UtModelChecker.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/UtModelTestCaseChecker.kt similarity index 97% rename from utbot-framework/src/test/kotlin/org/utbot/examples/UtModelChecker.kt rename to utbot-framework/src/test/kotlin/org/utbot/examples/UtModelTestCaseChecker.kt index ece09a5275..4756287698 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/UtModelChecker.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/UtModelTestCaseChecker.kt @@ -15,7 +15,6 @@ import org.utbot.framework.plugin.api.FieldId import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.MockStrategyApi.NO_MOCKS import org.utbot.framework.plugin.api.UtAssembleModel -import org.utbot.framework.plugin.api.TestCaseGenerator import org.utbot.framework.plugin.api.UtCompositeModel import org.utbot.framework.plugin.api.UtDirectSetFieldModel import org.utbot.framework.plugin.api.UtExecution @@ -39,7 +38,7 @@ import kotlin.reflect.KFunction2 import kotlin.reflect.KFunction3 import org.junit.jupiter.api.Assertions.assertTrue -internal abstract class UtModelChecker( +internal abstract class UtModelTestCaseChecker( testClass: KClass<*>, testCodeGeneration: Boolean = true, languagePipelines: List = listOf( @@ -136,7 +135,7 @@ internal abstract class UtModelChecker( buildDir = findPathToClassFiles(classLocation) previousClassLocation = classLocation } - TestCaseGenerator.init(buildDir, classpath = null, dependencyPaths = System.getProperty("java.class.path")) + TestSpecificTestCaseGenerator.init(buildDir, classpath = null, dependencyPaths = System.getProperty("java.class.path")) return TestSpecificTestCaseGenerator.generate(method, mockStrategy) } diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/UtTestCaseChecker.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/UtValueTestCaseChecker.kt similarity index 99% rename from utbot-framework/src/test/kotlin/org/utbot/examples/UtTestCaseChecker.kt rename to utbot-framework/src/test/kotlin/org/utbot/examples/UtValueTestCaseChecker.kt index fe5315e4c7..6b9ca65657 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/UtTestCaseChecker.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/UtValueTestCaseChecker.kt @@ -42,7 +42,6 @@ import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.MockStrategyApi.NO_MOCKS import org.utbot.framework.plugin.api.ObjectMockTarget import org.utbot.framework.plugin.api.ParameterMockTarget -import org.utbot.framework.plugin.api.TestCaseGenerator import org.utbot.framework.plugin.api.UtCompositeModel import org.utbot.framework.plugin.api.UtConcreteValue import org.utbot.framework.plugin.api.UtInstrumentation @@ -72,7 +71,7 @@ import kotlin.reflect.KFunction5 val logger = KotlinLogging.logger {} -abstract class UtTestCaseChecker( +abstract class UtValueTestCaseChecker( testClass: KClass<*>, testCodeGeneration: Boolean = true, languagePipelines: List = listOf( @@ -2493,7 +2492,7 @@ abstract class UtTestCaseChecker( mockStrategy: MockStrategyApi, additionalDependenciesClassPath: String ): UtTestCase { - TestCaseGenerator.init(buildDir, additionalDependenciesClassPath, System.getProperty("java.class.path")) + TestSpecificTestCaseGenerator.init(buildDir, additionalDependenciesClassPath, System.getProperty("java.class.path")) return TestSpecificTestCaseGenerator.generate(method, mockStrategy) } @@ -2504,7 +2503,7 @@ abstract class UtTestCaseChecker( ): UtTestCase { val additionalDependenciesClassPath = computeAdditionalDependenciesClasspathAndBuildDir(method, additionalDependencies) - TestCaseGenerator.init(buildDir, additionalDependenciesClassPath, System.getProperty("java.class.path")) + TestSpecificTestCaseGenerator.init(buildDir, additionalDependenciesClassPath, System.getProperty("java.class.path")) withUtContext(UtContext(method.clazz.java.classLoader)) { return TestSpecificTestCaseGenerator.generate(method, mockStrategy) } diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt index 61dbde7e36..6b7aabc9da 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.algorithms -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.ignoreExecutionsNumber import org.utbot.examples.isException import org.utbot.framework.plugin.api.DocCodeStmt @@ -9,7 +9,7 @@ import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test -class BinarySearchTest : UtTestCaseChecker(testClass = BinarySearch::class,) { +class BinarySearchTest : UtValueTestCaseChecker(testClass = BinarySearch::class,) { @Test fun testLeftBinarySearch() { val fullSummary = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt index 6d7a40b201..27a98ede11 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.algorithms -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.algorithms.CorrectBracketSequences.isBracket import org.utbot.examples.algorithms.CorrectBracketSequences.isOpen import org.utbot.examples.eq @@ -14,7 +14,7 @@ import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.junit.jupiter.api.Test -internal class CorrectBracketSequencesTest : UtTestCaseChecker( +internal class CorrectBracketSequencesTest : UtValueTestCaseChecker( testClass = CorrectBracketSequences::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt index fa97847427..99fd3428c2 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.algorithms -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.ignoreExecutionsNumber import org.utbot.examples.isException import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test -internal class GraphTest : UtTestCaseChecker(testClass = GraphExample::class) { +internal class GraphTest : UtValueTestCaseChecker(testClass = GraphExample::class) { @Test @Tag("slow") fun testRunFindCycle() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt index 412fa92a60..8134633b32 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.algorithms -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.ge import org.utbot.examples.ignoreExecutionsNumber @@ -12,7 +12,7 @@ import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.jupiter.api.Test -internal class SortTest : UtTestCaseChecker(testClass = Sort::class) { +internal class SortTest : UtValueTestCaseChecker(testClass = Sort::class) { @Test fun testQuickSort() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/LombokAnnotationTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/LombokAnnotationTest.kt index 2988979ec6..36a40d4c7c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/LombokAnnotationTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/LombokAnnotationTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.annotations -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.annotations.lombok.EnumWithAnnotations import org.utbot.examples.annotations.lombok.EnumWithoutAnnotations @@ -15,7 +15,7 @@ import org.junit.jupiter.api.Test * (see, i.e. https://stackoverflow.com/questions/44584487/improve-lombok-data-code-coverage) * and Lombok code is considered to be already tested itself. */ -class LombokAnnotationTest : UtTestCaseChecker(testClass = EnumWithAnnotations::class) { +class LombokAnnotationTest : UtValueTestCaseChecker(testClass = EnumWithAnnotations::class) { @Test fun testGetterWithAnnotations() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt index 00510ea5a5..74e1d7ac96 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.annotations -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -internal class NotNullAnnotationTest : UtTestCaseChecker(testClass = NotNullAnnotation::class) { +internal class NotNullAnnotationTest : UtValueTestCaseChecker(testClass = NotNullAnnotation::class) { @Test fun testDoesNotThrowNPE() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt index 91837bed92..61e6fe08e8 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.arrays -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.atLeast import org.utbot.examples.casts.ColoredPoint @@ -11,7 +11,7 @@ import org.utbot.examples.withoutMinimization import org.junit.jupiter.api.Test @Suppress("NestedLambdaShadowedImplicitParameter") -internal class ArrayOfArraysTest : UtTestCaseChecker(testClass = ArrayOfArrays::class) { +internal class ArrayOfArraysTest : UtValueTestCaseChecker(testClass = ArrayOfArrays::class) { @Test fun testDefaultValues() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt index 478b28a4f9..e528b50657 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.arrays -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.atLeast import org.utbot.examples.between @@ -13,7 +13,7 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -internal class ArrayOfObjectsTest : UtTestCaseChecker( +internal class ArrayOfObjectsTest : UtValueTestCaseChecker( testClass = ArrayOfObjects::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt index bdd1bc7471..77cd497e98 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.arrays -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.framework.codegen.CodeGeneration import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -class ArraysOverwriteValueTest : UtTestCaseChecker( +class ArraysOverwriteValueTest : UtValueTestCaseChecker( testClass = ArraysOverwriteValue::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt index d8a3265da1..702a4e8018 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.arrays -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.ignoreExecutionsNumber import org.junit.jupiter.api.Test -internal class FinalStaticFieldArrayTest : UtTestCaseChecker(testClass = FinalStaticFieldArray::class) { +internal class FinalStaticFieldArrayTest : UtValueTestCaseChecker(testClass = FinalStaticFieldArray::class) { @Test fun testFactorial() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt index 3a0eac72af..55d9d449e5 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.arrays -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.ge import org.utbot.examples.ignoreExecutionsNumber @@ -10,7 +10,7 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -internal class IntArrayBasicsTest : UtTestCaseChecker( +internal class IntArrayBasicsTest : UtValueTestCaseChecker( testClass = IntArrayBasics::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt index 3667895da4..4f4a476297 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.arrays -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.atLeast import org.utbot.examples.eq import org.utbot.examples.isException @@ -9,7 +9,7 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -internal class PrimitiveArraysTest : UtTestCaseChecker( +internal class PrimitiveArraysTest : UtValueTestCaseChecker( testClass = PrimitiveArrays::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt index 9311b0aa26..b7ce0b10d4 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.casts -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.framework.codegen.CodeGeneration @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test // TODO failed Kotlin compilation (generics) SAT-1332 //TODO: SAT-1487 calculate coverage for all methods of this test class -internal class ArrayCastExampleTest : UtTestCaseChecker( +internal class ArrayCastExampleTest : UtValueTestCaseChecker( testClass = ArrayCastExample::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt index 5c34c3eaab..758c8a0cd5 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.casts -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.isException @@ -9,7 +9,7 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -internal class CastExampleTest : UtTestCaseChecker( +internal class CastExampleTest : UtValueTestCaseChecker( testClass = CastExample::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt index c6754547d7..68698fddc4 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.casts -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.between import org.utbot.examples.eq @@ -9,7 +9,7 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -internal class GenericCastExampleTest : UtTestCaseChecker( +internal class GenericCastExampleTest : UtValueTestCaseChecker( testClass = GenericCastExample::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt index 4fd4a1e53a..a5e008aed6 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.casts -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.ge @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -internal class InstanceOfExampleTest : UtTestCaseChecker( +internal class InstanceOfExampleTest : UtValueTestCaseChecker( testClass = InstanceOfExample::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt index 05bee3864b..f3d6f1b187 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.codegen -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Test @Suppress("INACCESSIBLE_TYPE") -internal class ClassWithStaticAndInnerClassesTest : UtTestCaseChecker(testClass = ClassWithStaticAndInnerClasses::class) { +internal class ClassWithStaticAndInnerClassesTest : UtValueTestCaseChecker(testClass = ClassWithStaticAndInnerClasses::class) { @Test fun testUsePrivateStaticClassWithPrivateField() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt index edc9135ade..5ca9999e3d 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.codegen -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.mock.MockRandomExamples import org.utbot.examples.withoutConcrete import kotlin.reflect.full.functions import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -internal class CodegenExampleTest : UtTestCaseChecker(testClass = CodegenExample::class) { +internal class CodegenExampleTest : UtValueTestCaseChecker(testClass = CodegenExample::class) { @Test fun firstExampleTest() { withoutConcrete { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt index dadafac695..69858e8c1c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.codegen -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Test -class VoidStaticMethodsTest : UtTestCaseChecker(testClass = VoidStaticMethodsTestingClass::class) { +class VoidStaticMethodsTest : UtValueTestCaseChecker(testClass = VoidStaticMethodsTestingClass::class) { @Test fun testInvokeChangeStaticFieldMethod() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt index 02dfcb65f7..a2e2f85e4a 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.codegen.deepequals -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.framework.codegen.CodeGeneration @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test // TODO failed Kotlin compilation (generics) SAT-1332 -class DeepEqualsTest : UtTestCaseChecker( +class DeepEqualsTest : UtValueTestCaseChecker( testClass = DeepEqualsTestingClass::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt index 9360695b3b..61e921b843 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.ignoreExecutionsNumber @@ -10,7 +10,7 @@ import org.utbot.framework.plugin.api.FieldId import org.utbot.framework.plugin.api.UtConcreteValue import org.junit.jupiter.api.Test -internal class CustomerExamplesTest: UtTestCaseChecker( +internal class CustomerExamplesTest: UtValueTestCaseChecker( testClass = CustomerExamples::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/GenericListsExample.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/GenericListsExample.kt index 6dabf8186e..936037c0dc 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/GenericListsExample.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/GenericListsExample.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.framework.codegen.CodeGeneration @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test // TODO disabled tests should be fixes with SAT-1441 -internal class GenericListsExampleTest : UtTestCaseChecker( +internal class GenericListsExampleTest : UtValueTestCaseChecker( testClass = GenericListsExample::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt index 5e24a0f357..36f8e4e29f 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.isException @@ -9,7 +9,7 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test // TODO failed Kotlin compilation (generics) SAT-1332 -internal class LinkedListsTest : UtTestCaseChecker( +internal class LinkedListsTest : UtValueTestCaseChecker( testClass = LinkedLists::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt index 33f5023294..48e61edf88 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.framework.codegen.CodeGeneration import org.utbot.framework.plugin.api.CodegenLanguage @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test import org.utbot.examples.atLeast // TODO failed Kotlin compilation SAT-1332 -class ListAlgorithmsTest : UtTestCaseChecker( +class ListAlgorithmsTest : UtValueTestCaseChecker( testClass = ListAlgorithms::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt index a5cf3a9349..147c5e5d56 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.ignoreExecutionsNumber @@ -10,7 +10,7 @@ import kotlin.math.min import org.junit.jupiter.api.Test // TODO failed Kotlin compilation (generics) SAT-1332 -internal class ListIteratorsTest : UtTestCaseChecker( +internal class ListIteratorsTest : UtValueTestCaseChecker( testClass = ListIterators::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt index 3eb2f75534..88d3f35872 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.isException @@ -9,7 +9,7 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test // TODO failed Kotlin compilation ($ in function names, generics) SAT-1220 SAT-1332 -internal class ListWrapperReturnsVoidTest : UtTestCaseChecker( +internal class ListWrapperReturnsVoidTest : UtValueTestCaseChecker( testClass = ListWrapperReturnsVoidExample::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsTest.kt index 3665156682..eec96e6858 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.ge @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -internal class ListsTest : UtTestCaseChecker( +internal class ListsTest : UtValueTestCaseChecker( testClass = Lists::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt index d873ec264e..bdbcf49739 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.between import org.utbot.examples.eq @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -class MapEntrySetTest : UtTestCaseChecker( +class MapEntrySetTest : UtValueTestCaseChecker( testClass = MapEntrySet::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt index 5c031c2007..a833e0a49e 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.AtLeast import org.utbot.examples.DoNotCalculate import org.utbot.examples.between @@ -15,7 +15,7 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -class MapKeySetTest : UtTestCaseChecker( +class MapKeySetTest : UtValueTestCaseChecker( testClass = MapKeySet::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt index 962ab9dbeb..14eb77c680 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.AtLeast import org.utbot.examples.DoNotCalculate import org.utbot.examples.between @@ -13,7 +13,7 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -class MapValuesTest : UtTestCaseChecker( +class MapValuesTest : UtValueTestCaseChecker( testClass = MapValues::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapsTest.kt index f350b64c1d..d3bfc52c46 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.AtLeast import org.utbot.examples.DoNotCalculate import org.utbot.examples.between @@ -16,7 +16,7 @@ import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.jupiter.api.Test // TODO failed Kotlin compilation ($ in names, generics) SAT-1220 SAT-1332 -internal class MapsTest : UtTestCaseChecker( +internal class MapsTest : UtValueTestCaseChecker( testClass = Maps::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt index c32699845c..baf628804b 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.between import org.utbot.examples.eq @@ -11,7 +11,7 @@ import org.utbot.framework.codegen.CodeGeneration import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test -class OptionalsTest : UtTestCaseChecker( +class OptionalsTest : UtValueTestCaseChecker( Optionals::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt index cf9f630bde..53fbed9972 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.between import org.utbot.examples.ge import org.utbot.examples.ignoreExecutionsNumber @@ -10,7 +10,7 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -class SetIteratorsTest : UtTestCaseChecker( +class SetIteratorsTest : UtValueTestCaseChecker( testClass = SetIterators::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt index 2a5c136910..8e1ff194be 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.collections -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.AtLeast import org.utbot.examples.DoNotCalculate import org.utbot.examples.between @@ -15,7 +15,7 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -internal class SetsTest : UtTestCaseChecker( +internal class SetsTest : UtValueTestCaseChecker( testClass = Sets::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt index 7047a40bca..74f3941e02 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.controlflow -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.ignoreExecutionsNumber import org.utbot.examples.keyContain @@ -11,7 +11,7 @@ import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test -internal class ConditionsTest : UtTestCaseChecker(testClass = Conditions::class) { +internal class ConditionsTest : UtValueTestCaseChecker(testClass = Conditions::class) { @Test fun testSimpleCondition() { val conditionSummary = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt index 14cb835502..4d7007a2fb 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.controlflow -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.keyContain import org.utbot.examples.keyMatch @@ -10,7 +10,7 @@ import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test -internal class CycleDependedConditionTest : UtTestCaseChecker(testClass = CycleDependedCondition::class) { +internal class CycleDependedConditionTest : UtValueTestCaseChecker(testClass = CycleDependedCondition::class) { @Test fun testCycleDependedOneCondition() { val conditionSummary = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt index d60070efc1..3a201d911d 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.controlflow -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.atLeast import org.utbot.examples.between import org.utbot.examples.eq @@ -14,7 +14,7 @@ import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test -internal class CyclesTest : UtTestCaseChecker(testClass = Cycles::class) { +internal class CyclesTest : UtValueTestCaseChecker(testClass = Cycles::class) { @Test fun testForCycle() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt index 3aca82a55f..834e8adb8b 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.controlflow -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.ge import org.utbot.examples.keyContain @@ -17,7 +17,7 @@ import java.math.RoundingMode.HALF_EVEN import java.math.RoundingMode.HALF_UP import org.junit.jupiter.api.Test -internal class SwitchTest : UtTestCaseChecker(testClass = Switch::class) { +internal class SwitchTest : UtValueTestCaseChecker(testClass = Switch::class) { @Test fun testSimpleSwitch() { val switchCaseSummary = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt index c726b3b2c6..48fb11b8ba 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt @@ -1,7 +1,7 @@ package org.utbot.examples.enums import org.utbot.common.findField -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.enums.ClassWithEnum.StatusEnum.ERROR import org.utbot.examples.enums.ClassWithEnum.StatusEnum.READY @@ -14,7 +14,7 @@ import org.utbot.framework.plugin.api.util.id import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -class ClassWithEnumTest : UtTestCaseChecker(testClass = ClassWithEnum::class) { +class ClassWithEnumTest : UtValueTestCaseChecker(testClass = ClassWithEnum::class) { @Test fun testOrdinal() { withoutConcrete { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt index 0c3307fcd3..65e03739a1 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt @@ -1,6 +1,6 @@ package org.utbot.examples.exceptions -import org.utbot.examples.UtModelChecker +import org.utbot.examples.UtModelTestCaseChecker import org.utbot.examples.ge import org.utbot.examples.ignoreExecutionsNumber import org.utbot.examples.primitiveValue @@ -12,7 +12,7 @@ import org.utbot.framework.plugin.api.UtTimeoutException import org.junit.jupiter.api.Test internal class ExceptionClusteringChecker : - UtModelChecker(testClass = ExceptionClusteringExamples::class) { + UtModelTestCaseChecker(testClass = ExceptionClusteringExamples::class) { /** * Difference is in throwing unchecked exceptions - for method under test is [UtExpectedCheckedThrow]. */ diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt index 78d9498c01..13a6040b19 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.exceptions -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.atLeast import org.utbot.examples.eq import org.utbot.examples.ignoreExecutionsNumber @@ -9,7 +9,7 @@ import org.utbot.framework.codegen.CodeGeneration import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test -internal class ExceptionExamplesTest : UtTestCaseChecker( +internal class ExceptionExamplesTest : UtValueTestCaseChecker( testClass = ExceptionExamples::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt index 49fd9e1cec..c34faf0053 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.exceptions -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -internal class JvmCrashExamplesTest : UtTestCaseChecker(testClass = JvmCrashExamples::class) { +internal class JvmCrashExamplesTest : UtValueTestCaseChecker(testClass = JvmCrashExamples::class) { @Test @Disabled("JIRA:1527") fun testExit() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt index 361b5315fa..c439745e03 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.invokes -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.ignoreExecutionsNumber import org.utbot.examples.isException import org.junit.jupiter.api.Test -internal class InvokeExampleTest : UtTestCaseChecker(testClass = InvokeExample::class) { +internal class InvokeExampleTest : UtValueTestCaseChecker(testClass = InvokeExample::class) { @Test fun testSimpleFormula() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt index 2dfa22ec82..ac219a5bc2 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.invokes -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.atLeast import org.utbot.examples.eq import org.utbot.examples.ge @@ -10,7 +10,7 @@ import kotlin.math.sqrt import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test -internal class NativeExampleTest : UtTestCaseChecker(testClass = NativeExample::class) { +internal class NativeExampleTest : UtValueTestCaseChecker(testClass = NativeExample::class) { @Test fun testPartialEx() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt index 70c4b7e1ab..ccf9487706 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.invokes -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class SimpleInterfaceExampleTest : UtTestCaseChecker( +internal class SimpleInterfaceExampleTest : UtValueTestCaseChecker( testClass = SimpleInterfaceExample::class ) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt index e32277b882..b3a6e513df 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.invokes -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.between import kotlin.math.max import org.junit.jupiter.api.Test -internal class StaticInvokeExampleTest : UtTestCaseChecker(testClass = StaticInvokeExample::class) { +internal class StaticInvokeExampleTest : UtValueTestCaseChecker(testClass = StaticInvokeExample::class) { // TODO: inline local variables when types inference bug in Kotlin fixed @Test fun testMaxForThree() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt index 97a254b875..14404d027a 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt @@ -2,14 +2,14 @@ package org.utbot.examples.invokes -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.isException import java.lang.Boolean import org.junit.jupiter.api.Test -internal class VirtualInvokeExampleTest : UtTestCaseChecker(testClass = VirtualInvokeExample::class) { +internal class VirtualInvokeExampleTest : UtValueTestCaseChecker(testClass = VirtualInvokeExample::class) { @Test fun testSimpleVirtualInvoke() { checkWithException( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt index 7fb61eca70..597dc3a712 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt @@ -2,11 +2,11 @@ package org.utbot.examples.lambda import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.isException -class SimpleLambdaExamplesTest : UtTestCaseChecker(testClass = SimpleLambdaExamples::class) { +class SimpleLambdaExamplesTest : UtValueTestCaseChecker(testClass = SimpleLambdaExamples::class) { @Test fun testBiFunctionLambdaExample() { checkWithException( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt index a1775dff49..9b9d85ffa3 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.make.symbolic -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.withoutConcrete @@ -15,7 +15,7 @@ import org.junit.jupiter.api.Test // This class is substituted with ComplicatedMethodsSubstitutionsStorage // but we cannot do in code generation. // For this reason code generation executions are disabled -internal class ClassWithComplicatedMethodsTest : UtTestCaseChecker( +internal class ClassWithComplicatedMethodsTest : UtValueTestCaseChecker( testClass = ClassWithComplicatedMethods::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt index 5b4b8589b8..3f6a2eff17 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.math -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.atLeast import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class BitOperatorsTest : UtTestCaseChecker(testClass = BitOperators::class) { +internal class BitOperatorsTest : UtValueTestCaseChecker(testClass = BitOperators::class) { @Test fun testComplement() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt index f7896a4f83..ee06b5d250 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.math -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.isException import org.junit.jupiter.api.Test -internal class DivRemExamplesTest : UtTestCaseChecker(testClass = DivRemExamples::class) { +internal class DivRemExamplesTest : UtValueTestCaseChecker(testClass = DivRemExamples::class) { @Test fun testDiv() { checkWithException( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt index fe8d70e100..e31825ddcf 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.math -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.isException @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test @Suppress("SimplifyNegatedBinaryExpression") -internal class DoubleFunctionsTest : UtTestCaseChecker(testClass = DoubleFunctions::class) { +internal class DoubleFunctionsTest : UtValueTestCaseChecker(testClass = DoubleFunctions::class) { @Test @Tag("slow") fun testHypo() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt index f8fb4a2796..26d38c02ac 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt @@ -2,7 +2,7 @@ package org.utbot.examples.math import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.AtLeast import org.utbot.examples.algorithms.Sort import org.utbot.examples.eq @@ -15,7 +15,7 @@ import org.utbot.framework.plugin.api.CodegenLanguage import kotlin.math.floor import kotlin.math.sqrt -internal class OverflowAsErrorTest : UtTestCaseChecker( +internal class OverflowAsErrorTest : UtValueTestCaseChecker( testClass = OverflowExamples::class, testCodeGeneration = true, // Don't launch tests, because ArithmeticException will be expected, but it is not supposed to be actually thrown. diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt index df8fad27bd..25c298c080 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.framework.codegen.CodeGeneration @@ -12,7 +12,7 @@ import org.utbot.framework.plugin.api.UtStaticMethodInstrumentation import org.utbot.framework.plugin.api.isNull import org.junit.jupiter.api.Test -internal class LoggerExampleTest : UtTestCaseChecker( +internal class LoggerExampleTest : UtValueTestCaseChecker( testClass = LoggerExample::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt index d237827850..a22d51445c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.atLeast import org.utbot.examples.ignoreExecutionsNumber import org.junit.jupiter.api.Test -internal class MonitorUsageTest : UtTestCaseChecker(testClass = MonitorUsage::class) { +internal class MonitorUsageTest : UtValueTestCaseChecker(testClass = MonitorUsage::class) { @Test fun testSimpleMonitor() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt index 726af5094d..1dce00c33f 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class OverloadTest : UtTestCaseChecker(testClass = Overload::class) { +internal class OverloadTest : UtValueTestCaseChecker(testClass = Overload::class) { @Test fun testSignOneParam() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt index ac4195775c..262eb71125 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class PrivateConstructorExampleTest : UtTestCaseChecker(testClass = PrivateConstructorExample::class) { +internal class PrivateConstructorExampleTest : UtValueTestCaseChecker(testClass = PrivateConstructorExample::class) { /** * Two branches need to be covered: diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt index cc8eceda00..f86c4778ef 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class SimpleNoConditionTest : UtTestCaseChecker(testClass = SimpleNoCondition::class) { +internal class SimpleNoConditionTest : UtValueTestCaseChecker(testClass = SimpleNoCondition::class) { @Test fun testNoConditionAdd() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt index 2287629917..f7795a28a3 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class SimplifierTest: UtTestCaseChecker(testClass = Simplifier::class) { +internal class SimplifierTest: UtValueTestCaseChecker(testClass = Simplifier::class) { @Test fun testSimplifyAdditionWithZero() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt index b31dc426c9..4963667270 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt @@ -2,12 +2,12 @@ package org.utbot.examples.mixed import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.StaticInitializerExample import org.utbot.examples.eq @Disabled("Unknown build failure") -internal class StaticInitializerExampleTest : UtTestCaseChecker(testClass = StaticInitializerExample::class) { +internal class StaticInitializerExampleTest : UtValueTestCaseChecker(testClass = StaticInitializerExample::class) { @Test fun testPositive() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt index 01238840e7..a03e1dabf3 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class StaticMethodExamplesTest : UtTestCaseChecker(testClass = StaticMethodExamples::class) { +internal class StaticMethodExamplesTest : UtValueTestCaseChecker(testClass = StaticMethodExamples::class) { // TODO: inline local variables when types inference bug in Kotlin fixed @Test fun testComplement() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt index 2032d6205c..ee38f79aed 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.between import org.utbot.examples.eq @@ -13,7 +13,7 @@ import org.utbot.examples.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.junit.jupiter.api.Test -internal class ArgumentsMockTest : UtTestCaseChecker(testClass = ServiceWithArguments::class) { +internal class ArgumentsMockTest : UtValueTestCaseChecker(testClass = ServiceWithArguments::class) { @Test fun testMockForArguments_callMultipleMethods() { checkMocksAndInstrumentation( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt index d47b5c18a8..61d2af567b 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.mock -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.jupiter.api.Test -internal class CommonMocksExampleTest: UtTestCaseChecker(testClass = CommonMocksExample::class) { +internal class CommonMocksExampleTest: UtValueTestCaseChecker(testClass = CommonMocksExample::class) { @Test fun testMockInterfaceWithoutImplementors() { checkMocks( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt index 69e324da6e..4e515fac83 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.between import org.utbot.examples.eq @@ -12,7 +12,7 @@ import org.utbot.examples.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.junit.jupiter.api.Test -internal class FieldMockTest : UtTestCaseChecker(testClass = ServiceWithField::class) { +internal class FieldMockTest : UtValueTestCaseChecker(testClass = ServiceWithField::class) { @Test fun testMockForField_callMultipleMethods() { checkMocksAndInstrumentation( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt index b0cfd22752..33b05797ff 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock -import org.utbot.examples.UtModelChecker +import org.utbot.examples.UtModelTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.primitiveValue import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES @@ -11,7 +11,7 @@ import org.utbot.framework.plugin.api.isNotNull import org.utbot.framework.plugin.api.isNull import org.junit.jupiter.api.Test -internal class InnerMockWithFieldChecker : UtModelChecker(testClass = InnerMockWithFieldExample::class) { +internal class InnerMockWithFieldChecker : UtModelTestCaseChecker(testClass = InnerMockWithFieldExample::class) { @Test fun testCheckAndUpdate() { checkStatic( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt index 8aa6e687d0..6a82bfd39f 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.ge import org.utbot.examples.mock.others.FinalClass @@ -9,7 +9,7 @@ import org.utbot.examples.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_CLASSES import org.junit.jupiter.api.Test -internal class MockFinalClassTest : UtTestCaseChecker(testClass = MockReturnObjectExample::class) { +internal class MockFinalClassTest : UtValueTestCaseChecker(testClass = MockReturnObjectExample::class) { @Test fun testFinalClass() { checkMocks( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt index 478f309508..784380a95c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.isParameter @@ -13,7 +13,7 @@ import org.utbot.framework.plugin.api.UtNewInstanceInstrumentation import java.util.Random import org.junit.jupiter.api.Test -internal class MockRandomTest : UtTestCaseChecker(testClass = MockRandomExamples::class) { +internal class MockRandomTest : UtValueTestCaseChecker(testClass = MockRandomExamples::class) { @Test fun testRandomAsParameter() { val method: Random.() -> Int = Random::nextInt diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt index 4f41752332..f888f01e97 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.mock.others.Generator @@ -12,7 +12,7 @@ import org.utbot.examples.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.junit.jupiter.api.Test -internal class MockReturnObjectExampleTest : UtTestCaseChecker(testClass = MockReturnObjectExample::class) { +internal class MockReturnObjectExampleTest : UtValueTestCaseChecker(testClass = MockReturnObjectExample::class) { @Test fun testMockReturnObject() { checkMocks( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt index 027927544b..00b18d18cb 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.mock.others.Generator @@ -14,7 +14,7 @@ import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import kotlin.reflect.KClass import org.junit.jupiter.api.Test -internal class MockStaticFieldExampleTest : UtTestCaseChecker(testClass = MockStaticFieldExample::class) { +internal class MockStaticFieldExampleTest : UtValueTestCaseChecker(testClass = MockStaticFieldExample::class) { @Test fun testMockStaticField() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt index bb385facdc..f1996bbace 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.framework.plugin.api.MockStrategyApi @@ -10,7 +10,7 @@ import org.utbot.framework.util.singleStaticMethod import org.utbot.framework.util.singleValue import org.junit.jupiter.api.Test -internal class MockStaticMethodExampleTest : UtTestCaseChecker(testClass = MockStaticMethodExample::class) { +internal class MockStaticMethodExampleTest : UtValueTestCaseChecker(testClass = MockStaticMethodExample::class) { @Test fun testUseStaticMethod() { checkMocksAndInstrumentation( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt index a7de107d21..44a69a71ab 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock -import org.utbot.examples.UtModelChecker +import org.utbot.examples.UtModelTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.primitiveValue import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES @@ -10,7 +10,7 @@ import org.utbot.framework.plugin.api.isMockModel import org.utbot.framework.plugin.api.isNull import org.junit.jupiter.api.Test -internal class MockWithFieldChecker : UtModelChecker(testClass = MockWithFieldExample::class) { +internal class MockWithFieldChecker : UtModelTestCaseChecker(testClass = MockWithFieldExample::class) { @Test fun testCheckAndUpdate() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt index 169cebde32..5a9e85098d 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.mock -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.isException import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.Test -internal class MockWithSideEffectExampleTest : UtTestCaseChecker(testClass = MockWithSideEffectExample::class) { +internal class MockWithSideEffectExampleTest : UtValueTestCaseChecker(testClass = MockWithSideEffectExample::class) { @Test fun testSideEffect() { checkWithException( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt index 3dc17f0588..f3ee30d290 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.mock.provider.Provider @@ -11,7 +11,7 @@ import org.utbot.examples.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.junit.jupiter.api.Test -internal class StaticFieldMockTest : UtTestCaseChecker(testClass = ServiceWithStaticField::class) { +internal class StaticFieldMockTest : UtValueTestCaseChecker(testClass = ServiceWithStaticField::class) { @Test fun testMockForStaticField_callMultipleMethods() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt index 60fb7d2c57..0a96f573fa 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.isException @@ -8,7 +8,7 @@ import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.UtConcreteValue import org.junit.jupiter.api.Test -internal class UseNetworkTest : UtTestCaseChecker(testClass = UseNetwork::class) { +internal class UseNetworkTest : UtValueTestCaseChecker(testClass = UseNetwork::class) { @Test fun testReadBytes() { val method = UseNetwork::readBytes diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt index aab4e7f3ac..fa0edf891d 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.mock.aliasing -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.jupiter.api.Test -internal class AliasingInParamsExampleTest : UtTestCaseChecker(testClass = AliasingInParamsExample::class) { +internal class AliasingInParamsExampleTest : UtValueTestCaseChecker(testClass = AliasingInParamsExample::class) { @Test fun testExamplePackageBased() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt index 44d6303c4e..c50ed1ed00 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock.model -import org.utbot.examples.UtModelChecker +import org.utbot.examples.UtModelTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.mock.provider.impl.ProviderImpl import org.utbot.examples.mock.service.impl.ServiceWithField @@ -11,7 +11,7 @@ import org.utbot.framework.plugin.api.isNotNull import org.utbot.framework.plugin.api.isNull import org.junit.jupiter.api.Test -internal class FieldMockChecker : UtModelChecker(testClass = ServiceWithField::class) { +internal class FieldMockChecker : UtModelTestCaseChecker(testClass = ServiceWithField::class) { @Test fun testMockForField_IntPrimitive() { checkStatic( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt index cb9d69b534..2e94dd327f 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.mock.model -import org.utbot.examples.UtModelChecker +import org.utbot.examples.UtModelTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.mock.UseNetwork import org.utbot.framework.plugin.api.MockStrategyApi @@ -8,7 +8,7 @@ import org.utbot.framework.plugin.api.UtCompositeModel import org.utbot.framework.plugin.api.UtVoidModel import org.junit.jupiter.api.Test -internal class UseNetworkModelBasedTest : UtModelChecker(testClass = UseNetwork::class) { +internal class UseNetworkModelBasedTest : UtModelTestCaseChecker(testClass = UseNetwork::class) { @Test fun testMockVoidMethod() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt index f0a2bb3be8..ce587e20e8 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt @@ -1,6 +1,6 @@ package org.utbot.examples.models -import org.utbot.examples.UtModelChecker +import org.utbot.examples.UtModelTestCaseChecker import org.utbot.examples.eq import org.utbot.framework.codegen.CodeGeneration import org.utbot.framework.plugin.api.CodegenLanguage @@ -11,7 +11,7 @@ import org.utbot.framework.plugin.api.UtModel import org.utbot.framework.plugin.api.UtReferenceModel import org.junit.Test -internal class CompositeModelMinimizationChecker : UtModelChecker( +internal class CompositeModelMinimizationChecker : UtModelTestCaseChecker( testClass = CompositeModelMinimizationExample::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt index 9d479c43cf..da6b7a14cc 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt @@ -1,6 +1,6 @@ package org.utbot.examples.models -import org.utbot.examples.UtModelChecker +import org.utbot.examples.UtModelTestCaseChecker import org.utbot.examples.eq import org.utbot.framework.codegen.CodeGeneration import org.utbot.framework.plugin.api.CodegenLanguage @@ -12,7 +12,7 @@ import org.utbot.framework.plugin.api.UtReferenceModel import org.junit.jupiter.api.Test // TODO failed Kotlin compilation SAT-1332 -internal class ModelsIdEqualityChecker : UtModelChecker( +internal class ModelsIdEqualityChecker : UtModelTestCaseChecker( testClass = ModelsIdEqualityExample::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt index 8e03592ccb..0d21b9979d 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.natives -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.ge import org.junit.jupiter.api.Test import org.utbot.examples.withSolverTimeoutInMillis -internal class NativeExamplesTest : UtTestCaseChecker(testClass = NativeExamples::class) { +internal class NativeExamplesTest : UtValueTestCaseChecker(testClass = NativeExamples::class) { @Test fun testFindAndPrintSum() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt index bd90ce4ca5..28d257c272 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.isException import org.junit.jupiter.api.Test -class AnonymousClassesExampleTest : UtTestCaseChecker(testClass = AnonymousClassesExample::class) { +class AnonymousClassesExampleTest : UtValueTestCaseChecker(testClass = AnonymousClassesExample::class) { @Test fun testAnonymousClassAsParam() { checkWithException( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt index ca222f6ea3..943c7e9eaa 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt @@ -2,7 +2,7 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.atLeast import org.utbot.examples.eq import org.utbot.framework.codegen.CodeGeneration @@ -13,7 +13,7 @@ import kotlin.Suppress import kotlin.arrayOf import org.junit.jupiter.api.Test -internal class ClassRefTest : UtTestCaseChecker( +internal class ClassRefTest : UtValueTestCaseChecker( testClass = ClassRef::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt index dda77477db..ac9f086372 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.isException @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test // TODO Kotlin compilation SAT-1332 // Code generation executions fail due we cannot analyze strings properly for now -internal class ClassWithClassRefTest : UtTestCaseChecker( +internal class ClassWithClassRefTest : UtValueTestCaseChecker( testClass = ClassWithClassRef::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt index a3168044c4..70664a6359 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -internal class HiddenFieldExampleTest : UtTestCaseChecker(testClass = HiddenFieldExample::class) { +internal class HiddenFieldExampleTest : UtValueTestCaseChecker(testClass = HiddenFieldExample::class) { @Test // Engine creates HiddenFieldSuccClass instead of HiddenFieldSuperClass, feels wrong field and matchers fail fun testCheckHiddenField() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt index dbff807f9c..cc08947cad 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.Test -internal class ModelMinimizationExamplesTest : UtTestCaseChecker(testClass = ModelMinimizationExamples::class) { +internal class ModelMinimizationExamplesTest : UtValueTestCaseChecker(testClass = ModelMinimizationExamples::class) { @Test fun singleValueComparisonTest() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt index c168ca03a5..24de9d64eb 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.singleValue @@ -8,7 +8,7 @@ import org.utbot.framework.codegen.CodeGeneration import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test -class ObjectWithFinalStaticTest : UtTestCaseChecker( +class ObjectWithFinalStaticTest : UtValueTestCaseChecker( testClass = ObjectWithFinalStatic::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt index b2de169afb..f00bcf07de 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import kotlin.reflect.KFunction0 import kotlin.reflect.KFunction3 import org.junit.jupiter.api.Test -internal class ObjectWithPrimitivesClassTest : UtTestCaseChecker(testClass = ObjectWithPrimitivesClass::class) { +internal class ObjectWithPrimitivesClassTest : UtValueTestCaseChecker(testClass = ObjectWithPrimitivesClass::class) { @Test fun testDefaultConstructor() { val method: KFunction0 = ::ObjectWithPrimitivesClass diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt index 24f3fd160b..74c7a50759 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.atLeast import org.utbot.examples.eq @@ -9,7 +9,7 @@ import org.utbot.examples.isException import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -internal class ObjectWithPrimitivesExampleTest : UtTestCaseChecker(testClass = ObjectWithPrimitivesExample::class) { +internal class ObjectWithPrimitivesExampleTest : UtValueTestCaseChecker(testClass = ObjectWithPrimitivesExample::class) { @Test fun testMax() { checkWithException( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt index a24e7b904e..58ca01a2ff 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.atLeast import org.utbot.examples.eq @@ -8,7 +8,7 @@ import org.utbot.examples.ignoreExecutionsNumber import org.utbot.examples.isException import org.junit.jupiter.api.Test -internal class ObjectWithRefFieldsExampleTest : UtTestCaseChecker(testClass = ObjectWithRefFieldExample::class) { +internal class ObjectWithRefFieldsExampleTest : UtValueTestCaseChecker(testClass = ObjectWithRefFieldExample::class) { @Test fun testDefaultValue() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt index 8f9f4802a0..52f60f210f 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.findByName @@ -8,7 +8,7 @@ import org.utbot.examples.ignoreExecutionsNumber import org.utbot.examples.singleValue import org.junit.jupiter.api.Test -internal class ObjectWithStaticFieldsExampleTest : UtTestCaseChecker(testClass = ObjectWithStaticFieldsExample::class) { +internal class ObjectWithStaticFieldsExampleTest : UtValueTestCaseChecker(testClass = ObjectWithStaticFieldsExample::class) { @Test fun testReadFromStaticArray() { checkStatics( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt index b3647ee6e0..b9a7ae6189 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import kotlin.reflect.KFunction2 import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -internal class ObjectWithThrowableConstructorTest : UtTestCaseChecker(testClass = ObjectWithThrowableConstructor::class) { +internal class ObjectWithThrowableConstructorTest : UtValueTestCaseChecker(testClass = ObjectWithThrowableConstructor::class) { @Test @Disabled("SAT-1500 Support verification of UtAssembleModel for possible exceptions") fun testThrowableConstructor() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt index 26f89b88b6..9a61a65e36 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.isException import org.junit.jupiter.api.Test -internal class PrivateFieldsTest : UtTestCaseChecker(testClass = PrivateFields::class) { +internal class PrivateFieldsTest : UtValueTestCaseChecker(testClass = PrivateFields::class) { @Test fun testAccessWithGetter() { checkWithException( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt index e1d9b137e0..55e6d8a1e4 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class RecursiveTypeTest : UtTestCaseChecker(testClass = RecursiveType::class) { +internal class RecursiveTypeTest : UtValueTestCaseChecker(testClass = RecursiveType::class) { @Test fun testNextValue() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt index 361052e3b6..5c07197f0c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.between import org.utbot.examples.eq @@ -13,7 +13,7 @@ import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test -internal class SimpleClassExampleTest : UtTestCaseChecker(testClass = SimpleClassExample::class) { +internal class SimpleClassExampleTest : UtValueTestCaseChecker(testClass = SimpleClassExample::class) { @Test fun simpleConditionTest() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt index d54bbd8156..a467734a0a 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.objects -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.Test -internal class SimpleClassMultiInstanceExampleTest : UtTestCaseChecker(testClass = SimpleClassMultiInstanceExample::class) { +internal class SimpleClassMultiInstanceExampleTest : UtValueTestCaseChecker(testClass = SimpleClassMultiInstanceExample::class) { @Test fun singleObjectChangeTest() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt index 24b4b9ef9b..e9b8bfde5b 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.primitives -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class ByteExamplesTest : UtTestCaseChecker(testClass = ByteExamples::class) { +internal class ByteExamplesTest : UtValueTestCaseChecker(testClass = ByteExamples::class) { @Test fun testNegByte() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt index 22b6a29dc1..1d2d814ded 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.primitives -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.isException import org.junit.jupiter.api.Test -internal class CharExamplesTest : UtTestCaseChecker(testClass = CharExamples::class) { +internal class CharExamplesTest : UtValueTestCaseChecker(testClass = CharExamples::class) { @Test fun testCharDiv() { checkWithException( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt index 680ff35c5a..2fdda4b1aa 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.primitives -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Test @Suppress("SimplifyNegatedBinaryExpression") -internal class DoubleExamplesTest : UtTestCaseChecker(testClass = DoubleExamples::class) { +internal class DoubleExamplesTest : UtValueTestCaseChecker(testClass = DoubleExamples::class) { @Test fun testCompareSum() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt index ceaf63cf62..919820f498 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.primitives -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class FloatExamplesTest : UtTestCaseChecker(testClass = FloatExamples::class) { +internal class FloatExamplesTest : UtValueTestCaseChecker(testClass = FloatExamples::class) { @Test fun testFloatInfinity() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt index b0dc0d889f..7afa113d7e 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.primitives -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test @Suppress("ConvertTwoComparisonsToRangeCheck") -internal class IntExamplesTest : UtTestCaseChecker(testClass = IntExamples::class) { +internal class IntExamplesTest : UtValueTestCaseChecker(testClass = IntExamples::class) { @Test @Disabled("SAT-1009 [JAVA] Engine can't analyze isInteger") fun testIsInteger() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt index 2ccce3c7a4..313b75855f 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.recursion -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.atLeast import org.utbot.examples.between import org.utbot.examples.eq @@ -16,7 +16,7 @@ import kotlin.math.pow import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -internal class RecursionTest : UtTestCaseChecker(testClass = Recursion::class) { +internal class RecursionTest : UtValueTestCaseChecker(testClass = Recursion::class) { @Test fun testFactorial() { val factorialSummary = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt index ffb4f2644e..42b78dbc3c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.statics.substitution -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.withoutSubstituteStaticsWithSymbolicVariable import org.junit.jupiter.api.Test -class StaticsSubstitutionTest : UtTestCaseChecker(testClass = StaticSubstitutionExamples::class) { +class StaticsSubstitutionTest : UtValueTestCaseChecker(testClass = StaticSubstitutionExamples::class) { @Test fun lessThanZeroWithSubstitution() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt index f3fd68258d..c88d7df478 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt @@ -2,13 +2,13 @@ package org.utbot.examples.stdlib import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.utbot.examples.isException import org.utbot.examples.withUsingReflectionForMaximizingCoverage import java.util.Date -class DateExampleTest : UtTestCaseChecker(testClass = DateExample::class) { +class DateExampleTest : UtValueTestCaseChecker(testClass = DateExample::class) { @Suppress("SpellCheckingInspection") @Tag("slow") @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt index 2e4beeb126..1945421b76 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt @@ -3,7 +3,7 @@ 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.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.Full import org.utbot.examples.FullWithAssumptions @@ -20,7 +20,7 @@ import kotlin.streams.toList // TODO 1 instruction is always uncovered https://github.com/UnitTestBot/UTBotJava/issues/193 // TODO failed Kotlin compilation (generics) JIRA:1332 -class BaseStreamExampleTest : UtTestCaseChecker( +class BaseStreamExampleTest : UtValueTestCaseChecker( testClass = BaseStreamExample::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt index 7a18fa913b..3f36a7dfc1 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.strings -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.atLeast import org.utbot.examples.between @@ -17,7 +17,7 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.examples.withSolverTimeoutInMillis -internal class StringExamplesTest : UtTestCaseChecker( +internal class StringExamplesTest : UtValueTestCaseChecker( testClass = StringExamples::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt index 9e41230cdf..ad74b569da 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.structures -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.ignoreExecutionsNumber import org.junit.jupiter.api.Test -internal class HeapTest : UtTestCaseChecker(testClass = Heap::class) { +internal class HeapTest : UtValueTestCaseChecker(testClass = Heap::class) { @Test fun testIsHeap() { val method = Heap::isHeap diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt index 92c8788b28..bc7fa1d01f 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.structures -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.between import org.utbot.examples.eq import kotlin.math.min import org.junit.jupiter.api.Test -internal class MinStackExampleTest : UtTestCaseChecker(testClass = MinStackExample::class) { +internal class MinStackExampleTest : UtValueTestCaseChecker(testClass = MinStackExample::class) { @Test fun testCreate() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt index fc957892e0..82774419b6 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.structures -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.keyContain @@ -14,7 +14,7 @@ import java.util.TreeMap import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -internal class StandardStructuresTest : UtTestCaseChecker(testClass = StandardStructures::class) { +internal class StandardStructuresTest : UtValueTestCaseChecker(testClass = StandardStructures::class) { @Test @Disabled("TODO down cast for object wrapper JIRA:1480") fun testGetList() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt index c2b6e26393..0c6e8574eb 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.thirdparty.numbers -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test // example from Apache common-numbers -internal class ArithmeticUtilsTest : UtTestCaseChecker(testClass = ArithmeticUtils::class) { +internal class ArithmeticUtilsTest : UtValueTestCaseChecker(testClass = ArithmeticUtils::class) { @Test @Tag("slow") fun testPow() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt index 8d81703a92..3b53a7bfd1 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.types -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Test @Suppress("SimplifyNegatedBinaryExpression") -internal class CastExamplesTest : UtTestCaseChecker(testClass = CastExamples::class) { +internal class CastExamplesTest : UtValueTestCaseChecker(testClass = CastExamples::class) { @Test fun testLongToByte() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt index dc90c85f77..5eea67df3d 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.types -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.atLeast import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class TypeBordersTest : UtTestCaseChecker(testClass = TypeBorders::class) { +internal class TypeBordersTest : UtValueTestCaseChecker(testClass = TypeBorders::class) { @Test fun testByteBorder() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt index 7970849acc..acdd68f612 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.types -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Test @Suppress("SimplifyNegatedBinaryExpression") -internal class TypeMatchesTest : UtTestCaseChecker(testClass = TypeMatches::class) { +internal class TypeMatchesTest : UtValueTestCaseChecker(testClass = TypeMatches::class) { @Test fun testCompareDoubleByte() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt index fd478ac5e9..7ba67fce6f 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.unsafe -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class UnsafeWithFieldTest: UtTestCaseChecker(UnsafeWithField::class) { +internal class UnsafeWithFieldTest: UtValueTestCaseChecker(UnsafeWithField::class) { @Test fun checkSetField() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt index d08c64bc00..1d8db68914 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class BooleanWrapperTest : UtTestCaseChecker(testClass = BooleanWrapper::class) { +internal class BooleanWrapperTest : UtValueTestCaseChecker(testClass = BooleanWrapper::class) { @Test fun primitiveToWrapperTest() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt index f83b4900d9..11c718b900 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Test -internal class ByteWrapperTest : UtTestCaseChecker(testClass = ByteWrapper::class) { +internal class ByteWrapperTest : UtValueTestCaseChecker(testClass = ByteWrapper::class) { @Test fun primitiveToWrapperTest() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt index 1433dd8a69..bad71de9a0 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.framework.codegen.CodeGeneration @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test // TODO failed Kotlin compilation -internal class CharacterWrapperTest : UtTestCaseChecker( +internal class CharacterWrapperTest : UtValueTestCaseChecker( testClass = CharacterWrapper::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt index f8ce7e1d75..947e3d33fd 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Test @Suppress("SimplifyNegatedBinaryExpression") -internal class DoubleWrapperTest : UtTestCaseChecker(testClass = DoubleWrapper::class) { +internal class DoubleWrapperTest : UtValueTestCaseChecker(testClass = DoubleWrapper::class) { @Test fun primitiveToWrapperTest() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt index 6d9feb6149..36ebeb2823 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Test @Suppress("SimplifyNegatedBinaryExpression") -internal class FloatWrapperTest : UtTestCaseChecker(testClass = FloatWrapper::class) { +internal class FloatWrapperTest : UtValueTestCaseChecker(testClass = FloatWrapper::class) { @Test fun primitiveToWrapperTest() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt index ac5973261c..0fb136b716 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -internal class IntegerWrapperTest : UtTestCaseChecker(testClass = IntegerWrapper::class) { +internal class IntegerWrapperTest : UtValueTestCaseChecker(testClass = IntegerWrapper::class) { @Test fun primitiveToWrapperTest() { check( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt index 57018e548e..1ca131b1f7 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt @@ -1,6 +1,6 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.utbot.examples.withoutMinimization @@ -9,7 +9,7 @@ import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -internal class LongWrapperTest : UtTestCaseChecker( +internal class LongWrapperTest : UtValueTestCaseChecker( testClass = LongWrapper::class, testCodeGeneration = true, languagePipelines = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt index 6202d1e652..2ae4661cab 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt +++ b/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.DoNotCalculate import org.utbot.examples.eq import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -internal class ShortWrapperTest : UtTestCaseChecker(testClass = ShortWrapper::class) { +internal class ShortWrapperTest : UtValueTestCaseChecker(testClass = ShortWrapper::class) { @Test fun primitiveToWrapperTest() { check( diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/CodeGenerationProcessor.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/CodeGenerationController.kt similarity index 98% rename from utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/CodeGenerationProcessor.kt rename to utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/CodeGenerationController.kt index df6c52aed8..010ee21ea7 100644 --- a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/CodeGenerationProcessor.kt +++ b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/CodeGenerationController.kt @@ -62,10 +62,10 @@ import org.utbot.framework.plugin.api.UtMethod import org.utbot.framework.plugin.api.UtTestCase import org.utbot.framework.plugin.api.util.UtContext import org.utbot.framework.plugin.api.util.withUtContext -import org.utbot.intellij.plugin.generator.CodeGenerationProcessor.Target.EDT_LATER -import org.utbot.intellij.plugin.generator.CodeGenerationProcessor.Target.READ_ACTION -import org.utbot.intellij.plugin.generator.CodeGenerationProcessor.Target.THREAD_POOL -import org.utbot.intellij.plugin.generator.CodeGenerationProcessor.Target.WRITE_ACTION +import org.utbot.intellij.plugin.generator.CodeGenerationController.Target.EDT_LATER +import org.utbot.intellij.plugin.generator.CodeGenerationController.Target.READ_ACTION +import org.utbot.intellij.plugin.generator.CodeGenerationController.Target.THREAD_POOL +import org.utbot.intellij.plugin.generator.CodeGenerationController.Target.WRITE_ACTION import org.utbot.intellij.plugin.models.GenerateTestsModel import org.utbot.intellij.plugin.models.packageName import org.utbot.intellij.plugin.sarif.SarifReportIdea @@ -85,7 +85,7 @@ import java.util.concurrent.TimeUnit import kotlin.reflect.KClass import kotlin.reflect.full.functions -object CodeGenerationProcessor { +object CodeGenerationController { private enum class Target { THREAD_POOL, READ_ACTION, WRITE_ACTION, EDT_LATER } fun generateTests(model: GenerateTestsModel, testCasesByClass: Map>) { diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt index 820d7378ac..5bde74bc1b 100644 --- a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt +++ b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt @@ -30,7 +30,7 @@ import org.utbot.framework.plugin.api.UtTestCase import org.utbot.framework.plugin.api.util.UtContext import org.utbot.framework.plugin.api.util.withSubstitutionCondition import org.utbot.framework.plugin.api.util.withUtContext -import org.utbot.intellij.plugin.generator.CodeGenerationProcessor.generateTests +import org.utbot.intellij.plugin.generator.CodeGenerationController.generateTests import org.utbot.intellij.plugin.models.GenerateTestsModel import org.utbot.intellij.plugin.ui.GenerateTestsDialogWindow import org.utbot.intellij.plugin.ui.utils.jdkVersion @@ -187,7 +187,7 @@ object UtTestsDialogProcessor { val notEmptyCases = withUtContext(context) { testCaseGenerator - .generateTestCases(methods, model.mockStrategy, model.chosenClassesToMockAlways, model.timeout) + .generate(methods, model.mockStrategy, model.chosenClassesToMockAlways, model.timeout) .map { it.summarize(searchDirectory) } .filterNot { it.executions.isEmpty() && it.errors.isEmpty() } } diff --git a/utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt b/utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt index 5cb32693eb..0778a303c4 100644 --- a/utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt +++ b/utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt @@ -331,7 +331,7 @@ fun runGeneration( } - testCaseGenerator.generateTestCasesAsync(controller, method, mockStrategyApi) + testCaseGenerator.generateAsync(controller, method, mockStrategyApi) .collect { result -> when (result) { is UtExecution -> { diff --git a/utbot-summary-tests/src/test/kotlin/examples/SummaryTestCaseGeneratorTest.kt b/utbot-summary-tests/src/test/kotlin/examples/SummaryTestCaseGeneratorTest.kt index 8f6470dee1..1cee8edecb 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/SummaryTestCaseGeneratorTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/SummaryTestCaseGeneratorTest.kt @@ -3,7 +3,7 @@ package examples import org.junit.jupiter.api.* import org.utbot.common.WorkaroundReason import org.utbot.common.workaround -import org.utbot.examples.UtTestCaseChecker +import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.CoverageMatcher import org.utbot.examples.DoNotCalculate import org.utbot.framework.UtSettings.checkNpeInNestedMethods @@ -33,7 +33,7 @@ open class SummaryTestCaseGeneratorTest( CodeGenerationLanguageLastStage(CodegenLanguage.JAVA), CodeGenerationLanguageLastStage(CodegenLanguage.KOTLIN, TestExecution) ) -) : UtTestCaseChecker(testClass, testCodeGeneration, languagePipelines) { +) : UtValueTestCaseChecker(testClass, testCodeGeneration, languagePipelines) { private lateinit var cookie: AutoCloseable @BeforeEach