diff --git a/.github/workflows/build-and-run-tests-from-branch.yml b/.github/workflows/build-and-run-tests-from-branch.yml index 37be623744..b56d640538 100644 --- a/.github/workflows/build-and-run-tests-from-branch.yml +++ b/.github/workflows/build-and-run-tests-from-branch.yml @@ -30,10 +30,10 @@ jobs: steps: - name: Print environment variables run: printenv - + - name: Checkout repository uses: actions/checkout@v3 - + - name: Check out ${{ github.event.inputs.commit_sha }} commit if: github.event.inputs.commit_sha != '' run: | @@ -45,101 +45,102 @@ jobs: TASKS=$(echo $(cat .github/workflows/framework-tests-matrix.json)) echo "::set-output name=matrix::$TASKS" echo $TASKS - framework: + + framework-test: # This job does not need to wait for 'prepare-tests-matrix' result. - # GitHub allocates runners portionally. Framework tests are time consuming. That's why we want to force them + # GitHub allocates runners portionally. Framework tests are time consuming. That's why we want to force them # to start execution early. needs: prepare-tests-matrix - # Using matrices let create multiple jobs runs based on the combinations of the variables from matrices. + # Using matrices let create multiple jobs runs based on the combinations of the variables from matrices. # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs strategy: - # The option forces to execute all jobs even though some of them have failed. + # The option forces to execute all jobs even though some of them have failed. fail-fast: false matrix: ${{ fromJson(needs.prepare-tests-matrix.outputs.matrix) }} runs-on: ubuntu-20.04 container: unittestbot/java-env:java11-zulu-jdk-gradle7.4.2-kotlinc1.7.0 steps: - - name: Print environment variables - run: printenv - - - name: Checkout repository - uses: actions/checkout@v3 + - name: Print environment variables + run: printenv - - name: Check out ${{ github.event.inputs.commit_sha }} commit - if: github.event.inputs.commit_sha != '' - run: | - git fetch - git checkout ${{ github.event.inputs.commit_sha }} - - name: Run monitoring - run: | - echo Find your Prometheus metrics using label {instance=\"${GITHUB_RUN_ID}-${HOSTNAME}\"} - chmod +x ./scripts/project/monitoring.sh - ./scripts/project/monitoring.sh ${{ secrets.PUSHGATEWAY_HOSTNAME }} ${{ secrets.PUSHGATEWAY_USER }} ${{ secrets.PUSHGATEWAY_PASSWORD }} - - name: Run tests - run: | - gradle --no-daemon :utbot-framework:test ${{ matrix.project.TESTS_TO_RUN }} - - name: Upload logs - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: logs ${{ matrix.project.PART_NAME }} - path: utbot-framework/logs/* + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Check out ${{ github.event.inputs.commit_sha }} commit + if: github.event.inputs.commit_sha != '' + run: | + git fetch + git checkout ${{ github.event.inputs.commit_sha }} + - name: Run monitoring + run: | + echo Find your Prometheus metrics using label {instance=\"${GITHUB_RUN_ID}-${HOSTNAME}\"} + chmod +x ./scripts/project/monitoring.sh + ./scripts/project/monitoring.sh ${{ secrets.PUSHGATEWAY_HOSTNAME }} ${{ secrets.PUSHGATEWAY_USER }} ${{ secrets.PUSHGATEWAY_PASSWORD }} + - name: Run tests + run: | + gradle --no-daemon :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} + - name: Upload logs + if: ${{ always() }} + uses: actions/upload-artifact@v3 + with: + name: logs ${{ matrix.project.PART_NAME }} + path: utbot-framework-test/logs/* - - name: Upload UTBot temp directory content - if: ${{ always() }} - uses: actions/upload-artifact@v3 - with: - name: utbot_temp ${{ matrix.project.PART_NAME }} - path: | - /tmp/UTBot/generated*/* - /tmp/UTBot/utbot-childprocess-errors/* - - name: Upload test report if tests have failed - if: ${{ failure() }} - uses: actions/upload-artifact@v3 - with: - name: test_report ${{ matrix.project.PART_NAME }} - path: utbot-framework/build/reports/tests/test/* + - name: Upload UTBot temp directory content + if: ${{ always() }} + uses: actions/upload-artifact@v3 + with: + name: utbot_temp ${{ matrix.project.PART_NAME }} + path: | + /tmp/UTBot/generated*/* + /tmp/UTBot/utbot-childprocess-errors/* + - name: Upload test report if tests have failed + if: ${{ failure() }} + uses: actions/upload-artifact@v3 + with: + name: test_report ${{ matrix.project.PART_NAME }} + path: utbot-framework-test/build/reports/tests/test/* project: needs: prepare-tests-matrix - # Using matrices let create multiple jobs runs based on the combinations of the variables from matrices. + # Using matrices let create multiple jobs runs based on the combinations of the variables from matrices. # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs strategy: - # The option forces to execute all jobs even though some of them have failed. + # The option forces to execute all jobs even though some of them have failed. fail-fast: false matrix: - project: [utbot-api, utbot-cli, utbot-core, utbot-framework-api, utbot-fuzzers, utbot-gradle, utbot-instrumentation, utbot-instrumentation-tests, utbot-intellij, utbot-junit-contest, utbot-rd, utbot-sample, utbot-summary, utbot-summary-tests] + project: [utbot-api, utbot-cli, utbot-core, utbot-framework, utbot-framework-api, utbot-fuzzers, utbot-gradle, utbot-instrumentation, utbot-instrumentation-tests, utbot-intellij, utbot-junit-contest, utbot-rd, utbot-sample, utbot-summary, utbot-summary-tests] runs-on: ubuntu-20.04 container: unittestbot/java-env:java11-zulu-jdk-gradle7.4.2-kotlinc1.7.0 steps: - - name: Print environment variables - run: printenv + - name: Print environment variables + run: printenv - - name: Checkout repository - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - - name: Check out ${{ github.event.inputs.commit_sha }} commit - if: github.event.inputs.commit_sha != '' - run: | - git fetch - git checkout ${{ github.event.inputs.commit_sha }} - - uses: actions/checkout@v3 - with: - ref: ${{ env.COMMIT_SHA }} + - name: Check out ${{ github.event.inputs.commit_sha }} commit + if: github.event.inputs.commit_sha != '' + run: | + git fetch + git checkout ${{ github.event.inputs.commit_sha }} + - uses: actions/checkout@v3 + with: + ref: ${{ env.COMMIT_SHA }} - - name: Run monitoring - run: | - echo Find your Prometheus metrics using label {instance=\"${GITHUB_RUN_ID}-${HOSTNAME}\"} - chmod +x ./scripts/project/monitoring.sh - ./scripts/project/monitoring.sh ${{ secrets.PUSHGATEWAY_HOSTNAME }} ${{ secrets.PUSHGATEWAY_USER }} ${{ secrets.PUSHGATEWAY_PASSWORD }} - - name: Run tests - run: | - cd ${{ matrix.project }} - gradle build --no-daemon - - name: Upload test report if tests have failed - if: ${{ failure() }} - uses: actions/upload-artifact@v3 - with: - name: test_report ${{ matrix.project }} - path: ${{ matrix.project }}/build/reports/tests/test/* + - name: Run monitoring + run: | + echo Find your Prometheus metrics using label {instance=\"${GITHUB_RUN_ID}-${HOSTNAME}\"} + chmod +x ./scripts/project/monitoring.sh + ./scripts/project/monitoring.sh ${{ secrets.PUSHGATEWAY_HOSTNAME }} ${{ secrets.PUSHGATEWAY_USER }} ${{ secrets.PUSHGATEWAY_PASSWORD }} + - name: Run tests + run: | + cd ${{ matrix.project }} + gradle build --no-daemon + - name: Upload test report if tests have failed + if: ${{ failure() }} + uses: actions/upload-artifact@v3 + with: + name: test_report ${{ matrix.project }} + path: ${{ matrix.project }}/build/reports/tests/test/* diff --git a/gradle.properties b/gradle.properties index d293fa1752..c0565e2cd4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,7 +27,7 @@ antlr_version=4.9.2 kryo_version=5.3.0 kryo_serializers_version=0.45 asm_version=9.2 -testng_version=7.4.0 +testng_version=7.6.0 mockito_inline_version=4.0.0 jackson_version = 2.12.3 javasmt_solver_z3_version=4.8.9-sosy1 diff --git a/settings.gradle b/settings.gradle index 78fb689b9d..c6ea552e41 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,5 +27,6 @@ include 'utbot-summary' include 'utbot-gradle' //include 'utbot-maven' include 'utbot-summary-tests' +include 'utbot-framework-test' include 'utbot-rd' 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 42f3c4a1c7..8ab741488c 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.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.withFeaturePath +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withFeaturePath import java.io.File import java.io.FileInputStream -class FeatureProcessorWithRepetitionTest : UtValueTestCaseChecker(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-analytics/src/test/kotlin/org/utbot/predictors/LinearStateRewardPredictorTest.kt b/utbot-analytics/src/test/kotlin/org/utbot/predictors/LinearStateRewardPredictorTest.kt index 6a68e83212..e02f7e6c12 100644 --- a/utbot-analytics/src/test/kotlin/org/utbot/predictors/LinearStateRewardPredictorTest.kt +++ b/utbot-analytics/src/test/kotlin/org/utbot/predictors/LinearStateRewardPredictorTest.kt @@ -2,10 +2,10 @@ package org.utbot.predictors import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test -import org.utbot.examples.withPathSelectorType -import org.utbot.examples.withRewardModelPath import org.utbot.framework.PathSelectorType import org.utbot.framework.UtSettings +import org.utbot.testcheckers.withPathSelectorType +import org.utbot.testcheckers.withRewardModelPath class LinearStateRewardPredictorTest { @Test diff --git a/utbot-analytics/src/test/kotlin/org/utbot/predictors/NNStateRewardPredictorTest.kt b/utbot-analytics/src/test/kotlin/org/utbot/predictors/NNStateRewardPredictorTest.kt index 42dd3bac40..3bb7a50d48 100644 --- a/utbot-analytics/src/test/kotlin/org/utbot/predictors/NNStateRewardPredictorTest.kt +++ b/utbot-analytics/src/test/kotlin/org/utbot/predictors/NNStateRewardPredictorTest.kt @@ -3,11 +3,11 @@ package org.utbot.predictors import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.withPathSelectorType import org.utbot.analytics.StateRewardPredictor -import org.utbot.examples.withRewardModelPath import org.utbot.framework.PathSelectorType import org.utbot.framework.UtSettings +import org.utbot.testcheckers.withPathSelectorType +import org.utbot.testcheckers.withRewardModelPath import kotlin.system.measureNanoTime class NNStateRewardPredictorTest { diff --git a/utbot-cli/build.gradle b/utbot-cli/build.gradle index 22068905c7..b9eb8a0cd1 100644 --- a/utbot-cli/build.gradle +++ b/utbot-cli/build.gradle @@ -1,5 +1,18 @@ apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle" +compileKotlin { + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11 + freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"] + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_11 +} + + //noinspection GroovyAssignabilityCheck configurations { fetchInstrumentationJar diff --git a/utbot-framework/src/test/java/org/utbot/examples/StaticInitializerExample.java b/utbot-core/src/test/java/org/utbot/examples/StaticInitializerExample.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/StaticInitializerExample.java rename to utbot-core/src/test/java/org/utbot/examples/StaticInitializerExample.java diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/testcheckers/MatcherUtils.kt b/utbot-framework-api/src/main/kotlin/org/utbot/testcheckers/MatcherUtils.kt new file mode 100644 index 0000000000..3e94b92c2e --- /dev/null +++ b/utbot-framework-api/src/main/kotlin/org/utbot/testcheckers/MatcherUtils.kt @@ -0,0 +1,12 @@ +package org.utbot.testcheckers + +fun ge(count: Int) = ExecutionsNumberMatcher("ge $count") { it >= count } + +fun eq(count: Int) = ExecutionsNumberMatcher("eq $count") { it == count } + +fun between(bounds: IntRange) = ExecutionsNumberMatcher("$bounds") { it in bounds } + +class ExecutionsNumberMatcher(private val description: String, private val cmp: (Int) -> Boolean) { + operator fun invoke(x: Int) = cmp(x) + override fun toString() = description +} \ No newline at end of file diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/testcheckers/SettingsModificators.kt b/utbot-framework-api/src/main/kotlin/org/utbot/testcheckers/SettingsModificators.kt new file mode 100644 index 0000000000..8f44bfc96f --- /dev/null +++ b/utbot-framework-api/src/main/kotlin/org/utbot/testcheckers/SettingsModificators.kt @@ -0,0 +1,123 @@ +package org.utbot.testcheckers + +import org.utbot.framework.PathSelectorType +import org.utbot.framework.TestSelectionStrategyType +import org.utbot.framework.UtSettings + +inline fun withFeaturePath(featurePath: String, block: () -> T): T { + val prevFeaturePath = UtSettings.featurePath + val prevEnableFeatureProcess = UtSettings.enableFeatureProcess + + UtSettings.featurePath = featurePath + UtSettings.enableFeatureProcess = true + + try { + return block() + } finally { + UtSettings.featurePath = prevFeaturePath + UtSettings.enableFeatureProcess = prevEnableFeatureProcess + } +} + +inline fun withUsingReflectionForMaximizingCoverage(maximizeCoverage: Boolean, block: () -> T): T { + val prev = UtSettings.maximizeCoverageUsingReflection + UtSettings.maximizeCoverageUsingReflection = maximizeCoverage + try { + return block() + } finally { + UtSettings.maximizeCoverageUsingReflection = prev + } +} + +inline fun withPathSelectorType(pathSelectorType: PathSelectorType, block: () -> T): T { + val prev = UtSettings.pathSelectorType + UtSettings.pathSelectorType = pathSelectorType + try { + return block() + } finally { + UtSettings.pathSelectorType = prev + } +} + +inline fun withRewardModelPath(rewardModelPath: String, block: () -> T): T { + val prev = UtSettings.rewardModelPath + UtSettings.rewardModelPath = rewardModelPath + try { + return block() + } finally { + UtSettings.rewardModelPath = prev + } +} + +inline fun withTreatingOverflowAsError(block: () -> T): T { + val prev = UtSettings.treatOverflowAsError + UtSettings.treatOverflowAsError = true + try { + return block() + } finally { + UtSettings.treatOverflowAsError = prev + } +} + +inline fun withPushingStateFromPathSelectorForConcrete(block: () -> T): T { + val prev = UtSettings.saveRemainingStatesForConcreteExecution + UtSettings.saveRemainingStatesForConcreteExecution = true + try { + return block() + } finally { + UtSettings.saveRemainingStatesForConcreteExecution = prev + } +} + +inline fun withoutSubstituteStaticsWithSymbolicVariable(block: () -> T) { + val substituteStaticsWithSymbolicVariable = UtSettings.substituteStaticsWithSymbolicVariable + UtSettings.substituteStaticsWithSymbolicVariable = false + try { + block() + } finally { + UtSettings.substituteStaticsWithSymbolicVariable = substituteStaticsWithSymbolicVariable + } +} + +inline fun withoutMinimization(block: () -> T): T { + val prev = UtSettings.testMinimizationStrategyType + UtSettings.testMinimizationStrategyType = TestSelectionStrategyType.DO_NOT_MINIMIZE_STRATEGY + try { + return block() + } finally { + UtSettings.testMinimizationStrategyType = prev + } +} + +inline fun withSolverTimeoutInMillis(timeoutInMillis: Int, block: () -> T): T { + val prev = UtSettings.checkSolverTimeoutMillis + UtSettings.checkSolverTimeoutMillis = timeoutInMillis + try { + return block() + } finally { + UtSettings.checkSolverTimeoutMillis = prev + } +} + +inline fun withoutConcrete(block: () -> T): T { + val prev = UtSettings.useConcreteExecution + UtSettings.useConcreteExecution = false + try { + return block() + } finally { + UtSettings.useConcreteExecution = prev + } +} + +/** + * Run [block] with disabled sandbox in the concrete executor + */ +inline fun withoutSandbox(block: () -> T): T { + val prev = UtSettings.disableSandbox + UtSettings.disableSandbox = true + try { + return block() + } finally { + UtSettings.disableSandbox = prev + } +} diff --git a/utbot-framework-test/build.gradle b/utbot-framework-test/build.gradle new file mode 100644 index 0000000000..363c57075c --- /dev/null +++ b/utbot-framework-test/build.gradle @@ -0,0 +1,92 @@ +apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle" + +compileKotlin { + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11 + freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"] + } +} + + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_11 +} + +//noinspection GroovyAssignabilityCheck +repositories { + flatDir { + dirs 'dist' + } +} + +//noinspection GroovyAssignabilityCheck +configurations { + z3native +} + +dependencies { + api project(':utbot-api') + api project(':utbot-fuzzers') + api project(':utbot-core') + api project(':utbot-instrumentation') + api project(':utbot-summary') + api project(':utbot-framework-api') + + implementation(project(":utbot-framework")) + testImplementation project(':utbot-sample') + testImplementation project(":utbot-framework").sourceSets.test.output + testImplementation project(":utbot-core").sourceSets.test.output + + implementation "com.github.UnitTestBot:soot:${soot_commit_hash}" + + implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: jackson_version + implementation group: 'org.sosy-lab', name: 'javasmt-solver-z3', version: javasmt_solver_z3_version + implementation group: 'com.github.curious-odd-man', name: 'rgxgen', version: rgxgen_version + implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: log4j2_version + implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version + implementation group: 'org.jacoco', name: 'org.jacoco.report', version: jacoco_version + implementation group: 'org.apache.commons', name: 'commons-text', version: apache_commons_text_version + // we need this for construction mocks from composite models + implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0' + + // To use JUnit4, comment out JUnit5 and uncomment JUnit4 dependencies here. Please also check "test" section + // testImplementation group: 'junit', name: 'junit', version: '4.13.1' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.1' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.1' + + // used for testing code generation + testImplementation group: 'commons-io', name: 'commons-io', version: commons_io_version + testImplementation group: 'junit', name: 'junit', version: junit4_version + testImplementation group: 'org.junit.platform', name: 'junit-platform-console-standalone', version: junit4_platform_version + testImplementation group: 'org.antlr', name: 'antlr4', version: antlr_version + testImplementation group: 'org.mockito', name: 'mockito-core', version: mockito_version + testImplementation group: 'org.testng', name: 'testng', version: testng_version + testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockito_inline_version + testImplementation group: 'com.google.guava', name: 'guava', version: guava_version + + testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockito_inline_version + testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j2_version + + z3native group: 'com.microsoft.z3', name: 'z3-native-win64', version: z3_version, ext: 'zip' + z3native group: 'com.microsoft.z3', name: 'z3-native-linux64', version: z3_version, ext: 'zip' + z3native group: 'com.microsoft.z3', name: 'z3-native-osx', version: z3_version, ext: 'zip' +} + + +test { + + minHeapSize = "128m" + maxHeapSize = "2048m" + + jvmArgs '-XX:MaxHeapSize=2048m' + + // To use JUnit4, comment out useJUnitPlatform and uncomment useJUnit. Please also check "dependencies" section + //useJUnit() + useJUnitPlatform() { + excludeTags 'slow', 'IntegrationTest' + } + if (System.getProperty('DEBUG', 'false') == 'true') { + jvmArgs '-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9009' + } +} diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/AssembleTestUtils.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/AssembleTestUtils.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/AssembleTestUtils.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/AssembleTestUtils.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/ComplexField.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/ComplexField.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/ComplexField.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/ComplexField.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/DirectAccess.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/DirectAccess.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/DirectAccess.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/DirectAccess.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/DirectAccessAndSetter.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/DirectAccessAndSetter.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/DirectAccessAndSetter.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/DirectAccessAndSetter.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/DirectAccessFinal.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/DirectAccessFinal.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/DirectAccessFinal.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/DirectAccessFinal.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/InheritedField.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/InheritedField.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/InheritedField.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/InheritedField.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/ListItem.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/ListItem.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/ListItem.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/ListItem.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/NoModifier.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/NoModifier.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/NoModifier.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/NoModifier.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/PackagePrivateFields.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/PackagePrivateFields.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/PackagePrivateFields.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/PackagePrivateFields.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/PrimitiveFields.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/PrimitiveFields.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/PrimitiveFields.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/PrimitiveFields.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/arrays/ArrayOfComplexArrays.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/arrays/ArrayOfComplexArrays.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/arrays/ArrayOfComplexArrays.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/arrays/ArrayOfComplexArrays.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/arrays/ArrayOfPrimitiveArrays.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/arrays/ArrayOfPrimitiveArrays.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/arrays/ArrayOfPrimitiveArrays.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/arrays/ArrayOfPrimitiveArrays.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/arrays/AssignedArray.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/arrays/AssignedArray.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/arrays/AssignedArray.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/arrays/AssignedArray.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/arrays/ComplexArray.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/arrays/ComplexArray.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/arrays/ComplexArray.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/arrays/ComplexArray.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/arrays/MethodUnderTest.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/arrays/MethodUnderTest.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/arrays/MethodUnderTest.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/arrays/MethodUnderTest.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/arrays/PrimitiveArray.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/arrays/PrimitiveArray.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/arrays/PrimitiveArray.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/arrays/PrimitiveArray.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/ComplexConstructor.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/ComplexConstructor.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/ComplexConstructor.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/ComplexConstructor.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/ComplexConstructorWithSetter.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/ComplexConstructorWithSetter.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/ComplexConstructorWithSetter.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/ComplexConstructorWithSetter.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/ConstructorModifyingStatic.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/ConstructorModifyingStatic.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/ConstructorModifyingStatic.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/ConstructorModifyingStatic.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/InheritComplexConstructor.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/InheritComplexConstructor.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/InheritComplexConstructor.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/InheritComplexConstructor.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/InheritPrimitiveConstructor.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/InheritPrimitiveConstructor.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/InheritPrimitiveConstructor.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/InheritPrimitiveConstructor.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/PrimitiveConstructor.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/PrimitiveConstructor.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/PrimitiveConstructor.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/PrimitiveConstructor.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/PrimitiveConstructorWithDefaultField.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/PrimitiveConstructorWithDefaultField.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/PrimitiveConstructorWithDefaultField.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/PrimitiveConstructorWithDefaultField.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/PrivateConstructor.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/PrivateConstructor.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/PrivateConstructor.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/PrivateConstructor.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/PseudoComplexConstructor.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/PseudoComplexConstructor.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/constructors/PseudoComplexConstructor.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/constructors/PseudoComplexConstructor.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/defaults/DefaultField.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/defaults/DefaultField.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/defaults/DefaultField.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/defaults/DefaultField.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/defaults/DefaultFieldModifiedInConstructor.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/defaults/DefaultFieldModifiedInConstructor.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/defaults/DefaultFieldModifiedInConstructor.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/defaults/DefaultFieldModifiedInConstructor.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/defaults/DefaultFieldWithDirectAccessor.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/defaults/DefaultFieldWithDirectAccessor.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/defaults/DefaultFieldWithDirectAccessor.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/defaults/DefaultFieldWithDirectAccessor.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/defaults/DefaultFieldWithSetter.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/defaults/DefaultFieldWithSetter.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/defaults/DefaultFieldWithSetter.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/defaults/DefaultFieldWithSetter.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/defaults/DefaultPackagePrivateField.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/defaults/DefaultPackagePrivateField.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/defaults/DefaultPackagePrivateField.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/defaults/DefaultPackagePrivateField.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/assemble/statics/StaticField.java b/utbot-framework-test/src/main/java/org/utbot/examples/assemble/statics/StaticField.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/assemble/statics/StaticField.java rename to utbot-framework-test/src/main/java/org/utbot/examples/assemble/statics/StaticField.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/KotlinWrappers.kt b/utbot-framework-test/src/main/java/org/utbot/examples/manual/KotlinWrappers.kt similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/KotlinWrappers.kt rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/KotlinWrappers.kt diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/ArrayOfComplexArraysExample.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/ArrayOfComplexArraysExample.java similarity index 99% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/ArrayOfComplexArraysExample.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/ArrayOfComplexArraysExample.java index d2392e36ea..4f1a0be423 100644 --- a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/ArrayOfComplexArraysExample.java +++ b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/ArrayOfComplexArraysExample.java @@ -1,4 +1,5 @@ package org.utbot.examples.manual.examples; + import org.utbot.examples.assemble.arrays.ArrayOfComplexArrays; public class ArrayOfComplexArraysExample { diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/ArrayOfPrimitiveArraysExample.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/ArrayOfPrimitiveArraysExample.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/ArrayOfPrimitiveArraysExample.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/ArrayOfPrimitiveArraysExample.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/AssignedArrayExample.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/AssignedArrayExample.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/AssignedArrayExample.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/AssignedArrayExample.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/ClassRefExample.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/ClassRefExample.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/ClassRefExample.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/ClassRefExample.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/ComplexArraysExample.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/ComplexArraysExample.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/ComplexArraysExample.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/ComplexArraysExample.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/DirectAccessExample.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/DirectAccessExample.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/DirectAccessExample.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/DirectAccessExample.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/MultiMethodExample.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/MultiMethodExample.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/MultiMethodExample.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/MultiMethodExample.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/ProvidedExample.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/ProvidedExample.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/ProvidedExample.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/ProvidedExample.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/StringSwitchExample.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/StringSwitchExample.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/StringSwitchExample.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/StringSwitchExample.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/Trivial.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/Trivial.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/Trivial.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/Trivial.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/customer/A.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/customer/A.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/customer/A.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/customer/A.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/customer/B.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/customer/B.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/customer/B.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/customer/B.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/customer/C.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/customer/C.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/customer/C.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/customer/C.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/examples/customer/Demo9.java b/utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/customer/Demo9.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/manual/examples/customer/Demo9.java rename to utbot-framework-test/src/main/java/org/utbot/examples/manual/examples/customer/Demo9.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/ConstructorsAndSetters.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/ConstructorsAndSetters.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/ConstructorsAndSetters.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/ConstructorsAndSetters.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/DefaultField.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/DefaultField.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/DefaultField.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/DefaultField.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/InvokeInAssignment.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/InvokeInAssignment.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/InvokeInAssignment.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/InvokeInAssignment.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/NoFields.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/NoFields.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/NoFields.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/NoFields.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/NoMethods.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/NoMethods.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/NoMethods.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/NoMethods.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/PrimitiveModifications.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/PrimitiveModifications.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/PrimitiveModifications.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/PrimitiveModifications.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/RecursiveAndCrossCalls.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/RecursiveAndCrossCalls.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/RecursiveAndCrossCalls.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/RecursiveAndCrossCalls.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/StronglyConnectedComponent.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/StronglyConnectedComponent.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/StronglyConnectedComponent.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/StronglyConnectedComponent.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/StronglyConnectedComponents.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/StronglyConnectedComponents.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/StronglyConnectedComponents.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/StronglyConnectedComponents.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/coupling/ClassA.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/coupling/ClassA.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/coupling/ClassA.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/coupling/ClassA.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/coupling/ClassB.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/coupling/ClassB.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/coupling/ClassB.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/coupling/ClassB.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/hierarchy/BaseModifications.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/hierarchy/BaseModifications.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/hierarchy/BaseModifications.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/hierarchy/BaseModifications.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/hierarchy/InheritedModifications.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/hierarchy/InheritedModifications.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/hierarchy/InheritedModifications.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/hierarchy/InheritedModifications.java diff --git a/utbot-framework/src/test/java/org/utbot/examples/modificators/hierarchy/InterfaceModifications.java b/utbot-framework-test/src/main/java/org/utbot/examples/modificators/hierarchy/InterfaceModifications.java similarity index 100% rename from utbot-framework/src/test/java/org/utbot/examples/modificators/hierarchy/InterfaceModifications.java rename to utbot-framework-test/src/main/java/org/utbot/examples/modificators/hierarchy/InterfaceModifications.java diff --git a/utbot-framework/src/test/kotlin/org/utbot/engine/pc/QueryOptimizationsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/engine/pc/QueryOptimizationsTest.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/engine/pc/QueryOptimizationsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/engine/pc/QueryOptimizationsTest.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/engine/z3/ExtensionsKtTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/engine/z3/ExtensionsKtTest.kt similarity index 99% rename from utbot-framework/src/test/kotlin/org/utbot/engine/z3/ExtensionsKtTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/engine/z3/ExtensionsKtTest.kt index 91afc1a1c5..6beffa785e 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/engine/z3/ExtensionsKtTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/engine/z3/ExtensionsKtTest.kt @@ -12,6 +12,7 @@ import org.junit.jupiter.api.assertThrows import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.Arguments.arguments import org.junit.jupiter.params.provider.MethodSource +import org.utbot.engine.z3.ExtensionsKtTest.Companion.toSort import soot.BooleanType import soot.ByteType import soot.CharType diff --git a/utbot-framework/src/test/kotlin/org/utbot/engine/z3/OperatorsKtTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/engine/z3/OperatorsKtTest.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/engine/z3/OperatorsKtTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/engine/z3/OperatorsKtTest.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt index 6b7aabc9da..d197e8a838 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/BinarySearchTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.algorithms -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt similarity index 95% rename from utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt index 27a98ede11..d19f753319 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/CorrectBracketSequencesTest.kt @@ -1,18 +1,18 @@ package org.utbot.examples.algorithms -import org.utbot.examples.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.examples.algorithms.CorrectBracketSequences.isBracket import org.utbot.examples.algorithms.CorrectBracketSequences.isOpen -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.examples.keyMatch -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException +import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration internal class CorrectBracketSequencesTest : UtValueTestCaseChecker( testClass = CorrectBracketSequences::class, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt similarity index 90% rename from utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt index 847f166773..71d13c4383 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/GraphTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.algorithms -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class GraphTest : UtValueTestCaseChecker(testClass = GraphExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt similarity index 95% rename from utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt index 5db0444ffa..438571905e 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/algorithms/SortTest.kt @@ -1,16 +1,16 @@ package org.utbot.examples.algorithms -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.examples.keyMatch +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException +import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge internal class SortTest : UtValueTestCaseChecker(testClass = Sort::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt index 74e1d7ac96..0b64573d0e 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/NotNullAnnotationTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.annotations -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class NotNullAnnotationTest : UtValueTestCaseChecker(testClass = NotNullAnnotation::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithAnnotationsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithAnnotationsTest.kt similarity index 82% rename from utbot-framework/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithAnnotationsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithAnnotationsTest.kt index 7f5494a31b..b2987df28c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithAnnotationsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithAnnotationsTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.annotations.lombok import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.testcheckers.eq /** * Tests for Lombok annotations diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithoutAnnotationsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithoutAnnotationsTest.kt similarity index 80% rename from utbot-framework/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithoutAnnotationsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithoutAnnotationsTest.kt index 37dc03c27c..1aa631f627 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithoutAnnotationsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/EnumWithoutAnnotationsTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.annotations.lombok import org.junit.jupiter.api.Test -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.testcheckers.eq internal class EnumWithoutAnnotationsTest : UtValueTestCaseChecker(testClass = EnumWithoutAnnotations::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/lombok/NotNullAnnotationsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/NotNullAnnotationsTest.kt similarity index 82% rename from utbot-framework/src/test/kotlin/org/utbot/examples/annotations/lombok/NotNullAnnotationsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/NotNullAnnotationsTest.kt index 31334c78ea..b73330d07c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/annotations/lombok/NotNullAnnotationsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/annotations/lombok/NotNullAnnotationsTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.annotations.lombok import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.testcheckers.eq /** * Tests for Lombok NonNull annotation diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt similarity index 97% rename from utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt index 61e6fe08e8..1ffe1baf69 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfArraysTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.arrays -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.atLeast +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.atLeast import org.utbot.examples.casts.ColoredPoint import org.utbot.examples.casts.Point -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.withoutMinimization +import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withoutMinimization @Suppress("NestedLambdaShadowedImplicitParameter") internal class ArrayOfArraysTest : UtValueTestCaseChecker(testClass = ArrayOfArrays::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt similarity index 89% rename from utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt index e528b50657..5f67396996 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArrayOfObjectsTest.kt @@ -1,16 +1,16 @@ package org.utbot.examples.arrays -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.atLeast -import org.utbot.examples.between -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.atLeast +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 internal class ArrayOfObjectsTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt similarity index 97% rename from utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt index 77cd497e98..3f0bab6159 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/ArraysOverwriteValueTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.arrays -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 class ArraysOverwriteValueTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt similarity index 84% rename from utbot-framework/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt index 702a4e8018..e6cfd39049 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/FinalStaticFieldArrayTest.kt @@ -1,7 +1,7 @@ package org.utbot.examples.arrays -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.junit.jupiter.api.Test internal class FinalStaticFieldArrayTest : UtValueTestCaseChecker(testClass = FinalStaticFieldArray::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt index ae941fbaad..89cd68e821 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.arrays import org.junit.jupiter.api.Disabled -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 internal class IntArrayBasicsTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt index 4f4a476297..93353521fe 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/arrays/PrimitiveArraysTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.arrays -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.atLeast -import org.utbot.examples.eq -import org.utbot.examples.isException -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.atLeast +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 internal class PrimitiveArraysTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt index 549d70c09e..e57047e56c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/ArrayCastExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.casts import org.junit.jupiter.api.Disabled -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation (generics) SAT-1332 //TODO: SAT-1487 calculate coverage for all methods of this test class diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/CastClassTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastClassTest.kt similarity index 74% rename from utbot-framework/src/test/kotlin/org/utbot/examples/casts/CastClassTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastClassTest.kt index 9fc9be6ef9..8444e963cf 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/CastClassTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastClassTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.casts import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.framework.plugin.api.CodegenLanguage +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration internal class CastClassTest : UtValueTestCaseChecker( testClass = CastClass::class, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt index 20060b5c4d..cc6078c0f7 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/CastExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.casts -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.isException -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 internal class CastExampleTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt index 68698fddc4..d903203673 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/GenericCastExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.casts -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.between -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.between import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 internal class GenericCastExampleTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt similarity index 98% rename from utbot-framework/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt index a5e008aed6..2b4561ecf3 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/casts/InstanceOfExampleTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.casts -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 internal class InstanceOfExampleTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt similarity index 95% rename from utbot-framework/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt index 1b1cc4436e..ee12e07204 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/ClassWithStaticAndInnerClassesTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.codegen -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq @Suppress("INACCESSIBLE_TYPE") internal class ClassWithStaticAndInnerClassesTest : UtValueTestCaseChecker(testClass = ClassWithStaticAndInnerClasses::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt similarity index 93% rename from utbot-framework/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt index 5ca9999e3d..ae342017f3 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/CodegenExampleTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.codegen -import org.utbot.examples.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.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 +import org.utbot.testcheckers.withoutConcrete internal class CodegenExampleTest : UtValueTestCaseChecker(testClass = CodegenExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/JavaAssertTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/JavaAssertTest.kt similarity index 77% rename from utbot-framework/src/test/kotlin/org/utbot/examples/codegen/JavaAssertTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/JavaAssertTest.kt index ed0060bd53..5560cd4e6a 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/JavaAssertTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/JavaAssertTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.codegen import org.junit.jupiter.api.Test -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.isException +import org.utbot.testcheckers.eq class JavaAssertTest : UtValueTestCaseChecker(testClass = JavaAssert::class){ @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt similarity index 85% rename from utbot-framework/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt index 69858e8c1c..65c76c7bd1 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/VoidStaticMethodsTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.codegen -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq class VoidStaticMethodsTest : UtValueTestCaseChecker(testClass = VoidStaticMethodsTestingClass::class) { @Test diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithCrossReferenceRelationshipTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithCrossReferenceRelationshipTest.kt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithNullableFieldTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithNullableFieldTest.kt similarity index 81% rename from utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithNullableFieldTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithNullableFieldTest.kt index edbff7e6b6..7b29e44c7e 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithNullableFieldTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithNullableFieldTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.codegen.deepequals import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.framework.plugin.api.CodegenLanguage +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration class ClassWithNullableFieldTest : UtValueTestCaseChecker( testClass = ClassWithNullableField::class, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt similarity index 95% rename from utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt index a2e2f85e4a..6fd453ca51 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/codegen/deepequals/DeepEqualsTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.codegen.deepequals -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation (generics) SAT-1332 class DeepEqualsTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt index 61e921b843..72e5dadcd7 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/CustomerExamplesTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.collections -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.FieldId import org.utbot.framework.plugin.api.UtConcreteValue import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration internal class CustomerExamplesTest: UtValueTestCaseChecker( testClass = CustomerExamples::class, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/GenericListsExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/GenericListsExampleTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/GenericListsExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/GenericListsExampleTest.kt index 936037c0dc..f3746e865c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/GenericListsExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/GenericListsExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.collections -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO disabled tests should be fixes with SAT-1441 internal class GenericListsExampleTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt similarity index 97% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt index 36f8e4e29f..7bc1497ffe 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/LinkedListsTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.collections -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.isException -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation (generics) SAT-1332 internal class LinkedListsTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt similarity index 84% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt index 48e61edf88..714c790228 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListAlgorithmsTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.collections -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test -import org.utbot.examples.atLeast +import org.utbot.tests.infrastructure.atLeast +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 class ListAlgorithmsTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt similarity index 93% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt index b123aee133..053a1fa1da 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.collections import org.junit.jupiter.api.Disabled -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage import kotlin.math.min import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation (generics) SAT-1332 internal class ListIteratorsTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt similarity index 87% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt index e6232b9d67..b1356ecb47 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListWrapperReturnsVoidTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.collections import org.junit.jupiter.api.Disabled -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.isException -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation ($ in function names, generics) SAT-1220 SAT-1332 @Disabled("Java 11 transition") diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsPart1Test.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart1Test.kt similarity index 82% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsPart1Test.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart1Test.kt index 1b4358a783..0564bf685c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsPart1Test.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart1Test.kt @@ -2,10 +2,10 @@ package org.utbot.examples.collections import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 @Disabled diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsPart2Test.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart2Test.kt similarity index 83% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsPart2Test.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart2Test.kt index beafd50941..dd62849c37 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsPart2Test.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart2Test.kt @@ -1,10 +1,11 @@ package org.utbot.examples.collections import org.junit.jupiter.api.Disabled -import org.utbot.framework.codegen.CodeGeneration import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test -import org.utbot.examples.* +import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.ignoreExecutionsNumber // TODO failed Kotlin compilation SAT-1332 @Disabled diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsPart3Test.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart3Test.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsPart3Test.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart3Test.kt index 4e92a042b5..5242bc47d3 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListsPart3Test.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/ListsPart3Test.kt @@ -1,15 +1,15 @@ package org.utbot.examples.collections -import org.utbot.framework.codegen.CodeGeneration import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.between -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.isException +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 internal class ListsPart3Test : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt similarity index 94% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt index bdbcf49739..0139515e59 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapEntrySetTest.kt @@ -1,16 +1,16 @@ package org.utbot.examples.collections -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.between -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.isException -import org.utbot.examples.withPushingStateFromPathSelectorForConcrete -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge +import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 class MapEntrySetTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt index a833e0a49e..d82f0a87a7 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapKeySetTest.kt @@ -1,18 +1,18 @@ package org.utbot.examples.collections -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.AtLeast -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.between -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.examples.withPushingStateFromPathSelectorForConcrete -import org.utbot.examples.withoutMinimization -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.AtLeast +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge +import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete +import org.utbot.testcheckers.withoutMinimization +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 class MapKeySetTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt similarity index 94% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt index 14eb77c680..3eb88f6594 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapValuesTest.kt @@ -1,16 +1,16 @@ package org.utbot.examples.collections -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.AtLeast -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.between -import org.utbot.examples.ge -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.examples.withoutMinimization -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.AtLeast +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.ge +import org.utbot.testcheckers.withoutMinimization +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 class MapValuesTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapsPart1Test.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart1Test.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapsPart1Test.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart1Test.kt index 9eec8128c0..22afa44e9d 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapsPart1Test.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart1Test.kt @@ -1,17 +1,17 @@ package org.utbot.examples.collections -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.AtLeast -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.between -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.withoutMinimization -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.AtLeast +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge +import org.utbot.testcheckers.withoutMinimization +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation ($ in names, generics) SAT-1220 SAT-1332 internal class MapsPart1Test : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapsPart2Test.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart2Test.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapsPart2Test.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart2Test.kt index fa6007db66..62150776f1 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/MapsPart2Test.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/MapsPart2Test.kt @@ -1,14 +1,14 @@ package org.utbot.examples.collections -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.ge -import org.utbot.examples.isException -import org.utbot.examples.withPushingStateFromPathSelectorForConcrete -import org.utbot.examples.withoutMinimization -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.ge +import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete +import org.utbot.testcheckers.withoutMinimization +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation ($ in names, generics) SAT-1220 SAT-1332 internal class MapsPart2Test : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt similarity index 97% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt index 73267d46f8..d6bfec1bdd 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/OptionalsTest.kt @@ -1,15 +1,14 @@ package org.utbot.examples.collections -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.between -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.examples.singleValue -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration import java.util.* class OptionalsTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt similarity index 92% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt index 53fbed9972..145a083892 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetIteratorsTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.collections -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.between -import org.utbot.examples.ge -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.ge +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 class SetIteratorsTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt similarity index 94% rename from utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt index 8e1ff194be..add140e79f 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/collections/SetsTest.kt @@ -1,18 +1,18 @@ package org.utbot.examples.collections -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.AtLeast -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.between -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.withPushingStateFromPathSelectorForConcrete -import org.utbot.examples.withoutMinimization -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.AtLeast +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge +import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete +import org.utbot.testcheckers.withoutMinimization +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 internal class SetsTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt similarity index 88% rename from utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt index 74f3941e02..c781994415 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/ConditionsTest.kt @@ -1,15 +1,15 @@ package org.utbot.examples.controlflow -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.keyContain -import org.utbot.examples.keyMatch +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.keyContain +import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class ConditionsTest : UtValueTestCaseChecker(testClass = Conditions::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt similarity index 95% rename from utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt index 4d7007a2fb..4899e41931 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CycleDependedConditionTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.controlflow -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.keyContain -import org.utbot.examples.keyMatch +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.keyContain +import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class CycleDependedConditionTest : UtValueTestCaseChecker(testClass = CycleDependedCondition::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt similarity index 95% rename from utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt index 3a201d911d..f3d2d7d981 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/CyclesTest.kt @@ -1,18 +1,18 @@ package org.utbot.examples.controlflow -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.atLeast -import org.utbot.examples.between -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.examples.keyContain -import org.utbot.examples.keyMatch +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.atLeast +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException +import org.utbot.tests.infrastructure.keyContain +import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class CyclesTest : UtValueTestCaseChecker(testClass = Cycles::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt similarity index 92% rename from utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt index 834e8adb8b..e503715393 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/controlflow/SwitchTest.kt @@ -1,11 +1,8 @@ package org.utbot.examples.controlflow -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.keyContain -import org.utbot.examples.keyMatch -import org.utbot.examples.withoutMinimization +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.keyContain +import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt @@ -16,6 +13,9 @@ import java.math.RoundingMode.HALF_DOWN import java.math.RoundingMode.HALF_EVEN import java.math.RoundingMode.HALF_UP import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge +import org.utbot.testcheckers.withoutMinimization internal class SwitchTest : UtValueTestCaseChecker(testClass = Switch::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt similarity index 94% rename from utbot-framework/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt index 57628fc21c..8fb8b9b67b 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt @@ -1,18 +1,18 @@ package org.utbot.examples.enums -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.enums.ClassWithEnum.StatusEnum.ERROR import org.utbot.examples.enums.ClassWithEnum.StatusEnum.READY -import org.utbot.examples.eq -import org.utbot.examples.isException -import org.utbot.examples.withPushingStateFromPathSelectorForConcrete -import org.utbot.examples.withoutConcrete +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.FieldId import org.utbot.framework.plugin.api.util.id import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.utbot.framework.plugin.api.util.jField +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete +import org.utbot.testcheckers.withoutConcrete class ClassWithEnumTest : UtValueTestCaseChecker(testClass = ClassWithEnum::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/enums/ComplexEnumExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ComplexEnumExamplesTest.kt similarity index 94% rename from utbot-framework/src/test/kotlin/org/utbot/examples/enums/ComplexEnumExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ComplexEnumExamplesTest.kt index d67c6d83d0..901245dec5 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/enums/ComplexEnumExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/enums/ComplexEnumExamplesTest.kt @@ -2,15 +2,15 @@ package org.utbot.examples.enums import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.utbot.examples.enums.ComplexEnumExamples.Color import org.utbot.examples.enums.ComplexEnumExamples.Color.BLUE import org.utbot.examples.enums.ComplexEnumExamples.Color.GREEN import org.utbot.examples.enums.ComplexEnumExamples.Color.RED -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.utbot.framework.plugin.api.CodegenLanguage +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration class ComplexEnumExamplesTest : UtValueTestCaseChecker( testClass = ComplexEnumExamples::class, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt index 65e03739a1..53abd8bf53 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionClusteringChecker.kt @@ -1,15 +1,15 @@ package org.utbot.examples.exceptions -import org.utbot.examples.UtModelTestCaseChecker -import org.utbot.examples.ge -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.primitiveValue +import org.utbot.tests.infrastructure.UtModelTestCaseChecker +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.primitiveValue import org.utbot.framework.plugin.api.UtExecutionSuccess import org.utbot.framework.plugin.api.UtExplicitlyThrownException import org.utbot.framework.plugin.api.UtImplicitlyThrownException import org.utbot.framework.plugin.api.UtModel import org.utbot.framework.plugin.api.UtTimeoutException import org.junit.jupiter.api.Test +import org.utbot.testcheckers.ge internal class ExceptionClusteringChecker : UtModelTestCaseChecker(testClass = ExceptionClusteringExamples::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt similarity index 92% rename from utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt index 13a6040b19..96bc056f47 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/ExceptionExamplesTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.exceptions -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.atLeast -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.atLeast +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration internal class ExceptionExamplesTest : UtValueTestCaseChecker( testClass = ExceptionExamples::class, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt similarity index 79% rename from utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt index 8f7ed8ff04..2e654c4f06 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/exceptions/JvmCrashExamplesTest.kt @@ -1,13 +1,11 @@ package org.utbot.examples.exceptions -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.withoutSandbox -import org.utbot.framework.codegen.CodeGeneration -import org.utbot.framework.plugin.api.CodegenLanguage +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withoutSandbox internal class JvmCrashExamplesTest : UtValueTestCaseChecker(testClass = JvmCrashExamples::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt index c439745e03..4f8379a08e 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/InvokeExampleTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.invokes -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class InvokeExampleTest : UtValueTestCaseChecker(testClass = InvokeExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt similarity index 83% rename from utbot-framework/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt index ac219a5bc2..1323697b42 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/NativeExampleTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.invokes -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.atLeast -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.atLeast +import org.utbot.tests.infrastructure.ignoreExecutionsNumber import kotlin.math.ln import kotlin.math.sqrt import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge internal class NativeExampleTest : UtValueTestCaseChecker(testClass = NativeExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt index ccf9487706..8b1fc9bec7 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/SimpleInterfaceExampleTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.invokes -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class SimpleInterfaceExampleTest : UtValueTestCaseChecker( testClass = SimpleInterfaceExample::class diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt similarity index 86% rename from utbot-framework/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt index b3a6e513df..34c54d5a29 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/StaticInvokeExampleTest.kt @@ -1,7 +1,7 @@ package org.utbot.examples.invokes -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.between +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.between import kotlin.math.max import org.junit.jupiter.api.Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt index 14404d027a..ba1ff4814a 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/invokes/VirtualInvokeExampleTest.kt @@ -2,12 +2,12 @@ package org.utbot.examples.invokes -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.isException import java.lang.Boolean import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class VirtualInvokeExampleTest : UtValueTestCaseChecker(testClass = VirtualInvokeExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt similarity index 87% rename from utbot-framework/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt index 597dc3a712..9723722c59 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/lambda/SimpleLambdaExamplesTest.kt @@ -2,9 +2,9 @@ package org.utbot.examples.lambda import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.isException +import org.utbot.testcheckers.eq class SimpleLambdaExamplesTest : UtValueTestCaseChecker(testClass = SimpleLambdaExamples::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt similarity index 93% rename from utbot-framework/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt index 9b9d85ffa3..ddba26f794 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/make/symbolic/ClassWithComplicatedMethodsTest.kt @@ -1,16 +1,16 @@ package org.utbot.examples.make.symbolic -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.withoutConcrete -import org.utbot.framework.codegen.Compilation +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.MockStrategyApi import kotlin.math.abs import kotlin.math.sqrt import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withoutConcrete +import org.utbot.tests.infrastructure.Compilation // This class is substituted with ComplicatedMethodsSubstitutionsStorage // but we cannot do in code generation. diff --git a/utbot-framework/src/test/java/org/utbot/examples/manual/UtBotJavaApiTest.java b/utbot-framework-test/src/test/kotlin/org/utbot/examples/manual/UtBotJavaApiTest.java similarity index 89% rename from utbot-framework/src/test/java/org/utbot/examples/manual/UtBotJavaApiTest.java rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/manual/UtBotJavaApiTest.java index e9769575f2..25ba275781 100644 --- a/utbot-framework/src/test/java/org/utbot/examples/manual/UtBotJavaApiTest.java +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/manual/UtBotJavaApiTest.java @@ -1,5 +1,11 @@ package org.utbot.examples.manual; +import kotlin.Pair; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.utbot.common.PathUtil; import org.utbot.examples.assemble.DirectAccess; import org.utbot.examples.assemble.PrimitiveFields; @@ -7,58 +13,27 @@ import org.utbot.examples.assemble.arrays.ArrayOfPrimitiveArrays; import org.utbot.examples.assemble.arrays.AssignedArray; import org.utbot.examples.assemble.arrays.ComplexArray; -import org.utbot.examples.manual.examples.ArrayOfComplexArraysExample; -import org.utbot.examples.manual.examples.ArrayOfPrimitiveArraysExample; -import org.utbot.examples.manual.examples.AssignedArrayExample; -import org.utbot.examples.manual.examples.ClassRefExample; -import org.utbot.examples.manual.examples.DirectAccessExample; -import org.utbot.examples.manual.examples.MultiMethodExample; -import org.utbot.examples.manual.examples.ProvidedExample; -import org.utbot.examples.manual.examples.StringSwitchExample; -import org.utbot.examples.manual.examples.Trivial; +import org.utbot.examples.manual.examples.*; import org.utbot.examples.manual.examples.customer.B; import org.utbot.examples.manual.examples.customer.C; import org.utbot.examples.manual.examples.customer.Demo9; -import org.utbot.external.api.UtBotJavaApi; import org.utbot.external.api.TestMethodInfo; +import org.utbot.external.api.UtBotJavaApi; import org.utbot.external.api.UtModelFactory; import org.utbot.framework.codegen.ForceStaticMocking; import org.utbot.framework.codegen.Junit4; import org.utbot.framework.codegen.MockitoStaticMocking; -import org.utbot.framework.plugin.api.ClassId; -import org.utbot.framework.plugin.api.CodegenLanguage; -import org.utbot.framework.plugin.api.EnvironmentModels; -import org.utbot.framework.plugin.api.MockStrategyApi; -import org.utbot.framework.plugin.api.UtArrayModel; -import org.utbot.framework.plugin.api.UtClassRefModel; -import org.utbot.framework.plugin.api.UtCompositeModel; -import org.utbot.framework.plugin.api.UtModel; -import org.utbot.framework.plugin.api.UtNullModel; -import org.utbot.framework.plugin.api.UtPrimitiveModel; -import org.utbot.framework.plugin.api.UtMethodTestSet; +import org.utbot.framework.plugin.api.*; import org.utbot.framework.plugin.api.util.UtContext; import org.utbot.framework.util.Snippet; + import java.io.File; import java.lang.reflect.Method; -import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; -import java.net.URLClassLoader; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; -import kotlin.Pair; -import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import static org.utbot.examples.manual.PredefinedGeneratorParameters.destinationClassName; -import static org.utbot.examples.manual.PredefinedGeneratorParameters.getMethodByName; + import static org.utbot.external.api.UtModelFactoryKt.classIdForType; import static org.utbot.framework.plugin.api.MockFramework.MOCKITO; import static org.utbot.framework.plugin.api.util.IdUtilKt.getIntArrayClassId; @@ -125,17 +100,17 @@ public void testMultiMethodClass() { ); - Method firstMethodUnderTest = getMethodByName( + Method firstMethodUnderTest = PredefinedGeneratorParameters.getMethodByName( MultiMethodExample.class, "firstMethod" ); - Method secondMethodUnderTest = getMethodByName( + Method secondMethodUnderTest = PredefinedGeneratorParameters.getMethodByName( MultiMethodExample.class, "secondMethod" ); - Method thirdMethodUnderTest = getMethodByName( + Method thirdMethodUnderTest = PredefinedGeneratorParameters.getMethodByName( MultiMethodExample.class, "thirdMethod", String.class @@ -163,7 +138,7 @@ public void testMultiMethodClass() { String generationResult = UtBotJavaApi.generate( Collections.emptyList(), testSets, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, MultiMethodExample.class, @@ -177,18 +152,18 @@ public void testMultiMethodClass() { ); Snippet snippet1 = new Snippet(CodegenLanguage.JAVA, generationResult); - compileClassFile(destinationClassName, snippet1); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet1); String generationResultWithConcreteExecutionOnly = UtBotJavaApi.generate( Arrays.asList(firstTestMethodInfo, secondTestMethodInfo, thirdTestMethodInfo), Collections.emptyList(), - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, MultiMethodExample.class ); Snippet snippet2 = new Snippet(CodegenLanguage.JAVA, generationResultWithConcreteExecutionOnly); - compileClassFile(destinationClassName, snippet2); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet2); } @Test @@ -215,7 +190,7 @@ public void testCustomPackage() { Collections.emptyMap() ); - Method methodUnderTest = getMethodByName( + Method methodUnderTest = PredefinedGeneratorParameters.getMethodByName( ClassRefExample.class, "assertInstance", Class.class @@ -237,7 +212,7 @@ public void testCustomPackage() { String generationResult = UtBotJavaApi.generate( Collections.emptyList(), testSets, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, ClassRefExample.class, @@ -251,7 +226,7 @@ public void testCustomPackage() { ); Snippet snippet1 = new Snippet(CodegenLanguage.JAVA, generationResult); - compileClassFile(destinationClassName, snippet1); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet1); String generationResultWithConcreteExecutionOnly = UtBotJavaApi.generate( Collections.singletonList( @@ -260,7 +235,7 @@ public void testCustomPackage() { initialState) ), Collections.emptyList(), - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, ClassRefExample.class, @@ -274,7 +249,7 @@ public void testCustomPackage() { ); Snippet snippet2 = new Snippet(CodegenLanguage.JAVA, generationResultWithConcreteExecutionOnly); - compileClassFile(destinationClassName, snippet2); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet2); } @Test @@ -314,7 +289,7 @@ public void testOnObjectWithAssignedArrayField() { ); - Method methodUnderTest = getMethodByName( + Method methodUnderTest = PredefinedGeneratorParameters.getMethodByName( AssignedArrayExample.class, "foo", AssignedArray.class @@ -336,7 +311,7 @@ public void testOnObjectWithAssignedArrayField() { String generationResult = UtBotJavaApi.generate( Collections.emptyList(), testSets, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, AssignedArrayExample.class, @@ -349,7 +324,7 @@ public void testOnObjectWithAssignedArrayField() { ); Snippet snippet1 = new Snippet(CodegenLanguage.JAVA, generationResult); - compileClassFile(destinationClassName, snippet1); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet1); String generationResultWithConcreteExecutionOnly = UtBotJavaApi.generate( Collections.singletonList( @@ -358,7 +333,7 @@ public void testOnObjectWithAssignedArrayField() { initialState) ), Collections.emptyList(), - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, AssignedArrayExample.class, @@ -371,7 +346,7 @@ public void testOnObjectWithAssignedArrayField() { ); Snippet snippet2 = new Snippet(CodegenLanguage.JAVA, generationResultWithConcreteExecutionOnly); - compileClassFile(destinationClassName, snippet2); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet2); } @Test @@ -398,7 +373,7 @@ public void testClassRef() { Collections.emptyMap() ); - Method methodUnderTest = getMethodByName( + Method methodUnderTest = PredefinedGeneratorParameters.getMethodByName( ClassRefExample.class, "assertInstance", Class.class @@ -420,7 +395,7 @@ public void testClassRef() { String generationResult = UtBotJavaApi.generate( Collections.emptyList(), testSets, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, ClassRefExample.class, @@ -434,7 +409,7 @@ public void testClassRef() { Snippet snippet1 = new Snippet(CodegenLanguage.JAVA, generationResult); - compileClassFile(destinationClassName, snippet1); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet1); String generationResultWithConcreteExecutionOnly = UtBotJavaApi.generate( Collections.singletonList( @@ -443,7 +418,7 @@ public void testClassRef() { initialState) ), Collections.emptyList(), - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, ClassRefExample.class, @@ -456,7 +431,7 @@ public void testClassRef() { ); Snippet snippet2 = new Snippet(CodegenLanguage.JAVA, generationResultWithConcreteExecutionOnly); - compileClassFile(destinationClassName, snippet2); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet2); } @Test @@ -503,7 +478,7 @@ public void testObjectWithPublicFields() { ); - Method methodUnderTest = getMethodByName( + Method methodUnderTest = PredefinedGeneratorParameters.getMethodByName( DirectAccessExample.class, "foo", DirectAccess.class @@ -525,7 +500,7 @@ public void testObjectWithPublicFields() { String generationResult = UtBotJavaApi.generate( Collections.emptyList(), testSets, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, DirectAccessExample.class, @@ -538,7 +513,7 @@ public void testObjectWithPublicFields() { ); Snippet snippet1 = new Snippet(CodegenLanguage.JAVA, generationResult); - compileClassFile(destinationClassName, snippet1); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet1); String generationResultWithConcreteExecutionOnly = UtBotJavaApi.generate( Collections.singletonList( @@ -547,7 +522,7 @@ public void testObjectWithPublicFields() { initialState) ), Collections.emptyList(), - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, DirectAccessExample.class, @@ -560,7 +535,7 @@ public void testObjectWithPublicFields() { ); Snippet snippet2 = new Snippet(CodegenLanguage.JAVA, generationResultWithConcreteExecutionOnly); - compileClassFile(destinationClassName, snippet2); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet2); } @Test @@ -606,7 +581,7 @@ public void testObjectWithPublicFieldsWithAssembleModel() { Collections.emptyMap() ); - Method methodUnderTest = getMethodByName( + Method methodUnderTest = PredefinedGeneratorParameters.getMethodByName( DirectAccessExample.class, "foo", DirectAccess.class @@ -628,7 +603,7 @@ public void testObjectWithPublicFieldsWithAssembleModel() { String generationResult = UtBotJavaApi.generate( Collections.emptyList(), testSets, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, DirectAccessExample.class, @@ -641,7 +616,7 @@ public void testObjectWithPublicFieldsWithAssembleModel() { ); Snippet snippet1 = new Snippet(CodegenLanguage.JAVA, generationResult); - compileClassFile(destinationClassName, snippet1); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet1); } @@ -695,7 +670,7 @@ public void testOnObjectWithArrayOfPrimitiveArrays() { Collections.emptyMap() ); - Method methodUnderTest = getMethodByName( + Method methodUnderTest = PredefinedGeneratorParameters.getMethodByName( ArrayOfPrimitiveArraysExample.class, "assign10", ArrayOfPrimitiveArrays.class @@ -717,7 +692,7 @@ public void testOnObjectWithArrayOfPrimitiveArrays() { String generationResult = UtBotJavaApi.generate( Collections.emptyList(), testSets, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, ArrayOfPrimitiveArraysExample.class, @@ -730,7 +705,7 @@ public void testOnObjectWithArrayOfPrimitiveArrays() { ); Snippet snippet = new Snippet(CodegenLanguage.JAVA, generationResult); - compileClassFile(destinationClassName, snippet); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet); String generationResultWithConcreteExecutionOnly = UtBotJavaApi.generate( Collections.singletonList( @@ -739,7 +714,7 @@ public void testOnObjectWithArrayOfPrimitiveArrays() { initialState) ), Collections.emptyList(), - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, ArrayOfPrimitiveArraysExample.class, @@ -752,7 +727,7 @@ public void testOnObjectWithArrayOfPrimitiveArrays() { ); Snippet snippet2 = new Snippet(CodegenLanguage.JAVA, generationResultWithConcreteExecutionOnly); - compileClassFile(destinationClassName, snippet2); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet2); } /** @@ -790,7 +765,7 @@ public void testProvided3() { Collections.emptyMap() ); - Method methodUnderTest = getMethodByName( + Method methodUnderTest = PredefinedGeneratorParameters.getMethodByName( Demo9.class, "test", B.class @@ -813,7 +788,7 @@ public void testProvided3() { String generationResult = UtBotJavaApi.generate( Collections.emptyList(), testSets, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, Demo9.class, @@ -826,7 +801,7 @@ public void testProvided3() { ); Snippet snippet1 = new Snippet(CodegenLanguage.JAVA, generationResult); - compileClassFile(destinationClassName, snippet1); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet1); String generationResultWithConcreteExecutionOnly = UtBotJavaApi.generate( Collections.singletonList( @@ -836,14 +811,14 @@ public void testProvided3() { ) ), Collections.emptyList(), - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, Demo9.class ); Snippet snippet2 = new Snippet(CodegenLanguage.JAVA, generationResultWithConcreteExecutionOnly); - compileClassFile(destinationClassName, snippet2); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet2); } @Test @@ -862,7 +837,7 @@ public void testCustomAssertion() { Collections.emptyMap() ); - Method methodUnderTest = getMethodByName( + Method methodUnderTest = PredefinedGeneratorParameters.getMethodByName( Trivial.class, "aMethod", int.class @@ -885,7 +860,7 @@ public void testCustomAssertion() { String generationResult = UtBotJavaApi.generate( Collections.emptyList(), testSets, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, Trivial.class, @@ -898,7 +873,7 @@ public void testCustomAssertion() { ); Snippet snippet1 = new Snippet(CodegenLanguage.JAVA, generationResult); - compileClassFile(destinationClassName, snippet1); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet1); String generationResult2 = UtBotJavaApi.generate( Collections.singletonList( @@ -908,7 +883,7 @@ public void testCustomAssertion() { ) ), Collections.emptyList(), - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, Trivial.class, @@ -921,7 +896,7 @@ public void testCustomAssertion() { ); Snippet snippet2 = new Snippet(CodegenLanguage.JAVA, generationResult2); - compileClassFile(destinationClassName, snippet2); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet2); } /** @@ -974,7 +949,7 @@ public void testProvided3Reused() { Collections.emptyMap() ); - Method methodUnderTest = getMethodByName( + Method methodUnderTest = PredefinedGeneratorParameters.getMethodByName( compiledClass, "test", int.class @@ -997,7 +972,7 @@ public void testProvided3Reused() { String generationResultWithConcreteExecutionOnly = UtBotJavaApi.generate( Collections.emptyList(), testSets, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, compiledClass, @@ -1010,7 +985,7 @@ public void testProvided3Reused() { ); Snippet snippet = new Snippet(CodegenLanguage.JAVA, generationResultWithConcreteExecutionOnly); - compileClassFile(destinationClassName, snippet); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet); // The test compiles and everything goes well. // Let's recompile the initial clas file @@ -1046,7 +1021,7 @@ public void testProvided3Reused() { Collections.emptyMap() ); - Method methodUnderTest2 = getMethodByName( + Method methodUnderTest2 = PredefinedGeneratorParameters.getMethodByName( recompiledClass, "test", int.class, @@ -1070,7 +1045,7 @@ public void testProvided3Reused() { String generationResultWithConcreteExecutionOnly2 = UtBotJavaApi.generate( Collections.emptyList(), testSets1, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, recompiledClass, @@ -1083,7 +1058,7 @@ public void testProvided3Reused() { ); Snippet snippet2 = new Snippet(CodegenLanguage.JAVA, generationResultWithConcreteExecutionOnly2); - compileClassFile(destinationClassName, snippet2); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet2); } @Test @@ -1112,7 +1087,7 @@ public void testProvided1() { Collections.emptyMap() ); - Method methodUnderTest = getMethodByName( + Method methodUnderTest = PredefinedGeneratorParameters.getMethodByName( ProvidedExample.class, "test0", int.class, int.class, String.class @@ -1135,7 +1110,7 @@ public void testProvided1() { String generationResult = UtBotJavaApi.generate( Collections.emptyList(), testSets, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, ProvidedExample.class, @@ -1148,7 +1123,7 @@ public void testProvided1() { ); Snippet snippet1 = new Snippet(CodegenLanguage.JAVA, generationResult); - compileClassFile(destinationClassName, snippet1); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet1); String generationResultWithConcreteExecutionOnly = UtBotJavaApi.generate( Collections.singletonList( @@ -1158,14 +1133,14 @@ public void testProvided1() { ) ), Collections.emptyList(), - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, ProvidedExample.class ); Snippet snippet2 = new Snippet(CodegenLanguage.JAVA, generationResultWithConcreteExecutionOnly); - compileClassFile(destinationClassName, snippet2); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet2); } @Test @@ -1188,7 +1163,7 @@ public void testOnObjectWithArrayOfComplexArrays() { Collections.emptyMap() ); - Method methodUnderTest = getMethodByName( + Method methodUnderTest = PredefinedGeneratorParameters.getMethodByName( ArrayOfComplexArraysExample.class, "getValue", ArrayOfComplexArrays.class @@ -1211,7 +1186,7 @@ public void testOnObjectWithArrayOfComplexArrays() { String generationResult = UtBotJavaApi.generate( Collections.emptyList(), testSets, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, ArrayOfComplexArraysExample.class, @@ -1224,7 +1199,7 @@ public void testOnObjectWithArrayOfComplexArrays() { ); Snippet snippet1 = new Snippet(CodegenLanguage.JAVA, generationResult); - compileClassFile(destinationClassName, snippet1); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet1); String generationResultWithConcreteExecutionOnly = UtBotJavaApi.generate( Collections.singletonList( @@ -1234,14 +1209,14 @@ public void testOnObjectWithArrayOfComplexArrays() { ) ), Collections.emptyList(), - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, ArrayOfComplexArraysExample.class ); Snippet snippet2 = new Snippet(CodegenLanguage.JAVA, generationResultWithConcreteExecutionOnly); - compileClassFile(destinationClassName, snippet2); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet2); } @Test @@ -1255,7 +1230,7 @@ public void testFuzzingSimple() { classIdForType(StringSwitchExample.class) ); - Method methodUnderTest = getMethodByName(StringSwitchExample.class, "validate", String.class, int.class, int.class); + Method methodUnderTest = PredefinedGeneratorParameters.getMethodByName(StringSwitchExample.class, "validate", String.class, int.class, int.class); IdentityHashMap models = modelFactory.produceAssembleModel( methodUnderTest, @@ -1292,14 +1267,14 @@ public void testFuzzingSimple() { String generate = UtBotJavaApi.generate( Collections.singletonList(methodInfo), testSets1, - destinationClassName, + PredefinedGeneratorParameters.destinationClassName, classpath, dependencyClassPath, StringSwitchExample.class ); Snippet snippet2 = new Snippet(CodegenLanguage.JAVA, generate); - compileClassFile(destinationClassName, snippet2); + compileClassFile(PredefinedGeneratorParameters.destinationClassName, snippet2); } @NotNull diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt index 3f6a2eff17..7f9f63dbe6 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/BitOperatorsTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.math -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.atLeast -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.atLeast import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class BitOperatorsTest : UtValueTestCaseChecker(testClass = BitOperators::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt similarity index 93% rename from utbot-framework/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt index ee06b5d250..8d8d8249a3 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DivRemExamplesTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.math -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class DivRemExamplesTest : UtValueTestCaseChecker(testClass = DivRemExamples::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt similarity index 90% rename from utbot-framework/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt index e31825ddcf..0f1c0a7db1 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/DoubleFunctionsTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.math -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.isException import kotlin.math.abs import kotlin.math.hypot import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq @Suppress("SimplifyNegatedBinaryExpression") internal class DoubleFunctionsTest : UtValueTestCaseChecker(testClass = DoubleFunctions::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt index 26d38c02ac..558fe403d3 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/math/OverflowAsErrorTest.kt @@ -2,16 +2,16 @@ package org.utbot.examples.math import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.AtLeast +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.AtLeast import org.utbot.examples.algorithms.Sort -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.examples.withSolverTimeoutInMillis -import org.utbot.examples.withTreatingOverflowAsError -import org.utbot.framework.codegen.Compilation +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withSolverTimeoutInMillis +import org.utbot.testcheckers.withTreatingOverflowAsError +import org.utbot.tests.infrastructure.Compilation import kotlin.math.floor import kotlin.math.sqrt diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt index 25c298c080..e9fc3eb935 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/LoggerExampleTest.kt @@ -1,9 +1,7 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.UtConcreteValue import org.utbot.framework.plugin.api.UtInstrumentation @@ -11,6 +9,8 @@ import org.utbot.framework.plugin.api.UtModel import org.utbot.framework.plugin.api.UtStaticMethodInstrumentation import org.utbot.framework.plugin.api.isNull import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration internal class LoggerExampleTest : UtValueTestCaseChecker( testClass = LoggerExample::class, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt similarity index 73% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt index a22d51445c..92c29a00f1 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/MonitorUsageTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.atLeast -import org.utbot.examples.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.atLeast +import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.junit.jupiter.api.Test internal class MonitorUsageTest : UtValueTestCaseChecker(testClass = MonitorUsage::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt similarity index 87% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt index 1dce00c33f..7bf7baa316 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/OverloadTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class OverloadTest : UtValueTestCaseChecker(testClass = Overload::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt similarity index 84% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt index 262eb71125..6884cb0d09 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/PrivateConstructorExampleTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class PrivateConstructorExampleTest : UtValueTestCaseChecker(testClass = PrivateConstructorExample::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt similarity index 86% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt index f86c4778ef..a68bd75eef 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimpleNoConditionTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class SimpleNoConditionTest : UtValueTestCaseChecker(testClass = SimpleNoCondition::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt similarity index 74% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt index f7795a28a3..c6358e1024 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/SimplifierTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class SimplifierTest: UtValueTestCaseChecker(testClass = Simplifier::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt similarity index 88% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt index 4963667270..97d959117b 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticInitializerExampleTest.kt @@ -2,9 +2,9 @@ package org.utbot.examples.mixed import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.UtValueTestCaseChecker import org.utbot.examples.StaticInitializerExample -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.testcheckers.eq @Disabled("Unknown build failure") internal class StaticInitializerExampleTest : UtValueTestCaseChecker(testClass = StaticInitializerExample::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt similarity index 92% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt index a03e1dabf3..34bbf5a7fe 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mixed/StaticMethodExamplesTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.mixed -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class StaticMethodExamplesTest : UtValueTestCaseChecker(testClass = StaticMethodExamples::class) { // TODO: inline local variables when types inference bug in Kotlin fixed diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt similarity index 97% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt index ee38f79aed..36e997b811 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/ArgumentsMockTest.kt @@ -1,17 +1,17 @@ package org.utbot.examples.mock -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.between -import org.utbot.examples.eq -import org.utbot.examples.isParameter +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.isParameter import org.utbot.examples.mock.provider.Provider import org.utbot.examples.mock.service.impl.ExampleClass import org.utbot.examples.mock.service.impl.ServiceWithArguments -import org.utbot.examples.mocksMethod -import org.utbot.examples.value +import org.utbot.tests.infrastructure.mocksMethod +import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class ArgumentsMockTest : UtValueTestCaseChecker(testClass = ServiceWithArguments::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt similarity index 92% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt index 61d2af567b..0e5d1dc4f8 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/CommonMocksExampleTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.mock -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class CommonMocksExampleTest: UtValueTestCaseChecker(testClass = CommonMocksExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt similarity index 97% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt index 4e515fac83..caa273ea18 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt @@ -1,16 +1,16 @@ package org.utbot.examples.mock -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.between -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.between import org.utbot.examples.mock.provider.Provider import org.utbot.examples.mock.service.impl.ExampleClass import org.utbot.examples.mock.service.impl.ServiceWithField -import org.utbot.examples.mocksMethod -import org.utbot.examples.value +import org.utbot.tests.infrastructure.mocksMethod +import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class FieldMockTest : UtValueTestCaseChecker(testClass = ServiceWithField::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt similarity index 93% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt index 33b05797ff..f648affdce 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/InnerMockWithFieldChecker.kt @@ -1,8 +1,7 @@ package org.utbot.examples.mock -import org.utbot.examples.UtModelTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.primitiveValue +import org.utbot.tests.infrastructure.UtModelTestCaseChecker +import org.utbot.tests.infrastructure.primitiveValue import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.utbot.framework.plugin.api.UtModel import org.utbot.framework.plugin.api.getOrThrow @@ -10,6 +9,7 @@ import org.utbot.framework.plugin.api.isMockModel import org.utbot.framework.plugin.api.isNotNull import org.utbot.framework.plugin.api.isNull import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class InnerMockWithFieldChecker : UtModelTestCaseChecker(testClass = InnerMockWithFieldExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt similarity index 78% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt index 6e5005e22f..0e96e4ee1a 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.mock -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.ge +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.mock.others.FinalClass -import org.utbot.examples.singleMock -import org.utbot.examples.value +import org.utbot.tests.infrastructure.singleMock +import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_CLASSES import org.junit.jupiter.api.Test +import org.utbot.testcheckers.ge internal class MockFinalClassTest : UtValueTestCaseChecker(testClass = MockFinalClassExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt similarity index 93% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt index 784380a95c..fe974f373f 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt @@ -1,17 +1,17 @@ package org.utbot.examples.mock -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.isParameter -import org.utbot.examples.mockValues -import org.utbot.examples.mocksMethod -import org.utbot.examples.singleMock -import org.utbot.examples.value +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.isParameter +import org.utbot.tests.infrastructure.mockValues +import org.utbot.tests.infrastructure.mocksMethod +import org.utbot.tests.infrastructure.singleMock +import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.UtCompositeModel import org.utbot.framework.plugin.api.UtNewInstanceInstrumentation import java.util.Random import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class MockRandomTest : UtValueTestCaseChecker(testClass = MockRandomExamples::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt similarity index 89% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt index a496e934ba..446f5d25c6 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockReturnObjectExampleTest.kt @@ -1,17 +1,17 @@ package org.utbot.examples.mock import org.junit.jupiter.api.Disabled -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.mock.others.Generator import org.utbot.examples.mock.others.Locator -import org.utbot.examples.mockValue -import org.utbot.examples.singleMock -import org.utbot.examples.singleMockOrNull -import org.utbot.examples.value +import org.utbot.tests.infrastructure.mockValue +import org.utbot.tests.infrastructure.singleMock +import org.utbot.tests.infrastructure.singleMockOrNull +import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class MockReturnObjectExampleTest : UtValueTestCaseChecker(testClass = MockReturnObjectExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt similarity index 90% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt index 00b18d18cb..907d9b5829 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticFieldExampleTest.kt @@ -1,18 +1,18 @@ package org.utbot.examples.mock -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.mock.others.Generator -import org.utbot.examples.singleMock -import org.utbot.examples.singleMockOrNull -import org.utbot.examples.value -import org.utbot.examples.withoutConcrete +import org.utbot.tests.infrastructure.singleMock +import org.utbot.tests.infrastructure.singleMockOrNull +import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.FieldMockTarget import org.utbot.framework.plugin.api.MockInfo import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import kotlin.reflect.KClass import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withoutConcrete internal class MockStaticFieldExampleTest : UtValueTestCaseChecker(testClass = MockStaticFieldExample::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt similarity index 89% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt index f1996bbace..784498fd51 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockStaticMethodExampleTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.mock -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.UtPrimitiveModel import org.utbot.framework.util.singleModel import org.utbot.framework.util.singleStaticMethod import org.utbot.framework.util.singleValue import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class MockStaticMethodExampleTest : UtValueTestCaseChecker(testClass = MockStaticMethodExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt index 44a69a71ab..ac185f2b82 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithFieldChecker.kt @@ -1,14 +1,14 @@ package org.utbot.examples.mock -import org.utbot.examples.UtModelTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.primitiveValue +import org.utbot.tests.infrastructure.UtModelTestCaseChecker +import org.utbot.tests.infrastructure.primitiveValue import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.utbot.framework.plugin.api.UtModel import org.utbot.framework.plugin.api.getOrThrow import org.utbot.framework.plugin.api.isMockModel import org.utbot.framework.plugin.api.isNull import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class MockWithFieldChecker : UtModelTestCaseChecker(testClass = MockWithFieldExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt index 5a9e85098d..5b234c9e0f 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockWithSideEffectExampleTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.mock -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.Test +import org.utbot.testcheckers.eq internal class MockWithSideEffectExampleTest : UtValueTestCaseChecker(testClass = MockWithSideEffectExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt similarity index 97% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt index f3ee30d290..4207e1585c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/StaticFieldMockTest.kt @@ -1,15 +1,15 @@ package org.utbot.examples.mock -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.mock.provider.Provider import org.utbot.examples.mock.service.impl.ExampleClass import org.utbot.examples.mock.service.impl.ServiceWithStaticField -import org.utbot.examples.mocksMethod -import org.utbot.examples.value +import org.utbot.tests.infrastructure.mocksMethod +import org.utbot.tests.infrastructure.value import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class StaticFieldMockTest : UtValueTestCaseChecker(testClass = ServiceWithStaticField::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt index 0a96f573fa..277ed3aff0 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/UseNetworkTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.mock -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.UtConcreteValue import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class UseNetworkTest : UtValueTestCaseChecker(testClass = UseNetwork::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt similarity index 85% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt index fa0edf891d..6177ac7922 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/aliasing/AliasingInParamsExampleTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.mock.aliasing -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class AliasingInParamsExampleTest : UtValueTestCaseChecker(testClass = AliasingInParamsExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt index c50ed1ed00..25cd7d4d88 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/FieldMockChecker.kt @@ -1,15 +1,15 @@ package org.utbot.examples.mock.model -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 -import org.utbot.examples.primitiveValue +import org.utbot.tests.infrastructure.primitiveValue import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_PACKAGES import org.utbot.framework.plugin.api.UtModel import org.utbot.framework.plugin.api.isNotNull import org.utbot.framework.plugin.api.isNull import org.junit.jupiter.api.Test +import org.utbot.tests.infrastructure.UtModelTestCaseChecker +import org.utbot.testcheckers.eq internal class FieldMockChecker : UtModelTestCaseChecker(testClass = ServiceWithField::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt similarity index 89% rename from utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt index 2e94dd327f..063c199216 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/model/UseNetworkModelBasedTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.mock.model -import org.utbot.examples.UtModelTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtModelTestCaseChecker import org.utbot.examples.mock.UseNetwork import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.UtCompositeModel import org.utbot.framework.plugin.api.UtVoidModel import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class UseNetworkModelBasedTest : UtModelTestCaseChecker(testClass = UseNetwork::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt similarity index 94% rename from utbot-framework/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt index ce587e20e8..dcd76468f3 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/models/CompositeModelMinimizationChecker.kt @@ -1,8 +1,6 @@ package org.utbot.examples.models -import org.utbot.examples.UtModelTestCaseChecker -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtModelTestCaseChecker import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.FieldId import org.utbot.framework.plugin.api.UtAssembleModel @@ -10,6 +8,8 @@ import org.utbot.framework.plugin.api.UtCompositeModel import org.utbot.framework.plugin.api.UtModel import org.utbot.framework.plugin.api.UtReferenceModel import org.junit.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration internal class CompositeModelMinimizationChecker : UtModelTestCaseChecker( testClass = CompositeModelMinimizationExample::class, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt index da6b7a14cc..45a9bad8c7 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/models/ModelsIdEqualityChecker.kt @@ -1,8 +1,6 @@ package org.utbot.examples.models -import org.utbot.examples.UtModelTestCaseChecker -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtModelTestCaseChecker import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.UtArrayModel import org.utbot.framework.plugin.api.UtAssembleModel @@ -10,6 +8,8 @@ import org.utbot.framework.plugin.api.UtDirectSetFieldModel import org.utbot.framework.plugin.api.UtExecutionSuccess import org.utbot.framework.plugin.api.UtReferenceModel import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation SAT-1332 internal class ModelsIdEqualityChecker : UtModelTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt similarity index 74% rename from utbot-framework/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt index 0d21b9979d..e0969950fc 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/natives/NativeExamplesTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.natives -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.ge +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test -import org.utbot.examples.withSolverTimeoutInMillis +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge +import org.utbot.testcheckers.withSolverTimeoutInMillis internal class NativeExamplesTest : UtValueTestCaseChecker(testClass = NativeExamples::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt similarity index 87% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt index 28d257c272..df8a29b463 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/AnonymousClassesExampleTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq class AnonymousClassesExampleTest : UtValueTestCaseChecker(testClass = AnonymousClassesExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt similarity index 94% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt index 943c7e9eaa..28ad43a36b 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassRefTest.kt @@ -2,16 +2,16 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.atLeast -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.atLeast import org.utbot.framework.plugin.api.CodegenLanguage import java.lang.Boolean import kotlin.Array import kotlin.Suppress import kotlin.arrayOf import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration internal class ClassRefTest : UtValueTestCaseChecker( testClass = ClassRef::class, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt similarity index 78% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt index ac9f086372..474293cf44 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ClassWithClassRefTest.kt @@ -1,14 +1,14 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.isException -import org.utbot.examples.withoutConcrete -import org.utbot.framework.codegen.CodeGeneration -import org.utbot.framework.codegen.Compilation +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withoutConcrete +import org.utbot.tests.infrastructure.CodeGeneration +import org.utbot.tests.infrastructure.Compilation // TODO Kotlin compilation SAT-1332 // Code generation executions fail due we cannot analyze strings properly for now diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldAccessModifiersTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldAccessModifiersTest.kt similarity index 87% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldAccessModifiersTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldAccessModifiersTest.kt index 2a66eb2288..0c29e632dd 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldAccessModifiersTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldAccessModifiersTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class HiddenFieldAccessModifiersTest : UtValueTestCaseChecker(testClass = HiddenFieldAccessModifiersExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt similarity index 89% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt index d316d2a68d..4a7e6af07c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/HiddenFieldExampleTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class HiddenFieldExampleTest : UtValueTestCaseChecker(testClass = HiddenFieldExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt similarity index 97% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt index cc08947cad..1752e2b7cd 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ModelMinimizationExamplesTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.Test +import org.utbot.testcheckers.eq internal class ModelMinimizationExamplesTest : UtValueTestCaseChecker(testClass = ModelMinimizationExamples::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt similarity index 79% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt index 24de9d64eb..c14cea0dec 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithFinalStaticTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.singleValue -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.singleValue import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration class ObjectWithFinalStaticTest : UtValueTestCaseChecker( testClass = ObjectWithFinalStatic::class, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt similarity index 88% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt index f00bcf07de..ef9b11d1c5 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesClassTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import kotlin.reflect.KFunction0 import kotlin.reflect.KFunction3 import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class ObjectWithPrimitivesClassTest : UtValueTestCaseChecker(testClass = ObjectWithPrimitivesClass::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt index 74c7a50759..e2eff5b8e8 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithPrimitivesExampleTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.atLeast -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.atLeast +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class ObjectWithPrimitivesExampleTest : UtValueTestCaseChecker(testClass = ObjectWithPrimitivesExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt similarity index 95% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt index 58ca01a2ff..d85212e204 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithRefFieldsExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.atLeast -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.atLeast +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class ObjectWithRefFieldsExampleTest : UtValueTestCaseChecker(testClass = ObjectWithRefFieldExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt similarity index 95% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt index 52f60f210f..6717bd4d3d 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithStaticFieldsExampleTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.findByName -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.singleValue +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.findByName +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.singleValue import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class ObjectWithStaticFieldsExampleTest : UtValueTestCaseChecker(testClass = ObjectWithStaticFieldsExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt similarity index 82% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt index b9a7ae6189..45f999e00d 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/ObjectWithThrowableConstructorTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import kotlin.reflect.KFunction2 import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class ObjectWithThrowableConstructorTest : UtValueTestCaseChecker(testClass = ObjectWithThrowableConstructor::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt similarity index 78% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt index 9a61a65e36..08c26a5c40 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/PrivateFieldsTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class PrivateFieldsTest : UtValueTestCaseChecker(testClass = PrivateFields::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt similarity index 88% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt index 55e6d8a1e4..44e7c9cee3 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/RecursiveTypeTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class RecursiveTypeTest : UtValueTestCaseChecker(testClass = RecursiveType::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt index 5c07197f0c..ed71ca4e24 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassExampleTest.kt @@ -1,17 +1,17 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.between -import org.utbot.examples.eq -import org.utbot.examples.isException -import org.utbot.examples.keyContain -import org.utbot.examples.keyMatch +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.isException +import org.utbot.tests.infrastructure.keyContain +import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt import org.utbot.framework.plugin.api.DocStatement import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class SimpleClassExampleTest : UtValueTestCaseChecker(testClass = SimpleClassExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt similarity index 79% rename from utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt index a467734a0a..92134bfb17 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/objects/SimpleClassMultiInstanceExampleTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.objects -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.Test +import org.utbot.testcheckers.eq internal class SimpleClassMultiInstanceExampleTest : UtValueTestCaseChecker(testClass = SimpleClassMultiInstanceExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt index e9b8bfde5b..d418b38e89 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/ByteExamplesTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.primitives -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class ByteExamplesTest : UtValueTestCaseChecker(testClass = ByteExamples::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt index 1d2d814ded..d3621440be 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/CharExamplesTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.primitives -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.isException +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.isException import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class CharExamplesTest : UtValueTestCaseChecker(testClass = CharExamples::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt similarity index 98% rename from utbot-framework/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt index 2fdda4b1aa..4318c6ef2c 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/DoubleExamplesTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.primitives -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq @Suppress("SimplifyNegatedBinaryExpression") internal class DoubleExamplesTest : UtValueTestCaseChecker(testClass = DoubleExamples::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt similarity index 83% rename from utbot-framework/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt index 919820f498..390714174a 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/FloatExamplesTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.primitives -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class FloatExamplesTest : UtValueTestCaseChecker(testClass = FloatExamples::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt similarity index 97% rename from utbot-framework/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt index 7afa113d7e..07e0b463fc 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/primitives/IntExamplesTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.primitives -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.testcheckers.eq @Suppress("ConvertTwoComparisonsToRangeCheck") internal class IntExamplesTest : UtValueTestCaseChecker(testClass = IntExamples::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt index 313b75855f..e9a9fe3363 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/recursion/RecursionTest.kt @@ -1,13 +1,11 @@ package org.utbot.examples.recursion -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.atLeast -import org.utbot.examples.between -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.isException -import org.utbot.examples.keyContain -import org.utbot.examples.keyMatch +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.atLeast +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.isException +import org.utbot.tests.infrastructure.keyContain +import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt @@ -15,6 +13,8 @@ import org.utbot.framework.plugin.api.DocStatement import kotlin.math.pow import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge internal class RecursionTest : UtValueTestCaseChecker(testClass = Recursion::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt similarity index 77% rename from utbot-framework/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt index 42b78dbc3c..4b495cc750 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/statics/substitution/StaticsSubstitutionTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.statics.substitution -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.withoutSubstituteStaticsWithSymbolicVariable +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withoutSubstituteStaticsWithSymbolicVariable class StaticsSubstitutionTest : UtValueTestCaseChecker(testClass = StaticSubstitutionExamples::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt similarity index 91% rename from utbot-framework/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt index 68f9fd3ab5..1e04bb4799 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stdlib/DateExampleTest.kt @@ -3,10 +3,10 @@ package org.utbot.examples.stdlib import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.isException -import org.utbot.examples.withUsingReflectionForMaximizingCoverage +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.isException +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withUsingReflectionForMaximizingCoverage import java.util.Date @Disabled("Java 11 transition -- these tests seems to take too much time and memory") diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt index f435e4d644..0f7d6d99eb 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/stream/BaseStreamExampleTest.kt @@ -3,17 +3,17 @@ 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.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.Full -import org.utbot.examples.FullWithAssumptions -import org.utbot.examples.StaticsType -import org.utbot.examples.eq -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.examples.withoutConcrete -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.Full +import org.utbot.tests.infrastructure.FullWithAssumptions +import org.utbot.tests.infrastructure.StaticsType +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException import org.utbot.framework.plugin.api.CodegenLanguage +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withoutConcrete +import org.utbot.tests.infrastructure.CodeGeneration import java.util.Optional import java.util.stream.Stream import kotlin.streams.toList diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt index 321da17cef..94b4337230 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/strings/StringExamplesTest.kt @@ -1,21 +1,21 @@ package org.utbot.examples.strings -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.atLeast -import org.utbot.examples.between -import org.utbot.examples.eq -import org.utbot.examples.ge -import org.utbot.examples.ignoreExecutionsNumber -import org.utbot.examples.isException -import org.utbot.examples.keyMatch -import org.utbot.examples.withPushingStateFromPathSelectorForConcrete -import org.utbot.examples.withoutMinimization -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.atLeast +import org.utbot.tests.infrastructure.between +import org.utbot.tests.infrastructure.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.isException +import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.withSolverTimeoutInMillis +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.ge +import org.utbot.testcheckers.withPushingStateFromPathSelectorForConcrete +import org.utbot.testcheckers.withSolverTimeoutInMillis +import org.utbot.testcheckers.withoutMinimization +import org.utbot.tests.infrastructure.CodeGeneration internal class StringExamplesTest : UtValueTestCaseChecker( testClass = StringExamples::class, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt similarity index 86% rename from utbot-framework/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt index ad74b569da..d28e3ecbe0 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/HeapTest.kt @@ -1,7 +1,7 @@ package org.utbot.examples.structures -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.ignoreExecutionsNumber +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.ignoreExecutionsNumber import org.junit.jupiter.api.Test internal class HeapTest : UtValueTestCaseChecker(testClass = Heap::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt similarity index 95% rename from utbot-framework/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt index bc7fa1d01f..42a7a77913 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/MinStackExampleTest.kt @@ -1,11 +1,11 @@ package org.utbot.examples.structures -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.between -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.between import kotlin.math.min import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class MinStackExampleTest : UtValueTestCaseChecker(testClass = MinStackExample::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt similarity index 93% rename from utbot-framework/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt index 82774419b6..673d033edd 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/structures/StandardStructuresTest.kt @@ -1,10 +1,9 @@ package org.utbot.examples.structures -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.keyContain -import org.utbot.examples.keyMatch +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.keyContain +import org.utbot.tests.infrastructure.keyMatch import org.utbot.framework.plugin.api.DocCodeStmt import org.utbot.framework.plugin.api.DocPreTagStatement import org.utbot.framework.plugin.api.DocRegularStmt @@ -13,6 +12,7 @@ import java.util.LinkedList import java.util.TreeMap import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class StandardStructuresTest : UtValueTestCaseChecker(testClass = StandardStructures::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt similarity index 93% rename from utbot-framework/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt index 0c6e8574eb..54a24c8124 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/thirdparty/numbers/ArithmeticUtilsTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.thirdparty.numbers -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq // example from Apache common-numbers internal class ArithmeticUtilsTest : UtValueTestCaseChecker(testClass = ArithmeticUtils::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt index 3b53a7bfd1..a30bcb4f39 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/CastExamplesTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.types -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq @Suppress("SimplifyNegatedBinaryExpression") internal class CastExamplesTest : UtValueTestCaseChecker(testClass = CastExamples::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt similarity index 93% rename from utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt index 5eea67df3d..a379e4518b 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeBordersTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.types -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.atLeast -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.atLeast import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class TypeBordersTest : UtValueTestCaseChecker(testClass = TypeBorders::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt similarity index 94% rename from utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt index acdd68f612..1b0735f765 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/types/TypeMatchesTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.types -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq @Suppress("SimplifyNegatedBinaryExpression") internal class TypeMatchesTest : UtValueTestCaseChecker(testClass = TypeMatches::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/unsafe/UnsafeOperationsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeOperationsTest.kt similarity index 82% rename from utbot-framework/src/test/kotlin/org/utbot/examples/unsafe/UnsafeOperationsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeOperationsTest.kt index e44f286e94..5995993cee 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/unsafe/UnsafeOperationsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeOperationsTest.kt @@ -1,13 +1,11 @@ package org.utbot.examples.unsafe import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.examples.withoutSandbox -import org.utbot.framework.codegen.CodeGeneration -import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.MockStrategyApi +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withoutSandbox +import org.utbot.tests.infrastructure.DoNotCalculate +import org.utbot.tests.infrastructure.UtValueTestCaseChecker internal class UnsafeOperationsTest : UtValueTestCaseChecker(testClass = UnsafeOperations::class) { @Test @@ -38,4 +36,4 @@ internal class UnsafeOperationsTest : UtValueTestCaseChecker(testClass = UnsafeO ) } } -} +} \ No newline at end of file diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt similarity index 81% rename from utbot-framework/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt index 7ba67fce6f..919c0da3cf 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/unsafe/UnsafeWithFieldTest.kt @@ -1,8 +1,8 @@ package org.utbot.examples.unsafe -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class UnsafeWithFieldTest: UtValueTestCaseChecker(UnsafeWithField::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt similarity index 87% rename from utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt index 1d8db68914..649735906f 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/BooleanWrapperTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class BooleanWrapperTest : UtValueTestCaseChecker(testClass = BooleanWrapper::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt similarity index 87% rename from utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt index 11c718b900..c8db0cbec7 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ByteWrapperTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class ByteWrapperTest : UtValueTestCaseChecker(testClass = ByteWrapper::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt similarity index 88% rename from utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt index bad71de9a0..e9f4bb5f3a 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/CharacterWrapperTest.kt @@ -1,12 +1,12 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.tests.infrastructure.CodeGeneration // TODO failed Kotlin compilation internal class CharacterWrapperTest : UtValueTestCaseChecker( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt similarity index 85% rename from utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt index 947e3d33fd..3c7cb5f2f1 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/DoubleWrapperTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq @Suppress("SimplifyNegatedBinaryExpression") internal class DoubleWrapperTest : UtValueTestCaseChecker(testClass = DoubleWrapper::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt similarity index 85% rename from utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt index 36ebeb2823..2265aa1bda 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/FloatWrapperTest.kt @@ -1,9 +1,9 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq @Suppress("SimplifyNegatedBinaryExpression") internal class FloatWrapperTest : UtValueTestCaseChecker(testClass = FloatWrapper::class) { diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt similarity index 93% rename from utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt index 0fb136b716..29231c1b1a 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/IntegerWrapperTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class IntegerWrapperTest : UtValueTestCaseChecker(testClass = IntegerWrapper::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt similarity index 89% rename from utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt index 1ca131b1f7..51b4de5557 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/LongWrapperTest.kt @@ -1,13 +1,13 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq -import org.utbot.examples.withoutMinimization -import org.utbot.framework.codegen.CodeGeneration +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.CodegenLanguage import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq +import org.utbot.testcheckers.withoutMinimization +import org.utbot.tests.infrastructure.CodeGeneration internal class LongWrapperTest : UtValueTestCaseChecker( testClass = LongWrapper::class, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt similarity index 89% rename from utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt index 2ae4661cab..a8b179d805 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/examples/wrappers/ShortWrapperTest.kt @@ -1,10 +1,10 @@ package org.utbot.examples.wrappers -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.eq +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.DoNotCalculate import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test +import org.utbot.testcheckers.eq internal class ShortWrapperTest : UtValueTestCaseChecker(testClass = ShortWrapper::class) { @Test diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/JUnitSetup.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/JUnitSetup.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/framework/JUnitSetup.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/JUnitSetup.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/SootUtils.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/SootUtils.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/framework/SootUtils.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/SootUtils.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/assemble/AssembleModelGeneratorTests.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/assemble/AssembleModelGeneratorTests.kt similarity index 98% rename from utbot-framework/src/test/kotlin/org/utbot/framework/assemble/AssembleModelGeneratorTests.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/assemble/AssembleModelGeneratorTests.kt index ffa6b63c69..fdc2fc5044 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/framework/assemble/AssembleModelGeneratorTests.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/framework/assemble/AssembleModelGeneratorTests.kt @@ -1,9 +1,20 @@ package org.utbot.framework.assemble +import org.utbot.examples.assemble.AssembleTestUtils +import org.utbot.examples.assemble.ComplexField +import org.utbot.examples.assemble.DirectAccess +import org.utbot.examples.assemble.DirectAccessAndSetter +import org.utbot.examples.assemble.DirectAccessFinal +import org.utbot.examples.assemble.InheritedField +import org.utbot.examples.assemble.ListItem +import org.utbot.examples.assemble.NoModifier +import org.utbot.examples.assemble.PackagePrivateFields +import org.utbot.examples.assemble.PrimitiveFields import org.utbot.examples.assemble.arrays.ArrayOfComplexArrays import org.utbot.examples.assemble.arrays.ArrayOfPrimitiveArrays import org.utbot.examples.assemble.arrays.AssignedArray import org.utbot.examples.assemble.arrays.ComplexArray +import org.utbot.examples.assemble.arrays.MethodUnderTest import org.utbot.examples.assemble.arrays.PrimitiveArray import org.utbot.examples.assemble.constructors.ComplexConstructor import org.utbot.examples.assemble.constructors.ComplexConstructorWithSetter @@ -45,7 +56,6 @@ import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.assemble.* /** * Test classes must be located in the same folder as [AssembleTestUtils] class. @@ -137,7 +147,7 @@ class AssembleModelGeneratorTests { ) val methodFromAnotherPackage = - org.utbot.examples.assemble.arrays.MethodUnderTest::class.functions.first() + MethodUnderTest::class.functions.first() createModelAndAssert(compositeModel, null, UtMethod.from(methodFromAnotherPackage)) } diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/concrete/constructors/BaseConstructorTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/concrete/constructors/BaseConstructorTest.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/framework/concrete/constructors/BaseConstructorTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/concrete/constructors/BaseConstructorTest.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/concrete/constructors/ListConstructorTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/concrete/constructors/ListConstructorTest.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/framework/concrete/constructors/ListConstructorTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/concrete/constructors/ListConstructorTest.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/concrete/constructors/MapConstructorTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/concrete/constructors/MapConstructorTest.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/framework/concrete/constructors/MapConstructorTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/concrete/constructors/MapConstructorTest.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/concrete/constructors/OptionalConstructorTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/concrete/constructors/OptionalConstructorTest.kt similarity index 79% rename from utbot-framework/src/test/kotlin/org/utbot/framework/concrete/constructors/OptionalConstructorTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/concrete/constructors/OptionalConstructorTest.kt index c4d600b5f5..7c515f9d55 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/framework/concrete/constructors/OptionalConstructorTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/framework/concrete/constructors/OptionalConstructorTest.kt @@ -1,19 +1,10 @@ package org.utbot.framework.concrete.constructors -import org.utbot.engine.ValueConstructor -import org.utbot.framework.concrete.UtModelConstructor -import org.utbot.framework.plugin.api.UtAssembleModel -import org.utbot.framework.plugin.api.util.UtContext -import org.utbot.framework.plugin.api.util.id -import java.util.IdentityHashMap import java.util.Optional import java.util.OptionalDouble import java.util.OptionalInt import java.util.OptionalLong -import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertTrue -import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test class OptionalConstructorTest : BaseConstructorTest() { diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/concrete/constructors/SetConstructorTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/concrete/constructors/SetConstructorTest.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/framework/concrete/constructors/SetConstructorTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/concrete/constructors/SetConstructorTest.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/coverage/CoverageFinder.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/coverage/CoverageFinder.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/framework/coverage/CoverageFinder.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/coverage/CoverageFinder.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/minimization/MinimizationGreedyEssentialTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/minimization/MinimizationGreedyEssentialTest.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/framework/minimization/MinimizationGreedyEssentialTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/minimization/MinimizationGreedyEssentialTest.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/modificators/UtBotFieldModificatorsTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/modificators/UtBotFieldModificatorsTest.kt similarity index 99% rename from utbot-framework/src/test/kotlin/org/utbot/framework/modificators/UtBotFieldModificatorsTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/modificators/UtBotFieldModificatorsTest.kt index 88455929a9..38b2b768b5 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/framework/modificators/UtBotFieldModificatorsTest.kt +++ b/utbot-framework-test/src/test/kotlin/org/utbot/framework/modificators/UtBotFieldModificatorsTest.kt @@ -1,6 +1,5 @@ package org.utbot.framework.modificators -import org.utbot.common.packageName import org.utbot.examples.modificators.ConstructorsAndSetters import org.utbot.examples.modificators.DefaultField import org.utbot.examples.modificators.InvokeInAssignment diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/plugin/api/MockStrategyApiTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/plugin/api/MockStrategyApiTest.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/framework/plugin/api/MockStrategyApiTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/plugin/api/MockStrategyApiTest.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/z3/extension/Z3ExtensionForTests.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/z3/extension/Z3ExtensionForTests.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/framework/z3/extension/Z3ExtensionForTests.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/z3/extension/Z3ExtensionForTests.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/z3/extension/Z3ExtensionTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/framework/z3/extension/Z3ExtensionTest.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/framework/z3/extension/Z3ExtensionTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/framework/z3/extension/Z3ExtensionTest.kt diff --git a/utbot-framework/src/test/kotlin/org/utbot/sarif/SarifReportTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/sarif/SarifReportTest.kt similarity index 100% rename from utbot-framework/src/test/kotlin/org/utbot/sarif/SarifReportTest.kt rename to utbot-framework-test/src/test/kotlin/org/utbot/sarif/SarifReportTest.kt diff --git a/utbot-framework/src/test/resources/junit-platform.properties b/utbot-framework-test/src/test/resources/junit-platform.properties similarity index 100% rename from utbot-framework/src/test/resources/junit-platform.properties rename to utbot-framework-test/src/test/resources/junit-platform.properties diff --git a/utbot-framework/src/test/resources/log4j2.xml b/utbot-framework-test/src/test/resources/log4j2.xml similarity index 100% rename from utbot-framework/src/test/resources/log4j2.xml rename to utbot-framework-test/src/test/resources/log4j2.xml diff --git a/utbot-framework/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/utbot-framework-test/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from utbot-framework/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to utbot-framework-test/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/utbot-framework/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/utbot-framework-test/src/test/resources/services/org.junit.jupiter.api.extension.Extension similarity index 100% rename from utbot-framework/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension rename to utbot-framework-test/src/test/resources/services/org.junit.jupiter.api.extension.Extension diff --git a/utbot-framework/build.gradle b/utbot-framework/build.gradle index f4949c02e6..039757b3d7 100644 --- a/utbot-framework/build.gradle +++ b/utbot-framework/build.gradle @@ -14,10 +14,11 @@ configurations { dependencies { + api project(':utbot-api') + api project(':utbot-fuzzers') api project(':utbot-core') api project(':utbot-instrumentation') api project(':utbot-summary') - //implementation 'junit:junit:4.13.1' api project(':utbot-framework-api') implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1' @@ -34,30 +35,11 @@ dependencies { implementation group: 'org.apache.commons', name: 'commons-text', version: apache_commons_text_version // we need this for construction mocks from composite models implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0' - api project(':utbot-api') - api project(':utbot-fuzzers') - - testImplementation project(':utbot-summary') - testImplementation project(':utbot-sample') -// testImplementation project(':utbot-analytics') // To use JUnit4, comment out JUnit5 and uncomment JUnit4 dependencies here. Please also check "test" section -// testImplementation group: 'junit', name: 'junit', version: '4.13.1' - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.7.0' - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0' - - // used for testing code generation - testImplementation group: 'commons-io', name: 'commons-io', version: commons_io_version - testImplementation group: 'junit', name: 'junit', version: junit4_version - testImplementation group: 'org.junit.platform', name: 'junit-platform-console-standalone', version: junit4_platform_version - testImplementation group: 'org.antlr', name: 'antlr4', version: antlr_version - testImplementation group: 'org.mockito', name: 'mockito-core', version: mockito_version - testImplementation group: 'org.testng', name: 'testng', version: testng_version - testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockito_inline_version - testImplementation group: 'com.google.guava', name: 'guava', version: guava_version - - testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockito_inline_version - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j2_version + //implementation group: 'junit', name: 'junit', version: '4.13.1' + implementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.1' + implementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.1' z3native group: 'com.microsoft.z3', name: 'z3-native-win64', version: z3_version, ext: 'zip' z3native group: 'com.microsoft.z3', name: 'z3-native-linux64', version: z3_version, ext: 'zip' @@ -71,20 +53,3 @@ processResources { } } } - -test { - - minHeapSize = "128m" - maxHeapSize = "2048m" - - jvmArgs '-XX:MaxHeapSize=2048m' - - // To use JUnit4, comment out useJUnitPlatform and uncomment useJUnit. Please also check "dependencies" section - //useJUnit() - useJUnitPlatform() { - excludeTags 'slow', 'IntegrationTest' - } - if (System.getProperty('DEBUG', 'false') == 'true') { - jvmArgs '-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9009' - } -} diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/UtOperators.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/UtOperators.kt index da1debc6b7..dfd00fb6ef 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/engine/UtOperators.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/engine/UtOperators.kt @@ -87,26 +87,26 @@ sealed class UtBoolOperator(delegate: BoolOperator) : UtOperator error("Wrong type ${const::class}") } -internal fun Context.toSort(type: Type): Sort = +fun Context.toSort(type: Type): Sort = when (type) { is ByteType -> mkBitVecSort(Byte.SIZE_BITS) is ShortType -> mkBitVecSort(Short.SIZE_BITS) diff --git a/utbot-framework/src/main/kotlin/org/utbot/engine/z3/Operators.kt b/utbot-framework/src/main/kotlin/org/utbot/engine/z3/Operators.kt index f4d5bb4d3d..01ed0cb2e6 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/engine/z3/Operators.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/engine/z3/Operators.kt @@ -48,12 +48,12 @@ abstract class BoolOperator( onBool: (Context, BoolExpr, BoolExpr) -> BoolExpr = { _, _, _ -> TODO() } ) : Operator(onBitVec, onFP, onBool) -internal object Le : BoolOperator(Context::mkBVSLE, Context::mkFPLEq) -internal object Lt : BoolOperator(Context::mkBVSLT, Context::mkFPLt) -internal object Ge : BoolOperator(Context::mkBVSGE, Context::mkFPGEq) -internal object Gt : BoolOperator(Context::mkBVSGT, Context::mkFPGt) -internal object Eq : BoolOperator(Context::mkEq, Context::mkFPEq, Context::mkEq) -internal object Ne : BoolOperator(::ne, ::fpNe, ::ne) +object Le : BoolOperator(Context::mkBVSLE, Context::mkFPLEq) +object Lt : BoolOperator(Context::mkBVSLT, Context::mkFPLt) +object Ge : BoolOperator(Context::mkBVSGE, Context::mkFPGEq) +object Gt : BoolOperator(Context::mkBVSGT, Context::mkFPGt) +object Eq : BoolOperator(Context::mkEq, Context::mkFPEq, Context::mkEq) +object Ne : BoolOperator(::ne, ::fpNe, ::ne) private fun ne(context: Context, left: Expr, right: Expr): BoolExpr = context.mkNot(context.mkEq(left, right)) private fun fpNe(context: Context, left: FPExpr, right: FPExpr): BoolExpr = context.mkNot(context.mkFPEq(left, right)) @@ -183,7 +183,7 @@ fun negate(context: Context, variable: Z3Variable): Expr = when (variable.expr) * @see * Java Language Specification: Binary Numeric Promotion */ -internal fun Context.alignVars(left: Z3Variable, right: Z3Variable): Pair { +fun Context.alignVars(left: Z3Variable, right: Z3Variable): Pair { val maxSort = maxOf(left.expr.sort, right.expr.sort, mkBitVecSort(Int.SIZE_BITS), compareBy { it.rank() }) return convertVar(left, maxSort) to convertVar(right, maxSort) } @@ -210,7 +210,7 @@ internal fun Context.alignVarAndConst(left: Z3Variable, right: Number): Pair * Java Language Specification: Unary Numeric Promotion */ -internal fun Context.alignVar(variable: Z3Variable): Z3Variable = when (variable.type) { +fun Context.alignVar(variable: Z3Variable): Z3Variable = when (variable.type) { is ByteType, is ShortType, is CharType -> convertVar(variable, IntType.v()) else -> variable } diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtModelConstructor.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtModelConstructor.kt index 60b490a293..2efdbfac02 100644 --- a/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtModelConstructor.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtModelConstructor.kt @@ -53,7 +53,7 @@ internal interface UtModelConstructorInterface { * @param compositeModelStrategy decides whether we should construct a composite model for a certain value or not. * searches in [objectToModelCache] for [UtReferenceModel.id]. */ -internal class UtModelConstructor( +class UtModelConstructor( private val objectToModelCache: IdentityHashMap, private val compositeModelStrategy: UtCompositeModelStrategy = AlwaysConstructStrategy ) : UtModelConstructorInterface { @@ -294,7 +294,7 @@ internal class UtModelConstructor( /** * Decides, should we construct a UtCompositeModel from a value or not. */ -internal interface UtCompositeModelStrategy { +interface UtCompositeModelStrategy { fun shouldConstruct(value: Any, clazz: Class<*>): Boolean } diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/TestUtil.kt b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CheckersUtil.kt similarity index 99% rename from utbot-framework/src/test/kotlin/org/utbot/examples/TestUtil.kt rename to utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CheckersUtil.kt index 5db223f9d0..874fd112a1 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/TestUtil.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CheckersUtil.kt @@ -1,4 +1,4 @@ -package org.utbot.examples +package org.utbot.tests.infrastructure import org.utbot.framework.codegen.ForceStaticMocking import org.utbot.framework.codegen.Junit4 @@ -17,7 +17,6 @@ import org.utbot.framework.plugin.api.MockStrategyApi.OTHER_CLASSES import org.utbot.framework.util.Conflict import org.utbot.framework.util.ConflictTriggers - data class TestFrameworkConfiguration( val testFramework: TestFramework, val mockFramework: MockFramework, diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/CodeGenerationIntegrationTest.kt b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CodeGenerationIntegrationTest.kt similarity index 93% rename from utbot-framework/src/test/kotlin/org/utbot/examples/CodeGenerationIntegrationTest.kt rename to utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CodeGenerationIntegrationTest.kt index 57aa7dd227..cdc4dce755 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/CodeGenerationIntegrationTest.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CodeGenerationIntegrationTest.kt @@ -1,15 +1,8 @@ -package org.utbot.examples +package org.utbot.tests.infrastructure import org.utbot.common.FileUtil -import org.utbot.common.packageName import org.utbot.common.withAccessibility import org.utbot.framework.UtSettings -import org.utbot.framework.codegen.ClassStages -import org.utbot.framework.codegen.CodeGeneration -import org.utbot.framework.codegen.ExecutionStatus -import org.utbot.framework.codegen.Stage -import org.utbot.framework.codegen.StageStatusCheck -import org.utbot.framework.codegen.TestExecution import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.UtMethodTestSet import org.utbot.instrumentation.ConcreteExecutor @@ -28,7 +21,6 @@ import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.api.fail import org.junit.jupiter.engine.descriptor.ClassTestDescriptor import org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor -import org.utbot.framework.codegen.TestCodeGeneratorPipeline import java.nio.file.Path @TestInstance(TestInstance.Lifecycle.PER_CLASS) @@ -173,7 +165,7 @@ abstract class CodeGenerationIntegrationTest( private var runningTestsNumber: Int = 0 - private val logger = KotlinLogging.logger { } + internal val logger = KotlinLogging.logger { } @JvmStatic protected val testCaseGeneratorCache = mutableMapOf() @@ -182,7 +174,7 @@ abstract class CodeGenerationIntegrationTest( private fun getTestPackageSize(packageName: String): Int = // filter all not disabled tests classes allRunningTestClasses - .filter { it.testClass.packageName == packageName } + .filter { it.testClass.`package`.name == packageName } .distinctBy { it.testClass.name.substringBeforeLast("Kt") } .size diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/codegen/CompilationAndRunUtils.kt b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CompilationAndRunUtils.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/framework/codegen/CompilationAndRunUtils.kt rename to utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CompilationAndRunUtils.kt index ac27d92c7b..b476aa4dcb 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/framework/codegen/CompilationAndRunUtils.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/CompilationAndRunUtils.kt @@ -1,10 +1,13 @@ -package org.utbot.framework.codegen +package org.utbot.tests.infrastructure import org.utbot.framework.plugin.api.CodegenLanguage import java.io.File import java.nio.file.Path import mu.KotlinLogging import org.utbot.common.FileUtil +import org.utbot.engine.logger +import org.utbot.framework.codegen.Junit5 +import org.utbot.framework.codegen.TestFramework data class ClassUnderTest( val testClassSimpleName: String, @@ -12,8 +15,6 @@ data class ClassUnderTest( val generatedTestFile: File ) -private val logger = KotlinLogging.logger {} - fun writeTest( testContents: String, testClassName: String, diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/codegen/TestCodeGeneratorPipeline.kt b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestCodeGeneratorPipeline.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/framework/codegen/TestCodeGeneratorPipeline.kt rename to utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestCodeGeneratorPipeline.kt index ee361004b6..3d0e569696 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/framework/codegen/TestCodeGeneratorPipeline.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestCodeGeneratorPipeline.kt @@ -1,13 +1,14 @@ -package org.utbot.framework.codegen +package org.utbot.tests.infrastructure import mu.KotlinLogging import org.junit.jupiter.api.Assertions.assertTrue import org.utbot.common.FileUtil import org.utbot.common.bracket import org.utbot.common.info -import org.utbot.common.packageName -import org.utbot.examples.TestFrameworkConfiguration -import org.utbot.framework.codegen.ExecutionStatus.SUCCESS +import org.utbot.framework.codegen.ForceStaticMocking +import org.utbot.framework.codegen.ParametrizedTestSource +import org.utbot.framework.codegen.StaticsMocking +import org.utbot.framework.codegen.TestFramework import org.utbot.framework.codegen.model.CodeGenerator import org.utbot.framework.plugin.api.CodegenLanguage import org.utbot.framework.plugin.api.ExecutableId @@ -196,7 +197,7 @@ class TestCodeGeneratorPipeline(private val testFrameworkConfiguration: TestFram * for nested CUT is its package + dot + its simple name + [testSuffix] suffix (to avoid outer class mention). */ private fun ClassPipeline.retrieveTestClassName(testSuffix: String): String = - stageContext.classUnderTest.let { "${it.java.packageName}.${it.simpleName}" } + testSuffix + stageContext.classUnderTest.let { "${it.java.`package`.name}.${it.simpleName}" } + testSuffix private fun List>.createBuildDirectory() = FileUtil.isolateClassFiles(*toTypedArray()).toPath() @@ -335,7 +336,7 @@ data class StageExecutionInformation( val stage: Stage, val status: ExecutionStatus = ExecutionStatus.IN_PROCESS ) { - fun completeStage(status: ExecutionStatus = SUCCESS) = copy(status = status) + fun completeStage(status: ExecutionStatus = ExecutionStatus.SUCCESS) = copy(status = status) } data class CodeGenerationResult( @@ -372,7 +373,7 @@ private fun constructPipelineResultCheck( val statuses = result.stageStatisticInformation.associate { it.stage to it.status } val failedPrevStage = pipeline(firstStage, lastStage) .takeWhile { it != lastStage } - .firstOrNull { statuses[it] != SUCCESS } + .firstOrNull { statuses[it] != ExecutionStatus.SUCCESS } if (failedPrevStage != null) error("[$lastStage] is not started cause $failedPrevStage has failed") @@ -390,7 +391,7 @@ data class StageContext( val data: Any = Unit, val numberOfTestCases: Int = 0, val stages: List = emptyList(), - val status: ExecutionStatus = SUCCESS + val status: ExecutionStatus = ExecutionStatus.SUCCESS ) data class ClassStages( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/TestSpecificTestCaseGenerator.kt b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestSpecificTestCaseGenerator.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/TestSpecificTestCaseGenerator.kt rename to utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestSpecificTestCaseGenerator.kt index 55b760e0b4..4340dbe89e 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/TestSpecificTestCaseGenerator.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestSpecificTestCaseGenerator.kt @@ -1,6 +1,5 @@ -package org.utbot.examples +package org.utbot.tests.infrastructure -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch import mu.KotlinLogging import org.utbot.common.runBlockingWithCancellationPredicate @@ -12,7 +11,6 @@ import org.utbot.engine.util.mockListeners.ForceMockListener import org.utbot.engine.util.mockListeners.ForceStaticMockListener import org.utbot.framework.UtSettings import org.utbot.framework.codegen.ParametrizedTestSource -import org.utbot.framework.codegen.TestCodeGeneratorPipeline import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.TestCaseGenerator import org.utbot.framework.plugin.api.UtError diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/UtModelTestCaseChecker.kt b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/UtModelTestCaseChecker.kt similarity index 98% rename from utbot-framework/src/test/kotlin/org/utbot/examples/UtModelTestCaseChecker.kt rename to utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/UtModelTestCaseChecker.kt index 2d66c07750..6ac2af2743 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/UtModelTestCaseChecker.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/UtModelTestCaseChecker.kt @@ -1,6 +1,6 @@ @file:Suppress("NestedLambdaShadowedImplicitParameter") -package org.utbot.examples +package org.utbot.tests.infrastructure import org.utbot.common.ClassLocation import org.utbot.common.FileUtil.findPathToClassFiles @@ -36,10 +36,10 @@ import kotlin.reflect.KFunction2 import kotlin.reflect.KFunction3 import org.junit.jupiter.api.Assertions.assertTrue import org.utbot.framework.UtSettings.useFuzzing -import org.utbot.framework.codegen.TestCodeGeneratorPipeline import org.utbot.framework.util.Conflict +import org.utbot.testcheckers.ExecutionsNumberMatcher -internal abstract class UtModelTestCaseChecker( +abstract class UtModelTestCaseChecker( testClass: KClass<*>, testCodeGeneration: Boolean = true, languagePipelines: List = listOf( diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/UtValueTestCaseChecker.kt b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/UtValueTestCaseChecker.kt similarity index 96% rename from utbot-framework/src/test/kotlin/org/utbot/examples/UtValueTestCaseChecker.kt rename to utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/UtValueTestCaseChecker.kt index 6e31fd4d83..ceec13a021 100644 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/UtValueTestCaseChecker.kt +++ b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/UtValueTestCaseChecker.kt @@ -1,6 +1,6 @@ @file:Suppress("NestedLambdaShadowedImplicitParameter") -package org.utbot.examples +package org.utbot.tests.infrastructure import mu.KotlinLogging import org.junit.jupiter.api.Assertions.assertTrue @@ -9,21 +9,12 @@ import org.utbot.common.FileUtil.clearTempDirectory import org.utbot.common.FileUtil.findPathToClassFiles import org.utbot.common.FileUtil.locateClass import org.utbot.engine.prettify -import org.utbot.examples.codegen.ClassWithStaticAndInnerClassesTest -import org.utbot.framework.PathSelectorType -import org.utbot.framework.TestSelectionStrategyType import org.utbot.framework.UtSettings import org.utbot.framework.UtSettings.checkCoverageInCodeGenerationTests import org.utbot.framework.UtSettings.daysLimitForTempFiles import org.utbot.framework.UtSettings.testDisplayName import org.utbot.framework.UtSettings.testName import org.utbot.framework.UtSettings.testSummary -import org.utbot.framework.codegen.ClassStages -import org.utbot.framework.codegen.CodeGeneration -import org.utbot.framework.codegen.ExecutionStatus -import org.utbot.framework.codegen.StageStatusCheck -import org.utbot.framework.codegen.TestCodeGeneratorPipeline -import org.utbot.framework.codegen.TestExecution import org.utbot.framework.coverage.Coverage import org.utbot.framework.coverage.counters import org.utbot.framework.coverage.methodCoverage @@ -62,6 +53,7 @@ import org.utbot.framework.plugin.api.util.withUtContext import org.utbot.framework.util.Conflict import org.utbot.framework.util.toValueTestCase import org.utbot.summary.summarize +import org.utbot.testcheckers.ExecutionsNumberMatcher import java.io.File import java.nio.file.Path import java.nio.file.Paths @@ -74,8 +66,6 @@ import kotlin.reflect.KFunction3 import kotlin.reflect.KFunction4 import kotlin.reflect.KFunction5 -val logger = KotlinLogging.logger {} - abstract class UtValueTestCaseChecker( testClass: KClass<*>, testCodeGeneration: Boolean = true, @@ -2589,7 +2579,7 @@ abstract class UtValueTestCaseChecker( @Suppress("UNCHECKED_CAST") // TODO please use matcher.reflect().call(...) when it will be ready, currently call isn't supported in kotlin reflect -internal fun invokeMatcher(matcher: Function, params: List) = when (matcher) { +public fun invokeMatcher(matcher: Function, params: List) = when (matcher) { is Function1<*, *> -> (matcher as Function1).invoke(params[0]) is Function2<*, *, *> -> (matcher as Function2).invoke(params[0], params[1]) is Function3<*, *, *, *> -> (matcher as Function3).invoke( @@ -2610,8 +2600,6 @@ internal fun invokeMatcher(matcher: Function, params: List) = whe else -> error("Function with arity > 7 not supported") } -fun ge(count: Int) = ExecutionsNumberMatcher("ge $count") { it >= count } -fun eq(count: Int) = ExecutionsNumberMatcher("eq $count") { it == count } fun between(bounds: IntRange) = ExecutionsNumberMatcher("$bounds") { it in bounds } val ignoreExecutionsNumber = ExecutionsNumberMatcher("Do not calculate") { it > 0 } @@ -2651,11 +2639,6 @@ inline fun UtCompositeModel.mockValues(methodName: String): List inline fun UtModel.primitiveValue(): T = (this as? UtPrimitiveModel)?.value as? T ?: error("Can't transform $this to ${T::class}") -class ExecutionsNumberMatcher(private val description: String, private val cmp: (Int) -> Boolean) { - operator fun invoke(x: Int) = cmp(x) - override fun toString() = description -} - sealed class CoverageMatcher(private val description: String, private val cmp: (Coverage) -> Boolean) { operator fun invoke(c: Coverage) = cmp(c) override fun toString() = description @@ -2765,39 +2748,10 @@ fun keyMatch(keyStmt: List) = { summary: List? -> fun Map>.findByName(name: String) = entries.single { name == it.key.name }.value.value fun Map>.singleValue() = values.single().value -internal typealias StaticsType = Map> +typealias StaticsType = Map> private typealias Mocks = List private typealias Instrumentation = List -inline fun withoutConcrete(block: () -> T): T { - val prev = UtSettings.useConcreteExecution - UtSettings.useConcreteExecution = false - try { - return block() - } finally { - UtSettings.useConcreteExecution = prev - } -} - -inline fun withSolverTimeoutInMillis(timeoutInMillis: Int, block: () -> T): T { - val prev = UtSettings.checkSolverTimeoutMillis - UtSettings.checkSolverTimeoutMillis = timeoutInMillis - try { - return block() - } finally { - UtSettings.checkSolverTimeoutMillis = prev - } -} - -inline fun withoutMinimization(block: () -> T): T { - val prev = UtSettings.testMinimizationStrategyType - UtSettings.testMinimizationStrategyType = TestSelectionStrategyType.DO_NOT_MINIMIZE_STRATEGY - try { - return block() - } finally { - UtSettings.testMinimizationStrategyType = prev - } -} inline fun withSettingsFromTestFrameworkConfiguration( config: TestFrameworkConfiguration, @@ -2815,91 +2769,3 @@ inline fun withSettingsFromTestFrameworkConfiguration( TestCodeGeneratorPipeline.currentTestFrameworkConfiguration = previousConfig } } - -inline fun withoutSubstituteStaticsWithSymbolicVariable(block: () -> T) { - val substituteStaticsWithSymbolicVariable = UtSettings.substituteStaticsWithSymbolicVariable - UtSettings.substituteStaticsWithSymbolicVariable = false - try { - block() - } finally { - UtSettings.substituteStaticsWithSymbolicVariable = substituteStaticsWithSymbolicVariable - } -} - -inline fun withPushingStateFromPathSelectorForConcrete(block: () -> T): T { - val prev = UtSettings.saveRemainingStatesForConcreteExecution - UtSettings.saveRemainingStatesForConcreteExecution = true - try { - return block() - } finally { - UtSettings.saveRemainingStatesForConcreteExecution = prev - } -} - -inline fun withTreatingOverflowAsError(block: () -> T): T { - val prev = UtSettings.treatOverflowAsError - UtSettings.treatOverflowAsError = true - try { - return block() - } finally { - UtSettings.treatOverflowAsError = prev - } -} - -inline fun withRewardModelPath(rewardModelPath: String, block: () -> T): T { - val prev = UtSettings.rewardModelPath - UtSettings.rewardModelPath = rewardModelPath - try { - return block() - } finally { - UtSettings.rewardModelPath = prev - } -} - -inline fun withPathSelectorType(pathSelectorType: PathSelectorType, block: () -> T): T { - val prev = UtSettings.pathSelectorType - UtSettings.pathSelectorType = pathSelectorType - try { - return block() - } finally { - UtSettings.pathSelectorType = prev - } -} - -inline fun withFeaturePath(featurePath: String, block: () -> T): T { - val prevFeaturePath = UtSettings.featurePath - val prevEnableFeatureProcess = UtSettings.enableFeatureProcess - - UtSettings.featurePath = featurePath - UtSettings.enableFeatureProcess = true - - try { - return block() - } finally { - UtSettings.featurePath = prevFeaturePath - UtSettings.enableFeatureProcess = prevEnableFeatureProcess - } -} - -inline fun withUsingReflectionForMaximizingCoverage(maximizeCoverage: Boolean, block: () -> T): T { - val prev = UtSettings.maximizeCoverageUsingReflection - UtSettings.maximizeCoverageUsingReflection = maximizeCoverage - try { - return block() - } finally { - UtSettings.maximizeCoverageUsingReflection = prev - } -} - -/** - * Run [block] with disabled sandbox in the concrete executor - */ -inline fun withoutSandbox(block: () -> T): T { - val prev = UtSettings.disableSandbox - UtSettings.disableSandbox = true - try { - return block() - } finally { - UtSettings.disableSandbox = prev - } -} diff --git a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithCrossReferenceRelationshipTest.kt b/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithCrossReferenceRelationshipTest.kt deleted file mode 100644 index f94c95e268..0000000000 --- a/utbot-framework/src/test/kotlin/org/utbot/examples/codegen/deepequals/ClassWithCrossReferenceRelationshipTest.kt +++ /dev/null @@ -1,29 +0,0 @@ -package org.utbot.examples.codegen.deepequals - -import org.junit.jupiter.api.Disabled -import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.eq -import org.utbot.framework.codegen.CodeGeneration -import org.utbot.framework.plugin.api.CodegenLanguage - -class ClassWithCrossReferenceRelationshipTest : UtValueTestCaseChecker( - testClass = ClassWithCrossReferenceRelationship::class, - testCodeGeneration = true, - languagePipelines = listOf( - CodeGenerationLanguageLastStage(CodegenLanguage.JAVA), - CodeGenerationLanguageLastStage(CodegenLanguage.KOTLIN, CodeGeneration) - ) -) { - // TODO: The test is disabled due to [https://github.com/UnitTestBot/UTBotJava/issues/812] - @Disabled - @Test - fun testClassWithCrossReferenceRelationship() { - check( - ClassWithCrossReferenceRelationship::returnFirstClass, - eq(2), - coverage = DoNotCalculate - ) - } -} \ No newline at end of file diff --git a/utbot-framework/src/test/kotlin/org/utbot/framework/codegen/DependencyUtilsTests.kt b/utbot-framework/src/test/kotlin/org/utbot/framework/codegen/DependencyUtilsTests.kt deleted file mode 100644 index b7ff880b47..0000000000 --- a/utbot-framework/src/test/kotlin/org/utbot/framework/codegen/DependencyUtilsTests.kt +++ /dev/null @@ -1,50 +0,0 @@ -package org.utbot.framework.codegen - -import org.junit.jupiter.api.Assertions.assertTrue -import org.junit.jupiter.api.Disabled -import org.junit.jupiter.params.ParameterizedTest -import org.junit.jupiter.params.provider.Arguments -import org.junit.jupiter.params.provider.MethodSource -import org.utbot.common.PathUtil.getUrlsFromClassLoader -import org.utbot.framework.codegen.model.util.checkFrameworkDependencies -import java.io.File - -@Disabled -class DependencyUtilsTests { - @ParameterizedTest - @MethodSource("provideDependencyPaths") - fun testDependencyChecker(path: String?, isValid: Boolean, reason: String) { - try { - checkFrameworkDependencies(path) - assertTrue(isValid) - } catch (ex: IllegalStateException) { - val message = ex.message - assertTrue(message != null && message.contains(reason), message) - } - } - - companion object { - private val separator = File.pathSeparatorChar - private val jarUrls = getUrlsFromClassLoader(Thread.currentThread().contextClassLoader) - - private val mockito = jarUrls.firstOrNull { it.path.contains("mockito-core") }?.path ?: "" - private val junit4 = jarUrls.firstOrNull { it.path.contains("junit-4") }?.path ?: "" - private val junit5 = jarUrls.firstOrNull { it.path.contains("junit-jupiter-api") }?.path ?: "" - private val testNg = jarUrls.firstOrNull { it.path.contains("testng") }?.path ?: "" - - @JvmStatic - fun provideDependencyPaths(): ArrayList { - val argList = ArrayList() - - argList.add(Arguments.arguments("$junit4$separator$mockito$separator", true, "")) - argList.add(Arguments.arguments("$junit5$separator$mockito$separator", true, "")) - argList.add(Arguments.arguments("$testNg$separator$mockito$separator", true, "")) - argList.add(Arguments.arguments("", false, "Dependency paths is empty")) - argList.add(Arguments.arguments(null, false, "Dependency paths is empty")) - argList.add(Arguments.arguments("$junit4$separator$junit5$separator$testNg$separator", false, "Mock frameworks are not found")) - argList.add(Arguments.arguments("$mockito$separator", false, "Test frameworks are not found")) - - return argList - } - } -} \ No newline at end of file diff --git a/utbot-summary-tests/src/test/kotlin/examples/SummaryTestCaseGeneratorTest.kt b/utbot-summary-tests/src/test/kotlin/examples/SummaryTestCaseGeneratorTest.kt index 6ed631a6ca..3341943265 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/SummaryTestCaseGeneratorTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/SummaryTestCaseGeneratorTest.kt @@ -3,16 +3,16 @@ package examples import org.junit.jupiter.api.* import org.utbot.common.WorkaroundReason import org.utbot.common.workaround -import org.utbot.examples.UtValueTestCaseChecker -import org.utbot.examples.CoverageMatcher +import org.utbot.tests.infrastructure.UtValueTestCaseChecker +import org.utbot.tests.infrastructure.CoverageMatcher import org.utbot.framework.UtSettings.checkNpeInNestedMethods import org.utbot.framework.UtSettings.checkNpeInNestedNotPrivateMethods import org.utbot.framework.UtSettings.checkSolverTimeoutMillis -import org.utbot.framework.codegen.TestExecution import org.utbot.framework.plugin.api.* import org.utbot.framework.plugin.api.util.UtContext import org.utbot.summary.comment.nextSynonyms import org.utbot.summary.summarize +import org.utbot.tests.infrastructure.TestExecution import kotlin.reflect.KClass import kotlin.reflect.KFunction diff --git a/utbot-summary-tests/src/test/kotlin/examples/algorithms/SummaryReturnExampleTest.kt b/utbot-summary-tests/src/test/kotlin/examples/algorithms/SummaryReturnExampleTest.kt index 7b9c74a549..d52bc5a02f 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/algorithms/SummaryReturnExampleTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/algorithms/SummaryReturnExampleTest.kt @@ -3,7 +3,7 @@ package examples.algorithms import examples.SummaryTestCaseGeneratorTest import org.utbot.examples.algorithms.ReturnExample import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi class SummaryReturnExampleTest : SummaryTestCaseGeneratorTest( diff --git a/utbot-summary-tests/src/test/kotlin/examples/collections/SummaryListWrapperReturnsVoidTest.kt b/utbot-summary-tests/src/test/kotlin/examples/collections/SummaryListWrapperReturnsVoidTest.kt index 13ada7f993..787c630847 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/collections/SummaryListWrapperReturnsVoidTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/collections/SummaryListWrapperReturnsVoidTest.kt @@ -2,7 +2,7 @@ package examples.collections import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.collections.ListWrapperReturnsVoidExample import org.utbot.framework.plugin.api.MockStrategyApi diff --git a/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryConditionsTest.kt b/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryConditionsTest.kt index 79947a0817..239951a80c 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryConditionsTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryConditionsTest.kt @@ -4,7 +4,7 @@ import examples.CustomJavaDocTagsEnabler import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith -import org.utbot.examples.DoNotCalculate +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.controlflow.Conditions import org.utbot.framework.plugin.api.MockStrategyApi diff --git a/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryCycleTest.kt b/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryCycleTest.kt index a9d92afa6b..1f37c2db2b 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryCycleTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/controlflow/SummaryCycleTest.kt @@ -2,7 +2,7 @@ package examples.controlflow import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.controlflow.Cycles import org.utbot.framework.plugin.api.MockStrategyApi diff --git a/utbot-summary-tests/src/test/kotlin/examples/exceptions/SummaryExceptionClusteringExamplesTest.kt b/utbot-summary-tests/src/test/kotlin/examples/exceptions/SummaryExceptionClusteringExamplesTest.kt index bc51997a1e..d86144f380 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/exceptions/SummaryExceptionClusteringExamplesTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/exceptions/SummaryExceptionClusteringExamplesTest.kt @@ -4,7 +4,7 @@ import examples.CustomJavaDocTagsEnabler import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith -import org.utbot.examples.DoNotCalculate +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.exceptions.ExceptionClusteringExamples import org.utbot.framework.plugin.api.MockStrategyApi diff --git a/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryInnerCallsTest.kt b/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryInnerCallsTest.kt index 48628c114c..cc596ceca0 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryInnerCallsTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryInnerCallsTest.kt @@ -2,7 +2,7 @@ package examples.inner import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.inner.InnerCalls import org.utbot.framework.plugin.api.MockStrategyApi diff --git a/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryNestedCallsTest.kt b/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryNestedCallsTest.kt index 47f25c552b..19e14e9b41 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryNestedCallsTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/inner/SummaryNestedCallsTest.kt @@ -2,7 +2,7 @@ package examples.inner import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.inner.NestedCalls import org.utbot.framework.plugin.api.MockStrategyApi diff --git a/utbot-summary-tests/src/test/kotlin/examples/structures/SummaryMinStackTest.kt b/utbot-summary-tests/src/test/kotlin/examples/structures/SummaryMinStackTest.kt index 5cfca1201b..3301fb1a26 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/structures/SummaryMinStackTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/structures/SummaryMinStackTest.kt @@ -4,7 +4,7 @@ import examples.CustomJavaDocTagsEnabler import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith -import org.utbot.examples.DoNotCalculate +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.structures.MinStack import org.utbot.framework.plugin.api.MockStrategyApi diff --git a/utbot-summary-tests/src/test/kotlin/examples/ternary/SummaryTernaryTest.kt b/utbot-summary-tests/src/test/kotlin/examples/ternary/SummaryTernaryTest.kt index 3b6ae02502..b7c031075a 100644 --- a/utbot-summary-tests/src/test/kotlin/examples/ternary/SummaryTernaryTest.kt +++ b/utbot-summary-tests/src/test/kotlin/examples/ternary/SummaryTernaryTest.kt @@ -2,7 +2,7 @@ package examples.ternary import examples.SummaryTestCaseGeneratorTest import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.examples.ternary.Ternary import org.utbot.framework.plugin.api.MockStrategyApi diff --git a/utbot-summary-tests/src/test/kotlin/math/SummaryIntMathTest.kt b/utbot-summary-tests/src/test/kotlin/math/SummaryIntMathTest.kt index cf48b07e58..e0dd005b12 100644 --- a/utbot-summary-tests/src/test/kotlin/math/SummaryIntMathTest.kt +++ b/utbot-summary-tests/src/test/kotlin/math/SummaryIntMathTest.kt @@ -3,7 +3,7 @@ package math import examples.SummaryTestCaseGeneratorTest import guava.examples.math.IntMath import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.UtClusterInfo diff --git a/utbot-summary-tests/src/test/kotlin/math/SummaryOfMathTest.kt b/utbot-summary-tests/src/test/kotlin/math/SummaryOfMathTest.kt index a58856675a..48abef0d4f 100644 --- a/utbot-summary-tests/src/test/kotlin/math/SummaryOfMathTest.kt +++ b/utbot-summary-tests/src/test/kotlin/math/SummaryOfMathTest.kt @@ -2,8 +2,9 @@ package math import examples.SummaryTestCaseGeneratorTest import guava.examples.math.Stats +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import org.utbot.examples.DoNotCalculate +import org.utbot.tests.infrastructure.DoNotCalculate import org.utbot.framework.plugin.api.MockStrategyApi import org.utbot.framework.plugin.api.UtClusterInfo @@ -17,6 +18,7 @@ class SummaryOfMathTest : SummaryTestCaseGeneratorTest( Stats::class, ) { @Test + @Disabled fun testOfInts() { val summary1 = "Test calls {@link guava.examples.math.StatsAccumulator#addAll(int[])},\n" + " there it triggers recursion of addAll once, \n" +