diff --git a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/affected/ChangesOnDifferentModulesAffectedTestsSelectionExecutionFunctionalTest.java b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/affected/ChangesOnDifferentModulesAffectedTestsSelectionExecutionFunctionalTest.java index cb9cf8b03..6faf191a0 100644 --- a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/affected/ChangesOnDifferentModulesAffectedTestsSelectionExecutionFunctionalTest.java +++ b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/affected/ChangesOnDifferentModulesAffectedTestsSelectionExecutionFunctionalTest.java @@ -37,7 +37,7 @@ public void should_detect_changes_on_maven_modules_and_execute_test() { // when final TestResults actualTestResults = project - .build() + .build("config/impl-base") .options() .withSystemProperties("scm.range.head", "HEAD", "scm.range.tail", "HEAD~") .configure() diff --git a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/affected/HistoricalChangesAffectedTestsSelectionExecutionFunctionalTest.java b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/affected/HistoricalChangesAffectedTestsSelectionExecutionFunctionalTest.java index 8b827e45e..38fdea3bb 100644 --- a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/affected/HistoricalChangesAffectedTestsSelectionExecutionFunctionalTest.java +++ b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/affected/HistoricalChangesAffectedTestsSelectionExecutionFunctionalTest.java @@ -7,6 +7,7 @@ import org.arquillian.smart.testing.rules.TestBed; import org.arquillian.smart.testing.ftest.testbed.testresults.TestResult; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; diff --git a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/affected/LocalChangesAffectedTestsSelectionExecutionFunctionalTest.java b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/affected/LocalChangesAffectedTestsSelectionExecutionFunctionalTest.java index 64e7dbc4f..d4c8d529c 100644 --- a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/affected/LocalChangesAffectedTestsSelectionExecutionFunctionalTest.java +++ b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/affected/LocalChangesAffectedTestsSelectionExecutionFunctionalTest.java @@ -37,7 +37,7 @@ public void should_only_execute_tests_related_to_single_local_change_in_producti .applyAsLocalChanges("Single method body modification - sysout"); // when - final TestResults actualTestResults = project.build().run(); + final TestResults actualTestResults = project.build("config/impl-base").run(); // then assertThat(actualTestResults.accumulatedPerTestClass()).containsAll(expectedTestResults).hasSameSizeAs(expectedTestResults); @@ -58,7 +58,7 @@ public void should_only_execute_tests_related_to_multiple_local_changes_in_produ "Inlined variable in a method"); // when - final TestResults actualTestResults = project.build().run(); + final TestResults actualTestResults = project.build("config/impl-base").run(); // then assertThat(actualTestResults.accumulatedPerTestClass()).containsAll(expectedTestResults).hasSameSizeAs(expectedTestResults); diff --git a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/failed/HistoricalChangesFailedTestsSelectionExecutionFunctionalTest.java b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/failed/HistoricalChangesFailedTestsSelectionExecutionFunctionalTest.java deleted file mode 100644 index bc1845099..000000000 --- a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/failed/HistoricalChangesFailedTestsSelectionExecutionFunctionalTest.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.arquillian.smart.testing.ftest.failed; - -import java.util.Collection; -import org.arquillian.smart.testing.ftest.FileVerifier; -import org.arquillian.smart.testing.ftest.testbed.project.Project; -import org.arquillian.smart.testing.ftest.testbed.project.TestResults; -import org.arquillian.smart.testing.rules.git.GitClone; -import org.arquillian.smart.testing.rules.TestBed; -import org.arquillian.smart.testing.ftest.testbed.testresults.TestResult; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; - -import static org.arquillian.smart.testing.ftest.testbed.TestRepository.testRepository; -import static org.arquillian.smart.testing.ftest.testbed.configuration.Mode.SELECTING; -import static org.arquillian.smart.testing.ftest.testbed.configuration.Strategy.FAILED; -import static org.arquillian.smart.testing.spi.TestResult.TEMP_REPORT_DIR; -import static org.assertj.core.api.Assertions.assertThat; - -public class HistoricalChangesFailedTestsSelectionExecutionFunctionalTest { - - @ClassRule - public static final GitClone GIT_CLONE = new GitClone(testRepository()); - - @Rule - public final TestBed testBed = new TestBed(GIT_CLONE); - - @Test - public void should_only_execute_previously_failing_tests_when_failed_is_enabled() throws Exception { - // given - final Project project = testBed.getProject(); - - project.applyAsCommits("Introduces error by changing return value"); - - project - .build() - .options() - .ignoreBuildFailure() - .configure() - .run(); - - project.configureSmartTesting() - .executionOrder(FAILED) - .inMode(SELECTING) - .enable(); - - final Collection expectedTestResults = project - .applyAsCommits("fix: Introduces error by changing return value"); - - // when - final TestResults actualTestResults = project - .build() - .options() - .withSystemProperties("scm.range.head", "HEAD", "scm.range.tail", "HEAD~") - .configure() - .run(); - - // then - assertThat(actualTestResults.accumulatedPerTestClass()).containsAll(expectedTestResults).hasSameSizeAs(expectedTestResults); - FileVerifier.assertThatFileIsNotPresent(project, TEMP_REPORT_DIR); - } -} diff --git a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/failed/LocalChangesFailedTestsSelectionExecutionFunctionalTest.java b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/failed/LocalChangesFailedTestsSelectionExecutionFunctionalTest.java index 1fdc1a064..e76db5f7b 100644 --- a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/failed/LocalChangesFailedTestsSelectionExecutionFunctionalTest.java +++ b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/failed/LocalChangesFailedTestsSelectionExecutionFunctionalTest.java @@ -33,7 +33,7 @@ public void should_only_execute_previously_failing_tests_when_failed_is_enabled( project.applyAsCommits("Introduces error by changing return value"); project - .build() + .build("container/impl-base") .options() .ignoreBuildFailure() .configure() @@ -49,7 +49,7 @@ public void should_only_execute_previously_failing_tests_when_failed_is_enabled( // when - final TestResults actualTestResults = project.build().run(); + final TestResults actualTestResults = project.build("container/impl-base").run(); // then assertThat(actualTestResults.accumulatedPerTestClass()).containsAll(expectedTestResults).hasSameSizeAs(expectedTestResults); diff --git a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/mixed/LocalChangesMixedStrategySelectionExecutionFunctionalTest.java b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/mixed/LocalChangesMixedStrategySelectionExecutionFunctionalTest.java index 52382dd90..8e25a0a37 100644 --- a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/mixed/LocalChangesMixedStrategySelectionExecutionFunctionalTest.java +++ b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/mixed/LocalChangesMixedStrategySelectionExecutionFunctionalTest.java @@ -43,7 +43,7 @@ public void should_execute_all_new_tests_and_related_to_production_code_changes( "Inlined variable in a method", "Adds new unit test"); // when - final TestResults actualTestResults = project.build().run(); + final TestResults actualTestResults = project.build("config/impl-base").run(); // then assertThat(actualTestResults.accumulatedPerTestClass()).containsAll(expectedTestResults).hasSameSizeAs(expectedTestResults); diff --git a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/newtests/LocalChangesNewTestsSelectionExecutionFunctionalTest.java b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/newtests/LocalChangesNewTestsSelectionExecutionFunctionalTest.java index 2dab1c3de..8cafb1076 100644 --- a/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/newtests/LocalChangesNewTestsSelectionExecutionFunctionalTest.java +++ b/functional-tests/test-bed/src/test/java/org/arquillian/smart/testing/ftest/newtests/LocalChangesNewTestsSelectionExecutionFunctionalTest.java @@ -37,7 +37,7 @@ public void should_only_execute_new_tests_related_to_single_local_change() throw .applyAsLocalChanges("Adds new unit test"); // when - final TestResults actualTestResults = project.build().run(); + final TestResults actualTestResults = project.build("config/impl-base").run(); // then assertThat(actualTestResults.accumulatedPerTestClass()).containsAll(expectedTestResults).hasSameSizeAs(expectedTestResults); @@ -61,7 +61,7 @@ public void should_only_execute_new_tests_related_to_single_local_change_using_f .applyAsLocalChanges("Adds new unit test"); // when - final TestResults actualTestResults = project.build().run("clean", "verify"); + final TestResults actualTestResults = project.build("config/impl-base").run("clean", "verify"); // then assertThat(actualTestResults.accumulatedPerTestClass()).containsAll(expectedTestResults).hasSameSizeAs(expectedTestResults);