Consistently rename JUnit 4.x integration tests
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/77cafbe3 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/77cafbe3 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/77cafbe3 Branch: refs/heads/junit5 Commit: 77cafbe36d5b3ca82b4fc3837b26be1aab73c537 Parents: e6b3921 Author: Benedikt Ritter <brit...@apache.org> Authored: Mon Oct 3 18:06:38 2016 +0200 Committer: Benedikt Ritter <brit...@apache.org> Committed: Wed Oct 12 07:07:56 2016 +0200 ---------------------------------------------------------------------- .../surefire/its/JUnit47ConcurrencyIT.java | 58 +++++++++++++ .../its/JUnit47StaticInnerClassTestsIT.java | 34 ++++++++ .../surefire/its/JUnit47WithCucumberIT.java | 71 ++++++++++++++++ .../maven/surefire/its/JUnit4IgnoreIT.java | 52 ++++++++++++ .../maven/surefire/its/JUnit4VersionsIT.java | 87 ++++++++++++++++++++ .../its/Junit47StaticInnerClassTestsIT.java | 34 -------- .../surefire/its/Junit47WithCucumberIT.java | 71 ---------------- .../surefire/its/Junit47concurrencyIT.java | 58 ------------- .../maven/surefire/its/Junit4IgnoreIT.java | 52 ------------ .../maven/surefire/its/Junit4VersionsIT.java | 87 -------------------- .../test/resources/concurrentjunit47/pom.xml | 62 -------------- .../src/test/java/junit47/BasicTest.java | 71 ---------------- .../test/resources/junit47-concurrency/pom.xml | 61 ++++++++++++++ .../src/test/java/junit47/BasicTest.java | 71 ++++++++++++++++ 14 files changed, 434 insertions(+), 435 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java new file mode 100644 index 0000000..57007a7 --- /dev/null +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java @@ -0,0 +1,58 @@ +package org.apache.maven.surefire.its; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.surefire.its.fixture.OutputValidator; +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.*; + +/** + * Basic suite test using all known versions of JUnit 4.x + * + * @author Kristian Rosenvold + */ +public class JUnit47ConcurrencyIT + extends SurefireJUnit4IntegrationTestCase +{ + @Test + public void test47() + throws Exception + { + OutputValidator validator = unpack( "junit47-concurrency" ) + .executeTest() + .verifyErrorFree( 4 ); + String result = null; + for ( String line : validator.loadLogLines() ) + { + if ( line.startsWith( "[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:" ) ) + { + result = line; + break; + } + } + assertNotNull( result); + assertThat( result, anyOf( containsString( "Time elapsed: 1." ), containsString( "Time elapsed: 0.9" ) ) ); + assertThat( result, endsWith( " s - in concurrentjunit47.src.test.java.junit47.BasicTest" ) ); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47StaticInnerClassTestsIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47StaticInnerClassTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47StaticInnerClassTestsIT.java new file mode 100644 index 0000000..e50e6d7 --- /dev/null +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47StaticInnerClassTestsIT.java @@ -0,0 +1,34 @@ +package org.apache.maven.surefire.its; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.junit.Test; + +public class JUnit47StaticInnerClassTestsIT + extends SurefireJUnit4IntegrationTestCase +{ + + @Test + public void testStaticInnerClassTests() + { + executeErrorFreeTest( "junit47-static-inner-class-tests", 3 ); + } +} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java new file mode 100644 index 0000000..4bb1842 --- /dev/null +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java @@ -0,0 +1,71 @@ +package org.apache.maven.surefire.its; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.junit.Before; +import org.junit.Test; + +import static org.apache.commons.lang3.JavaVersion.JAVA_1_6; +import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; + +/** + * Tests the JUnit 47 provider with the cucumber runner. At the moment, they don't play along that perfectly (minor + * glitches in the reports with parallel=classes), but at least all tests are executed, the execution times are counted + * correctly and failing tests are reported. The main problem that the junit47 provider has with the cucumber runner is + * that the junit Description instance created by the runner has a null test class attribute. + * + * @author agudian + */ +public class JUnit47WithCucumberIT + extends SurefireJUnit4IntegrationTestCase +{ + + @Before + public void assumeJdk16() + { + assumeJavaVersion( JAVA_1_6 ); + } + + @Test + public void testWithoutParallel() + { + // 8 tests in total is what's probably correct + doTest( "none", 8 ); + } + + @Test + public void testWithParallelClasses() + { + // with parallel=classes, we get 9 tests in total, + // as the dummy "scenario" test entry is reported twice: once as success, and once with the failure from the + // failing test step + doTest( "classes", 9 ); + } + + private void doTest( String parallel, int total ) + { + unpack( "junit47-cucumber" ) + .sysProp( "parallel", parallel ) + .sysProp( "threadCount", "2" ) + .executeTest() + .assertTestSuiteResults( total, 0, 2, 0 ); + } +} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4IgnoreIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4IgnoreIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4IgnoreIT.java new file mode 100644 index 0000000..71ec3d8 --- /dev/null +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4IgnoreIT.java @@ -0,0 +1,52 @@ +package org.apache.maven.surefire.its; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.apache.maven.surefire.its.fixture.SurefireLauncher; +import org.junit.Test; + +/** + * Test JUnit 4 tests marked with "Ignore" attribute + * + * @author <a href="mailto:dfabul...@apache.org";>Dan Fabulich</a> + */ +public class JUnit4IgnoreIT + extends SurefireJUnit4IntegrationTestCase +{ + @Test + public void testJunit4Ignore() + { + // Todo: Support assumption failure == ignore for junit4 + unpack().executeTest().verifyErrorFreeLog().assertTestSuiteResults( 7, 0, 0, 6 ); + } + + @Test + public void testJunit47ParallelIgnore() + { + unpack().setJUnitVersion( "4.8.1" ).parallelClasses().executeTest().verifyErrorFreeLog().assertTestSuiteResults( + 7, 0, 0, 7 ); + } + + private SurefireLauncher unpack() + { + return unpack( "/junit-ignore" ); + } +} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java new file mode 100644 index 0000000..87fe140 --- /dev/null +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java @@ -0,0 +1,87 @@ +package org.apache.maven.surefire.its; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.util.Arrays; +import java.util.Collection; + +import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; +import org.apache.maven.surefire.its.fixture.SurefireLauncher; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameter; + +import static org.junit.runners.Parameterized.*; + +/** + * Basic suite test using all known versions of JUnit 4.x + * + * @author <a href="mailto:dfabul...@apache.org";>Dan Fabulich</a> + */ +@RunWith( Parameterized.class ) +public class JUnit4VersionsIT + extends SurefireJUnit4IntegrationTestCase +{ + + @Parameters( name = "{index}: JUnit {0}" ) + public static Collection<Object[]> junitVersions() + { + return Arrays.asList( new Object[][] { + { "4.0" }, + { "4.1" }, + { "4.2" }, + { "4.3" }, + { "4.3.1" }, + { "4.4" }, + { "4.5" }, + { "4.6" }, + { "4.7" }, + { "4.8" }, + { "4.8.1" }, + { "4.8.2" }, + { "4.9" }, + { "4.10" }, + { "4.11" }, + { "4.12" } + } ); + } + + @Parameter + public String version; + + private SurefireLauncher unpack() + { + return unpack( "/junit4" ); + } + + @Test + public void testJunit() + throws Exception + { + runJUnitTest( version ); + } + + public void runJUnitTest( String version ) + throws Exception + { + unpack().setJUnitVersion( version ).executeTest().verifyErrorFree( 1 ); + } +} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java deleted file mode 100644 index b8d38bf..0000000 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.apache.maven.surefire.its; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.junit.Test; - -public class Junit47StaticInnerClassTestsIT - extends SurefireJUnit4IntegrationTestCase -{ - - @Test - public void testStaticInnerClassTests() - { - executeErrorFreeTest( "junit47-static-inner-class-tests", 3 ); - } -} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47WithCucumberIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47WithCucumberIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47WithCucumberIT.java deleted file mode 100644 index 4850005..0000000 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47WithCucumberIT.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.apache.maven.surefire.its; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.junit.Before; -import org.junit.Test; - -import static org.apache.commons.lang3.JavaVersion.JAVA_1_6; -import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion; - -/** - * Tests the JUnit 47 provider with the cucumber runner. At the moment, they don't play along that perfectly (minor - * glitches in the reports with parallel=classes), but at least all tests are executed, the execution times are counted - * correctly and failing tests are reported. The main problem that the junit47 provider has with the cucumber runner is - * that the junit Description instance created by the runner has a null test class attribute. - * - * @author agudian - */ -public class Junit47WithCucumberIT - extends SurefireJUnit4IntegrationTestCase -{ - - @Before - public void assumeJdk16() - { - assumeJavaVersion( JAVA_1_6 ); - } - - @Test - public void testWithoutParallel() - { - // 8 tests in total is what's probably correct - doTest( "none", 8 ); - } - - @Test - public void testWithParallelClasses() - { - // with parallel=classes, we get 9 tests in total, - // as the dummy "scenario" test entry is reported twice: once as success, and once with the failure from the - // failing test step - doTest( "classes", 9 ); - } - - private void doTest( String parallel, int total ) - { - unpack( "junit47-cucumber" ) - .sysProp( "parallel", parallel ) - .sysProp( "threadCount", "2" ) - .executeTest() - .assertTestSuiteResults( total, 0, 2, 0 ); - } -} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java deleted file mode 100644 index 12c4419..0000000 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.apache.maven.surefire.its; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.maven.surefire.its.fixture.OutputValidator; -import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.junit.Test; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.*; -import static org.hamcrest.CoreMatchers.*; - -/** - * Basic suite test using all known versions of JUnit 4.x - * - * @author Kristian Rosenvold - */ -public class Junit47concurrencyIT - extends SurefireJUnit4IntegrationTestCase -{ - @Test - public void test47() - throws Exception - { - OutputValidator validator = unpack( "concurrentjunit47" ) - .executeTest() - .verifyErrorFree( 4 ); - String result = null; - for ( String line : validator.loadLogLines() ) - { - if ( line.startsWith( "[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:" ) ) - { - result = line; - break; - } - } - assertNotNull( result); - assertThat( result, anyOf( containsString( "Time elapsed: 1." ), containsString( "Time elapsed: 0.9" ) ) ); - assertThat( result, endsWith( " s - in concurrentjunit47.src.test.java.junit47.BasicTest" ) ); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java deleted file mode 100644 index 0e050ce..0000000 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.apache.maven.surefire.its; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.apache.maven.surefire.its.fixture.SurefireLauncher; -import org.junit.Test; - -/** - * Test JUnit 4 tests marked with "Ignore" attribute - * - * @author <a href="mailto:dfabul...@apache.org";>Dan Fabulich</a> - */ -public class Junit4IgnoreIT - extends SurefireJUnit4IntegrationTestCase -{ - @Test - public void testJunit4Ignore() - { - // Todo: Support assumption failure == ignore for junit4 - unpack().executeTest().verifyErrorFreeLog().assertTestSuiteResults( 7, 0, 0, 6 ); - } - - @Test - public void testJunit47ParallelIgnore() - { - unpack().setJUnitVersion( "4.8.1" ).parallelClasses().executeTest().verifyErrorFreeLog().assertTestSuiteResults( - 7, 0, 0, 7 ); - } - - private SurefireLauncher unpack() - { - return unpack( "/junit-ignore" ); - } -} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java deleted file mode 100644 index 500591a..0000000 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.apache.maven.surefire.its; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.util.Arrays; -import java.util.Collection; - -import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; -import org.apache.maven.surefire.its.fixture.SurefireLauncher; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameter; - -import static org.junit.runners.Parameterized.*; - -/** - * Basic suite test using all known versions of JUnit 4.x - * - * @author <a href="mailto:dfabul...@apache.org";>Dan Fabulich</a> - */ -@RunWith( Parameterized.class ) -public class Junit4VersionsIT - extends SurefireJUnit4IntegrationTestCase -{ - - @Parameters( name = "{index}: JUnit {0}" ) - public static Collection<Object[]> junitVersions() - { - return Arrays.asList( new Object[][] { - { "4.0" }, - { "4.1" }, - { "4.2" }, - { "4.3" }, - { "4.3.1" }, - { "4.4" }, - { "4.5" }, - { "4.6" }, - { "4.7" }, - { "4.8" }, - { "4.8.1" }, - { "4.8.2" }, - { "4.9" }, - { "4.10" }, - { "4.11" }, - { "4.12" } - } ); - } - - @Parameter - public String version; - - private SurefireLauncher unpack() - { - return unpack( "/junit4" ); - } - - @Test - public void testJunit() - throws Exception - { - runJUnitTest( version ); - } - - public void runJUnitTest( String version ) - throws Exception - { - unpack().setJUnitVersion( version ).executeTest().verifyErrorFree( 1 ); - } -} http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml b/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml deleted file mode 100644 index d064175..0000000 --- a/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - - - <parent> - <groupId>org.apache.maven.surefire</groupId> - <artifactId>it-parent</artifactId> - <version>1.0</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.apache.maven.plugins.surefire</groupId> - <artifactId>junit47</artifactId> - <version>1.0-SNAPSHOT</version> - <name>Test for JUnit 4.7</name> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <parallel>methods</parallel> - <perCoreThreadCount>false</perCoreThreadCount> - <threadCount>3</threadCount> - </configuration> - </plugin> - </plugins> - </build> - -</project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/resources/concurrentjunit47/src/test/java/junit47/BasicTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/concurrentjunit47/src/test/java/junit47/BasicTest.java b/surefire-integration-tests/src/test/resources/concurrentjunit47/src/test/java/junit47/BasicTest.java deleted file mode 100644 index 1f11060..0000000 --- a/surefire-integration-tests/src/test/resources/concurrentjunit47/src/test/java/junit47/BasicTest.java +++ /dev/null @@ -1,71 +0,0 @@ -package concurrentjunit47.src.test.java.junit47; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.junit.*; - -import java.util.concurrent.TimeUnit; - -public class BasicTest -{ - private boolean setUpCalled = false; - - @Before - public void setUp() - { - setUpCalled = true; - System.out.println( "Called setUp" ); - } - - @After - public void tearDown() - { - setUpCalled = false; - System.out.println( "Called tearDown" ); - } - - @Test - public void testSetUp() - { - Assert.assertTrue( "setUp was not called", setUpCalled ); - } - - @Test - public void a() throws Exception { - TimeUnit.SECONDS.sleep( 1 ); - } - - @Test - public void b() throws Exception { - TimeUnit.SECONDS.sleep( 1 ); - } - - @Test - public void c() throws Exception { - TimeUnit.SECONDS.sleep( 1 ); - } - - @AfterClass - public static void oneTimeTearDown() - { - - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml b/surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml new file mode 100644 index 0000000..4f648df --- /dev/null +++ b/surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>it-parent</artifactId> + <version>1.0</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.apache.maven.plugins.surefire</groupId> + <artifactId>junit47-concurrency</artifactId> + <version>1.0-SNAPSHOT</version> + <name>Concurrency test for JUnit 4.7</name> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <parallel>methods</parallel> + <perCoreThreadCount>false</perCoreThreadCount> + <threadCount>3</threadCount> + </configuration> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/77cafbe3/surefire-integration-tests/src/test/resources/junit47-concurrency/src/test/java/junit47/BasicTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit47-concurrency/src/test/java/junit47/BasicTest.java b/surefire-integration-tests/src/test/resources/junit47-concurrency/src/test/java/junit47/BasicTest.java new file mode 100644 index 0000000..1f11060 --- /dev/null +++ b/surefire-integration-tests/src/test/resources/junit47-concurrency/src/test/java/junit47/BasicTest.java @@ -0,0 +1,71 @@ +package concurrentjunit47.src.test.java.junit47; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.junit.*; + +import java.util.concurrent.TimeUnit; + +public class BasicTest +{ + private boolean setUpCalled = false; + + @Before + public void setUp() + { + setUpCalled = true; + System.out.println( "Called setUp" ); + } + + @After + public void tearDown() + { + setUpCalled = false; + System.out.println( "Called tearDown" ); + } + + @Test + public void testSetUp() + { + Assert.assertTrue( "setUp was not called", setUpCalled ); + } + + @Test + public void a() throws Exception { + TimeUnit.SECONDS.sleep( 1 ); + } + + @Test + public void b() throws Exception { + TimeUnit.SECONDS.sleep( 1 ); + } + + @Test + public void c() throws Exception { + TimeUnit.SECONDS.sleep( 1 ); + } + + @AfterClass + public static void oneTimeTearDown() + { + + } + +} \ No newline at end of file
