You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2018/02/18 00:47:13 UTC
[01/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Repository: maven-surefire
Updated Branches:
refs/heads/master 5e732c6b2 -> eb210e08f
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/src/test/java/resultcounting/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/src/test/java/resultcounting/Test2.java b/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/src/test/java/resultcounting/Test2.java
new file mode 100644
index 0000000..26b218c
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/src/test/java/resultcounting/Test2.java
@@ -0,0 +1,36 @@
+package resultcounting;
+
+/*
+ * 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.Test;
+
+/**
+ * A test that causes an error
+ *
+ * @author Kristian Rosenvold
+ */
+public class Test2
+{
+ @Test
+ public void testWithException1()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+}
\ No newline at end of file
[24/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml b/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml
deleted file mode 100644
index 4a01e23..0000000
--- a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>maven-dump-pid-plugin</artifactId>
- <version>0.1</version>
- <packaging>maven-plugin</packaging>
-
- <name>maven-dump-pid-plugin Maven Plugin</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.2</version>
- <configuration>
- <!-- see https://issues.apache.org/jira/browse/MNG-5346 -->
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- <executions>
- <execution>
- <id>mojo-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/src/main/java/org/apache/maven/plugins/surefire/dumppid/DumpPidMojo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/src/main/java/org/apache/maven/plugins/surefire/dumppid/DumpPidMojo.java b/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/src/main/java/org/apache/maven/plugins/surefire/dumppid/DumpPidMojo.java
deleted file mode 100644
index 035976b..0000000
--- a/surefire-integration-tests/src/test/resources/test-helper-dump-pid-plugin/src/main/java/org/apache/maven/plugins/surefire/dumppid/DumpPidMojo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.apache.maven.plugins.surefire.dumppid;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed 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.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-
-/**
- * Goal dumps the PID of the maven process
- */
-@Mojo( name = "dump-pid", defaultPhase = LifecyclePhase.GENERATE_TEST_RESOURCES )
-public class DumpPidMojo
- extends AbstractMojo
-{
-
- @Parameter( defaultValue = "${project.build.directory}", property = "dumpPid.targetDir" )
- private File targetDir;
-
- public void execute()
- throws MojoExecutionException
- {
- File target;
- try
- {
- getLog().info( "Dumping PID to " + targetDir );
-
- if ( !targetDir.exists() )
- {
- targetDir.mkdirs();
- }
-
- target = new File( targetDir, "maven.pid" ).getCanonicalFile();
-
- FileWriter fw = new FileWriter( target );
- String pid = ManagementFactory.getRuntimeMXBean().getName();
- fw.write( pid );
- fw.flush();
- fw.close();
-
- getLog().info( "Wrote " + pid + " to " + target );
-
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Unable to create pid file", e );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml b/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml
deleted file mode 100644
index 0b96853..0000000
--- a/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml
+++ /dev/null
@@ -1,76 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-afterSuiteFailure</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG failure after suite</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/src/test/java/testng/afterSuiteFailure/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/src/test/java/testng/afterSuiteFailure/TestNGSuiteTest.java b/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/src/test/java/testng/afterSuiteFailure/TestNGSuiteTest.java
deleted file mode 100644
index 0d93e1b..0000000
--- a/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/src/test/java/testng/afterSuiteFailure/TestNGSuiteTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package testng.afterSuiteFailure;
-
-/*
- * 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.testng.Assert;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.Test;
-
-
-public class TestNGSuiteTest {
-
- @Test
- public void doNothing()
- {
-
- }
-
- @AfterSuite
- public void failAfterSuite()
- {
- Assert.fail();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml b/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
deleted file mode 100644
index 1072958..0000000
--- a/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
+++ /dev/null
@@ -1,76 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-beforeMethod</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG @BeforeMethod annotation</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-beforeMethod/src/test/java/testng/beforeMethod/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-beforeMethod/src/test/java/testng/beforeMethod/TestNGSuiteTest.java b/surefire-integration-tests/src/test/resources/testng-beforeMethod/src/test/java/testng/beforeMethod/TestNGSuiteTest.java
deleted file mode 100644
index bdbad43..0000000
--- a/surefire-integration-tests/src/test/resources/testng-beforeMethod/src/test/java/testng/beforeMethod/TestNGSuiteTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package testng.beforeMethod;
-
-/*
- * 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.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-
-public class TestNGSuiteTest {
-
- private boolean beforeMethod = false;
-
- @BeforeMethod
- public void beforeMethod() {
- beforeMethod = true;
- }
- @Test
- public void testBeforeMethod()
- {
- Assert.assertTrue( beforeMethod );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml b/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
deleted file mode 100644
index 88b6a4e..0000000
--- a/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
+++ /dev/null
@@ -1,76 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-beforeMethodFailure</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG failure in @BeforeMethod annotation</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/test/java/testng/beforeMethodFailure/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/test/java/testng/beforeMethodFailure/TestNGSuiteTest.java b/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/test/java/testng/beforeMethodFailure/TestNGSuiteTest.java
deleted file mode 100644
index 58786f0..0000000
--- a/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/test/java/testng/beforeMethodFailure/TestNGSuiteTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package testng.beforeMethodFailure;
-
-/*
- * 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.testng.Assert;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-
-public class TestNGSuiteTest {
-
- private final boolean beforeMethod = false;
-
- @BeforeMethod
- public void beforeMethod() {
- Assert.fail();
- }
- @Test
- public void testBeforeMethod()
- {
- Assert.assertTrue( beforeMethod );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml b/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
deleted file mode 100644
index 7e06dbe..0000000
--- a/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
+++ /dev/null
@@ -1,80 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-execute-error</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test proper output from forked execution in case of uncatched error during suite run</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>once</forkMode>
- <useFile>true</useFile>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-execute-error/src/test/java/it/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-execute-error/src/test/java/it/BasicTest.java b/surefire-integration-tests/src/test/resources/testng-execute-error/src/test/java/it/BasicTest.java
deleted file mode 100644
index e601daf..0000000
--- a/surefire-integration-tests/src/test/resources/testng-execute-error/src/test/java/it/BasicTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package it;
-
-/*
- * 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 static org.testng.Assert.*;
-
-import org.testng.annotations.*;
-
-/*
- * Intentionally misconfigured (cycle) to cause an error before the suite is actually run.
- */
-@Test(groups = { "test" }, dependsOnGroups = { "test" })
-public class BasicTest {
-
- public void testTrue() {
- assertTrue(true);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml b/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml
deleted file mode 100644
index 4405bd3..0000000
--- a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml
+++ /dev/null
@@ -1,84 +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/xsd/maven-4.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>testng-group-thread-parallel</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG group/parallel thread tests</name>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <groups>nonexistent, functional</groups>
- <threadCount>3</threadCount>
- <parallel>methods</parallel>
- <forkCount>0</forkCount>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/src/test/java/testng/groupThreadParallel/TestNGTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/src/test/java/testng/groupThreadParallel/TestNGTest.java b/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/src/test/java/testng/groupThreadParallel/TestNGTest.java
deleted file mode 100644
index 9ccdef1..0000000
--- a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/src/test/java/testng/groupThreadParallel/TestNGTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package testng.groupThreadParallel;
-
-/*
- * 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.testng.Assert;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- * Tests grouping/threading/parallel functionality of TestNG.
- *
- * @author jkuhnert
- */
-public class TestNGTest
-{
-
- private static volatile int m_testCount = 0;
-
- /**
- * Sets up testObject
- */
- @BeforeClass( groups = "functional" )
- public void configureTest()
- {
- testObject = new Object();
- }
-
- @AfterSuite( alwaysRun = true, groups = "functional" )
- public void check_Test_Count()
- {
- System.out.println( "check_Test_Count(): " + m_testCount );
- Assert.assertEquals( m_testCount, 3 );
- }
-
- Object testObject;
-
- @Test( groups = { "functional", "notincluded" } )
- public void test1()
- throws InterruptedException
- {
- doTest( "test1" );
- }
-
- private void doTest( String test )
- throws InterruptedException
- {
- incrementTestCount();
- System.out.println( "running " + test );
- Assert.assertNotNull( testObject, "testObject" );
- waitForTestCountToBeThree();
- }
-
- private static synchronized void incrementTestCount()
- {
- m_testCount++;
- }
-
- @Test( groups = { "functional", "notincluded" } )
- public void test2()
- throws InterruptedException
- {
- doTest( "test2" );
- }
-
- @Test( groups = { "functional", "notincluded" } )
- public void test3()
- throws InterruptedException
- {
- doTest( "test3" );
- }
-
- private void waitForTestCountToBeThree()
- throws InterruptedException
- {
- if ( m_testCount == 3 )
- return;
- long now = System.currentTimeMillis();
- long timeout = 5 * 1000;
- long finish = now + timeout;
- while ( m_testCount < 3 && System.currentTimeMillis() < finish )
- {
- Thread.sleep( 10 );
- }
- Assert.assertTrue( m_testCount >= 3, "Expected TestCount >= 3, but was: " + m_testCount );
- }
-
- /**
- * Sample method that shouldn't be run by test suite.
- */
- @Test( groups = "notincluded" )
- public void shouldNotRun()
- {
- Assert.fail( "Group specified by test shouldnt be run." );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-groups/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-groups/pom.xml b/surefire-integration-tests/src/test/resources/testng-groups/pom.xml
deleted file mode 100644
index f6b7447..0000000
--- a/surefire-integration-tests/src/test/resources/testng-groups/pom.xml
+++ /dev/null
@@ -1,55 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-groups</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for testng groups</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-groups/src/test/java/testng/groups/TestNGGroupTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-groups/src/test/java/testng/groups/TestNGGroupTest.java b/surefire-integration-tests/src/test/resources/testng-groups/src/test/java/testng/groups/TestNGGroupTest.java
deleted file mode 100644
index 5d84bba..0000000
--- a/surefire-integration-tests/src/test/resources/testng-groups/src/test/java/testng/groups/TestNGGroupTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package testng.groups;
-
-/*
- * 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.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/**
- * Tests grouping
- */
-public class TestNGGroupTest
-{
- private Object testObject;
-
- @BeforeClass( groups = "functional" )
- public void configureTest()
- {
- testObject = new Object();
- }
-
- @Test( groups = { "functional" } )
- public void isFunctional()
- {
- Assert.assertNotNull( testObject, "testObject is null" );
- }
-
- @Test( groups = { "functional", "notincluded" } )
- public void isFunctionalAndNotincluded()
- {
- Assert.assertNotNull( testObject, "testObject is null" );
- }
-
- @Test( groups = "notincluded" )
- public void isNotIncluded()
- {
- Assert.assertTrue( false );
- }
-
- @Test( groups = "abc-def" )
- public void isDashedGroup()
- {
- }
-
- @Test( groups = "foo.bar" )
- public void isFooBar()
- {
- }
-
- @Test( groups = "foo.zap" )
- public void isFooZap()
- {
- }
-
- @Test
- public void noGroup()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml b/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml
deleted file mode 100644
index 337f71c..0000000
--- a/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml
+++ /dev/null
@@ -1,66 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-jdk14</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for testng jdk14 integration</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.7</version>
- <classifier>jdk14</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <groups>functional</groups>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-jdk14/src/test/java/testng/jdk14/TestNGJavadocTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-jdk14/src/test/java/testng/jdk14/TestNGJavadocTest.java b/surefire-integration-tests/src/test/resources/testng-jdk14/src/test/java/testng/jdk14/TestNGJavadocTest.java
deleted file mode 100644
index 25dd31a..0000000
--- a/surefire-integration-tests/src/test/resources/testng-jdk14/src/test/java/testng/jdk14/TestNGJavadocTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package testng.jdk14;
-
-/*
- * 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.testng.Assert;
-
-/**
- * Tests that forcing testng to run tests via the <code>"${maven.test.forcetestng}"</code> configuration option works.
- *
- * @author jkuhnert
- */
-public class TestNGJavadocTest
-{
-
- /**
- * Sets up testObject
- *
- * @testng.configuration beforeTestClass = "true" groups = "functional"
- */
- public void configureTest()
- {
- testObject = new Object();
- }
-
- Object testObject;
-
- /**
- * Tests reporting an error
- *
- * @testng.test groups = "functional, notincluded"
- */
- public void isTestObjectNull()
- {
- Assert.assertNotNull( testObject, "testObject is null" );
- }
-
- /**
- * Sample method that shouldn't be run by test suite.
- *
- * @testng.test groups = "notincluded"
- */
- public void shouldNotRun()
- {
- Assert.assertTrue( false, "Group specified by test shouldnt be run." );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml b/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
deleted file mode 100644
index 93c9942..0000000
--- a/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
+++ /dev/null
@@ -1,85 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-junit-together</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG and Junit Together</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/JunitTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/JunitTest.java b/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/JunitTest.java
deleted file mode 100644
index 58931a9..0000000
--- a/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/JunitTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-import junit.framework.TestCase;
-
-/*
- * 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.
- */
-
-/**
- * Provided to ensure both junit and testng tests can run together.
- *
- * @author jkuhnert
- */
-public class JunitTest extends TestCase {
-
- Object testObject;
-
- /**
- * Creates an object instance
- */
- public void setUp()
- {
- testObject = new Object();
- }
-
- /**
- * Tests that object created in setup
- * isn't null.
- */
- public void testJunitObject()
- {
- assertNotNull(testObject);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/TestNGJunitTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/TestNGJunitTest.java b/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/TestNGJunitTest.java
deleted file mode 100644
index 185e60c..0000000
--- a/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/TestNGJunitTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-/*
- * 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.
- */
-
-/**
- * Simple test
- *
- * @author jkuhnert
- */
-public class TestNGJunitTest {
-
- /**
- * Sets up testObject
- */
- @BeforeClass
- public void configureTest()
- {
- testObject = new Object();
- }
-
- Object testObject;
-
- /**
- * Tests reporting an error
- */
- @Test
- public void testNGTest()
- {
- assert testObject != null : "testObject is null";
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml b/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml
deleted file mode 100644
index e8efb68..0000000
--- a/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml
+++ /dev/null
@@ -1,50 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>testng-junit4-together</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG and Junit4 Together</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4NoRunWithTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4NoRunWithTest.java b/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4NoRunWithTest.java
deleted file mode 100644
index a7b6934..0000000
--- a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4NoRunWithTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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 static org.junit.Assert.assertNotNull;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Provided to ensure both junit and testng tests can run together.
- *
- * @author jkuhnert
- * @author agudian
- */
-public class Junit4NoRunWithTest {
-
- Object testObject;
-
- /**
- * Creates an object instance
- */
- @Before
- public void setUp()
- {
- testObject = new Object();
- }
-
- /**
- * Tests that object created in setup
- * isn't null.
- */
- @Test
- public void isJunitObject()
- {
- assertNotNull(testObject);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4SimpleRunWithTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4SimpleRunWithTest.java b/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4SimpleRunWithTest.java
deleted file mode 100644
index d9a6420..0000000
--- a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4SimpleRunWithTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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 static org.junit.Assert.assertNotNull;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Provided to ensure both junit and testng tests can run together.
- *
- * @author jkuhnert
- * @author agudian
- */
-@RunWith(JUnit4.class)
-public class Junit4SimpleRunWithTest {
-
- Object testObject;
-
- /**
- * Creates an object instance
- */
- @Before
- public void setUp()
- {
- testObject = new Object();
- }
-
- /**
- * Tests that object created in setup
- * isn't null.
- */
- @Test
- public void isJunitObject()
- {
- assertNotNull(testObject);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/TestNGTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/TestNGTest.java b/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/TestNGTest.java
deleted file mode 100644
index a7edb4a..0000000
--- a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/TestNGTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-
-/**
- * Simple test
- *
- * @author jkuhnert
- */
-public class TestNGTest {
-
- /**
- * Sets up testObject
- */
- @BeforeClass
- public void configureTest()
- {
- testObject = new Object();
- }
-
- Object testObject;
-
- /**
- * Tests reporting an error
- */
- @Test
- public void testNGTest()
- {
- assert testObject != null : "testObject is null";
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml b/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml
deleted file mode 100644
index af6ac28..0000000
--- a/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml
+++ /dev/null
@@ -1,90 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-listener-reporter</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG listener and reporter test</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <exclusions>
- <exclusion>
- <!-- Excluded for 5.14.3, 5.14.4 and 5.14.5 which depend on this artifact -->
- <groupId>org.testng</groupId>
- <artifactId>guice</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <properties>
- <property><name>usedefaultlisteners</name><value>false</value></property>
- <property><name>listener</name><value>listenReport.ResultListener,listenReport.SuiteListener</value></property>
- <property><name>reporter</name><value>listenReport.Reporter</value></property>
- </properties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/FileHelper.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/FileHelper.java b/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/FileHelper.java
deleted file mode 100644
index 6a6688a..0000000
--- a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/FileHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package listenReport;
-
-/*
- * 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.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class FileHelper
-{
- public static void writeFile(String fileName, String content)
- {
- try
- {
- File target = new File( "target" ).getAbsoluteFile();
- File listenerOutput = new File( target, fileName );
- FileWriter out = new FileWriter(listenerOutput);
- out.write( content );
- out.flush();
- out.close();
- }
- catch ( IOException e )
- {
- throw new RuntimeException(e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/Reporter.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/Reporter.java b/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/Reporter.java
deleted file mode 100644
index 4586270..0000000
--- a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/Reporter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package listenReport;
-
-/*
- * 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.List;
-
-import org.testng.IReporter;
-import org.testng.ISuite;
-import org.testng.xml.XmlSuite;
-
-public class Reporter
- implements IReporter
-{
-
- public void generateReport( List<XmlSuite> xmlSuites, List<ISuite> suites, String outputDirectory )
- {
- FileHelper.writeFile( "reporter-output.txt", "This is a reporter" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/ResultListener.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/ResultListener.java b/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/ResultListener.java
deleted file mode 100644
index fd1f461..0000000
--- a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/ResultListener.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package listenReport;
-
-/*
- * 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.testng.ITestContext;
-import org.testng.ITestResult;
-import org.testng.internal.IResultListener;
-
-
-public class ResultListener
- implements IResultListener
-{
-
- public void onFinish( ITestContext context )
- {
-
- }
-
- public void onStart( ITestContext context )
- {
- FileHelper.writeFile( "resultlistener-output.txt", "This is a result listener" );
- }
-
- public void onTestFailedButWithinSuccessPercentage( ITestResult result )
- {
-
- }
-
- public void onTestFailure( ITestResult result )
- {
-
- }
-
- public void onTestSkipped( ITestResult result )
- {
-
-
- }
-
- public void onTestStart( ITestResult result )
- {
-
-
- }
-
- public void onTestSuccess( ITestResult result )
- {
-
-
- }
-
- public void onConfigurationFailure( ITestResult itr )
- {
-
-
- }
-
- public void onConfigurationSkip( ITestResult itr )
- {
-
-
- }
-
- public void onConfigurationSuccess( ITestResult itr )
- {
-
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/SuiteListener.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/SuiteListener.java b/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/SuiteListener.java
deleted file mode 100644
index 48a86b4..0000000
--- a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/SuiteListener.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package listenReport;
-
-/*
- * 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.testng.ISuite;
-import org.testng.ISuiteListener;
-
-public class SuiteListener
- implements ISuiteListener
-{
-
- public void onFinish( ISuite suite )
- {
-
- }
-
- public void onStart( ISuite suite )
- {
- FileHelper.writeFile( "suitelistener-output.txt", "This is a suite listener" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/TestNGSuiteTest.java b/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/TestNGSuiteTest.java
deleted file mode 100644
index 3e27834..0000000
--- a/surefire-integration-tests/src/test/resources/testng-listener-reporter/src/test/java/listenReport/TestNGSuiteTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package listenReport;
-
-/*
- * 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.testng.annotations.Test;
-
-
-public class TestNGSuiteTest {
-
- @Test
- public void doNothing()
- {
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-listeners/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-listeners/pom.xml b/surefire-integration-tests/src/test/resources/testng-listeners/pom.xml
deleted file mode 100644
index e2482a2..0000000
--- a/surefire-integration-tests/src/test/resources/testng-listeners/pom.xml
+++ /dev/null
@@ -1,43 +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/xsd/maven-4.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>
-
- <artifactId>testng-listeners</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.8</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java b/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java
deleted file mode 100644
index 5ba401f..0000000
--- a/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package listeners;
-
-/*
- * 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.testng.IInvokedMethod;
-import org.testng.IInvokedMethodListener;
-import org.testng.ITestContext;
-import org.testng.ITestListener;
-import org.testng.ITestResult;
-
-/**
- * Created by etigwuu on 2014-04-26.
- */
-public class MarkAsFailureListener implements ITestListener, IInvokedMethodListener {
-
- //todo add @Override in surefire 3.0 running on the top of JDK 6
- public void onTestStart(ITestResult result) {
-
- }
-
- //todo add @Override in surefire 3.0 running on the top of JDK 6
- public void onTestSuccess(ITestResult result) {
-
- }
-
- public static int counter = 0;
- /**
- * I will be called twice in some condition!!!
- * @param result
- */
- //todo add @Override in surefire 3.0 running on the top of JDK 6
- public void onTestFailure(ITestResult result) {
- System.out.println(++counter);
- }
-
- //todo add @Override in surefire 3.0 running on the top of JDK 6
- public void onTestSkipped(ITestResult result) {
-
- }
-
- //todo add @Override in surefire 3.0 running on the top of JDK 6
- public void onTestFailedButWithinSuccessPercentage(ITestResult result) {
-
- }
-
- //todo add @Override in surefire 3.0 running on the top of JDK 6
- public void onStart(ITestContext context) {
-
- }
-
- //todo add @Override in surefire 3.0 running on the top of JDK 6
- public void onFinish(ITestContext context) {
-
- }
-
- //todo add @Override in surefire 3.0 running on the top of JDK 6
- public void beforeInvocation(IInvokedMethod method, ITestResult testResult) {
-
- }
-
- //todo add @Override in surefire 3.0 running on the top of JDK 6
- public void afterInvocation(IInvokedMethod method, ITestResult testResult) {
- testResult.setStatus(ITestResult.FAILURE);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/SimpleTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/SimpleTest.java b/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/SimpleTest.java
deleted file mode 100644
index f4204a1..0000000
--- a/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/SimpleTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package listeners;
-
-/*
- * 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.testng.annotations.Listeners;
-import org.testng.annotations.Test;
-
-/**
- * Created by etigwuu on 2014-04-26.
- */
-@Listeners(MarkAsFailureListener.class)
-public class SimpleTest {
-
- @Test
- public void test1(){
- System.out.println("Hello world");
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml
deleted file mode 100644
index 41768cd..0000000
--- a/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml
+++ /dev/null
@@ -1,79 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for Testng</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <test>BasicTest#testSuccess*</test>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-method-pattern-after/src/test/java/testng/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern-after/src/test/java/testng/BasicTest.java b/surefire-integration-tests/src/test/resources/testng-method-pattern-after/src/test/java/testng/BasicTest.java
deleted file mode 100644
index 468e425..0000000
--- a/surefire-integration-tests/src/test/resources/testng-method-pattern-after/src/test/java/testng/BasicTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package testng;
-
-/*
- * 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.testng.annotations.*;
-import org.testng.Assert;
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- private Integer foo;
-
- @BeforeTest
- public void intialize()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- foo = Integer.valueOf( 1 );
- }
-
- @AfterTest
- public void shutdown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( setUpCalled );
- Assert.assertNotNull( foo );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- Assert.assertNotNull( foo );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- Assert.assertNotNull( foo );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
[46/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
deleted file mode 100644
index ed0d40c..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-/*
- * 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.plugin.surefire.log.api.ConsoleLogger;
-import org.apache.maven.plugin.surefire.log.api.PrintStreamLogger;
-import org.apache.maven.plugins.surefire.report.ReportTestSuite;
-import org.apache.maven.plugins.surefire.report.SurefireReportParser;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
-
-@SuppressWarnings( { "JavaDoc" } )
-public class HelperAssertions
-{
- /**
- * assert that the reports in the specified testDir have the right summary statistics
- */
- public static void assertTestSuiteResults( int total, int errors, int failures, int skipped, File testDir )
- {
- IntegrationTestSuiteResults suite = parseTestResults( testDir );
- assertTestSuiteResults( total, errors, failures, skipped, suite );
- }
-
- public static void assertTestSuiteResults( int total, int errors, int failures, int skipped, int flakes, File testDir )
- {
- IntegrationTestSuiteResults suite = parseTestResults( testDir );
- assertTestSuiteResults( total, errors, failures, skipped, flakes, suite );
- }
-
- public static void assertTestSuiteResults( int total, File testDir )
- {
- IntegrationTestSuiteResults suite = parseTestResults( testDir );
- assertTestSuiteResults( total, suite );
- }
-
- /**
- * assert that the reports in the specified testDir have the right summary statistics
- */
- public static void assertIntegrationTestSuiteResults( int total, int errors, int failures, int skipped,
- File testDir )
- {
- IntegrationTestSuiteResults suite = parseIntegrationTestResults( testDir );
- assertTestSuiteResults( total, errors, failures, skipped, suite );
- }
-
- public static void assertIntegrationTestSuiteResults( int total, File testDir )
- {
- IntegrationTestSuiteResults suite = parseIntegrationTestResults( testDir );
- assertTestSuiteResults( total, suite );
- }
-
- public static void assertTestSuiteResults( int total, int errors, int failures, int skipped,
- IntegrationTestSuiteResults actualSuite )
- {
- assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
- assertEquals( "wrong number of errors", errors, actualSuite.getErrors() );
- assertEquals( "wrong number of failures", failures, actualSuite.getFailures() );
- assertEquals( "wrong number of skipped", skipped, actualSuite.getSkipped() );
- }
-
- public static void assertTestSuiteResults( int total, IntegrationTestSuiteResults actualSuite )
- {
- assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
- }
-
- public static void assertTestSuiteResults( int total, int errors, int failures, int skipped, int flakes,
- IntegrationTestSuiteResults actualSuite )
- {
- assertTestSuiteResults(total, errors, failures, skipped, actualSuite);
- assertEquals( "wrong number of flaky tests", flakes, actualSuite.getFlakes() );
- }
-
- public static IntegrationTestSuiteResults parseTestResults( File... testDirs )
- {
- List<ReportTestSuite> reports = extractReports( testDirs );
- return parseReportList( reports );
- }
-
- public static IntegrationTestSuiteResults parseIntegrationTestResults( File... testDirs )
- {
- List<ReportTestSuite> reports = extractITReports( testDirs );
- return parseReportList( reports );
- }
-
- /**
- * Converts a list of ReportTestSuites into an IntegrationTestSuiteResults object, suitable for summary assertions
- */
- public static IntegrationTestSuiteResults parseReportList( List<ReportTestSuite> reports )
- {
- assertTrue( "No reports!", !reports.isEmpty() );
- int total = 0, errors = 0, failures = 0, skipped = 0, flakes = 0;
- for ( ReportTestSuite report : reports )
- {
- total += report.getNumberOfTests();
- errors += report.getNumberOfErrors();
- failures += report.getNumberOfFailures();
- skipped += report.getNumberOfSkipped();
- flakes += report.getNumberOfFlakes();
- }
- return new IntegrationTestSuiteResults( total, errors, failures, skipped, flakes );
- }
-
- public static List<ReportTestSuite> extractReports( File... testDirs )
- {
- List<File> reportsDirs = new ArrayList<File>();
- for ( File testDir : testDirs )
- {
- File reportsDir = new File( testDir, "target/surefire-reports" );
- assertTrue( "Reports directory is missing: " + reportsDir.getAbsolutePath(), reportsDir.exists() );
- reportsDirs.add( reportsDir );
- }
- ConsoleLogger logger = new PrintStreamLogger( System.out );
- SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.getDefault(), logger );
- try
- {
- return parser.parseXMLReportFiles();
- }
- catch ( Exception e )
- {
- throw new RuntimeException( "Couldn't parse XML reports", e );
- }
- }
-
- public static List<ReportTestSuite> extractITReports( File... testDirs )
- {
- List<File> reportsDirs = new ArrayList<File>();
- for ( File testDir : testDirs )
- {
- File reportsDir = new File( testDir, "target/failsafe-reports" );
- assertTrue( "Reports directory is missing: " + reportsDir.getAbsolutePath(), reportsDir.exists() );
- reportsDirs.add( reportsDir );
- }
- ConsoleLogger logger = new PrintStreamLogger( System.out );
- SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.getDefault(), logger );
- try
- {
- return parser.parseXMLReportFiles();
- }
- catch ( Exception e )
- {
- throw new RuntimeException( "Couldn't parse XML reports", e );
- }
- }
-
- public static void assumeJavaVersion( double expectedVersion )
- {
- String thisVersion = System.getProperty( "java.specification.version" );
- assumeTrue( "java.specification.version: " + thisVersion,
- Double.valueOf( thisVersion ) >= expectedVersion );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java
deleted file mode 100644
index f147281..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.
- */
-
-
-public class IntegrationTestSuiteResults
-{
- private int total, errors, failures, skipped, flakes;
-
- public IntegrationTestSuiteResults( int total, int errors, int failures, int skipped )
- {
- this.total = total;
- this.errors = errors;
- this.failures = failures;
- this.skipped = skipped;
- }
-
- public IntegrationTestSuiteResults( int total, int errors, int failures, int skipped, int flakes )
- {
- this(total, errors, failures, skipped);
- this.flakes = flakes;
- }
-
- public int getTotal()
- {
- return total;
- }
-
- public void setTotal( int total )
- {
- this.total = total;
- }
-
- public int getErrors()
- {
- return errors;
- }
-
- public void setErrors( int errors )
- {
- this.errors = errors;
- }
-
- public int getFailures()
- {
- return failures;
- }
-
- public void setFailures( int failures )
- {
- this.failures = failures;
- }
-
- public int getSkipped()
- {
- return skipped;
- }
-
- public void setSkipped( int skipped )
- {
- this.skipped = skipped;
- }
-
- public int getFlakes()
- {
- return flakes;
- }
-
- public void setFlakes( int flakes )
- {
- this.flakes = flakes;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
deleted file mode 100755
index bd12dda..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++ /dev/null
@@ -1,504 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.commons.lang.text.StrSubstitutor;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.shared.utils.io.FileUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import static java.util.Collections.unmodifiableList;
-
-/**
- * Encapsulate all needed features to start a maven run
- * <br>
- *
- * @author Kristian Rosenvold
- */
-public class MavenLauncher
-{
- private final List<String> cliOptions = new ArrayList<String>();
-
- private final List<String> goals = new ArrayList<String>();
-
- private final Map<String, String> envvars = new HashMap<String, String>();
-
- private File unpackedAt;
-
- private Verifier verifier;
-
- private OutputValidator validator;
-
- private final Class testCaseBeingRun;
-
- private final String resourceName;
-
- private final String suffix;
-
- private final String[] cli;
-
- private boolean expectFailure;
-
- public MavenLauncher( Class testClass, String resourceName, String suffix, String[] cli )
- {
- this.testCaseBeingRun = testClass;
- this.resourceName = resourceName;
- this.suffix = suffix != null ? suffix : "";
- this.cli = cli == null ? null : cli.clone();
- resetGoals();
- resetCliOptions();
- }
-
- public MavenLauncher( Class testClass, String resourceName, String suffix )
- {
- this( testClass, resourceName, suffix, null );
- }
-
- public File getUnpackedAt()
- {
- return ensureUnpacked();
- }
-
- private File ensureUnpacked()
- {
- if ( unpackedAt == null )
- {
- unpackedAt = simpleExtractResources( testCaseBeingRun, resourceName );
- }
- return unpackedAt;
- }
-
- public void moveUnpackTo( File dest )
- throws IOException
- {
- FileUtils.deleteDirectory( dest );
- //noinspection ResultOfMethodCallIgnored
- getUnpackedAt().renameTo( dest );
- unpackedAt = dest;
- }
-
- public void resetGoals()
- {
- goals.clear();
- }
-
- void addCliOption( String cliOption )
- {
- cliOptions.add( cliOption );
- }
-
-
-
- private StackTraceElement findTopElemenent( StackTraceElement[] stackTrace, Class testClassToLookFor )
- {
- StackTraceElement bestmatch = null;
- for ( StackTraceElement stackTraceElement : stackTrace )
- {
- if ( stackTraceElement.getClassName().equals( testClassToLookFor.getName() ) )
- {
- bestmatch = stackTraceElement;
- }
- }
- return bestmatch;
- }
-
- StackTraceElement[] getStackTraceElements()
- {
- try
- {
- throw new RuntimeException();
- }
- catch ( RuntimeException e )
- {
- return e.getStackTrace();
- }
- }
-
- public void reset()
- {
- resetGoals();
- resetCliOptions();
- }
-
- private void resetCliOptions()
- {
- cliOptions.clear();
- }
-
- public MavenLauncher getSubProjectLauncher( String subProject )
- throws VerificationException
- {
- MavenLauncher mavenLauncher =
- new MavenLauncher( testCaseBeingRun, resourceName + File.separator + subProject, suffix, cli );
- mavenLauncher.unpackedAt = new File( ensureUnpacked(), subProject );
- return mavenLauncher;
- }
-
- public OutputValidator getSubProjectValidator( String subProject )
- throws VerificationException
- {
- final File subFile = getValidator().getSubFile( subProject );
- return new OutputValidator( new Verifier( subFile.getAbsolutePath() ) );
- }
-
-
- public MavenLauncher addEnvVar( String key, String value )
- {
- envvars.put( key, value );
- return this;
- }
-
- public MavenLauncher assertNotPresent( String subFile )
- {
- getVerifier().assertFileNotPresent( getValidator().getSubFile( subFile ).getAbsolutePath() );
- return this;
- }
-
- public MavenLauncher showErrorStackTraces()
- {
- addCliOption( "-e" );
- return this;
- }
-
- public MavenLauncher debugLogging()
- {
- addCliOption( "-X" );
- return this;
- }
-
- public MavenLauncher failNever()
- {
- addCliOption( "-fn" );
- return this;
- }
-
- public MavenLauncher offline()
- {
- addCliOption( "-o" );
- return this;
- }
-
- public MavenLauncher skipClean()
- {
- writeGoal( "-Dclean.skip=true" );
- return this;
- }
-
- public MavenLauncher addGoal( String goal )
- {
- writeGoal( goal );
- return this;
- }
-
- public FailsafeOutputValidator executeVerify()
- {
- return new FailsafeOutputValidator( conditionalExec( "verify" ) );
- }
-
- public OutputValidator executeTest()
- {
- return conditionalExec( "test" );
- }
-
- List<String> getGoals()
- {
- return unmodifiableList( goals );
- }
-
- private void writeGoal( String newGoal )
- {
- if ( newGoal != null && newGoal.startsWith( "-D" ) )
- {
- final String sysPropKey =
- newGoal.contains( "=" ) ? newGoal.substring( 0, newGoal.indexOf( '=' ) ) : newGoal;
-
- final String sysPropStarter = sysPropKey + "=";
-
- for ( ListIterator<String> it = goals.listIterator(); it.hasNext(); )
- {
- String goal = it.next();
- if ( goal.equals( sysPropKey ) || goal.startsWith( sysPropStarter ) )
- {
- System.out.printf( "[WARNING] System property already exists '%s'. Overriding to '%s'.\n",
- goal, newGoal );
- it.set( newGoal );
- return;
- }
- }
- }
- goals.add( newGoal );
- }
-
- private OutputValidator conditionalExec(String goal)
- {
- OutputValidator verify;
- try
- {
- verify = execute( goal );
- }
- catch ( SurefireVerifierException exc )
- {
- if ( expectFailure )
- {
- return getValidator();
- }
- else
- {
- throw exc;
- }
- }
- if ( expectFailure )
- {
- throw new RuntimeException( "Expecting build failure, got none!" );
- }
- return verify;
-
- }
-
- public MavenLauncher withFailure()
- {
- this.expectFailure = true;
- return this;
- }
-
-
- public OutputValidator execute( String goal )
- {
- addGoal( goal );
- return executeCurrentGoals();
- }
-
- public OutputValidator executeCurrentGoals()
- {
-
- String userLocalRepo = System.getProperty( "user.localRepository" );
- String testBuildDirectory = System.getProperty( "testBuildDirectory" );
- boolean useInterpolatedSettings = Boolean.getBoolean( "useInterpolatedSettings" );
-
- try
- {
- if ( useInterpolatedSettings )
- {
- File interpolatedSettings = new File( testBuildDirectory, "interpolated-settings" );
-
- if ( !interpolatedSettings.exists() )
- {
- // hack "a la" invoker plugin to download dependencies from local repo
- // and not download from central
-
- Map<String, String> values = new HashMap<String, String>( 1 );
- values.put( "localRepositoryUrl", toUrl( userLocalRepo ) );
- StrSubstitutor strSubstitutor = new StrSubstitutor( values );
-
- String fileContent = FileUtils.fileRead( new File( testBuildDirectory, "settings.xml" ) );
-
- String filtered = strSubstitutor.replace( fileContent );
-
- FileUtils.fileWrite( interpolatedSettings.getAbsolutePath(), filtered );
-
- }
-
- addCliOption( "-s " + interpolatedSettings.getCanonicalPath() );
- }
- getVerifier().setCliOptions( cliOptions );
-
- getVerifier().executeGoals( goals, envvars );
- return getValidator();
- }
- catch ( IOException e )
- {
- throw new SurefireVerifierException( e.getMessage(), e );
- }
- catch ( VerificationException e )
- {
- throw new SurefireVerifierException( e.getMessage(), e );
- }
- finally
- {
- getVerifier().resetStreams();
- }
- }
-
- private static String toUrl( String filename )
- {
- /*
- * NOTE: Maven fails to properly handle percent-encoded "file:" URLs (WAGON-111) so don't use File.toURI() here
- * as-is but use the decoded path component in the URL.
- */
- String url = "file://" + new File( filename ).toURI().getPath();
- if ( url.endsWith( "/" ) )
- {
- url = url.substring( 0, url.length() - 1 );
- }
- return url;
- }
-
- public MavenLauncher activateProfile( String profile )
- {
- return addGoal( "-P" + profile );
- }
-
- public MavenLauncher sysProp( String variable, String value )
- {
- return addGoal( "-D" + variable + "=" + value );
- }
-
- public MavenLauncher sysProp( Map<String, String> properties )
- {
- for ( Map.Entry<String, String> property : properties.entrySet() )
- {
- sysProp( property.getKey(), property.getValue() );
- }
- return this;
- }
-
- public MavenLauncher sysProp( String variable, boolean value )
- {
- return addGoal( "-D" + variable + "=" + value );
- }
-
- public MavenLauncher sysProp( String variable, int value )
- {
- return addGoal( "-D" + variable + "=" + value );
- }
-
- public MavenLauncher sysProp( String variable, double value )
- {
- return addGoal( "-D" + variable + "=" + value );
- }
-
- public MavenLauncher showExceptionMessages()
- {
- addCliOption( "-e" );
- return this;
- }
-
- public MavenLauncher deleteSiteDir()
- {
- try
- {
- FileUtils.deleteDirectory( getValidator().getSubFile( "site" ) );
- }
- catch ( IOException e )
- {
- throw new SurefireVerifierException( e );
- }
- return this;
- }
-
- public OutputValidator getValidator()
- {
- if ( validator == null )
- {
- this.validator = new OutputValidator( getVerifier() );
- }
- return validator;
- }
-
- public void setForkJvm( boolean forkJvm ) {
- getVerifier().setForkJvm( forkJvm );
- }
-
- private Verifier getVerifier()
- {
- if ( verifier == null )
- {
- try
- {
- verifier =
- cli == null
- ? new Verifier( ensureUnpacked().getAbsolutePath(), null, false )
- : new Verifier( ensureUnpacked().getAbsolutePath(), null, false, cli );
- }
- catch ( VerificationException e )
- {
- throw new RuntimeException( e );
- }
- }
- return verifier;
- }
-
- private File simpleExtractResources( Class<?> cl, String resourcePath )
- {
- if ( !resourcePath.startsWith( "/" ) )
- {
- resourcePath = "/" + resourcePath;
- }
- File tempDir = getUnpackDir();
- File testDir = new File( tempDir, resourcePath );
- try
- {
- File parentPom = new File( tempDir.getParentFile(), "pom.xml" );
- if (!parentPom.exists()){
- URL resource = cl.getResource( "/pom.xml" );
- FileUtils.copyURLToFile( resource, parentPom );
- }
-
- FileUtils.deleteDirectory( testDir );
- File file = ResourceExtractor.extractResourceToDestination( cl, resourcePath, tempDir, true );
- return file.getCanonicalFile();
- }
- catch ( IOException e )
- {
- throw new RuntimeException( e );
- }
-
- }
-
- File getUnpackDir()
- {
- String tempDirPath = System.getProperty( "maven.test.tmpdir", System.getProperty( "java.io.tmpdir" ) );
- return new File( tempDirPath,
- testCaseBeingRun.getSimpleName() + "_" + getTestMethodName() + suffix );
- }
-
- public File getArtifactPath( String gid, String aid, String version, String ext )
- {
- return new File( verifier.getArtifactPath( gid, aid, version, ext ) );
- }
-
- String getTestMethodName()
- {
- // dirty. Im sure we can use junit4 rules to attach testname to thread instead
- StackTraceElement[] stackTrace = getStackTraceElements();
- StackTraceElement topInTestClass;
- topInTestClass = findTopElemenent( stackTrace, testCaseBeingRun );
- if ( topInTestClass == null )
- {
- // Look in superclass...
- topInTestClass = findTopElemenent( stackTrace, testCaseBeingRun.getSuperclass() );
- }
- if ( topInTestClass != null )
- {
- return topInTestClass.getMethodName();
- }
- throw new IllegalStateException( "Cannot find " + testCaseBeingRun.getName() + "in stacktrace" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java
deleted file mode 100644
index 42657c0..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.hamcrest.CoreMatchers.hasItems;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.20
- */
-public class MavenLauncherTest
-{
- @Test
- public void shouldNotDuplicateSystemProperties()
- {
- MavenLauncher launcher = new MavenLauncher( getClass(), "", "" )
- .addGoal( "-DskipTests" )
- .addGoal( "-Dx=a" )
- .addGoal( "-DskipTests" )
- .addGoal( "-Dx=b" );
-
- assertThat( launcher.getGoals(), hasItems( "-Dx=b", "-DskipTests" ) );
-
- assertThat( launcher.getGoals().size(), is( 2 ) );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
deleted file mode 100644
index a76f86f..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.hamcrest.Matcher;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-
-/**
- * A specialized verifier that enforces a standard use case for surefire IT's
- *
- * @author Kristian Rosenvold
- */
-public class OutputValidator
-{
- protected final Verifier verifier;
-
- protected final File baseDir;
-
- public OutputValidator( Verifier verifier )
- {
- this.verifier = verifier;
- this.baseDir = new File( verifier.getBasedir() );
- }
-
- public OutputValidator verifyTextInLog( String text )
- {
- try
- {
- verifier.verifyTextInLog( text );
- }
- catch ( VerificationException e )
- {
- throw new SurefireVerifierException( e );
- }
- return this;
- }
-
-
- public OutputValidator verifyErrorFreeLog()
- {
- try
- {
- verifier.verifyErrorFreeLog();
- }
- catch ( VerificationException e )
- {
- throw new SurefireVerifierException( e );
- }
- return this;
- }
-
- public OutputValidator verifyErrorFree( int total )
- {
- try
- {
- verifier.verifyErrorFreeLog();
- this.assertTestSuiteResults( total, 0, 0, 0 );
- return this;
- }
- catch ( VerificationException e )
- {
- throw new SurefireVerifierException( e );
- }
- }
-
- public OutputValidator assertThatLogLine( Matcher<String> line, Matcher<Integer> nTimes )
- throws VerificationException
- {
- int counter = 0;
- for ( String log : loadLogLines() )
- {
- if ( line.matches( log ) )
- {
- counter++;
- }
- }
- assertThat( "log pattern does not match nTimes", counter, nTimes );
- return this;
- }
-
- public Collection<String> loadLogLines()
- throws VerificationException
- {
- return verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
- }
-
- public List<String> loadFile( File file, Charset charset )
- {
- //noinspection unchecked
- try
- {
- return FileUtils.readLines( file, charset.name() );
- }
- catch ( IOException e )
- {
- throw new SurefireVerifierException( e );
- }
- }
-
- public String getBasedir()
- {
- return verifier.getBasedir();
- }
-
- /**
- * Returns a file, referenced from the extracted root (where pom.xml is located)
- *
- * @param path The subdirectory under basedir
- * @return A file
- */
- public File getSubFile( String path )
- {
- return new File( getBasedir(), path );
- }
-
- public OutputValidator assertTestSuiteResults( int total, int errors, int failures, int skipped )
- {
- HelperAssertions.assertTestSuiteResults( total, errors, failures, skipped, baseDir );
- return this;
- }
-
- public OutputValidator assertTestSuiteResults( int total, int errors, int failures, int skipped, int flakes )
- {
- HelperAssertions.assertTestSuiteResults( total, errors, failures, skipped, flakes, baseDir );
- return this;
- }
-
- public OutputValidator assertTestSuiteResults( int total )
- {
- HelperAssertions.assertTestSuiteResults( total, baseDir );
- return this;
- }
-
- public OutputValidator assertIntegrationTestSuiteResults( int total, int errors, int failures, int skipped )
- {
- HelperAssertions.assertIntegrationTestSuiteResults( total, errors, failures, skipped, baseDir );
- return this;
- }
-
- public OutputValidator assertIntegrationTestSuiteResults( int total )
- {
- HelperAssertions.assertIntegrationTestSuiteResults( total, baseDir );
- return this;
- }
-
- public TestFile getTargetFile( String modulePath, String fileName )
- {
- File targetDir = getSubFile( modulePath + "/target" );
- return new TestFile( new File( targetDir, fileName ), this );
- }
-
- public TestFile getTargetFile( String fileName )
- {
- File targetDir = getSubFile( "target" );
- return new TestFile( new File( targetDir, fileName ), this );
- }
-
- public TestFile getSurefireReportsFile( String fileName )
- {
- File targetDir = getSurefireReportsDirectory();
- return new TestFile( new File( targetDir, fileName ), this );
- }
-
- public TestFile getSurefireReportsXmlFile( String fileName )
- {
- File targetDir = getSurefireReportsDirectory();
- return new TestFile( new File( targetDir, fileName ), Charset.forName( "UTF-8" ), this );
- }
-
- public File getSurefireReportsDirectory()
- {
- return getSubFile( "target/surefire-reports" );
- }
-
- public TestFile getSiteFile( String fileName )
- {
- File targetDir = getSubFile( "target/site" );
- return new TestFile( new File( targetDir, fileName ), this );
- }
-
- public File getBaseDir()
- {
- return baseDir;
- }
-
- public boolean stringsAppearInSpecificOrderInLog( String[] strings )
- throws VerificationException
- {
- int i = 0;
- for ( String line : loadLogLines() )
- {
- if ( line.startsWith( strings[i] ) )
- {
- if ( i == strings.length - 1 )
- {
- return true;
- }
- ++i;
- }
- }
- return false;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/Settings.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/Settings.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/Settings.java
deleted file mode 100644
index 28013fb..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/Settings.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.
- */
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19
- */
-public enum Settings
-{
- JUNIT4_TEST( TestFramework.JUNIT4, Configuration.TEST ),
- JUNIT47_TEST( TestFramework.JUNIT47, Configuration.TEST ),
- JUNIT4_INCLUDES( TestFramework.JUNIT4, Configuration.INCLUDES ),
- JUNIT47_INCLUDES( TestFramework.JUNIT47, Configuration.INCLUDES ),
- JUNIT4_INCLUDES_EXCLUDES( TestFramework.JUNIT4, Configuration.INCLUDES_EXCLUDES ),
- JUNIT47_INCLUDES_EXCLUDES( TestFramework.JUNIT47, Configuration.INCLUDES_EXCLUDES ),
- JUNIT4_INCLUDES_FILE( TestFramework.JUNIT4, Configuration.INCLUDES_FILE ),
- JUNIT47_INCLUDES_FILE( TestFramework.JUNIT47, Configuration.INCLUDES_FILE ),
- JUNIT4_INCLUDES_EXCLUDES_FILE( TestFramework.JUNIT4, Configuration.INCLUDES_EXCLUDES_FILE ),
- JUNIT47_INCLUDES_EXCLUDES_FILE( TestFramework.JUNIT47, Configuration.INCLUDES_EXCLUDES_FILE ),
- TestNG_TEST( TestFramework.TestNG, Configuration.TEST ),
- TestNG_INCLUDES( TestFramework.TestNG, Configuration.INCLUDES ),
- TestNG_INCLUDES_EXCLUDES( TestFramework.TestNG, Configuration.INCLUDES_EXCLUDES ),
- TestNG_INCLUDES_FILE( TestFramework.TestNG, Configuration.INCLUDES_FILE ),
- TestNG_INCLUDES_EXCLUDES_FILE( TestFramework.TestNG, Configuration.INCLUDES_EXCLUDES_FILE );
-
- private final TestFramework framework;
- private final Configuration configuration;
-
- Settings( TestFramework framework, Configuration configuration )
- {
- this.framework = framework;
- this.configuration = configuration;
- }
-
- public String path()
- {
- return name().replace( '_', '-' ).toLowerCase();
- }
-
- public String profile()
- {
- return path();
- }
-
- public TestFramework getFramework()
- {
- return framework;
- }
-
- public Configuration getConfiguration()
- {
- return configuration;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
deleted file mode 100644
index ee04dbc..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.
- */
-
-/**
- * Contains commonly used features for most tests, encapsulating
- * common use cases.
- * <br>
- * Also includes thread-safe access to the extracted resource
- * files, which AbstractSurefireIntegrationTestClass does not.
- * Thread safe only for running in "classes" mode.
- *
- * @author Kristian Rosenvold
- */
-public abstract class SurefireJUnit4IntegrationTestCase
-{
- public OutputValidator executeErrorFreeTest( String sourceName, int total )
- {
- return unpack( sourceName ).executeTest().verifyErrorFree( total );
- }
-
- public SurefireLauncher unpack( String sourceName )
- {
- return unpack( getClass(), sourceName, "" );
- }
-
- public SurefireLauncher unpack( String sourceName, String suffix )
- {
- return unpack( getClass(), sourceName, suffix );
- }
-
- public static SurefireLauncher unpack( Class testClass, String sourceName, String suffix, String[] cli )
- {
- MavenLauncher mavenLauncher = new MavenLauncher( testClass, sourceName, suffix, cli );
- return new SurefireLauncher( mavenLauncher );
- }
-
- public static SurefireLauncher unpack( Class testClass, String sourceName, String suffix )
- {
- return unpack( testClass, sourceName, suffix, null );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
deleted file mode 100755
index 76d96e0..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++ /dev/null
@@ -1,492 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.it.VerificationException;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.apache.commons.lang3.StringUtils.isBlank;
-
-/**
- * Encapsulate all needed features to start a surefire run
- * <br>
- * Also includes thread-safe access to the extracted resource
- * files
- *
- * @author Kristian Rosenvold -
- */
-public final class SurefireLauncher
-{
- public static final String EXT_JDK_HOME_KEY = "jdk.home";
-
- public static final String EXT_JDK_HOME = System.getProperty( EXT_JDK_HOME_KEY );
-
- private static final File JAVA_HOME = javaHome();
-
- private final MavenLauncher mavenLauncher;
-
- private final String surefireVersion = System.getProperty( "surefire.version" );
-
- public SurefireLauncher( MavenLauncher mavenLauncher )
- {
- this.mavenLauncher = mavenLauncher;
- reset();
- }
-
- public MavenLauncher maven()
- {
- return mavenLauncher;
- }
-
- String getTestMethodName()
- {
- return mavenLauncher.getTestMethodName();
- }
-
- public void reset()
- {
- mavenLauncher.reset();
- for ( String s : getInitialGoals() )
- {
- mavenLauncher.addGoal( s );
- }
- setInProcessJavaHome();
- }
-
- private static File javaHome()
- {
- String javaHome = isBlank( EXT_JDK_HOME ) ? System.getenv( "JAVA_HOME" ) : EXT_JDK_HOME;
- if ( isBlank( javaHome ) )
- {
- javaHome = System.getProperty( "java.home" );
- File jre = new File( javaHome );
- if ( "jre".equals( jre.getName() ) )
- {
- javaHome = jre.getParent();
- }
- }
-
- try
- {
- File javaHomeAsDir = new File( javaHome ).getCanonicalFile();
- if ( !javaHomeAsDir.isDirectory() )
- {
- throw new RuntimeException( javaHomeAsDir.getAbsolutePath() + " is not a JAVA_HOME directory." );
- }
- System.out.println( "Using JAVA_HOME=" + javaHomeAsDir.getAbsolutePath() + " in forked launcher." );
- return javaHomeAsDir;
- }
- catch ( IOException e )
- {
- throw new RuntimeException( e );
- }
- }
-
- private void setInProcessJavaHome()
- {
- setLauncherJavaHome( JAVA_HOME.getPath() );
- }
-
- public SurefireLauncher setLauncherJavaHome( String javaHome )
- {
- mavenLauncher.addEnvVar( "JAVA_HOME", javaHome );
- return this;
- }
-
- public SurefireLauncher getSubProjectLauncher( String subProject )
- throws VerificationException
- {
- return new SurefireLauncher( mavenLauncher.getSubProjectLauncher( subProject ) );
- }
-
- public OutputValidator getSubProjectValidator( String subProject )
- throws VerificationException
- {
- return mavenLauncher.getSubProjectValidator( subProject );
- }
-
- public SurefireLauncher addEnvVar( String key, String value )
- {
- mavenLauncher.addEnvVar( key, value );
- return this;
- }
-
- public SurefireLauncher setMavenOpts(String opts){
- addEnvVar( "MAVEN_OPTS", opts );
- return this;
- }
-
- private List<String> getInitialGoals()
- {
- List<String> goals = new ArrayList<>();
-
- goals.add( "-Dsurefire.version=" + surefireVersion );
-
- String jacocoAgent = System.getProperty( "jacoco.agent", "" );
- goals.add( "-Djacoco.agent=" + jacocoAgent );
-
- return goals;
- }
-
- public SurefireLauncher showErrorStackTraces()
- {
- mavenLauncher.showErrorStackTraces();
- return this;
- }
-
- public SurefireLauncher debugLogging()
- {
- mavenLauncher.debugLogging();
- return this;
- }
-
- @SuppressWarnings( "UnusedDeclaration" )
- public SurefireLauncher debugSurefireFork()
- {
- mavenLauncher.sysProp( "maven.surefire.debug", "true" );
- return this;
- }
-
- public SurefireLauncher failNever()
- {
- mavenLauncher.failNever();
- return this;
- }
-
- public SurefireLauncher groups( String groups )
- {
- mavenLauncher.sysProp( "groups", groups );
- return this;
- }
-
- public SurefireLauncher addGoal( String goal )
- {
- mavenLauncher.addGoal( goal );
- return this;
- }
-
- public OutputValidator executeTest()
- {
- return mavenLauncher.execute( "test" );
- }
-
- public OutputValidator executeInstall()
- throws VerificationException
- {
- return mavenLauncher.execute( "install" );
- }
-
-
- public FailsafeOutputValidator executeVerify()
- {
- OutputValidator verify = execute( "verify" );
- return new FailsafeOutputValidator( verify );
- }
-
- public OutputValidator execute( String goal )
- {
- return mavenLauncher.execute( goal );
- }
-
- public OutputValidator executeSurefireReport()
- {
- return mavenLauncher.execute( "surefire-report:report" );
- }
-
-
- public OutputValidator executeCurrentGoals()
- {
- return mavenLauncher.executeCurrentGoals();
- }
-
-
- public SurefireLauncher printSummary( boolean printsummary )
- {
- mavenLauncher.sysProp( "printSummary", printsummary );
- return this;
- }
-
- public SurefireLauncher redirectToFile( boolean redirect )
- {
- mavenLauncher.sysProp( "maven.test.redirectTestOutputToFile", redirect );
- return this;
- }
-
- public SurefireLauncher forkOnce()
- {
- return forkMode( "once" );
- }
-
- public SurefireLauncher forkNever()
- {
- return forkMode( "never" );
- }
-
- public SurefireLauncher forkAlways()
- {
- return forkMode( "always" );
- }
-
- public SurefireLauncher forkPerTest()
- {
- return forkMode( "pertest" );
- }
-
- public SurefireLauncher forkPerThread()
- {
- return forkMode( "perthread" );
- }
-
- public SurefireLauncher threadCount( int threadCount )
- {
- mavenLauncher.sysProp( "threadCount", threadCount );
- return this;
- }
-
- public SurefireLauncher forkCount( int forkCount )
- {
- mavenLauncher.sysProp( "forkCount", forkCount );
- return this;
- }
-
- public SurefireLauncher reuseForks( boolean reuseForks )
- {
- mavenLauncher.sysProp( "reuseForks", reuseForks );
- return this;
- }
-
- public SurefireLauncher forkMode( String forkMode )
- {
- mavenLauncher.sysProp( "forkMode", forkMode );
- return this;
- }
-
- public SurefireLauncher runOrder( String runOrder )
- {
- mavenLauncher.sysProp( "surefire.runOrder", runOrder );
- return this;
- }
-
- public SurefireLauncher failIfNoTests( boolean fail )
- {
- mavenLauncher.sysProp( "failIfNoTests", fail );
- return this;
- }
-
-
- public SurefireLauncher mavenTestFailureIgnore( boolean fail )
- {
- mavenLauncher.sysProp( "maven.test.failure.ignore", fail );
- return this;
- }
-
- public SurefireLauncher failIfNoSpecifiedTests( boolean fail )
- {
- mavenLauncher.sysProp( "surefire.failIfNoSpecifiedTests", fail );
- return this;
- }
-
- public SurefireLauncher useSystemClassLoader( boolean useSystemClassLoader )
- {
- mavenLauncher.sysProp( "useSystemClassLoader", useSystemClassLoader );
- return this;
- }
-
- public SurefireLauncher activateProfile( String profile )
- {
- mavenLauncher.activateProfile( profile );
- return this;
- }
-
-
- protected String getSurefireVersion()
- {
- return surefireVersion;
- }
-
- public SurefireLauncher disablePerCoreThreadCount()
- {
- mavenLauncher.sysProp( "perCoreThreadCount", false );
- return this;
- }
-
- public SurefireLauncher disableParallelOptimization()
- {
- mavenLauncher.sysProp( "parallelOptimized", "false" );
- return this;
- }
-
- public SurefireLauncher parallel( String parallel )
- {
- mavenLauncher.sysProp( "parallel", parallel );
- return this;
- }
-
- public SurefireLauncher parallelSuites()
- {
- return parallel( "suites" );
- }
-
- public SurefireLauncher parallelClasses()
- {
- return parallel( "classes" );
- }
-
- public SurefireLauncher parallelMethods()
- {
- return parallel( "methods" );
- }
-
- public SurefireLauncher parallelBoth()
- {
- return parallel( "both" );
- }
-
- public SurefireLauncher parallelSuitesAndClasses()
- {
- return parallel( "suitesAndClasses" );
- }
-
- public SurefireLauncher parallelSuitesAndMethods()
- {
- return parallel( "suitesAndMethods" );
- }
-
- public SurefireLauncher parallelClassesAndMethods()
- {
- return parallel( "classesAndMethods" );
- }
-
- public SurefireLauncher parallelAll()
- {
- return parallel( "all" );
- }
-
- public SurefireLauncher useUnlimitedThreads()
- {
- mavenLauncher.sysProp( "useUnlimitedThreads", true );
- return this;
- }
-
- public SurefireLauncher threadCountSuites( int count )
- {
- mavenLauncher.sysProp( "threadCountSuites", count );
- return this;
- }
-
- public SurefireLauncher threadCountClasses( int count )
- {
- mavenLauncher.sysProp( "threadCountClasses", count );
- return this;
- }
-
- public SurefireLauncher threadCountMethods( int count )
- {
- mavenLauncher.sysProp( "threadCountMethods", count );
- return this;
- }
-
- public SurefireLauncher parallelTestsTimeoutInSeconds( double timeout )
- {
- mavenLauncher.sysProp( "surefire.parallel.timeout", timeout );
- return this;
- }
-
- public SurefireLauncher parallelTestsTimeoutForcedInSeconds( double timeout )
- {
- mavenLauncher.sysProp( "surefire.parallel.forcedTimeout", timeout );
- return this;
- }
-
- public SurefireLauncher argLine( String value )
- {
- mavenLauncher.sysProp( "argLine", value );
- return this;
- }
-
- public SurefireLauncher sysProp( String variable, String value )
- {
- mavenLauncher.sysProp( variable, value );
- return this;
- }
-
- public SurefireLauncher setJUnitVersion( String version )
- {
- mavenLauncher.sysProp( "junit.version", version );
- return this;
- }
-
- public SurefireLauncher setGroups( String groups )
- {
- mavenLauncher.sysProp( "groups", groups );
- return this;
- }
-
- public SurefireLauncher setExcludedGroups( String excludedGroups )
- {
- mavenLauncher.sysProp( "excludedGroups", excludedGroups );
- return this;
- }
-
-
- public File getUnpackedAt()
- {
- return mavenLauncher.getUnpackedAt();
- }
-
- public SurefireLauncher addFailsafeReportOnlyGoal()
- {
- mavenLauncher.addGoal( getReportPluginGoal( ":failsafe-report-only" ) );
- return this;
- }
-
- public SurefireLauncher addSurefireReportGoal()
- {
- mavenLauncher.addGoal( getReportPluginGoal( "report" ) );
- return this;
- }
-
- public SurefireLauncher addSurefireReportOnlyGoal()
- {
- mavenLauncher.addGoal( getReportPluginGoal( "report-only" ) );
- return this;
- }
-
- private String getReportPluginGoal( String goal )
- {
- return "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":" + goal;
- }
-
- public SurefireLauncher setTestToRun( String basicTest )
- {
- mavenLauncher.sysProp( "test", basicTest );
- return this;
- }
-
- public SurefireLauncher setForkJvm()
- {
- mavenLauncher.setForkJvm( true );
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
deleted file mode 100644
index b5df941..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.io.IOException;
-import org.apache.maven.it.VerificationException;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author Kristian Rosenvold
- */
-public class SurefireLauncherTest
-{
- @Test
- public void launcherGetsProperMethodName()
- throws IOException, VerificationException
- {
- MavenLauncher mavenLauncher = new MavenLauncher( SurefireLauncherTest.class, "foo", "" );
- String method = new SurefireLauncher( mavenLauncher ).getTestMethodName();
- assertEquals( "launcherGetsProperMethodName", method );
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
deleted file mode 100644
index 5201503..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.
- */
-
-/**
- * @author Kristian Rosenvold
- */
-public class SurefireVerifierException
- extends RuntimeException
-{
- public SurefireVerifierException( String message, Throwable cause )
- {
- super( message, cause );
- }
-
- public SurefireVerifierException( Throwable cause )
- {
- super( cause );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
deleted file mode 100644
index cf6ad84..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.Charset;
-import java.util.List;
-import org.apache.commons.io.FileUtils;
-
-import junit.framework.Assert;
-
-import static junit.framework.Assert.assertTrue;
-
-/**
- * @author Kristian Rosenvold
- */
-public class TestFile
-{
- private final File file;
-
- private final Charset encoding;
-
- private final OutputValidator surefireVerifier;
-
- public TestFile( File file, OutputValidator surefireVerifier )
- {
- this( file, Charset.defaultCharset(), surefireVerifier);
- }
-
- public TestFile( File file, Charset charset, OutputValidator surefireVerifier )
- {
- this.file = file;
- this.encoding = charset;
- this.surefireVerifier = surefireVerifier;
- }
-
- public OutputValidator assertFileExists()
- {
- assertTrue( "File doesn't exist: " + file.getAbsolutePath(), file.exists() );
- return surefireVerifier;
- }
-
- public OutputValidator assertFileNotExists()
- {
- assertTrue( "File doesn't exist: " + file.getAbsolutePath(), !file.exists() );
- return surefireVerifier;
- }
-
- public void delete()
- {
- //noinspection ResultOfMethodCallIgnored
- file.delete();
- }
-
- public String getAbsolutePath()
- {
- return file.getAbsolutePath();
- }
-
- public boolean exists()
- {
- return file.exists();
- }
-
- public FileInputStream getFileInputStream()
- throws FileNotFoundException
- {
- return new FileInputStream( file );
- }
-
- public String slurpFile()
- {
- try
- {
- StringBuilder sb = new StringBuilder();
- BufferedReader reader;
- reader = new BufferedReader( new FileReader( file ) );
- for ( String line = reader.readLine(); line != null; line = reader.readLine() )
- {
- sb.append( line );
- }
- reader.close();
- return sb.toString();
- }
- catch ( IOException e )
- {
- throw new SurefireVerifierException( e );
- }
-
- }
-
- public String readFileToString()
- {
- try
- {
- return FileUtils.readFileToString( file );
- }
- catch ( IOException e )
- {
- throw new SurefireVerifierException( e );
- }
- }
-
- public boolean isFile()
- {
- return file.isFile();
- }
-
- public TestFile assertContainsText( String text )
- {
- final List<String> list = surefireVerifier.loadFile( file, encoding );
- for ( String line : list )
- {
- if ( line.contains( text ) )
- {
- return this;
- }
- }
- Assert.fail( "Did not find expected message in log" );
- return null;
- }
-
- public URI toURI()
- {
- return file.toURI();
- }
-
- public File getFile()
- {
- return file;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFramework.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFramework.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFramework.java
deleted file mode 100644
index c544347..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFramework.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.
- */
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19
- */
-public enum TestFramework
-{
- JUNIT4, JUNIT47, TestNG
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
deleted file mode 100644
index 886cd07..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * "verify" goal ignores "dependenciesToScan" parameter when checking tests existence
- * <p>
- * Found in Surefire 2.16.
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1024">SUREFIRE-1024</a>
- * @since 2.19
- */
-public class Surefire1024VerifyFailsafeIfTestedIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void shouldScanAndRunTestsInDependencyJars() throws Exception {
- SurefireLauncher launcher = unpack( "surefire-1024" );
- launcher.executeVerify()
- .verifyTextInLog( "class jiras.surefire1024.A1IT#test() dependency to scan" );
-
- launcher.getSubProjectValidator( "jiras-surefire-1024-it" )
- .assertIntegrationTestSuiteResults( 1, 0, 0, 0 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
deleted file mode 100644
index ec63a8a..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * Plugin Configuration: parallel=classes
- * <br>
- * With Surefire 2.15
- * {@code $ mvn test -Dtest=MyTest#testFoo}
- * Results:
- * Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
- * <br>
- * With Surefire 2.16
- * {@code $ mvn test -Dtest=MyTest#testFoo}
- * <br>
- * Results:
- * Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1028">SUREFIRE-1028</a>
- * @since 2.18
- */
-public class Surefire1028UnableToRunSingleIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void methodFilteringParallelExecution()
- {
- unpack().setTestToRun( "SomeTest#test" ).parallelClasses().useUnlimitedThreads()
- .executeTest().verifyErrorFree( 1 ).verifyTextInLog( "OK!" );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-1028-unable-to-run-single-test" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
deleted file mode 100644
index 0d6d8b6..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.shared.utils.xml.Xpp3Dom;
-import org.apache.maven.shared.utils.xml.Xpp3DomBuilder;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.TestFile;
-import org.junit.Test;
-
-import java.io.FileNotFoundException;
-
-import static org.junit.Assert.*;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1036">SUREFIRE-1036</a>
- * @since 2.18
- */
-public class Surefire1036NonFilterableJUnitRunnerWithCategoriesIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void test()
- throws VerificationException, FileNotFoundException
- {
- OutputValidator validator = unpack().maven().executeTest();
- validator.assertTestSuiteResults( 1, 0, 0, 0 );
- assertFalse( validator.getSurefireReportsXmlFile(
- "TEST-jiras.surefire1036.TestSomethingWithMockitoRunner.xml" ).exists() );
- assertFalse( validator.getSurefireReportsXmlFile( "TEST-jiras.surefire1036.TestSomeUnit.xml" ).exists() );
- TestFile reportFile =
- validator.getSurefireReportsXmlFile( "TEST-jiras.surefire1036.TestSomeIntegration.xml" );
- assertTestCount( reportFile, 1 );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-1036-NonFilterableJUnitRunnerWithCategories" );
- }
-
- private void assertTestCount( TestFile reportFile, int tests )
- throws FileNotFoundException
- {
- assertTrue( reportFile.exists() );
- Xpp3Dom testResult = Xpp3DomBuilder.build( reportFile.getFileInputStream(), "UTF-8" );
- Xpp3Dom[] children = testResult.getChildren( "testcase" );
- assertEquals( tests, children.length );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1041FailingJUnitRunnerIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1041FailingJUnitRunnerIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1041FailingJUnitRunnerIT.java
deleted file mode 100644
index bb65682..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1041FailingJUnitRunnerIT.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-1041: An error in a JUnit runner should not lead to an error in Surefire
- *
- * @author Andreas Gudian
- */
-public class Surefire1041FailingJUnitRunnerIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void reportErrorInJUnitRunnerAsTestError()
- {
- unpack( "surefire-1041-exception-in-junit-runner" ).mavenTestFailureIgnore( true ).executeTest().assertTestSuiteResults( 1, 1, 0, 0 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
deleted file mode 100644
index b3ed744..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1053">SUREFIRE-1053</a>
- * @since 2.18
- */
-public class Surefire1053SystemPropertiesIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void checkWarningsFileEncoding()
- {
- unpack().sysProp( "file.encoding", "ISO-8859-1" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyTextInLog( "file.encoding cannot be set as system property, use <argLine>-D"
- + "file.encoding=...</argLine> instead" );
- }
- @Test
- public void checkWarningsSysPropTwice() throws Exception
- {
- OutputValidator validator = unpack()
- .argLine( "-DmyArg=myVal2 -Dfile.encoding=ISO-8859-1" )
- .sysProp( "file.encoding", "ISO-8859-1" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyTextInLog( "The system property myArg is configured twice! "
- + "The property appears in <argLine/> and any of <systemPropertyVariables/>, "
- + "<systemProperties/> or user property." );
-
- for ( String line : validator.loadLogLines() )
- {
- assertFalse( "no warning for file.encoding not in argLine",
- line.contains( "file.encoding cannot be set as system property, use <argLine>" ) );
- assertFalse( "no warning for double definition of file.encoding",
- line.contains( "The system property file.encoding is configured twice!" ) );
- }
-
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-1053-system-properties" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1055CorrectConcurrentTestCountIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1055CorrectConcurrentTestCountIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1055CorrectConcurrentTestCountIT.java
deleted file mode 100644
index 0293a75..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1055CorrectConcurrentTestCountIT.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-1055 Correct test count in parallel run mode.
- *
- * @author Kristian Rosenvold
- */
-public class Surefire1055CorrectConcurrentTestCountIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testTestNgAndJUnitTogether()
- {
- OutputValidator outputValidator = unpack( "surefire-1055-parallelTestCount" ).executeTest();
- outputValidator.assertTestSuiteResults( 21, 0, 0, 0 );
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
deleted file mode 100644
index d6a38fa..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * Description of SUREFIRE-1080: <br>
- * <br>
- * There are 9 tests in total in the attached project, and mvn test will show 9 tests run.
- * When I use the command " mvn test -Dparallel=classes -DforkCount=2 -DuseUnlimitedThreads=true", it shows 13 tests
- * run (and sometimes 16), and some tests are run more than once.
- * If I remove forkCount, or parallel, everything will be fine. But it is problematic when combining together.
- * Apache Maven 3.2.2-SNAPSHOT
- * Surefire 2.18-SNAPSHOT
- * JUnit 4.11
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1080">SUREFIRE-1080</a>
- * @since 2.18
- */
-public class Surefire1080ParallelForkDoubleTestIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void test()
- {
- unpack().executeTest().assertTestSuiteResults( 9 );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-1080-parallel-fork-double-test" );
- }
-}
[39/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
deleted file mode 100644
index e40033c..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
+++ /dev/null
@@ -1,54 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-mode-resource-loading</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for forkMode</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/java/forkMode/ResourceLoadTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/java/forkMode/ResourceLoadTest.java b/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/java/forkMode/ResourceLoadTest.java
deleted file mode 100644
index e2c3d51..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/java/forkMode/ResourceLoadTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package forkMode;
-
-/*
- * 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 junit.framework.TestCase;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-public class ResourceLoadTest
- extends TestCase
-{
-
- public void testGetResourceUrl() throws IOException {
- final URL resource = this.getClass().getClassLoader().getResource( "myFile.txt" );
- assertNotNull( resource );
- }
-
- public void testGetResource() throws IOException {
- final InputStream resource = this.getClass().getClassLoader().getResourceAsStream( "myFile.txt" );
- assertNotNull( resource );
- }
-
- public void testGetResourceThreadLoader() throws IOException {
- final InputStream resource = Thread.currentThread().getContextClassLoader().getResourceAsStream( "myFile.txt" );
- assertNotNull( resource );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/resources/myFile.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/resources/myFile.txt b/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/resources/myFile.txt
deleted file mode 100644
index 51f466f..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/src/test/resources/myFile.txt
+++ /dev/null
@@ -1 +0,0 @@
-A file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
deleted file mode 100644
index 8e25749..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
+++ /dev/null
@@ -1,50 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-mode-testng</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for forkMode</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <threadCount>${threadCount}</threadCount>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.7</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <!-- NOTE: Deliberately excluding junit to enforce TestNG only tests, cf. SUREFIRE-642 -->
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test1.java b/surefire-integration-tests/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test1.java
deleted file mode 100644
index 8caec4e..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test1.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.util.Random;
-
-import org.testng.annotations.Test;
-
-public class Test1
-{
-
- private static final Random RANDOM = new Random();
-
- @Test
- public void test1()
- throws IOException, InterruptedException
- {
- int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "750" ));
- Thread.sleep(sleepLength);
- dumpPidFile( "test1" );
- }
-
- public static void dumpPidFile( String name )
- throws IOException
- {
- String fileName = name + "-pid";
- File target = new File( "target" ).getCanonicalFile();
- if ( !( target.exists() && target.isDirectory() ) )
- {
- target = new File( "." );
- }
- File pidFile = new File( target, fileName );
- FileWriter fw = new FileWriter( pidFile );
- // DGF little known trick... this is guaranteed to be unique to the PID
- // In fact, it usually contains the pid and the local host name!
- String pid = ManagementFactory.getRuntimeMXBean().getName();
- fw.write( pid );
- fw.write( " " );
- fw.write( System.getProperty( "testProperty", String.valueOf( RANDOM.nextLong() ) ) );
- fw.flush();
- fw.close();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test2.java b/surefire-integration-tests/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test2.java
deleted file mode 100644
index d7e8be9..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test2.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.IOException;
-
-import org.testng.annotations.Test;
-
-public class Test2
-{
- @Test
- public void test2() throws IOException {
- Test1.dumpPidFile( "test2" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test3.java b/surefire-integration-tests/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test3.java
deleted file mode 100644
index e52f2b7..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test3.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.IOException;
-
-import org.testng.annotations.Test;
-
-public class Test3
-{
-
- @Test
- public void test3() throws IOException {
- Test1.dumpPidFile( "test3" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
deleted file mode 100644
index 28bfb4d..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
+++ /dev/null
@@ -1,59 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-mode</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for forkMode</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <threadCount>${threadCount}</threadCount>
- <runOrder>alphabetical</runOrder>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java b/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
deleted file mode 100644
index 980123c..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-public class Test1
- extends TestCase
-{
-
- private static final Random RANDOM = new Random();
-
- public void test1()
- throws IOException, InterruptedException
- {
- int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "750" ));
- Thread.sleep(sleepLength);
- dumpPidFile( this );
- }
-
- public static void dumpPidFile( TestCase test )
- throws IOException
- {
- String fileName = test.getName() + "-pid";
- File target = new File( "target" ).getCanonicalFile(); // getCanonicalFile required for embedded mode
- if ( !( target.exists() && target.isDirectory() ) )
- {
- target = new File( "." );
- }
- File pidFile = new File( target, fileName );
- FileWriter fw = new FileWriter( pidFile );
- // DGF little known trick... this is guaranteed to be unique to the PID
- // In fact, it usually contains the pid and the local host name!
- String pid = ManagementFactory.getRuntimeMXBean().getName();
- fw.write( pid );
- fw.write( " " );
- fw.write( System.getProperty( "testProperty", String.valueOf( RANDOM.nextLong() ) ) );
- fw.flush();
- fw.close();
- System.out.println( "Done Writing pid file" + pidFile.getAbsolutePath() );
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test2.java b/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test2.java
deleted file mode 100644
index 33d3cf1..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test2.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.IOException;
-
-import junit.framework.TestCase;
-
-public class Test2
- extends TestCase
-{
-
- public void test2() throws IOException {
- Test1.dumpPidFile(this);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test3.java b/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test3.java
deleted file mode 100644
index c8eef74..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode/src/test/java/forkMode/Test3.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.IOException;
-
-import junit.framework.TestCase;
-
-public class Test3
- extends TestCase
-{
-
- public void test3() throws IOException {
- Test1.dumpPidFile(this);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml b/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
deleted file mode 100644
index 25365a2..0000000
--- a/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-timeout-test</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>fork-timeout</name>
- <url>http://maven.apache.org</url>
- <properties>
- <junit.version>4.8.1</junit.version>
- <junit.parallel>classes</junit.parallel>
- <forkMode>once</forkMode>
- <timeOut>1</timeOut>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <parallel>${junit.parallel}</parallel>
- <threadCount>3</threadCount>
- <perCoreThreadCount>false</perCoreThreadCount>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <forkedProcessTimeoutInSeconds>${timeOut}</forkedProcessTimeoutInSeconds>
- <reportFormat>plain</reportFormat>
- <useFile>true</useFile>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java b/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java
deleted file mode 100644
index a2dc6cb..0000000
--- a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package forktimeout;
-
-/*
- * 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.
- */
-
-public abstract class BaseForkTimeout
-{
- protected void dumpStuff( String prefix )
- {
- reallySleep( 990 );
- for ( int i = 0; i < 200; i++ )
- {
- System.out.println( prefix + " with lots of output " + i );
- System.err.println( prefix + "e with lots of output " + i );
- }
- System.out.println( prefix + "last line" );
- System.err.println( prefix + "e last line" );
- }
-
- private void reallySleep( long timeout )
- {
- long endAt = System.currentTimeMillis() + timeout;
- try
- {
- Thread.sleep( timeout );
- while ( System.currentTimeMillis() < endAt )
- {
- Thread.yield();
- Thread.sleep( 5 );
- }
- }
- catch ( InterruptedException e )
- {
- throw new RuntimeException( e );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test1.java b/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test1.java
deleted file mode 100644
index d176fce..0000000
--- a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test1.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package forktimeout;
-
-/*
- * 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.Test;
-
-public class Test1
- extends BaseForkTimeout
-{
- @Test
- public void test690()
- {
- dumpStuff( "test690" );
- System.out.println( " with lots of output " );
- System.err.println( "e with lots of output " );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test2.java b/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test2.java
deleted file mode 100644
index 25b0ecd..0000000
--- a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test2.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package forktimeout;
-/*
- * 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.Test;
-
-public class Test2 extends BaseForkTimeout
-{
- @Test
- public void test690_2() {
- dumpStuff( "test690_2" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test3.java b/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test3.java
deleted file mode 100644
index b618bdb..0000000
--- a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test3.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package forktimeout;
-/*
- * 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.Test;
-
-public class Test3 extends BaseForkTimeout
-{
-
- @Test
- public void test690_3() {
- dumpStuff( "test690_3" );
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test4.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test4.java b/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test4.java
deleted file mode 100644
index 4582c65..0000000
--- a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test4.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package forktimeout;
-/*
- * 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.Test;
-
-public class Test4
- extends BaseForkTimeout
-{
- @Test
- public void test690_4() {
- dumpStuff( "test690_4" );
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test5.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test5.java b/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test5.java
deleted file mode 100644
index 886385d..0000000
--- a/surefire-integration-tests/src/test/resources/fork-timeout/src/test/java/forktimeout/Test5.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package forktimeout;
-/*
- * 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.Test;
-
-public class Test5
- extends BaseForkTimeout
-{
- @Test
- public void test690_5() {
- dumpStuff( "test690_5" );
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/common-excludes.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/common-excludes.txt b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/common-excludes.txt
deleted file mode 100644
index 483aae3..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/common-excludes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# common excludes
-
-**/DontRunTest.*
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/path-includes.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/path-includes.txt b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/path-includes.txt
deleted file mode 100644
index cedff2a..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/path-includes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# path includes
-
-*/test/*
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml
deleted file mode 100644
index 39313db..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/pom.xml
+++ /dev/null
@@ -1,153 +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>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>maven-it-includes-excludes</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <name>Maven Integration Test :: includes-excludes-from-file</name>
- <description>Test surefire inclusion/exclusions from files</description>
-
- <properties>
- <junit.version>3.8.2</junit.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>simple</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludesFile>${project.basedir}/common-excludes.txt</excludesFile>
- <includesFile>${project.basedir}/simple-includes.txt</includesFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>simple-mixed</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludesFile>${project.basedir}/common-excludes.txt</excludesFile>
- <includes>
- <include>**/NotIncludedByDefault.java</include>
- </includes>
- <includesFile>${project.basedir}/simple-mixed-includes.txt</includesFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>regex</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludesFile>${project.basedir}/common-excludes.txt</excludesFile>
- <includesFile>${project.basedir}/regex-includes.txt</includesFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>path</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludesFile>${project.basedir}/common-excludes.txt</excludesFile>
- <includesFile>${project.basedir}/path-includes.txt</includesFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>missing-excludes-file</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludesFile>${project.basedir}/no-such-excludes-file</excludesFile>
- <includesFile>${project.basedir}/simple-includes.txt</includesFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>missing-includes-file</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludesFile>${project.basedir}/common-excludes.txt</excludesFile>
- <includesFile>${project.basedir}/no-such-includes-file</includesFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/regex-includes.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/regex-includes.txt b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/regex-includes.txt
deleted file mode 100644
index fcf6f9e..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/regex-includes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# regex includes
-
-%regex[.*Test.*|.*Not.*]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/simple-includes.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/simple-includes.txt b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/simple-includes.txt
deleted file mode 100644
index d2b1d12..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/simple-includes.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# simple includes
-
-**/NotIncludedByDefault.java
-**/*Test.java
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/simple-mixed-includes.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/simple-mixed-includes.txt b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/simple-mixed-includes.txt
deleted file mode 100644
index 68a1d5c..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/simple-mixed-includes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# simple-mixed includes
-
-**/*Test.java
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DefaultTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DefaultTest.java b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DefaultTest.java
deleted file mode 100644
index be6a6bb..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DefaultTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.test;
-
-/*
- * 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.io.FileOutputStream;
-
-public class DefaultTest
-{
- public void testRun()
- throws Exception
- {
- FileOutputStream fout = new FileOutputStream( "target/defaultTestTouchFile.txt" );
- fout.write( '!' );
- fout.flush();
- fout.close();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DontRunTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DontRunTest.java b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DontRunTest.java
deleted file mode 100644
index 0cce390..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DontRunTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.test;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class DontRunTest extends TestCase
-{
- public void testRun()
- {
- assertEquals(true, false);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/NotIncludedByDefault.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/NotIncludedByDefault.java b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/NotIncludedByDefault.java
deleted file mode 100644
index 58b962a..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/NotIncludedByDefault.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.test;
-
-/*
- * 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.io.FileOutputStream;
-
-public class NotIncludedByDefault
-{
- public void testRun()
- throws Exception
- {
- FileOutputStream fout = new FileOutputStream( "target/testTouchFile.txt" );
- fout.write( '!' );
- fout.flush();
- fout.close();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/aTestXmlFile.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/aTestXmlFile.xml b/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/aTestXmlFile.xml
deleted file mode 100644
index 17f382f..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes-from-file/src/test/java/org/test/aTestXmlFile.xml
+++ /dev/null
@@ -1,24 +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>
- <foo/>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml b/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
deleted file mode 100644
index 77711f7..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
+++ /dev/null
@@ -1,135 +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>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>maven-it-includes-excludes</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <name>Maven Integration Test :: includes-excludes</name>
- <description>Test surefire inclusion/exclusions</description>
-
- <properties>
- <junit.version>3.8.2</junit.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <profiles>
- <profile>
- <id>simple</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/DontRunTest.*</exclude>
- <exclude></exclude>
- <exclude />
- </excludes>
- <includes>
- <include>**/NotIncludedByDefault.java</include>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>regex</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/DontRunTest.*</exclude>
- </excludes>
- <includes>
- <include>%regex[.*Test.*|.*Not.*]</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>path</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/DontRunTest.java</exclude>
- </excludes>
- <includes>
- <include>*/test/*</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>withXmlFile</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/DontRunTest.java</exclude>
- </excludes>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/DefaultTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/DefaultTest.java b/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/DefaultTest.java
deleted file mode 100644
index be6a6bb..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/DefaultTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.test;
-
-/*
- * 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.io.FileOutputStream;
-
-public class DefaultTest
-{
- public void testRun()
- throws Exception
- {
- FileOutputStream fout = new FileOutputStream( "target/defaultTestTouchFile.txt" );
- fout.write( '!' );
- fout.flush();
- fout.close();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/DontRunTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/DontRunTest.java b/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/DontRunTest.java
deleted file mode 100644
index 0cce390..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/DontRunTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.test;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class DontRunTest extends TestCase
-{
- public void testRun()
- {
- assertEquals(true, false);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/NotIncludedByDefault.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/NotIncludedByDefault.java b/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/NotIncludedByDefault.java
deleted file mode 100644
index 58b962a..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/NotIncludedByDefault.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.test;
-
-/*
- * 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.io.FileOutputStream;
-
-public class NotIncludedByDefault
-{
- public void testRun()
- throws Exception
- {
- FileOutputStream fout = new FileOutputStream( "target/testTouchFile.txt" );
- fout.write( '!' );
- fout.flush();
- fout.close();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/aTestXmlFile.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/aTestXmlFile.xml b/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/aTestXmlFile.xml
deleted file mode 100644
index 17f382f..0000000
--- a/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/org/test/aTestXmlFile.xml
+++ /dev/null
@@ -1,24 +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>
- <foo/>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml b/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml
deleted file mode 100644
index a853063..0000000
--- a/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml
+++ /dev/null
@@ -1,56 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>isolated-classloader</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for useSystemClassLoader=false</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <useSystemClassLoader>false</useSystemClassLoader>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java b/surefire-integration-tests/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java
deleted file mode 100644
index f293734..0000000
--- a/surefire-integration-tests/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package isolatedClassloader;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public BasicTest( String name, String extraName )
- {
- super( name );
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite();
- Test test = new BasicTest( "testSetUp", "dummy" );
- suite.addTest( test );
-
- return new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml b/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml
deleted file mode 100644
index 2e4d4f3..0000000
--- a/surefire-integration-tests/src/test/resources/java9-full-api/pom.xml
+++ /dev/null
@@ -1,132 +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/xsd/maven-4.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>
-
- <artifactId>java9-full-api</artifactId>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>use-jvm-config-paramater</id>
- <activation>
- <property>
- <name>jdk.home</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <jvm>${jdk.home}/bin/java</jvm>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>use-toolchains</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <jdk>
- <version>9</version>
- </jdk>
- </toolchains>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/java9-full-api/src/test/java/J9IT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/java9-full-api/src/test/java/J9IT.java b/surefire-integration-tests/src/test/resources/java9-full-api/src/test/java/J9IT.java
deleted file mode 100644
index c74678d..0000000
--- a/surefire-integration-tests/src/test/resources/java9-full-api/src/test/java/J9IT.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.Test;
-
-public class J9IT
-{
- @Test
- public void testMiscellaneousAPI() throws java.sql.SQLException
- {
- System.out.println( "loaded class " + java.sql.SQLException.class.getName() );
- System.out.println( "loaded class " + javax.xml.ws.Holder.class.getName() );
- System.out.println( "loaded class " + javax.xml.bind.JAXBException.class.getName() );
- System.out.println( "loaded class " + javax.transaction.InvalidTransactionException.class.getName() );
- System.out.println( "from classloader " + javax.transaction.InvalidTransactionException.class.getClassLoader() );
- System.out.println( "loaded class " + javax.transaction.TransactionManager.class.getName() );
- System.out.println( "loaded class " + javax.xml.xpath.XPath.class.getName() );
- System.out.println( "java.specification.version=" + System.getProperty( "java.specification.version" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/java9-full-api/src/test/java/J9Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/java9-full-api/src/test/java/J9Test.java b/surefire-integration-tests/src/test/resources/java9-full-api/src/test/java/J9Test.java
deleted file mode 100644
index 6fc8536..0000000
--- a/surefire-integration-tests/src/test/resources/java9-full-api/src/test/java/J9Test.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.Test;
-
-public class J9Test
-{
- @Test
- public void testMiscellaneousAPI() throws java.sql.SQLException
- {
- System.out.println( "loaded class " + java.sql.SQLException.class.getName() );
- System.out.println( "loaded class " + javax.xml.ws.Holder.class.getName() );
- System.out.println( "loaded class " + javax.xml.bind.JAXBException.class.getName() );
- System.out.println( "loaded class " + javax.transaction.InvalidTransactionException.class.getName() );
- System.out.println( "loaded class " + javax.transaction.TransactionManager.class.getName() );
- System.out.println( "loaded class " + javax.xml.xpath.XPath.class.getName() );
- System.out.println( "java.specification.version=" + System.getProperty( "java.specification.version" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml b/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml
deleted file mode 100644
index 9b86c75..0000000
--- a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml
+++ /dev/null
@@ -1,57 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-fork-mode</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for forkMode</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java b/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java
deleted file mode 100644
index d206283..0000000
--- a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package junit4.forkMode;
-
-/*
- * 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.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-
-import org.junit.Test;
-
-public class Test1
-{
-
- @Test
- public void test1()
- throws IOException
- {
- dumpPidFile( "test1" );
- }
-
- public static void dumpPidFile( String name )
- throws IOException
- {
- String fileName = name + "-pid";
- File target = new File( "target" );
- if ( !( target.exists() && target.isDirectory() ) )
- {
- target = new File( "." );
- }
- File pidFile = new File( target, fileName );
- FileWriter fw = new FileWriter( pidFile );
- // DGF little known trick... this is guaranteed to be unique to the PID
- // In fact, it usually contains the pid and the local host name!
- String pid = ManagementFactory.getRuntimeMXBean().getName();
- fw.write( pid );
- fw.flush();
- fw.close();
-
- System.out.println( "pid = " + pid );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java b/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java
deleted file mode 100644
index f57f1b8..0000000
--- a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package junit4.forkMode;
-
-/*
- * 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.io.IOException;
-
-import org.junit.Test;
-
-public class Test2
-{
-
- @Test
- public void test2()
- throws IOException
- {
- Test1.dumpPidFile( "test2" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java b/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java
deleted file mode 100644
index af7f6fd..0000000
--- a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package junit4.forkMode;
-
-/*
- * 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.io.IOException;
-
-import org.junit.Test;
-
-public class Test3
-{
-
- @Test
- public void test3()
- throws IOException
- {
- Test1.dumpPidFile( "test3" );
- }
-
-}
[07/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-smartStackTrace/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-smartStackTrace/pom.xml b/surefire-its/src/test/resources/junit48-smartStackTrace/pom.xml
new file mode 100644
index 0000000..fe104a4
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-smartStackTrace/pom.xml
@@ -0,0 +1,57 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4-smartstacktrace</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for smart stack trace parser</name>
+
+
+ <properties>
+ <junitVersion>4.8.1</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java b/surefire-its/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
new file mode 100644
index 0000000..c367ef5
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
@@ -0,0 +1,50 @@
+package junit4;
+
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+
+
+public class SmartStackTraceTest
+{
+
+ @Test(expected = RuntimeException.class)
+ public void shouldFailInMethodButDoesnt()
+ {
+ }
+
+ @Test(expected = IOException.class)
+ public void incorrectExceptionThrown()
+ {
+ throw new RuntimeException("We fail here");
+ }
+
+ @Test(expected = IOException.class)
+ public void shortName()
+ {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/large-test-results/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/large-test-results/pom.xml b/surefire-its/src/test/resources/large-test-results/pom.xml
new file mode 100644
index 0000000..36caa01
--- /dev/null
+++ b/surefire-its/src/test/resources/large-test-results/pom.xml
@@ -0,0 +1,55 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>large-test-results</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for large test results</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <systemProperties>
+ <property><name>numTests</name><value>${numTests}</value></property>
+ </systemProperties>
+ <argLine>-Xmx1024m</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java b/surefire-its/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
new file mode 100644
index 0000000..bdeeb04
--- /dev/null
+++ b/surefire-its/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
@@ -0,0 +1,65 @@
+package largeTestResults;
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private final int number;
+
+ public BasicTest( String name, int number )
+ {
+ super( name );
+ this.number = number;
+ }
+
+ public static Test suite()
+ {
+ int tests = Integer.parseInt( System.getProperty( "numTests", "20" ) );
+ TestSuite suite = new TestSuite();
+ for ( int i = 0; i < tests; i++ )
+ {
+ if ( i % 4 == 0 )
+ {
+ suite.addTest( new BasicTest( "testPass", i ) );
+ }
+ else
+ {
+ suite.addTest( new BasicTest( "testFail", i ) );
+ }
+ }
+ return suite;
+ }
+
+ public void testFail()
+ {
+ fail( "failure " + number );
+ }
+
+ public void testPass()
+ {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/long-windows-path/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/long-windows-path/pom.xml b/surefire-its/src/test/resources/long-windows-path/pom.xml
new file mode 100644
index 0000000..c65948c
--- /dev/null
+++ b/surefire-its/src/test/resources/long-windows-path/pom.xml
@@ -0,0 +1,57 @@
+<?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/xsd/maven-4.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>long-windows-path</artifactId>
+ <version>1.0</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/long-windows-path/src/test/java/longwindowspath/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/long-windows-path/src/test/java/longwindowspath/BasicTest.java b/surefire-its/src/test/resources/long-windows-path/src/test/java/longwindowspath/BasicTest.java
new file mode 100644
index 0000000..bd9cf36
--- /dev/null
+++ b/surefire-its/src/test/resources/long-windows-path/src/test/java/longwindowspath/BasicTest.java
@@ -0,0 +1,36 @@
+package longwindowspath;
+
+/*
+ * 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.Test;
+
+public class BasicTest
+{
+ @Test
+ public void test()
+ {
+ System.out.println( "SUREFIRE-1400 user.dir="
+ + System.getProperty( "user.dir" ) );
+
+ System.out.println( "SUREFIRE-1400 surefire.real.class.path="
+ + System.getProperty( "surefire.real.class.path" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/modulepath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/modulepath/pom.xml b/surefire-its/src/test/resources/modulepath/pom.xml
new file mode 100644
index 0000000..e4a7783
--- /dev/null
+++ b/surefire-its/src/test/resources/modulepath/pom.xml
@@ -0,0 +1,45 @@
+<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>
+
+ <groupId>foo</groupId>
+ <artifactId>app</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <name>app</name>
+
+ <properties>
+ <maven.compiler.release>9</maven.compiler.release>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.6.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.9.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/modulepath/src/main/java/com/app/Main.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/modulepath/src/main/java/com/app/Main.java b/surefire-its/src/test/resources/modulepath/src/main/java/com/app/Main.java
new file mode 100644
index 0000000..6a44492
--- /dev/null
+++ b/surefire-its/src/test/resources/modulepath/src/main/java/com/app/Main.java
@@ -0,0 +1,34 @@
+package com.app;
+
+/*
+ * 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.joda.time.DateTime;
+
+public class Main
+{
+ public static void main( String... args )
+ {
+ System.out.println( "module path => " + System.getProperty( "jdk.module.path" ) );
+ System.out.println( " class path => " + System.getProperty( "java.class.path" ) );
+
+ DateTime dt = new DateTime();
+ System.out.println( dt );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/modulepath/src/main/java/module-info.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/modulepath/src/main/java/module-info.java b/surefire-its/src/test/resources/modulepath/src/main/java/module-info.java
new file mode 100644
index 0000000..5f3eed4
--- /dev/null
+++ b/surefire-its/src/test/resources/modulepath/src/main/java/module-info.java
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+module com.app {
+ requires joda.time;
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/modulepath/src/test/java/com/app/AppTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/modulepath/src/test/java/com/app/AppTest.java b/surefire-its/src/test/resources/modulepath/src/test/java/com/app/AppTest.java
new file mode 100644
index 0000000..aa836a4
--- /dev/null
+++ b/surefire-its/src/test/resources/modulepath/src/test/java/com/app/AppTest.java
@@ -0,0 +1,36 @@
+package com.app;
+
+/*
+ * 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.testng.annotations.Test;
+
+@Test
+public class AppTest
+{
+ public void testNoop()
+ throws Exception
+ {
+ }
+
+ public void testMain()
+ {
+ Main.main();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/norunnableTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/norunnableTests/pom.xml b/surefire-its/src/test/resources/norunnableTests/pom.xml
new file mode 100644
index 0000000..dd1a3cc
--- /dev/null
+++ b/surefire-its/src/test/resources/norunnableTests/pom.xml
@@ -0,0 +1,58 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>norunnabletests</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test JUnit classes with inner classes</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <failIfNoTests>true</failIfNoTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/norunnableTests/src/test/java/junit/norunnabletests/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/norunnableTests/src/test/java/junit/norunnabletests/BasicTest.java b/surefire-its/src/test/resources/norunnableTests/src/test/java/junit/norunnabletests/BasicTest.java
new file mode 100644
index 0000000..30acd3e
--- /dev/null
+++ b/surefire-its/src/test/resources/norunnableTests/src/test/java/junit/norunnabletests/BasicTest.java
@@ -0,0 +1,28 @@
+package junit.norunnabletests;
+
+
+/*
+ * 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 junit.framework.TestCase;
+
+
+public class BasicTest extends TestCase
+{
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/parallel-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/parallel-runtime/pom.xml b/surefire-its/src/test/resources/parallel-runtime/pom.xml
new file mode 100644
index 0000000..f39f949
--- /dev/null
+++ b/surefire-its/src/test/resources/parallel-runtime/pom.xml
@@ -0,0 +1,42 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>parallel-runtime</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>parallel-runtime</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <parallel>classes</parallel>
+ <threadCount>3</threadCount>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <threadCount>${threadCount}</threadCount>
+ <perCoreThreadCount>false</perCoreThreadCount>
+ <parallel>${parallel}</parallel>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test1.java b/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test1.java
new file mode 100755
index 0000000..3b6abf3
--- /dev/null
+++ b/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test1.java
@@ -0,0 +1,69 @@
+package runorder.parallel;
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class Test1
+{
+
+ public static final int ms = 5000;
+
+ static void sleep( int ms )
+ {
+ long target = System.currentTimeMillis() + ms;
+ try
+ {
+ do
+ {
+ Thread.sleep( ms );
+ } while ( System.currentTimeMillis() < target);
+ }
+ catch ( InterruptedException e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
+
+ @Test
+ public void testSleep1()
+ {
+ Test1.sleep( ms );
+ }
+
+ @Test
+ public void testSleep2()
+ {
+ Test1.sleep( ms );
+ }
+
+ @Test
+ public void testSleep3()
+ {
+ Test1.sleep( ms );
+ }
+
+ @Test
+ public void testSleep4()
+ {
+ Test1.sleep( ms );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test2.java b/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test2.java
new file mode 100644
index 0000000..f72c499
--- /dev/null
+++ b/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test2.java
@@ -0,0 +1,54 @@
+package runorder.parallel;
+
+/*
+ * 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.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Test2
+{
+
+ @Test
+ public void testSleep1()
+ {
+ Test1.sleep( Test1.ms );
+ }
+
+ @Test
+ public void testSleep2()
+ {
+ Test1.sleep( Test1.ms );
+ }
+
+ @Test
+ public void testSleep3()
+ {
+ Test1.sleep( Test1.ms );
+ }
+
+ @Test
+ public void testSleep4()
+ {
+ Test1.sleep( Test1.ms );
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test3.java b/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test3.java
new file mode 100644
index 0000000..3557667
--- /dev/null
+++ b/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test3.java
@@ -0,0 +1,55 @@
+package runorder.parallel;
+
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Test3
+{
+ @Test
+ public void testSleep1()
+ {
+ Test1.sleep( Test1.ms );
+ }
+
+ @Test
+ public void testSleep2()
+ {
+ Test1.sleep( Test1.ms );
+ }
+
+ @Test
+ public void testSleep3()
+ {
+ Test1.sleep( Test1.ms );
+ }
+
+ @Test
+ public void testSleep4()
+ {
+ Test1.sleep( Test1.ms );
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/plain-old-java-classpath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/plain-old-java-classpath/pom.xml b/surefire-its/src/test/resources/plain-old-java-classpath/pom.xml
new file mode 100644
index 0000000..72bd38c
--- /dev/null
+++ b/surefire-its/src/test/resources/plain-old-java-classpath/pom.xml
@@ -0,0 +1,57 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>plain-old-java-classpath</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for useManifestOnlyJar=false</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <useManifestOnlyJar>false</useManifestOnlyJar>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java b/surefire-its/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
new file mode 100644
index 0000000..e458631
--- /dev/null
+++ b/surefire-its/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
@@ -0,0 +1,87 @@
+package plainOldJavaClasspath;
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public BasicTest( String name, String extraName )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ System.out.println( "suite" );
+ TestSuite suite = new TestSuite();
+ Test test = new BasicTest( "testSetUp", "dummy" );
+ suite.addTest( test );
+
+ return new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/plexus-conflict/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/plexus-conflict/pom.xml b/surefire-its/src/test/resources/plexus-conflict/pom.xml
new file mode 100644
index 0000000..338904a
--- /dev/null
+++ b/surefire-its/src/test/resources/plexus-conflict/pom.xml
@@ -0,0 +1,59 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>plexus-conflict</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for plexus conflict</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java b/surefire-its/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java
new file mode 100644
index 0000000..98f2615
--- /dev/null
+++ b/surefire-its/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java
@@ -0,0 +1,35 @@
+package plexusConflict;
+
+/*
+ * 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.codehaus.plexus.util.cli.Commandline;
+
+/**
+ * Conflict with latest version of plexus by using modified protected class.
+ */
+public class CommandlineExtender
+ extends Commandline
+{
+ public CommandlineExtender()
+ {
+ // In 1.0.4, Commandline.envVars was a Vector; in 1.4.x, it's a Map.
+ super.envVars.add( "" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java b/surefire-its/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java
new file mode 100644
index 0000000..96f1bba
--- /dev/null
+++ b/surefire-its/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java
@@ -0,0 +1,37 @@
+package plexusConflict;
+
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ public void testPlexusConflict()
+ {
+ CommandlineExtender ce = new CommandlineExtender();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/pojo-simple/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/pojo-simple/pom.xml b/surefire-its/src/test/resources/pojo-simple/pom.xml
new file mode 100644
index 0000000..45986ac
--- /dev/null
+++ b/surefire-its/src/test/resources/pojo-simple/pom.xml
@@ -0,0 +1,50 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>pojo-simple</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Pojo simple test</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <!-- NOTE: This has no dependencies on JUnit or TestNG, just nothing -->
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/pojo-simple/src/test/java/PojoTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/pojo-simple/src/test/java/PojoTest.java b/surefire-its/src/test/resources/pojo-simple/src/test/java/PojoTest.java
new file mode 100644
index 0000000..8e13ecb
--- /dev/null
+++ b/surefire-its/src/test/resources/pojo-simple/src/test/java/PojoTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+public class PojoTest
+{
+
+ public void testSuccess()
+ {
+ assert true;
+ }
+
+ public void testFailure()
+ {
+ assert false;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/pom.xml b/surefire-its/src/test/resources/pom.xml
new file mode 100644
index 0000000..e01ed4c
--- /dev/null
+++ b/surefire-its/src/test/resources/pom.xml
@@ -0,0 +1,40 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <version>1.0</version>
+ <name>It parent</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>never</forkMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>never</forkMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/reporters/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/reporters/pom.xml b/surefire-its/src/test/resources/reporters/pom.xml
new file mode 100644
index 0000000..2152525
--- /dev/null
+++ b/surefire-its/src/test/resources/reporters/pom.xml
@@ -0,0 +1,49 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>reporters</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>reporters</name>
+ <url>http://maven.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.8</version>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <disableXmlReport>false</disableXmlReport>
+ <forkMode>${forkMode}</forkMode>
+ <printSummary>${printSummary}</printSummary>
+ <useFile>true</useFile>
+ <redirectTestOutputToFile>${redirect.to.file}</redirectTestOutputToFile>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <redirect.to.file>true</redirect.to.file>
+ <forkMode>once</forkMode>
+ <printSummary>true</printSummary>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/reporters/src/test/java/reporters/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/reporters/src/test/java/reporters/Test1.java b/surefire-its/src/test/resources/reporters/src/test/java/reporters/Test1.java
new file mode 100644
index 0000000..e783db5
--- /dev/null
+++ b/surefire-its/src/test/resources/reporters/src/test/java/reporters/Test1.java
@@ -0,0 +1,30 @@
+package reporters;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class Test1 extends TestCase
+{
+ public void test6281() {
+ System.out.println( "Test1 on" + Thread.currentThread().getName());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/reporters/src/test/java/reporters/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/reporters/src/test/java/reporters/Test2.java b/surefire-its/src/test/resources/reporters/src/test/java/reporters/Test2.java
new file mode 100644
index 0000000..e5622d2
--- /dev/null
+++ b/surefire-its/src/test/resources/reporters/src/test/java/reporters/Test2.java
@@ -0,0 +1,30 @@
+package reporters;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class Test2 extends TestCase
+{
+ public void test6281() {
+ System.out.println( "Test2 on" + Thread.currentThread().getName());
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/result-counting/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/result-counting/pom.xml b/surefire-its/src/test/resources/result-counting/pom.xml
new file mode 100644
index 0000000..fcb7372
--- /dev/null
+++ b/surefire-its/src/test/resources/result-counting/pom.xml
@@ -0,0 +1,41 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>mag</groupId>
+ <artifactId>junit4-test</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>junit4-test</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <includes>
+ <include>**/Test*.java</include>
+ <include>**/MySuiteTest1.java</include>
+ <include>**/MySuiteTest2.java</include>
+ <include>**/MySuiteTest3.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <forkMode>once</forkMode>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java b/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java
new file mode 100644
index 0000000..137fdee
--- /dev/null
+++ b/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java
@@ -0,0 +1,43 @@
+package resultcounting;
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class MySuiteTest1 extends TestCase {
+
+ public static Test suite () {
+ TestSuite suite = new TestSuite();
+
+ suite.addTest (new MySuiteTest1("testMe" ));
+
+ return suite;
+ }
+
+ public MySuiteTest1( String name ) {
+ super (name);
+ }
+
+ public void testMe() {
+ assertTrue (true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java b/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java
new file mode 100644
index 0000000..9188290
--- /dev/null
+++ b/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java
@@ -0,0 +1,44 @@
+package resultcounting;
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class MySuiteTest2 extends TestCase {
+
+ public static Test suite () {
+ TestSuite suite = new TestSuite();
+
+ suite.addTest (new MySuiteTest2("testMe" ));
+ suite.addTest (new MySuiteTest2("testMe" ));
+
+ return suite;
+ }
+
+ public MySuiteTest2( String name ) {
+ super (name);
+ }
+
+ public void testMe() {
+ assertTrue (true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java b/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java
new file mode 100644
index 0000000..35c6e5b
--- /dev/null
+++ b/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java
@@ -0,0 +1,45 @@
+package resultcounting;
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class MySuiteTest3 extends TestCase {
+
+ public static Test suite () {
+ TestSuite suite = new TestSuite();
+
+ suite.addTest (new MySuiteTest3("testMe" ));
+ suite.addTest (new MySuiteTest3("testMe" ));
+ suite.addTest (new MySuiteTest3("testMe" ));
+
+ return suite;
+ }
+
+ public MySuiteTest3( String name ) {
+ super (name);
+ }
+
+ public void testMe() {
+ assertTrue (true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java b/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java
new file mode 100644
index 0000000..c3283d2
--- /dev/null
+++ b/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java
@@ -0,0 +1,76 @@
+package resultcounting;
+/*
+ * 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.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assume.*;
+import junit.framework.TestCase;
+
+public class Test1 extends TestCase
+{
+ public void testWithFailingAssumption1() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption2() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption3() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption4() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption5() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption6() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption7() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption8() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption9() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption10() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption11() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption12() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption13() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption14() {
+ assumeThat( 2, is(3));
+ }
+ public void testWithFailingAssumption15() {
+ assumeThat( 2, is(3));
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/Test2.java b/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/Test2.java
new file mode 100644
index 0000000..e5d5f53
--- /dev/null
+++ b/surefire-its/src/test/resources/result-counting/src/test/java/resultcounting/Test2.java
@@ -0,0 +1,127 @@
+package resultcounting;
+
+/*
+ * 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.Ignore;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assume.*;
+import static junit.framework.Assert.fail;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Test2
+{
+ @Test
+ public void testAllok()
+ {
+ System.out.println( "testAllok to stdout" );
+ System.err.println( "testAllok to stderr" );
+ }
+
+ @Ignore
+ @Test
+ public void testWithIgnore1()
+ {
+ }
+
+ @Ignore
+ @Test
+ public void testWithIgnore2()
+ {
+ }
+
+ @Test
+ public void testiWithFail1()
+ {
+ fail( "We excpect this" );
+ }
+
+ @Test
+ public void testiWithFail2()
+ {
+ fail( "We excpect this" );
+ }
+
+ @Test
+ public void testiWithFail3()
+ {
+ fail( "We excpect this" );
+ }
+
+ @Test
+ public void testiWithFail4()
+ {
+ fail( "We excpect this" );
+ }
+
+ @Test
+ public void testWithException1()
+ {
+ System.out.println( "testWithException1 to stdout" );
+ System.err.println( "testWithException1 to stderr" );
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException2()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException3()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException4()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException5()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException6()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException7()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException8()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/runOrder/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/runOrder/pom.xml b/surefire-its/src/test/resources/runOrder/pom.xml
new file mode 100644
index 0000000..84abb53
--- /dev/null
+++ b/surefire-its/src/test/resources/runOrder/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>runOrder</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for runOrder</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ </configuration>
+ <dependencies>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/runOrder/src/test/java/junit/runOrder/TestA.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/runOrder/src/test/java/junit/runOrder/TestA.java b/surefire-its/src/test/resources/runOrder/src/test/java/junit/runOrder/TestA.java
new file mode 100644
index 0000000..cbf15e0
--- /dev/null
+++ b/surefire-its/src/test/resources/runOrder/src/test/java/junit/runOrder/TestA.java
@@ -0,0 +1,31 @@
+package junit.runOrder;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class TestA
+ extends TestCase
+{
+ public void testTwo()
+ {
+ System.out.println( "TA" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/runOrder/src/test/java/junit/runOrder/TestB.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/runOrder/src/test/java/junit/runOrder/TestB.java b/surefire-its/src/test/resources/runOrder/src/test/java/junit/runOrder/TestB.java
new file mode 100644
index 0000000..96da722
--- /dev/null
+++ b/surefire-its/src/test/resources/runOrder/src/test/java/junit/runOrder/TestB.java
@@ -0,0 +1,31 @@
+package junit.runOrder;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class TestB
+ extends TestCase
+{
+ public void testTwo()
+ {
+ System.out.println( "TB" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/runOrder/src/test/java/junit/runOrder/TestC.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/runOrder/src/test/java/junit/runOrder/TestC.java b/surefire-its/src/test/resources/runOrder/src/test/java/junit/runOrder/TestC.java
new file mode 100644
index 0000000..4ac63c2
--- /dev/null
+++ b/surefire-its/src/test/resources/runOrder/src/test/java/junit/runOrder/TestC.java
@@ -0,0 +1,31 @@
+package junit.runOrder;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class TestC
+ extends TestCase
+{
+ public void testTwo()
+ {
+ System.out.println( "TC" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/runorder-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/runorder-parallel/pom.xml b/surefire-its/src/test/resources/runorder-parallel/pom.xml
new file mode 100644
index 0000000..1dee7d8
--- /dev/null
+++ b/surefire-its/src/test/resources/runorder-parallel/pom.xml
@@ -0,0 +1,42 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>runorder-parallel</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>runorder-parallel</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <runOrder>balanced</runOrder>
+ <parallel>classesAndMethods</parallel>
+ <threadCountClasses>2</threadCountClasses>
+ <threadCountMethods>6</threadCountMethods>
+ <perCoreThreadCount>false</perCoreThreadCount>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java b/surefire-its/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
new file mode 100755
index 0000000..d11f48a
--- /dev/null
+++ b/surefire-its/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
@@ -0,0 +1,92 @@
+package runorder.parallel;
+
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class Test1
+{
+
+ public Test1()
+ {
+ System.out.println( Thread.currentThread().getName() + " Constructor" );
+ }
+
+ static void sleep( int ms )
+ {
+ long target = System.currentTimeMillis() + ms;
+ try
+ {
+ do
+ {
+ Thread.sleep( 1L );
+ }
+ while ( System.currentTimeMillis() < target );
+ }
+ catch ( InterruptedException e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
+
+ @Test
+ public void testSleep2000()
+ {
+ System.out.println(
+ Thread.currentThread().getName() + " Test1.sleep2000 started @ " + System.currentTimeMillis() );
+ sleep( 2000 );
+ }
+
+ @Test
+ public void testSleep4000()
+ {
+ System.out.println(
+ Thread.currentThread().getName() + " Test1.sleep4000 started @ " + System.currentTimeMillis() );
+ sleep( 4000 );
+ }
+
+ @Test
+ public void testSleep6000()
+ {
+ System.out.println(
+ Thread.currentThread().getName() + " Test1.sleep6000 started @ " + System.currentTimeMillis() );
+ sleep( 6000 );
+ }
+
+ @BeforeClass
+ public static void setUpBeforeClass()
+ throws Exception
+ {
+ System.out.println( Thread.currentThread().getName() + " beforeClass sleep 175 " + System.currentTimeMillis() );
+ Thread.sleep( 175 );
+ }
+
+ @AfterClass
+ public static void tearDownAfterClass()
+ throws Exception
+ {
+ System.out.println( Thread.currentThread().getName() + " afterClass sleep 175 " + System.currentTimeMillis() );
+ Thread.sleep( 175 );
+ }
+
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java b/surefire-its/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java
new file mode 100644
index 0000000..dfa4f4f
--- /dev/null
+++ b/surefire-its/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java
@@ -0,0 +1,50 @@
+package runorder.parallel;
+
+/*
+ * 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.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Test2
+{
+
+ @Test
+ public void testSleep1000()
+ {
+ System.out.println( "Test2.sleep1000 started @ " + System.currentTimeMillis() );
+ Test1.sleep( 1000 );
+ }
+
+ @Test
+ public void testSleep3000()
+ {
+ System.out.println( "Test2.sleep3000 started @ " + System.currentTimeMillis() );
+ Test1.sleep( 3000 );
+ }
+
+ @Test
+ public void testSleep5000()
+ {
+ System.out.println( "Test2.sleep5000 started @ " + System.currentTimeMillis() );
+ Test1.sleep( 5000 );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java b/surefire-its/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
new file mode 100644
index 0000000..0dbc57e
--- /dev/null
+++ b/surefire-its/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
@@ -0,0 +1,83 @@
+package runorder.parallel;
+
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Test3
+{
+
+ private void sleep( int ms )
+ {
+ try
+ {
+ Thread.sleep( ms );
+ }
+ catch ( InterruptedException e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
+
+ @Test
+ public void testSleep100()
+ {
+ System.out.println( "Test3.sleep100 started @ " + System.currentTimeMillis() );
+ Test1.sleep( 100 );
+ }
+
+ @Test
+ public void testSleep300()
+ {
+ System.out.println( "Test3.sleep300 started @ " + System.currentTimeMillis() );
+ Test1.sleep( 300 );
+ }
+
+ @Test
+ public void testSleep500()
+ {
+ System.out.println( "Test3.sleep500 started @ " + System.currentTimeMillis() );
+ Test1.sleep( 500 );
+ }
+
+ @BeforeClass
+ public static void setUpBeforeClass()
+ throws Exception
+ {
+ System.out.println(
+ Thread.currentThread().getName() + " Test3 beforeClass sleep 175 " + System.currentTimeMillis() );
+ Thread.sleep( 175 );
+ }
+
+ @AfterClass
+ public static void tearDownAfterClass()
+ throws Exception
+ {
+ System.out.println(
+ Thread.currentThread().getName() + " Test3 afterClass sleep 175 " + System.currentTimeMillis() );
+ Thread.sleep( 175 );
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/settings.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/settings.xml b/surefire-its/src/test/resources/settings.xml
new file mode 100644
index 0000000..991a3e3
--- /dev/null
+++ b/surefire-its/src/test/resources/settings.xml
@@ -0,0 +1,53 @@
+<?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.
+ -->
+<settings>
+ <profiles>
+ <profile>
+ <id>it-repo</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.central</id>
+ <url>${localRepositoryUrl}</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>local.central</id>
+ <url>${localRepositoryUrl}</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
[04/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
new file mode 100644
index 0000000..4fb9d72
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
@@ -0,0 +1,118 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1202</artifactId>
+ <version>1.0</version>
+
+ <url>http://maven.apache.org</url>
+
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>PMC</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ <forkCount>1</forkCount>
+ <skipAfterFailureCount>2</skipAfterFailureCount>
+ <rerunFailingTestsCount>3</rerunFailingTestsCount>
+ <runOrder>alphabetical</runOrder>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>junit47</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>junit4</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java
new file mode 100644
index 0000000..cbe3f6f
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java
@@ -0,0 +1,45 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public class ATest
+{
+ private static int count;
+
+ @Test
+ public void testA()
+ throws Exception
+ {
+ MILLISECONDS.sleep( 500 );
+ if ( count++ != 2 )
+ {
+ throw new RuntimeException( "assert \"foo\" == \"bar\"\n"
+ + " |\n"
+ + " false"
+ );
+ }
+ SECONDS.sleep( 5 );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/BTest.java b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/BTest.java
new file mode 100644
index 0000000..f44d396
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/BTest.java
@@ -0,0 +1,42 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public class BTest
+{
+
+ private static int count;
+
+ @Test
+ public void testB()
+ throws InterruptedException
+ {
+ SECONDS.sleep( 2 );
+ if ( count++ != 2 )
+ {
+ throw new RuntimeException();
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/CTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/CTest.java b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/CTest.java
new file mode 100644
index 0000000..e51a29d
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/CTest.java
@@ -0,0 +1,35 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+public class CTest
+{
+ @Test
+ public void testC()
+ throws InterruptedException
+ {
+ MILLISECONDS.sleep( 500 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/DTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/DTest.java b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/DTest.java
new file mode 100644
index 0000000..85bc666
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/DTest.java
@@ -0,0 +1,35 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+public class DTest
+{
+ @Test
+ public void testD()
+ throws InterruptedException
+ {
+ MILLISECONDS.sleep( 500 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ETest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ETest.java b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ETest.java
new file mode 100644
index 0000000..a74e734
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ETest.java
@@ -0,0 +1,31 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+public class ETest
+{
+ @Test
+ public void test()
+ throws InterruptedException
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
new file mode 100644
index 0000000..9bb5c27
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
@@ -0,0 +1,115 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1209</artifactId>
+ <version>1.0</version>
+
+ <url>http://maven.apache.org</url>
+
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>PMC</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkCount>2</forkCount>
+ <rerunFailingTestsCount>3</rerunFailingTestsCount>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>junit47</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>junit4</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ATest.java b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ATest.java
new file mode 100644
index 0000000..cbe3f6f
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ATest.java
@@ -0,0 +1,45 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public class ATest
+{
+ private static int count;
+
+ @Test
+ public void testA()
+ throws Exception
+ {
+ MILLISECONDS.sleep( 500 );
+ if ( count++ != 2 )
+ {
+ throw new RuntimeException( "assert \"foo\" == \"bar\"\n"
+ + " |\n"
+ + " false"
+ );
+ }
+ SECONDS.sleep( 5 );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/BTest.java b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/BTest.java
new file mode 100644
index 0000000..f44d396
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/BTest.java
@@ -0,0 +1,42 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public class BTest
+{
+
+ private static int count;
+
+ @Test
+ public void testB()
+ throws InterruptedException
+ {
+ SECONDS.sleep( 2 );
+ if ( count++ != 2 )
+ {
+ throw new RuntimeException();
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/CTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/CTest.java b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/CTest.java
new file mode 100644
index 0000000..e51a29d
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/CTest.java
@@ -0,0 +1,35 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+public class CTest
+{
+ @Test
+ public void testC()
+ throws InterruptedException
+ {
+ MILLISECONDS.sleep( 500 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/DTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/DTest.java b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/DTest.java
new file mode 100644
index 0000000..85bc666
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/DTest.java
@@ -0,0 +1,35 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+public class DTest
+{
+ @Test
+ public void testD()
+ throws InterruptedException
+ {
+ MILLISECONDS.sleep( 500 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ETest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ETest.java b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ETest.java
new file mode 100644
index 0000000..a74e734
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ETest.java
@@ -0,0 +1,31 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+public class ETest
+{
+ @Test
+ public void test()
+ throws InterruptedException
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1211/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1211/pom.xml b/surefire-its/src/test/resources/surefire-1211/pom.xml
new file mode 100644
index 0000000..98db2a7
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1211/pom.xml
@@ -0,0 +1,71 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-1211</artifactId>
+ <version>1.0</version>
+
+ <properties>
+ <junit/>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ <properties>
+ <property>
+ <name>junit</name>
+ <value>${junit}</value>
+ </property>
+ </properties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1211/src/test/java/jira1211/JUnitTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1211/src/test/java/jira1211/JUnitTest.java b/surefire-its/src/test/resources/surefire-1211/src/test/java/jira1211/JUnitTest.java
new file mode 100644
index 0000000..1580e8a
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1211/src/test/java/jira1211/JUnitTest.java
@@ -0,0 +1,31 @@
+package jira1211;
+
+/*
+ * 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.Test;
+
+public class JUnitTest {
+
+ @Test
+ public void doNothing()
+ {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1211/src/test/java/jira1211/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1211/src/test/java/jira1211/TestNGSuiteTest.java b/surefire-its/src/test/resources/surefire-1211/src/test/java/jira1211/TestNGSuiteTest.java
new file mode 100644
index 0000000..46959c7
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1211/src/test/java/jira1211/TestNGSuiteTest.java
@@ -0,0 +1,32 @@
+package jira1211;
+
+/*
+ * 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.testng.annotations.Test;
+
+
+public class TestNGSuiteTest {
+
+ @Test
+ public void doNothing()
+ {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1260-new-tests-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1260-new-tests-pattern/pom.xml b/surefire-its/src/test/resources/surefire-1260-new-tests-pattern/pom.xml
new file mode 100644
index 0000000..5f3df66
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1260-new-tests-pattern/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.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>surefire-1260</artifactId>
+ <version>1.0</version>
+
+ <url>http://maven.apache.org</url>
+
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Diga??a (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>PMC</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit3Tests.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit3Tests.java b/surefire-its/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit3Tests.java
new file mode 100644
index 0000000..d607a3b
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit3Tests.java
@@ -0,0 +1,34 @@
+package pkg;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class JUnit3Tests extends TestCase
+{
+ public void test1()
+ {
+ }
+
+ public void test2()
+ {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit4Tests.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit4Tests.java b/surefire-its/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit4Tests.java
new file mode 100644
index 0000000..f34aee7
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit4Tests.java
@@ -0,0 +1,42 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+public class JUnit4Tests
+{
+
+ @Test
+ public void shouldTestA()
+ {
+ }
+
+ @Test
+ public void shouldTestB()
+ {
+ }
+
+ @Test
+ public void shouldTestC()
+ {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1264/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1264/pom.xml b/surefire-its/src/test/resources/surefire-1264/pom.xml
new file mode 100644
index 0000000..320401d
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1264/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>com.appnexus.viewability.core.surefireJunitTests</groupId>
+ <artifactId>main</artifactId>
+ <version>1.0.0</version>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <threadCount>2</threadCount>
+ <parallel>all</parallel>
+ <runOrder>balanced</runOrder>
+ <forkMode>once</forkMode>
+ <systemPropertyVariables>
+ <canFail>${canFail}</canFail>
+ </systemPropertyVariables>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/ATest.java b/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/ATest.java
new file mode 100644
index 0000000..18c129e
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/ATest.java
@@ -0,0 +1,33 @@
+package com.appnexus.viewability.core.surefireJunitTests;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ATest
+ extends BaseTest
+{
+ public ATest( String param )
+ {
+ super( param );
+ }
+
+ @Test
+ public void methodA1() throws InterruptedException
+ {
+ sleep( 10 );
+ if ( Boolean.getBoolean( "canFail" ) )
+ {
+ Assert.fail( "Failing test: ATest.methodA1[" + param + "]" );
+ }
+ }
+
+ @Test
+ public void methodA2() throws InterruptedException
+ {
+ sleep( 10 );
+ if ( Boolean.getBoolean( "canFail" ) )
+ {
+ Assert.fail( "Failing test: ATest.methodA2[" + param + "]" );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BTest.java b/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BTest.java
new file mode 100644
index 0000000..3ebf05c
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BTest.java
@@ -0,0 +1,33 @@
+package com.appnexus.viewability.core.surefireJunitTests;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class BTest
+ extends BaseTest
+{
+ public BTest( String param )
+ {
+ super( param );
+ }
+
+ @Test
+ public void methodB1() throws InterruptedException
+ {
+ sleep( 10 );
+ if ( Boolean.getBoolean( "canFail" ) )
+ {
+ Assert.fail( "Failing test: BTest.methodB1[" + param + "]" );
+ }
+ }
+
+ @Test
+ public void methodB2() throws InterruptedException
+ {
+ sleep( 10 );
+ if ( Boolean.getBoolean( "canFail" ) )
+ {
+ Assert.fail( "Failing test: BTest.methodB2[" + param + "]" );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BaseTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BaseTest.java b/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BaseTest.java
new file mode 100644
index 0000000..bff4077
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BaseTest.java
@@ -0,0 +1,52 @@
+package com.appnexus.viewability.core.surefireJunitTests;
+
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.Collection;
+
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.junit.runner.RunWith;
+
+
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+
+@RunWith( Parameterized.class )
+public abstract class BaseTest
+{
+ protected final String param;
+
+ public BaseTest( String param )
+ {
+ this.param = param;
+ }
+
+ @Rule
+ public TestName testName = new TestName();
+
+ @Parameters( name = "{0}" )
+ public static Collection< String > parameterList() throws Exception
+ {
+ Collection< String > c = new ConcurrentLinkedQueue< String >();
+ c.add( "p0" );
+ c.add( "p1" );
+
+ return c;
+ }
+
+ public void sleep( int time )
+ {
+ System.err.println( "Start: " + this.getClass().getSimpleName() + "." + testName.getMethodName() );
+ try
+ {
+ Thread.sleep( time * 100 );
+ }
+ catch ( InterruptedException e )
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ System.err.println( "End: " + this.getClass().getSimpleName() + "." + testName.getMethodName() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/CTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/CTest.java b/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/CTest.java
new file mode 100644
index 0000000..3adb4ab
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/CTest.java
@@ -0,0 +1,33 @@
+package com.appnexus.viewability.core.surefireJunitTests;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CTest
+ extends BaseTest
+{
+ public CTest( String param )
+ {
+ super( param );
+ }
+
+ @Test
+ public void methodC1() throws InterruptedException
+ {
+ sleep( 1 );
+ if ( Boolean.getBoolean( "canFail" ) )
+ {
+ Assert.fail( "Failing test: CTest.methodC1[" + param + "]" );
+ }
+ }
+
+ @Test
+ public void methodC2() throws InterruptedException
+ {
+ sleep( 1 );
+ if ( Boolean.getBoolean( "canFail" ) )
+ {
+ Assert.fail( "Failing test: CTest.methodC2[" + param + "]" );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/DTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/DTest.java b/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/DTest.java
new file mode 100644
index 0000000..38ed7b7
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/DTest.java
@@ -0,0 +1,33 @@
+package com.appnexus.viewability.core.surefireJunitTests;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DTest
+ extends BaseTest
+{
+ public DTest( String param )
+ {
+ super( param );
+ }
+
+ @Test
+ public void methodC1() throws InterruptedException
+ {
+ sleep( 1 );
+ if ( Boolean.getBoolean( "canFail" ) )
+ {
+ Assert.fail( "Failing test: DTest.methodD1[" + param + "]" );
+ }
+ }
+
+ @Test
+ public void methodC2() throws InterruptedException
+ {
+ sleep( 1 );
+ if ( Boolean.getBoolean( "canFail" ) )
+ {
+ Assert.fail( "Failing test: DTest.methodD2[" + param + "]" );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1265/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1265/pom.xml b/surefire-its/src/test/resources/surefire-1265/pom.xml
new file mode 100644
index 0000000..ec74a49
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1265/pom.xml
@@ -0,0 +1,49 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-1265</artifactId>
+ <version>1.0</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>9</maven.compiler.source>
+ <maven.compiler.target>9</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1265/src/test/java/J9Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1265/src/test/java/J9Test.java b/surefire-its/src/test/resources/surefire-1265/src/test/java/J9Test.java
new file mode 100644
index 0000000..3d41aea
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1265/src/test/java/J9Test.java
@@ -0,0 +1,15 @@
+import org.junit.Test;
+
+public class J9Test
+{
+ @Test
+ public void test_sql_mod() throws java.sql.SQLException
+ {
+ System.out.println( System.getProperty( "java.specification.version" ) );
+ }
+
+ @Test
+ public void test_corba_mod() /*throws org.omg.CORBA.BAD_INV_ORDER*/
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1278-group-name-ending/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1278-group-name-ending/pom.xml b/surefire-its/src/test/resources/surefire-1278-group-name-ending/pom.xml
new file mode 100644
index 0000000..d262525
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1278-group-name-ending/pom.xml
@@ -0,0 +1,58 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1278</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for testng groups</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.8.7</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <groups>group</groups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1278-group-name-ending/src/test/java/pkg/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1278-group-name-ending/src/test/java/pkg/ATest.java b/surefire-its/src/test/resources/surefire-1278-group-name-ending/src/test/java/pkg/ATest.java
new file mode 100644
index 0000000..28c7e30
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1278-group-name-ending/src/test/java/pkg/ATest.java
@@ -0,0 +1,40 @@
+package pkg;
+
+/*
+ * 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.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * Tests grouping
+ */
+public class ATest
+{
+ @Test(groups = {"group"})
+ public void group()
+ {
+ }
+
+ @Test(groups = {"agroup"})
+ public void agroup()
+ {
+ Assert.fail("Group should not be run");
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1364/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1364/pom.xml b/surefire-its/src/test/resources/surefire-1364/pom.xml
new file mode 100644
index 0000000..952ca06
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1364/pom.xml
@@ -0,0 +1,155 @@
+<?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>
+ </parent>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-1364</artifactId>
+ <version>1.0</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <forkedMode>once</forkedMode>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <testIncludes>
+ <testInclude>FirstTest.java</testInclude>
+ <testInclude>SecondTest.java</testInclude>
+ </testIncludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>${forkedMode}</forkMode>
+ <systemPropertyVariables>
+ <forkedProp>forkedValue${surefire.forkNumber}</forkedProp>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <profile>
+ <id>junit3</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit3</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ <profile>
+ <id>junit47</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ <profile>
+ <id>testng</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.8.21</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testIncludes>
+ <testInclude>*.java</testInclude>
+ </testIncludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-testng</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1364/src/test/java/FirstTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1364/src/test/java/FirstTest.java b/surefire-its/src/test/resources/surefire-1364/src/test/java/FirstTest.java
new file mode 100644
index 0000000..f2a9e66
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1364/src/test/java/FirstTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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 junit.framework.TestCase;
+import org.junit.Test;
+
+public class FirstTest extends TestCase
+{
+ @Test
+ public void test() throws InterruptedException
+ {
+ Thread.sleep( 100 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1364/src/test/java/SecondTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1364/src/test/java/SecondTest.java b/surefire-its/src/test/resources/surefire-1364/src/test/java/SecondTest.java
new file mode 100644
index 0000000..cfd9b51
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1364/src/test/java/SecondTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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 junit.framework.TestCase;
+import org.junit.Test;
+
+public class SecondTest extends TestCase
+{
+ @Test
+ public void test() throws InterruptedException
+ {
+ Thread.sleep( 100 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1364/src/test/java/ThirdTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1364/src/test/java/ThirdTest.java b/surefire-its/src/test/resources/surefire-1364/src/test/java/ThirdTest.java
new file mode 100644
index 0000000..f3633d6
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1364/src/test/java/ThirdTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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.testng.annotations.Test;
+
+
+public class ThirdTest
+{
+ @Test
+ public void test() throws InterruptedException
+ {
+ Thread.sleep( 100 );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1367/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1367/pom.xml b/surefire-its/src/test/resources/surefire-1367/pom.xml
new file mode 100644
index 0000000..b1d3ac3
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1367/pom.xml
@@ -0,0 +1,59 @@
+<?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/xsd/maven-4.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>surefire-1367</artifactId>
+ <version>1.0</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1367/src/test/java/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1367/src/test/java/ATest.java b/surefire-its/src/test/resources/surefire-1367/src/test/java/ATest.java
new file mode 100644
index 0000000..df5231e
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1367/src/test/java/ATest.java
@@ -0,0 +1,38 @@
+/*
+ * 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.Test;
+
+import static org.junit.Assume.assumeTrue;
+
+public class ATest {
+
+ @Test
+ public void test() {
+ System.out.println("Hi");
+ System.out.println();
+ System.out.println("There!");
+
+ System.err.println("Hello");
+ System.err.println();
+ System.err.println("What's up!");
+
+ assumeTrue( false );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1367/src/test/java/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1367/src/test/java/BTest.java b/surefire-its/src/test/resources/surefire-1367/src/test/java/BTest.java
new file mode 100644
index 0000000..bec4da8
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1367/src/test/java/BTest.java
@@ -0,0 +1,34 @@
+/*
+ * 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.Test;
+
+import static org.junit.Assume.assumeTrue;
+
+public class BTest {
+
+ @Test
+ public void test() {
+ System.out.println("Hey");
+ System.out.println();
+ System.out.println("you!");
+
+ assumeTrue( false );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
new file mode 100644
index 0000000..30e5199
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
@@ -0,0 +1,52 @@
+<!--
+ ~ 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-test-classpath-provider</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test provider</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-api</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources/META-INF</directory>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/java/org/apache/maven/surefire/testprovider/ClassPathTestProvider.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/java/org/apache/maven/surefire/testprovider/ClassPathTestProvider.java b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/java/org/apache/maven/surefire/testprovider/ClassPathTestProvider.java
new file mode 100644
index 0000000..eeea397
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/java/org/apache/maven/surefire/testprovider/ClassPathTestProvider.java
@@ -0,0 +1,63 @@
+package org.apache.maven.surefire.testprovider;
+
+/*
+ * 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.lang.reflect.InvocationTargetException;
+import java.util.LinkedList;
+import java.util.Map.Entry;
+
+import org.apache.maven.surefire.providerapi.AbstractProvider;
+import org.apache.maven.surefire.providerapi.ProviderParameters;
+import org.apache.maven.surefire.report.ReporterException;
+import org.apache.maven.surefire.suite.RunResult;
+import org.apache.maven.surefire.testset.TestSetFailedException;
+
+/**
+ * @author Jonathan Bell
+ */
+public class ClassPathTestProvider
+ extends AbstractProvider
+{
+ boolean hasSLF4J; // SLF4J is not being included in our deps, so if it's in the classpath, that's a problem...
+
+ public ClassPathTestProvider( ProviderParameters params )
+ {
+ for ( Entry<String, String> propEntry : params.getProviderProperties().entrySet() )
+ {
+ if ( propEntry.getKey().startsWith( "surefireClassPathUrl" ) && propEntry.getValue().contains( "slf4j" ) )
+ hasSLF4J = true;
+ }
+ }
+
+ public Iterable<Class<?>> getSuites()
+ {
+ LinkedList<Class<?>> ret = new LinkedList<Class<?>>();
+ return ret;
+ }
+
+ public RunResult invoke( Object arg0 )
+ throws TestSetFailedException, ReporterException, InvocationTargetException
+ {
+ if ( hasSLF4J )
+ throw new TestSetFailedException( "SLF4J was found on the boot classpath" );
+ return new RunResult( 1, 0, 0, 0 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
new file mode 100644
index 0000000..fd31063
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
@@ -0,0 +1 @@
+org.apache.maven.surefire.testprovider.ClassPathTestProvider
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
new file mode 100644
index 0000000..be5cf97
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
@@ -0,0 +1,82 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>pluggableproviders-classpath</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>pluggableproviders-classpath-test</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-test-classpath-provider</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-test-classpath-provider</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyIT.java b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyIT.java
new file mode 100644
index 0000000..f7e2a7f
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyIT.java
@@ -0,0 +1,26 @@
+package pluggableproviders;
+
+/*
+ * 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.
+ */
+
+
+public class EmptyIT
+{
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyTest.java b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyTest.java
new file mode 100644
index 0000000..4ac75c7
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyTest.java
@@ -0,0 +1,26 @@
+package pluggableproviders;
+
+/*
+ * 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.
+ */
+
+
+public class EmptyTest
+{
+
+}
[11/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test1.java b/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test1.java
new file mode 100644
index 0000000..7497816
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test1.java
@@ -0,0 +1,67 @@
+package forkMode;
+
+/*
+ * 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.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.util.Random;
+
+import junit.framework.TestCase;
+
+public class Test1
+ extends TestCase
+{
+
+ private static final Random RANDOM = new Random();
+
+ public void test1()
+ throws IOException, InterruptedException
+ {
+ int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "1500" ));
+ Thread.sleep(sleepLength);
+ dumpPidFile( this );
+ }
+
+ public static void dumpPidFile( TestCase test )
+ throws IOException
+ {
+ String fileName = test.getName() + "-pid";
+ File target = new File( "target" ).getCanonicalFile(); // getCanonicalFile required for embedded mode
+ if ( !( target.exists() && target.isDirectory() ) )
+ {
+ target = new File( "." );
+ }
+ File pidFile = new File( target, fileName );
+ FileWriter fw = new FileWriter( pidFile );
+ // DGF little known trick... this is guaranteed to be unique to the PID
+ // In fact, it usually contains the pid and the local host name!
+ String pid = ManagementFactory.getRuntimeMXBean().getName();
+ fw.write( pid );
+ fw.write( " " );
+ fw.write( System.getProperty( "testProperty", String.valueOf( RANDOM.nextLong() ) ) );
+ fw.flush();
+ fw.close();
+ System.out.println( "Done Writing pid file" + pidFile.getAbsolutePath() );
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test2.java b/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test2.java
new file mode 100644
index 0000000..e9d0652
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test2.java
@@ -0,0 +1,36 @@
+package forkMode;
+
+/*
+ * 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.io.IOException;
+
+import junit.framework.TestCase;
+
+public class Test2
+ extends TestCase
+{
+
+ public void test2() throws IOException, InterruptedException {
+ int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "1500" ));
+ Thread.sleep(sleepLength);
+ Test1.dumpPidFile(this);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test3.java b/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test3.java
new file mode 100644
index 0000000..c8eef74
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test3.java
@@ -0,0 +1,34 @@
+package forkMode;
+
+/*
+ * 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.io.IOException;
+
+import junit.framework.TestCase;
+
+public class Test3
+ extends TestCase
+{
+
+ public void test3() throws IOException {
+ Test1.dumpPidFile(this);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-multimodule/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-multimodule/pom.xml b/surefire-its/src/test/resources/fork-mode-multimodule/pom.xml
new file mode 100644
index 0000000..e0786b1
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-multimodule/pom.xml
@@ -0,0 +1,66 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-mode-multimodule</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for forkMode Multimodule</name>
+
+ <packaging>pom</packaging>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <modules>
+ <module>module-a</module>
+ <module>module-b</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <threadCount>${threadCount}</threadCount>
+ <runOrder>alphabetical</runOrder>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-resource-loading/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-resource-loading/pom.xml b/surefire-its/src/test/resources/fork-mode-resource-loading/pom.xml
new file mode 100644
index 0000000..e40033c
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-resource-loading/pom.xml
@@ -0,0 +1,54 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-mode-resource-loading</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for forkMode</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-resource-loading/src/test/java/forkMode/ResourceLoadTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-resource-loading/src/test/java/forkMode/ResourceLoadTest.java b/surefire-its/src/test/resources/fork-mode-resource-loading/src/test/java/forkMode/ResourceLoadTest.java
new file mode 100644
index 0000000..e2c3d51
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-resource-loading/src/test/java/forkMode/ResourceLoadTest.java
@@ -0,0 +1,46 @@
+package forkMode;
+
+/*
+ * 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 junit.framework.TestCase;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+public class ResourceLoadTest
+ extends TestCase
+{
+
+ public void testGetResourceUrl() throws IOException {
+ final URL resource = this.getClass().getClassLoader().getResource( "myFile.txt" );
+ assertNotNull( resource );
+ }
+
+ public void testGetResource() throws IOException {
+ final InputStream resource = this.getClass().getClassLoader().getResourceAsStream( "myFile.txt" );
+ assertNotNull( resource );
+ }
+
+ public void testGetResourceThreadLoader() throws IOException {
+ final InputStream resource = Thread.currentThread().getContextClassLoader().getResourceAsStream( "myFile.txt" );
+ assertNotNull( resource );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-resource-loading/src/test/resources/myFile.txt
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-resource-loading/src/test/resources/myFile.txt b/surefire-its/src/test/resources/fork-mode-resource-loading/src/test/resources/myFile.txt
new file mode 100644
index 0000000..51f466f
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-resource-loading/src/test/resources/myFile.txt
@@ -0,0 +1 @@
+A file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-testng/pom.xml b/surefire-its/src/test/resources/fork-mode-testng/pom.xml
new file mode 100644
index 0000000..8e25749
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-testng/pom.xml
@@ -0,0 +1,50 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-mode-testng</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for forkMode</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <threadCount>${threadCount}</threadCount>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.7</version>
+ <classifier>jdk15</classifier>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <!-- NOTE: Deliberately excluding junit to enforce TestNG only tests, cf. SUREFIRE-642 -->
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test1.java b/surefire-its/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test1.java
new file mode 100644
index 0000000..8caec4e
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test1.java
@@ -0,0 +1,65 @@
+package forkMode;
+
+/*
+ * 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.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.util.Random;
+
+import org.testng.annotations.Test;
+
+public class Test1
+{
+
+ private static final Random RANDOM = new Random();
+
+ @Test
+ public void test1()
+ throws IOException, InterruptedException
+ {
+ int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "750" ));
+ Thread.sleep(sleepLength);
+ dumpPidFile( "test1" );
+ }
+
+ public static void dumpPidFile( String name )
+ throws IOException
+ {
+ String fileName = name + "-pid";
+ File target = new File( "target" ).getCanonicalFile();
+ if ( !( target.exists() && target.isDirectory() ) )
+ {
+ target = new File( "." );
+ }
+ File pidFile = new File( target, fileName );
+ FileWriter fw = new FileWriter( pidFile );
+ // DGF little known trick... this is guaranteed to be unique to the PID
+ // In fact, it usually contains the pid and the local host name!
+ String pid = ManagementFactory.getRuntimeMXBean().getName();
+ fw.write( pid );
+ fw.write( " " );
+ fw.write( System.getProperty( "testProperty", String.valueOf( RANDOM.nextLong() ) ) );
+ fw.flush();
+ fw.close();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test2.java b/surefire-its/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test2.java
new file mode 100644
index 0000000..d7e8be9
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test2.java
@@ -0,0 +1,33 @@
+package forkMode;
+
+/*
+ * 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.io.IOException;
+
+import org.testng.annotations.Test;
+
+public class Test2
+{
+ @Test
+ public void test2() throws IOException {
+ Test1.dumpPidFile( "test2" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test3.java b/surefire-its/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test3.java
new file mode 100644
index 0000000..e52f2b7
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-testng/src/test/java/forkMode/Test3.java
@@ -0,0 +1,34 @@
+package forkMode;
+
+/*
+ * 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.io.IOException;
+
+import org.testng.annotations.Test;
+
+public class Test3
+{
+
+ @Test
+ public void test3() throws IOException {
+ Test1.dumpPidFile( "test3" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode/pom.xml b/surefire-its/src/test/resources/fork-mode/pom.xml
new file mode 100644
index 0000000..28bfb4d
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode/pom.xml
@@ -0,0 +1,59 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-mode</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for forkMode</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <threadCount>${threadCount}</threadCount>
+ <runOrder>alphabetical</runOrder>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java b/surefire-its/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
new file mode 100644
index 0000000..980123c
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode/src/test/java/forkMode/Test1.java
@@ -0,0 +1,67 @@
+package forkMode;
+
+/*
+ * 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.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.util.Random;
+
+import junit.framework.TestCase;
+
+public class Test1
+ extends TestCase
+{
+
+ private static final Random RANDOM = new Random();
+
+ public void test1()
+ throws IOException, InterruptedException
+ {
+ int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "750" ));
+ Thread.sleep(sleepLength);
+ dumpPidFile( this );
+ }
+
+ public static void dumpPidFile( TestCase test )
+ throws IOException
+ {
+ String fileName = test.getName() + "-pid";
+ File target = new File( "target" ).getCanonicalFile(); // getCanonicalFile required for embedded mode
+ if ( !( target.exists() && target.isDirectory() ) )
+ {
+ target = new File( "." );
+ }
+ File pidFile = new File( target, fileName );
+ FileWriter fw = new FileWriter( pidFile );
+ // DGF little known trick... this is guaranteed to be unique to the PID
+ // In fact, it usually contains the pid and the local host name!
+ String pid = ManagementFactory.getRuntimeMXBean().getName();
+ fw.write( pid );
+ fw.write( " " );
+ fw.write( System.getProperty( "testProperty", String.valueOf( RANDOM.nextLong() ) ) );
+ fw.flush();
+ fw.close();
+ System.out.println( "Done Writing pid file" + pidFile.getAbsolutePath() );
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode/src/test/java/forkMode/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode/src/test/java/forkMode/Test2.java b/surefire-its/src/test/resources/fork-mode/src/test/java/forkMode/Test2.java
new file mode 100644
index 0000000..33d3cf1
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode/src/test/java/forkMode/Test2.java
@@ -0,0 +1,34 @@
+package forkMode;
+
+/*
+ * 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.io.IOException;
+
+import junit.framework.TestCase;
+
+public class Test2
+ extends TestCase
+{
+
+ public void test2() throws IOException {
+ Test1.dumpPidFile(this);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode/src/test/java/forkMode/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode/src/test/java/forkMode/Test3.java b/surefire-its/src/test/resources/fork-mode/src/test/java/forkMode/Test3.java
new file mode 100644
index 0000000..c8eef74
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode/src/test/java/forkMode/Test3.java
@@ -0,0 +1,34 @@
+package forkMode;
+
+/*
+ * 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.io.IOException;
+
+import junit.framework.TestCase;
+
+public class Test3
+ extends TestCase
+{
+
+ public void test3() throws IOException {
+ Test1.dumpPidFile(this);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-timeout/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-timeout/pom.xml b/surefire-its/src/test/resources/fork-timeout/pom.xml
new file mode 100644
index 0000000..25365a2
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-timeout/pom.xml
@@ -0,0 +1,47 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-timeout-test</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>fork-timeout</name>
+ <url>http://maven.apache.org</url>
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <junit.parallel>classes</junit.parallel>
+ <forkMode>once</forkMode>
+ <timeOut>1</timeOut>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <parallel>${junit.parallel}</parallel>
+ <threadCount>3</threadCount>
+ <perCoreThreadCount>false</perCoreThreadCount>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <forkedProcessTimeoutInSeconds>${timeOut}</forkedProcessTimeoutInSeconds>
+ <reportFormat>plain</reportFormat>
+ <useFile>true</useFile>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java
new file mode 100644
index 0000000..a2dc6cb
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java
@@ -0,0 +1,53 @@
+package forktimeout;
+
+/*
+ * 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.
+ */
+
+public abstract class BaseForkTimeout
+{
+ protected void dumpStuff( String prefix )
+ {
+ reallySleep( 990 );
+ for ( int i = 0; i < 200; i++ )
+ {
+ System.out.println( prefix + " with lots of output " + i );
+ System.err.println( prefix + "e with lots of output " + i );
+ }
+ System.out.println( prefix + "last line" );
+ System.err.println( prefix + "e last line" );
+ }
+
+ private void reallySleep( long timeout )
+ {
+ long endAt = System.currentTimeMillis() + timeout;
+ try
+ {
+ Thread.sleep( timeout );
+ while ( System.currentTimeMillis() < endAt )
+ {
+ Thread.yield();
+ Thread.sleep( 5 );
+ }
+ }
+ catch ( InterruptedException e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test1.java b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test1.java
new file mode 100644
index 0000000..d176fce
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test1.java
@@ -0,0 +1,34 @@
+package forktimeout;
+
+/*
+ * 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.Test;
+
+public class Test1
+ extends BaseForkTimeout
+{
+ @Test
+ public void test690()
+ {
+ dumpStuff( "test690" );
+ System.out.println( " with lots of output " );
+ System.err.println( "e with lots of output " );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test2.java b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test2.java
new file mode 100644
index 0000000..25b0ecd
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test2.java
@@ -0,0 +1,30 @@
+package forktimeout;
+/*
+ * 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.Test;
+
+public class Test2 extends BaseForkTimeout
+{
+ @Test
+ public void test690_2() {
+ dumpStuff( "test690_2" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test3.java b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test3.java
new file mode 100644
index 0000000..b618bdb
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test3.java
@@ -0,0 +1,32 @@
+package forktimeout;
+/*
+ * 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.Test;
+
+public class Test3 extends BaseForkTimeout
+{
+
+ @Test
+ public void test690_3() {
+ dumpStuff( "test690_3" );
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test4.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test4.java b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test4.java
new file mode 100644
index 0000000..4582c65
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test4.java
@@ -0,0 +1,32 @@
+package forktimeout;
+/*
+ * 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.Test;
+
+public class Test4
+ extends BaseForkTimeout
+{
+ @Test
+ public void test690_4() {
+ dumpStuff( "test690_4" );
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test5.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test5.java b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test5.java
new file mode 100644
index 0000000..886385d
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/Test5.java
@@ -0,0 +1,32 @@
+package forktimeout;
+/*
+ * 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.Test;
+
+public class Test5
+ extends BaseForkTimeout
+{
+ @Test
+ public void test690_5() {
+ dumpStuff( "test690_5" );
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes-from-file/common-excludes.txt
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes-from-file/common-excludes.txt b/surefire-its/src/test/resources/includes-excludes-from-file/common-excludes.txt
new file mode 100644
index 0000000..483aae3
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes-from-file/common-excludes.txt
@@ -0,0 +1,3 @@
+# common excludes
+
+**/DontRunTest.*
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes-from-file/path-includes.txt
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes-from-file/path-includes.txt b/surefire-its/src/test/resources/includes-excludes-from-file/path-includes.txt
new file mode 100644
index 0000000..cedff2a
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes-from-file/path-includes.txt
@@ -0,0 +1,3 @@
+# path includes
+
+*/test/*
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes-from-file/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes-from-file/pom.xml b/surefire-its/src/test/resources/includes-excludes-from-file/pom.xml
new file mode 100644
index 0000000..39313db
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes-from-file/pom.xml
@@ -0,0 +1,153 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>maven-it-includes-excludes</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>Maven Integration Test :: includes-excludes-from-file</name>
+ <description>Test surefire inclusion/exclusions from files</description>
+
+ <properties>
+ <junit.version>3.8.2</junit.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>simple</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludesFile>${project.basedir}/common-excludes.txt</excludesFile>
+ <includesFile>${project.basedir}/simple-includes.txt</includesFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>simple-mixed</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludesFile>${project.basedir}/common-excludes.txt</excludesFile>
+ <includes>
+ <include>**/NotIncludedByDefault.java</include>
+ </includes>
+ <includesFile>${project.basedir}/simple-mixed-includes.txt</includesFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>regex</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludesFile>${project.basedir}/common-excludes.txt</excludesFile>
+ <includesFile>${project.basedir}/regex-includes.txt</includesFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>path</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludesFile>${project.basedir}/common-excludes.txt</excludesFile>
+ <includesFile>${project.basedir}/path-includes.txt</includesFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>missing-excludes-file</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludesFile>${project.basedir}/no-such-excludes-file</excludesFile>
+ <includesFile>${project.basedir}/simple-includes.txt</includesFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>missing-includes-file</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludesFile>${project.basedir}/common-excludes.txt</excludesFile>
+ <includesFile>${project.basedir}/no-such-includes-file</includesFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes-from-file/regex-includes.txt
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes-from-file/regex-includes.txt b/surefire-its/src/test/resources/includes-excludes-from-file/regex-includes.txt
new file mode 100644
index 0000000..fcf6f9e
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes-from-file/regex-includes.txt
@@ -0,0 +1,3 @@
+# regex includes
+
+%regex[.*Test.*|.*Not.*]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes-from-file/simple-includes.txt
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes-from-file/simple-includes.txt b/surefire-its/src/test/resources/includes-excludes-from-file/simple-includes.txt
new file mode 100644
index 0000000..d2b1d12
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes-from-file/simple-includes.txt
@@ -0,0 +1,4 @@
+# simple includes
+
+**/NotIncludedByDefault.java
+**/*Test.java
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes-from-file/simple-mixed-includes.txt
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes-from-file/simple-mixed-includes.txt b/surefire-its/src/test/resources/includes-excludes-from-file/simple-mixed-includes.txt
new file mode 100644
index 0000000..68a1d5c
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes-from-file/simple-mixed-includes.txt
@@ -0,0 +1,3 @@
+# simple-mixed includes
+
+**/*Test.java
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DefaultTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DefaultTest.java b/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DefaultTest.java
new file mode 100644
index 0000000..be6a6bb
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DefaultTest.java
@@ -0,0 +1,34 @@
+package org.test;
+
+/*
+ * 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.io.FileOutputStream;
+
+public class DefaultTest
+{
+ public void testRun()
+ throws Exception
+ {
+ FileOutputStream fout = new FileOutputStream( "target/defaultTestTouchFile.txt" );
+ fout.write( '!' );
+ fout.flush();
+ fout.close();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DontRunTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DontRunTest.java b/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DontRunTest.java
new file mode 100644
index 0000000..0cce390
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/DontRunTest.java
@@ -0,0 +1,30 @@
+package org.test;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class DontRunTest extends TestCase
+{
+ public void testRun()
+ {
+ assertEquals(true, false);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/NotIncludedByDefault.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/NotIncludedByDefault.java b/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/NotIncludedByDefault.java
new file mode 100644
index 0000000..58b962a
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/NotIncludedByDefault.java
@@ -0,0 +1,34 @@
+package org.test;
+
+/*
+ * 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.io.FileOutputStream;
+
+public class NotIncludedByDefault
+{
+ public void testRun()
+ throws Exception
+ {
+ FileOutputStream fout = new FileOutputStream( "target/testTouchFile.txt" );
+ fout.write( '!' );
+ fout.flush();
+ fout.close();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/aTestXmlFile.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/aTestXmlFile.xml b/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/aTestXmlFile.xml
new file mode 100644
index 0000000..17f382f
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes-from-file/src/test/java/org/test/aTestXmlFile.xml
@@ -0,0 +1,24 @@
+<?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>
+ <foo/>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes/pom.xml b/surefire-its/src/test/resources/includes-excludes/pom.xml
new file mode 100644
index 0000000..77711f7
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes/pom.xml
@@ -0,0 +1,135 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>maven-it-includes-excludes</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>Maven Integration Test :: includes-excludes</name>
+ <description>Test surefire inclusion/exclusions</description>
+
+ <properties>
+ <junit.version>3.8.2</junit.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <profile>
+ <id>simple</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/DontRunTest.*</exclude>
+ <exclude></exclude>
+ <exclude />
+ </excludes>
+ <includes>
+ <include>**/NotIncludedByDefault.java</include>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>regex</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/DontRunTest.*</exclude>
+ </excludes>
+ <includes>
+ <include>%regex[.*Test.*|.*Not.*]</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>path</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/DontRunTest.java</exclude>
+ </excludes>
+ <includes>
+ <include>*/test/*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>withXmlFile</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/DontRunTest.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/DefaultTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/DefaultTest.java b/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/DefaultTest.java
new file mode 100644
index 0000000..be6a6bb
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/DefaultTest.java
@@ -0,0 +1,34 @@
+package org.test;
+
+/*
+ * 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.io.FileOutputStream;
+
+public class DefaultTest
+{
+ public void testRun()
+ throws Exception
+ {
+ FileOutputStream fout = new FileOutputStream( "target/defaultTestTouchFile.txt" );
+ fout.write( '!' );
+ fout.flush();
+ fout.close();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/DontRunTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/DontRunTest.java b/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/DontRunTest.java
new file mode 100644
index 0000000..0cce390
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/DontRunTest.java
@@ -0,0 +1,30 @@
+package org.test;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class DontRunTest extends TestCase
+{
+ public void testRun()
+ {
+ assertEquals(true, false);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/NotIncludedByDefault.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/NotIncludedByDefault.java b/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/NotIncludedByDefault.java
new file mode 100644
index 0000000..58b962a
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/NotIncludedByDefault.java
@@ -0,0 +1,34 @@
+package org.test;
+
+/*
+ * 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.io.FileOutputStream;
+
+public class NotIncludedByDefault
+{
+ public void testRun()
+ throws Exception
+ {
+ FileOutputStream fout = new FileOutputStream( "target/testTouchFile.txt" );
+ fout.write( '!' );
+ fout.flush();
+ fout.close();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/aTestXmlFile.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/aTestXmlFile.xml b/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/aTestXmlFile.xml
new file mode 100644
index 0000000..17f382f
--- /dev/null
+++ b/surefire-its/src/test/resources/includes-excludes/src/test/java/org/test/aTestXmlFile.xml
@@ -0,0 +1,24 @@
+<?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>
+ <foo/>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/isolated-classloader/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/isolated-classloader/pom.xml b/surefire-its/src/test/resources/isolated-classloader/pom.xml
new file mode 100644
index 0000000..a853063
--- /dev/null
+++ b/surefire-its/src/test/resources/isolated-classloader/pom.xml
@@ -0,0 +1,56 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>isolated-classloader</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for useSystemClassLoader=false</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java b/surefire-its/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java
new file mode 100644
index 0000000..f293734
--- /dev/null
+++ b/surefire-its/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java
@@ -0,0 +1,86 @@
+package isolatedClassloader;
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public BasicTest( String name, String extraName )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ Test test = new BasicTest( "testSetUp", "dummy" );
+ suite.addTest( test );
+
+ return new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/java9-full-api/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/java9-full-api/pom.xml b/surefire-its/src/test/resources/java9-full-api/pom.xml
new file mode 100644
index 0000000..2e4d4f3
--- /dev/null
+++ b/surefire-its/src/test/resources/java9-full-api/pom.xml
@@ -0,0 +1,132 @@
+<?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/xsd/maven-4.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>
+
+ <artifactId>java9-full-api</artifactId>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <forkMode>once</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>use-jvm-config-paramater</id>
+ <activation>
+ <property>
+ <name>jdk.home</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <jvm>${jdk.home}/bin/java</jvm>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>use-toolchains</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>9</version>
+ </jdk>
+ </toolchains>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/java9-full-api/src/test/java/J9IT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/java9-full-api/src/test/java/J9IT.java b/surefire-its/src/test/resources/java9-full-api/src/test/java/J9IT.java
new file mode 100644
index 0000000..c74678d
--- /dev/null
+++ b/surefire-its/src/test/resources/java9-full-api/src/test/java/J9IT.java
@@ -0,0 +1,37 @@
+/*
+ * 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.Test;
+
+public class J9IT
+{
+ @Test
+ public void testMiscellaneousAPI() throws java.sql.SQLException
+ {
+ System.out.println( "loaded class " + java.sql.SQLException.class.getName() );
+ System.out.println( "loaded class " + javax.xml.ws.Holder.class.getName() );
+ System.out.println( "loaded class " + javax.xml.bind.JAXBException.class.getName() );
+ System.out.println( "loaded class " + javax.transaction.InvalidTransactionException.class.getName() );
+ System.out.println( "from classloader " + javax.transaction.InvalidTransactionException.class.getClassLoader() );
+ System.out.println( "loaded class " + javax.transaction.TransactionManager.class.getName() );
+ System.out.println( "loaded class " + javax.xml.xpath.XPath.class.getName() );
+ System.out.println( "java.specification.version=" + System.getProperty( "java.specification.version" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/java9-full-api/src/test/java/J9Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/java9-full-api/src/test/java/J9Test.java b/surefire-its/src/test/resources/java9-full-api/src/test/java/J9Test.java
new file mode 100644
index 0000000..6fc8536
--- /dev/null
+++ b/surefire-its/src/test/resources/java9-full-api/src/test/java/J9Test.java
@@ -0,0 +1,36 @@
+/*
+ * 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.Test;
+
+public class J9Test
+{
+ @Test
+ public void testMiscellaneousAPI() throws java.sql.SQLException
+ {
+ System.out.println( "loaded class " + java.sql.SQLException.class.getName() );
+ System.out.println( "loaded class " + javax.xml.ws.Holder.class.getName() );
+ System.out.println( "loaded class " + javax.xml.bind.JAXBException.class.getName() );
+ System.out.println( "loaded class " + javax.transaction.InvalidTransactionException.class.getName() );
+ System.out.println( "loaded class " + javax.transaction.TransactionManager.class.getName() );
+ System.out.println( "loaded class " + javax.xml.xpath.XPath.class.getName() );
+ System.out.println( "java.specification.version=" + System.getProperty( "java.specification.version" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-fork-mode-always/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-fork-mode-always/pom.xml b/surefire-its/src/test/resources/junit-fork-mode-always/pom.xml
new file mode 100644
index 0000000..9b86c75
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-fork-mode-always/pom.xml
@@ -0,0 +1,57 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>testng-fork-mode</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for forkMode</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
[29/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/src/test/java/jiras/surefire649/SystemPropertiesTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/src/test/java/jiras/surefire649/SystemPropertiesTest.java b/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/src/test/java/jiras/surefire649/SystemPropertiesTest.java
deleted file mode 100644
index 27512df..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/src/test/java/jiras/surefire649/SystemPropertiesTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package jiras.surefire649;
-
-/*
- * 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.Test;
-
-public final class SystemPropertiesTest {
-
- @Test
- public void someMethod() throws InterruptedException {
- String prop = System.getProperty( "emptyProperty" );
- System.out.println( "emptyProperty=" + ( prop == null ? null : "'" + prop + "'" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml b/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
deleted file mode 100644
index e7a7fad..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
+++ /dev/null
@@ -1,64 +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/xsd/maven-4.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>jiras-surefire-649-sys-prop-vars</artifactId>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <emptyProperty/>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/src/test/java/jiras/surefire649/SystemPropertyVariablesTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/src/test/java/jiras/surefire649/SystemPropertyVariablesTest.java b/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/src/test/java/jiras/surefire649/SystemPropertyVariablesTest.java
deleted file mode 100644
index e235b46..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/src/test/java/jiras/surefire649/SystemPropertyVariablesTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package jiras.surefire649;
-
-/*
- * 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.Test;
-
-public final class SystemPropertyVariablesTest {
-
- @Test
- public void someMethod() throws InterruptedException {
- String prop = System.getProperty( "emptyProperty" );
- System.out.println( "emptyProperty=" + ( prop == null ? null : "'" + prop + "'" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml b/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml
deleted file mode 100644
index 0b03c13..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>MockitoTest</artifactId>
- <name>surefire-673-mockito</name>
- <version>1.0.0-SNAPSHOT</version>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>1.8.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-673-mockito/src/test/java/surefire673/TestMockito.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-673-mockito/src/test/java/surefire673/TestMockito.java b/surefire-integration-tests/src/test/resources/surefire-673-mockito/src/test/java/surefire673/TestMockito.java
deleted file mode 100644
index 12c16bd..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-673-mockito/src/test/java/surefire673/TestMockito.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package surefire673;
-
-/*
- * 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.Test;
-import org.mockito.Mockito;
-
-public class TestMockito
-{
- @Test
- public void canMockPrivateStaticClass()
- {
- Mockito.mock(PrivateClass.class);
- }
-
- private static class PrivateClass
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml b/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
deleted file mode 100644
index 398a225..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>buildFailingWhenErrors</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>buildFailingWhenErrors</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <includes>
- <include>**/Test*.java</include>
- <include>**/MySuiteTest1.java</include>
- <include>**/MySuiteTest2.java</include>
- <include>**/MySuiteTest3.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <junit.version>4.8.1</junit.version>
- <forkMode>once</forkMode>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/src/test/java/resultcounting/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/src/test/java/resultcounting/Test2.java b/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/src/test/java/resultcounting/Test2.java
deleted file mode 100644
index 26b218c..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/src/test/java/resultcounting/Test2.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package resultcounting;
-
-/*
- * 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.Test;
-
-/**
- * A test that causes an error
- *
- * @author Kristian Rosenvold
- */
-public class Test2
-{
- @Test
- public void testWithException1()
- {
- throw new RuntimeException( "We expect this" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml b/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
deleted file mode 100644
index eb40366..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
+++ /dev/null
@@ -1,63 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-685-commaseparatedIncludes</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>surefire-685-commaseparatedIncludes</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>once</forkMode>
- <includes>
- <include>**/TestA.java,**/TestB.java</include>
- </includes>
- </configuration>
- <dependencies>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestA.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestA.java b/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestA.java
deleted file mode 100644
index b34e410..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestA.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package surefire685;
-/*
- * 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 junit.framework.TestCase;
-
-
-public class TestA
- extends TestCase
-{
- public void testTwo() {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestB.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestB.java b/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestB.java
deleted file mode 100644
index 6e272d7..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestB.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package surefire685;
-/*
- * 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 junit.framework.TestCase;
-
-
-public class TestB
- extends TestCase
-{
- public void testTwo() {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestC.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestC.java b/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestC.java
deleted file mode 100644
index 68bd647..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/src/test/java/surefire685/TestC.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package surefire685;
-/*
- * 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 junit.framework.TestCase;
-
-
-public class TestC
- extends TestCase
-{
- public void testTwo() {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml b/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml
deleted file mode 100644
index 52663e5..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml
+++ /dev/null
@@ -1,55 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-697-niceSummary</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Tests summary with long/multiline exception messages</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/src/test/java/junit/surefire697/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/src/test/java/junit/surefire697/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/src/test/java/junit/surefire697/BasicTest.java
deleted file mode 100644
index f1c3d66..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/src/test/java/junit/surefire697/BasicTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package junit.surefire697;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- public void testShort()
- {
- throw new RuntimeException( "A very short message" );
- }
-
- public void testShortMultiline()
- {
- throw new RuntimeException( "A very short multiline message\nHere is line 2" );
- }
-
- public void testLong()
- {
- throw new RuntimeException( "A very long single line message"
- + "012345678900123456789001234567890012345678900123456789001234567890"
- + "012345678900123456789001234567890012345678900123456789001234567890" );
- }
-
- public void testLongMultiLineNoCr()
- {
- throw new RuntimeException( "A very long multi line message"
- + "012345678900123456789001234567890012345678900123456789001234567890"
- + "012345678900123456789001234567890012345678900123456789001234567890\n"
- + "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ"
- + "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" );
- }
-
- public void testLongMultiLine()
- {
- throw new RuntimeException( "A very long single line message"
- + "012345678900123456789001234567890012345678900123456789001234567890"
- + "012345678900123456789001234567890012345678900123456789001234567890\n"
- + "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ"
- + "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ\n" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/src/test/java/junit/surefire697/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/src/test/java/junit/surefire697/TestTwo.java b/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/src/test/java/junit/surefire697/TestTwo.java
deleted file mode 100644
index 759002f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/src/test/java/junit/surefire697/TestTwo.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package junit.surefire697;
-
-/*
- * 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 junit.framework.TestCase;
-
-
-public class TestTwo
- extends TestCase
-{
- public void testTwo() {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml b/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
deleted file mode 100644
index acb0d5e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
+++ /dev/null
@@ -1,56 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-733-allOverridesCaptured</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Ensures that all versions of system.out capture are handled</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
-
- </build>
-
- <properties>
- <junit.version>4.8.1</junit.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/src/test/java/junit/surefire733/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/src/test/java/junit/surefire733/ATest.java b/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/src/test/java/junit/surefire733/ATest.java
deleted file mode 100644
index 6e6e72d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/src/test/java/junit/surefire733/ATest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package junit.surefire733;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class ATest
- extends TestCase
-{
- public void testConsoleOut()
- {
- System.out.write( (int) 'a' );
- final byte[] bytes = "bc".getBytes();
- System.out.write( bytes, 0, bytes.length );
- System.out.write( '\n' );
- System.out.println( "ABC" );
- System.out.println( (String) null );
-
- final byte[] errbytes = "ef".getBytes();
- System.err.write( (int) 'z' );
- System.err.write( errbytes, 0, bytes.length );
- System.err.write( '\n' );
-
- System.err.println( "XYZ" );
- System.err.println( (String) null );
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml b/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml
deleted file mode 100644
index 4832590..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.02" errors="0" skipped="0" tests="1" name="junit.twoTestCases.BasicTest">
- <properties>
- <property name="surefire.version" value="2.8.1"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/>
- <property name="java.vm.version" value="19.1-b02"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="RU"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.runtime.version" value="1.6.0_24-b07"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
- <property name="os.version" value="2.6.32-29-generic"/>
- <property name="user.home" value="/home/kristian"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="user.name" value="kristian"/>
- <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="ru"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_24"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/kristian/fast/repo"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0.002" classname="junit.twoTestCases.BasicTest" name="testSetUp"/>
-</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml b/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml
deleted file mode 100644
index a7429aa..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.007" errors="0" skipped="0" tests="1" name="junit.twoTestCases.TestTwo">
- <properties>
- <property name="surefire.version" value="2.8.1"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/>
- <property name="java.vm.version" value="19.1-b02"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="RU"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.runtime.version" value="1.6.0_24-b07"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
- <property name="os.version" value="2.6.32-29-generic"/>
- <property name="user.home" value="/home/kristian"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="user.name" value="kristian"/>
- <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="ru"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_24"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/kristian/fast/repo"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0" classname="junit.twoTestCases.TestTwo" name="testTwo"/>
-</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml b/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml
deleted file mode 100644
index 5291cc6..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml
+++ /dev/null
@@ -1,61 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-twoTestCases</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for two test cases</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <reportsDirectories>
- <reportsDirectory>${basedir}/persistent-reports</reportsDirectory>
- </reportsDirectories>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/pom.xml b/surefire-integration-tests/src/test/resources/surefire-772-both-reports/pom.xml
deleted file mode 100644
index 6ce429f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/pom.xml
+++ /dev/null
@@ -1,91 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-twoTestCases</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for two test cases</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>skipFailsafe</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <skipFailsafeReport>true</skipFailsafeReport>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>skipSurefire</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <skipSurefireReport>true</skipSurefireReport>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/failsafe-reports/TEST-junit.twoTestCases.BasicTest.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/failsafe-reports/TEST-junit.twoTestCases.BasicTest.xml b/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/failsafe-reports/TEST-junit.twoTestCases.BasicTest.xml
deleted file mode 100644
index 4832590..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/failsafe-reports/TEST-junit.twoTestCases.BasicTest.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.02" errors="0" skipped="0" tests="1" name="junit.twoTestCases.BasicTest">
- <properties>
- <property name="surefire.version" value="2.8.1"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/>
- <property name="java.vm.version" value="19.1-b02"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="RU"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.runtime.version" value="1.6.0_24-b07"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
- <property name="os.version" value="2.6.32-29-generic"/>
- <property name="user.home" value="/home/kristian"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="user.name" value="kristian"/>
- <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="ru"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_24"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/kristian/fast/repo"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0.002" classname="junit.twoTestCases.BasicTest" name="testSetUp"/>
-</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/failsafe-reports/TEST-junit.twoTestCases.TestTwo.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/failsafe-reports/TEST-junit.twoTestCases.TestTwo.xml b/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/failsafe-reports/TEST-junit.twoTestCases.TestTwo.xml
deleted file mode 100644
index a7429aa..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/failsafe-reports/TEST-junit.twoTestCases.TestTwo.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.007" errors="0" skipped="0" tests="1" name="junit.twoTestCases.TestTwo">
- <properties>
- <property name="surefire.version" value="2.8.1"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/>
- <property name="java.vm.version" value="19.1-b02"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="RU"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.runtime.version" value="1.6.0_24-b07"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
- <property name="os.version" value="2.6.32-29-generic"/>
- <property name="user.home" value="/home/kristian"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="user.name" value="kristian"/>
- <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="ru"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_24"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/kristian/fast/repo"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0" classname="junit.twoTestCases.TestTwo" name="testTwo"/>
-</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/surefire-reports/TEST-junit.twoTestCases.BasicTest.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/surefire-reports/TEST-junit.twoTestCases.BasicTest.xml b/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/surefire-reports/TEST-junit.twoTestCases.BasicTest.xml
deleted file mode 100644
index 4832590..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/surefire-reports/TEST-junit.twoTestCases.BasicTest.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.02" errors="0" skipped="0" tests="1" name="junit.twoTestCases.BasicTest">
- <properties>
- <property name="surefire.version" value="2.8.1"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/>
- <property name="java.vm.version" value="19.1-b02"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="RU"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.runtime.version" value="1.6.0_24-b07"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
- <property name="os.version" value="2.6.32-29-generic"/>
- <property name="user.home" value="/home/kristian"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="user.name" value="kristian"/>
- <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="ru"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_24"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/kristian/fast/repo"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0.002" classname="junit.twoTestCases.BasicTest" name="testSetUp"/>
-</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/surefire-reports/TEST-junit.twoTestCases.TestTwo.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/surefire-reports/TEST-junit.twoTestCases.TestTwo.xml b/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/surefire-reports/TEST-junit.twoTestCases.TestTwo.xml
deleted file mode 100644
index a7429aa..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/target/surefire-reports/TEST-junit.twoTestCases.TestTwo.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.007" errors="0" skipped="0" tests="1" name="junit.twoTestCases.TestTwo">
- <properties>
- <property name="surefire.version" value="2.8.1"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/>
- <property name="java.vm.version" value="19.1-b02"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="RU"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.runtime.version" value="1.6.0_24-b07"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
- <property name="os.version" value="2.6.32-29-generic"/>
- <property name="user.home" value="/home/kristian"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="user.name" value="kristian"/>
- <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="ru"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_24"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/kristian/fast/repo"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0" classname="junit.twoTestCases.TestTwo" name="testTwo"/>
-</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/pom.xml b/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/pom.xml
deleted file mode 100644
index 5aa8b93..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/pom.xml
+++ /dev/null
@@ -1,91 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-twoTestCases</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for two test cases</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>skipFailsafe</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <skipFailsafeReport>true</skipFailsafeReport>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>forceFailsafe</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <alwaysGenerateFailsafeReport>true</alwaysGenerateFailsafeReport>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/target/surefire-reports/TEST-junit.twoTestCases.BasicTest.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/target/surefire-reports/TEST-junit.twoTestCases.BasicTest.xml b/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/target/surefire-reports/TEST-junit.twoTestCases.BasicTest.xml
deleted file mode 100644
index 4832590..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/target/surefire-reports/TEST-junit.twoTestCases.BasicTest.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.02" errors="0" skipped="0" tests="1" name="junit.twoTestCases.BasicTest">
- <properties>
- <property name="surefire.version" value="2.8.1"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/>
- <property name="java.vm.version" value="19.1-b02"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="RU"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.runtime.version" value="1.6.0_24-b07"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
- <property name="os.version" value="2.6.32-29-generic"/>
- <property name="user.home" value="/home/kristian"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="user.name" value="kristian"/>
- <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="ru"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_24"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/kristian/fast/repo"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0.002" classname="junit.twoTestCases.BasicTest" name="testSetUp"/>
-</testsuite>
\ No newline at end of file
[52/52] [abbrv] maven-surefire git commit: [SUREFIRE-1472]
Multibranch Pipeline supports JDK 7-10 Maven 3.2-3.5 Linux Windows
Posted by ti...@apache.org.
[SUREFIRE-1472] Multibranch Pipeline supports JDK 7-10 Maven 3.2-3.5 Linux Windows
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/eb210e08
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/eb210e08
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/eb210e08
Branch: refs/heads/master
Commit: eb210e08f5cf98a20c7d45c3e389391992845443
Parents: 4d00932
Author: Tibor17 <ti...@apache.org>
Authored: Tue Feb 6 05:30:00 2018 +0100
Committer: Tibor17 <ti...@apache.org>
Committed: Sun Feb 18 01:44:10 2018 +0100
----------------------------------------------------------------------
Jenkinsfile | 334 ++++++++-----------
maven-failsafe-plugin/pom.xml | 5 +
maven-surefire-common/pom.xml | 2 -
maven-surefire-report-plugin/pom.xml | 1 +
pom.xml | 93 +++---
surefire-api/pom.xml | 2 -
surefire-booter/pom.xml | 2 -
surefire-its/pom.xml | 14 +-
.../maven/surefire/its/JUnit47ParallelIT.java | 6 +-
.../apache/maven/surefire/its/UmlautDirIT.java | 17 +-
.../surefire/its/fixture/JUnit4SuiteTest.java | 44 +++
.../its/fixture/SurefireLauncherTest.java | 4 -
...urefire1295AttributeJvmCrashesToTestsIT.java | 107 +++---
.../test/resources/crash-during-test/pom.xml | 13 +
.../java/junit44/environment/BasicTest.java | 52 ---
.../java/junit44/environment/SomeOtherTest.java | 28 --
.../junit44/environment/Test1CrashedTest.java | 52 +++
.../junit44/environment/Test2WaitingTest.java | 34 ++
.../java/junit44/environment/Test3FastTest.java | 30 ++
surefire-providers/pom.xml | 1 -
surefire-providers/surefire-junit3/pom.xml | 1 -
surefire-providers/surefire-junit4/pom.xml | 6 -
.../surefire/junitcore/pc/ParallelComputer.java | 22 +-
.../junitcore/pc/ParallelComputerBuilder.java | 2 +-
.../pc/ParallelComputerBuilderTest.java | 82 +++--
.../junitcore/pc/ParallelComputerUtilTest.java | 63 ++--
surefire-report-parser/pom.xml | 12 +-
.../surefire/report/JUnit4SuiteTest.java | 46 +++
28 files changed, 606 insertions(+), 469 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index c080713..822bbc1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,208 +26,42 @@ properties(
]
)
-def oses = ['windows'] // ['linux', 'windows']
-def mavens = env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
-def jdks = ['9'] // env.BRANCH_NAME == 'master' ? ['7', '8', '9', '10'] : ['10']
+final String NIX_LABEL = 'ubuntu-1||ubuntu-4||ubuntu-6||H19||H20'
+final String WIN_LABEL = 'windows-2016-1'
-def cmd = ['mvn']
-def options = ['-e', '-V', '-nsu']
-def optionsITs = ['-e', '-V', '-nsu', '-P', 'run-its']
-def goals = ['clean', 'install' , 'jacoco:report']
-def goalsITs = ['verify']
-def Map stages = [:]
+final def oses = ['linux', 'windows']
+final def mavens = ['3.2.x', '3.3.x', '3.5.x'] // env.BRANCH_NAME == 'master' ? ['3.2.x', '3.3.x', '3.5.x'] : ['3.5.x']
+final def jdks = ['7', '8', '9', '10'] // env.BRANCH_NAME == 'master' ? ['7', '8', '9', '10'] : ['10']
-oses.eachWithIndex { os, indexOfOs ->
-
- mavens.eachWithIndex { maven, indexOfMaven ->
-
- jdks.eachWithIndex { jdk, indexOfJdk ->
-
- def String label = jenkinsEnv.labelForOS(os);
- def String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
- def String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
- def String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
-
- def stageKey = "${os}-jdk${jdk}-maven${maven}"
-
- if (label == null || jdkTestName == null || mvnName == null) {
- println "Skipping ${stageKey} as unsupported by Jenkins Environment."
- return;
- }
-
- println "${stageKey} ==> Label: ${label}, JDK: ${jdkTestName}, Maven: ${mvnName}."
+final def cmd = ['mvn']
+final def options = ['-e', '-V', '-nsu', '-P', 'run-its']
+final def goals = ['clean', 'install', 'jacoco:report']
+final Map stages = [:]
+oses.eachWithIndex { os, indexOfOs ->
+ stages[os] = {
+ mavens.eachWithIndex { maven, indexOfMaven ->
+ jdks.eachWithIndex { jdk, indexOfJdk ->
+ final String label = jenkinsEnv.labelForOS(os);
+ final String jdkTestName = jenkinsEnv.jdkFromVersion(os, jdk)
+ final String jdkName = jenkinsEnv.jdkFromVersion(os, '8')
+ final String mvnName = jenkinsEnv.mvnFromVersion(os, maven)
+ final String stageKey = "${os}-jdk${jdk}-maven${maven}"
+
+ if (label == null || jdkTestName == null || mvnName == null) {
+ println "Skipping ${stageKey} as unsupported by Jenkins Environment."
+ return;
+ }
- stages[stageKey] = {
+ println "${stageKey} ==> Label: ${label}, JDK: ${jdkTestName}, Maven: ${mvnName}."
if (os == 'windows') {
- node("${env.WIN_LABEL}") {
- try {
- println "Basedir = ${pwd()}."
-
- def mvnLocalRepoDir
-
- dir('.repository') {
- mvnLocalRepoDir = "${pwd()}"
- }
-
- println "Maven Local Repository = ${mvnLocalRepoDir}."
-
- dir('build') {
- stage("checkout ${stageKey}") {
- checkout scm
- }
-
- def jdkTestHome = resolveToolNameToJavaPath(jdkTestName, mvnName)
- def properties = ["\"-Djdk.home=${jdkTestHome}\"", "-Djacoco.skip=true"]
- println("Setting JDK for testing ${properties[0]}")
-
- stage("build ${stageKey}") {
- withMaven(jdk: jdkName, maven: mvnName,
- mavenLocalRepo: mvnLocalRepoDir, mavenOpts: '-Xmx512m',
- options: [
- artifactsPublisher(disabled: true),
- ]) {
- def script = cmd + options + goals + properties
- bat script.join(' ')
- }
- }
-
- def propertiesITs = properties
-
- stage("build-failsafe-it ${stageKey}") {
-// lock('maven-surefire-its') {
-// timeout(time: 15, unit: 'MINUTES') {
-// withMaven(jdk: jdkName, maven: mvnName,
-// mavenLocalRepo: mvnLocalRepoDir, mavenOpts: '-Xmx512m',
-// options: [
-// invokerPublisher(),
-// artifactsPublisher(disabled: true)
-// ]) {
-// def script = cmd + optionsITs + goalsITs + propertiesITs
-// bat script.join(' ')
-// }
-// }
-// }
- }
- }
- } finally {
-// Wait for INFRA installation of Pipeline Utils, use fileExists()
-// if (fileExists('build/maven-failsafe-plugin/target/it') {
-// zip(zipFile: "it--maven-failsafe-plugin--${stageKey}.zip", dir: 'build/maven-failsafe-plugin/target/it', archive: true)
-// }
-//
-// if (fileExists('build/surefire-its/target') {
-// zip(zipFile: "it--surefire-its--${stageKey}.zip", dir: 'build/surefire-its/target', archive: true)
-// }
-
-// archiveArtifacts(artifacts: 'build/surefire-its/target/**/log.txt', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: false)
-
- stage("cleanup ${stageKey}") {
- // clean up after ourselves to reduce disk space
- cleanWs()
- }
- }
+ node(WIN_LABEL) {
+ buildProcess(stageKey, jdkName, jdkTestName, mvnName, cmd, options, goals, false)
}
} else {
- node("${env.NIX_LABEL}") {
- try {
- println "Basedir = ${pwd()}."
-
- def mvnLocalRepoDir
-
- dir('.repository') {
- mvnLocalRepoDir = "${pwd()}"
- }
-
- println "Maven Local Repository = ${mvnLocalRepoDir}."
-
- dir('build') {
- stage("checkout ${stageKey}") {
- checkout scm
- }
-
- def jdkTestHome = resolveToolNameToJavaPath(jdkTestName, mvnName)
- //https://github.com/jacoco/jacoco/issues/629
- def skipPlugins = jdk != '9'
- def properties = ["\"-Djdk.home=${jdkTestHome}\"", "-Djacoco.skip=${skipPlugins}"]
- println("Setting JDK for testing ${properties[0]}")
-
- stage("build ${stageKey}") {
- withMaven(jdk: jdkName, maven: mvnName,
- mavenLocalRepo: mvnLocalRepoDir, mavenOpts: '-Xmx1g',
- options: [
- findbugsPublisher(disabled: skipPlugins),
- openTasksPublisher(disabled: skipPlugins, ignoreCase: true,
- pattern: sourcesPatternCsv(),
- low: tasksViolationLow(),
- normal: tasksViolationNormal(),
- high: tasksViolationHigh()),
- artifactsPublisher(disabled: true)
- ]) {
- def script = cmd + options + goals + properties
- sh script.join(' ')
- }
- }
-
- def propertiesITs = [properties[0], '-Djacoco.skip=true']
-
- stage("build-failsafe-it ${stageKey}") {
-// lock('maven-surefire-its') {
-// timeout(time: 15, unit: 'MINUTES') {
-// withMaven(jdk: jdkName, maven: mvnName,
-// mavenLocalRepo: mvnLocalRepoDir, mavenOpts: '-Xmx1g',
-// options: [
-// invokerPublisher(),
-// openTasksPublisher(disabled: true, ignoreCase: true,
-// pattern: sourcesPatternCsv(),
-// low: tasksViolationLow(),
-// normal: tasksViolationNormal(),
-// high: tasksViolationHigh()),
-// artifactsPublisher(disabled: true)
-// ]) {
-// def script = cmd + optionsITs + goalsITs + propertiesITs
-// sh script.join(' ')
-// }
-// }
-// }
- }
- }
- } finally {
- if (indexOfMaven == mavens.size() - 1 && jdk == '9') {
- jacoco(changeBuildStatus: false,
- execPattern: '**/*.exec',
- sourcePattern: sourcesPatternCsv(),
- classPattern: classPatternCsv())
-
- junit(healthScaleFactor: 0.0,
- allowEmptyResults: true,
- keepLongStdio: true,
- testResults: testReportsPatternCsv())
-
- if (currentBuild.result == 'UNSTABLE') {
- currentBuild.result = 'FAILURE'
- }
- }
-
-// Wait for INFRA installation of Pipeline Utils, use fileExists()
-// if (fileExists('build/maven-failsafe-plugin/target/it') {
-// zip(zipFile: "it--maven-failsafe-plugin--${stageKey}.zip", dir: 'build/maven-failsafe-plugin/target/it', archive: true)
-// }
-//
-// if (fileExists('build/surefire-its/target') {
-// zip(zipFile: "it--surefire-its--${stageKey}.zip", dir: 'build/surefire-its/target', archive: true)
-// }
-//
-// sh 'tar czvf it1.tgz build/maven-failsafe-plugin/target/it'
-// sh 'tar czvf it2.tgz build/surefire-its/target'
-// archiveArtifacts(artifacts: '**/*.tgz', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: false)
-// archiveArtifacts(artifacts: '*.tgz', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: false)
-
- stage("cleanup ${stageKey}") {
- // clean up after ourselves to reduce disk space
- cleanWs()
- }
- }
+ node(NIX_LABEL) {
+ boolean makeReports = indexOfMaven == mavens.size() - 1 && jdk == '9'
+ buildProcess(stageKey, jdkName, jdkTestName, mvnName, cmd, options, goals, makeReports)
}
}
}
@@ -235,7 +69,7 @@ oses.eachWithIndex { os, indexOfOs ->
}
}
-timeout(time: 18, unit: 'HOURS') {
+timeout(time: 24, unit: 'HOURS') {
try {
parallel(stages)
// JENKINS-34376 seems to make it hard to detect the aborted builds
@@ -268,6 +102,102 @@ timeout(time: 18, unit: 'HOURS') {
}
}
+def buildProcess(String stageKey, String jdkName, String jdkTestName, String mvnName, cmd, options, goals, boolean makeReports) {
+ cleanWs()
+ try {
+ if (isUnix()) {
+ sh 'mkdir -p .m2'
+ } else {
+ bat 'mkdir .m2'
+ }
+ def mvnLocalRepoDir = null
+ dir('.m2') {
+ mvnLocalRepoDir = "${pwd()}"
+ }
+
+ println "Maven Local Repository = ${mvnLocalRepoDir}."
+ assert mvnLocalRepoDir != null: 'Local Maven Repository is undefined.'
+
+ stage("checkout ${stageKey}") {
+ checkout scm
+ }
+
+ def jdkTestHome = resolveToolNameToJavaPath(jdkTestName, mvnName)
+ //https://github.com/jacoco/jacoco/issues/629
+ def properties = ["\"-Djdk.home=${jdkTestHome}\"", "-Djacoco.skip=${!makeReports}"]
+ println("Setting JDK for testing ${properties[0]}")
+ def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xms64m -Xmx1g -Djava.awt.headless=true'
+
+ stage("build ${stageKey}") {
+ withMaven(jdk: jdkName, maven: mvnName,
+ mavenLocalRepo: mvnLocalRepoDir, mavenOpts: mavenOpts,
+ options: [
+ findbugsPublisher(disabled: !makeReports),
+ openTasksPublisher(disabled: true),
+ junitPublisher(disabled: true),
+ artifactsPublisher(disabled: true),
+ invokerPublisher(disabled: true)
+ ]) {
+ def script = cmd + options + goals + properties
+ if (isUnix()) {
+ sh script.join(' ')
+ } else {
+ bat script.join(' ')
+ }
+ }
+ }
+ } finally {
+ stage("reporting ${stageKey}") {
+ if (makeReports) {
+ openTasks(ignoreCase: true, canComputeNew: false, defaultEncoding: 'UTF-8', pattern: sourcesPatternCsv(),
+ high: tasksViolationHigh(), normal: tasksViolationNormal(), low: tasksViolationLow())
+
+ jacoco(changeBuildStatus: false,
+ execPattern: '**/*.exec',
+ sourcePattern: sourcesPatternCsv(),
+ classPattern: classPatternCsv())
+
+ junit(healthScaleFactor: 0.0,
+ allowEmptyResults: true,
+ keepLongStdio: true,
+ testResults: testReportsPatternCsv())
+
+ if (currentBuild.result == 'UNSTABLE') {
+ currentBuild.result = 'FAILURE'
+ }
+ }
+
+ if (isUnix()) {
+ if (fileExists('maven-failsafe-plugin/target/it')) {
+ sh "tar czf failsafe-its-${stageKey}.tgz maven-failsafe-plugin/target/it"
+ }
+
+ if (fileExists('surefire-its/target')) {
+ sh "tar czf surefire-its-${stageKey}.tgz surefire-its/target"
+ }
+// println(readFile('target/rat.txt'))
+// Wait for INFRA installation of Pipeline Utils, use fileExists()
+// if (fileExists('maven-failsafe-plugin/target/it')) {
+// zip(zipFile: "it--maven-failsafe-plugin--${stageKey}.zip", dir: 'maven-failsafe-plugin/target/it', archive: true)
+// }
+//
+// if (fileExists('surefire-its/target')) {
+// zip(zipFile: "it--surefire-its--${stageKey}.zip", dir: 'surefire-its/target', archive: true)
+// }
+//
+// archiveArtifacts(artifacts: 'surefire-its/target/**/log.txt', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: false)
+
+ archive includes: '*.tgz'
+ }
+ }
+
+ stage("cleanup ${stageKey}") {
+ // clean up after ourselves to reduce disk space
+ cleanWs()
+ }
+ }
+}
+
/**
* It is used instead of tool(${jdkTestName}).
*/
@@ -295,7 +225,7 @@ def resolveToolNameToJavaPath(jdkToolName, mvnName) {
}
@NonCPS
-def sourcesPatternCsv() {
+static def sourcesPatternCsv() {
return '**/maven-failsafe-plugin/src/main/java,' +
'**/maven-surefire-common/src/main/java,' +
'**/maven-surefire-plugin/src/main/java,' +
@@ -310,7 +240,7 @@ def sourcesPatternCsv() {
}
@NonCPS
-def classPatternCsv() {
+static def classPatternCsv() {
return '**/maven-failsafe-plugin/target/classes,' +
'**/maven-surefire-common/target/classes,' +
'**/maven-surefire-plugin/target/classes,' +
@@ -325,23 +255,23 @@ def classPatternCsv() {
}
@NonCPS
-def tasksViolationLow() {
+static def tasksViolationLow() {
return '@SuppressWarnings'
}
@NonCPS
-def tasksViolationNormal() {
+static def tasksViolationNormal() {
return 'TODO,FIXME,@deprecated'
}
@NonCPS
-def tasksViolationHigh() {
+static def tasksViolationHigh() {
return 'finalize(),Locale.setDefault,TimeZone.setDefault,\
System.out,System.err,System.setOut,System.setErr,System.setIn,System.exit,System.gc,System.runFinalization,System.load'
}
@NonCPS
-def testReportsPatternCsv() {
+static def testReportsPatternCsv() {
return '**/maven-failsafe-plugin/target/surefire-reports/*.xml,' +
'**/maven-surefire-common/target/surefire-reports/*.xml,' +
'**/maven-surefire-plugin/target/surefire-reports/*.xml,' +
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/maven-failsafe-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index 9e3d87b..7176456 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -57,6 +57,10 @@
<classifier>site-source</classifier>
</dependency>
<dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
@@ -284,6 +288,7 @@
<goals>
<goal>clean</goal>
<goal>verify</goal>
+ <goal>-nsu</goal>
</goals>
<setupIncludes>
<setupInclude>dummy-*/pom.xml</setupInclude>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/maven-surefire-common/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index 7e063c8..e6ef88a 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -171,8 +171,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <jvm>${jdk.home}/bin/java</jvm>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
<includes>
<include>**/JUnit4SuiteTest.java</include>
</includes>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/maven-surefire-report-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index 9cdd569..662db98 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -168,6 +168,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <useSystemClassLoader>true</useSystemClassLoader>
<classpathDependencyExcludes>
<classpathDependencyExclude>org.fusesource.jansi:jansi</classpathDependencyExclude>
</classpathDependencyExcludes>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f5af360..4a768a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,8 +50,8 @@
<modules>
<module>surefire-logger-api</module>
- <module>surefire-shadefire</module>
<module>surefire-api</module>
+ <module>surefire-shadefire</module>
<module>surefire-booter</module>
<module>surefire-grouper</module>
<module>surefire-providers</module>
@@ -99,6 +99,7 @@
<jdk.home>${java.home}/..</jdk.home>
<maven.compiler.testSource>1.7</maven.compiler.testSource>
<maven.compiler.testTarget>1.7</maven.compiler.testTarget>
+ <jvm.args.tests>-server -XX:+UseG1GC -Xms128m -Xmx144m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true</jvm.args.tests>
</properties>
<dependencyManagement>
@@ -433,8 +434,10 @@
<configuration>
<!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! -->
<useSystemClassLoader>false</useSystemClassLoader>
- <argLine>-Xms128m -Xmx144m ${jacoco.agent}</argLine>
+ <argLine>${jvm.args.tests} ${jacoco.agent}</argLine>
<useFile>false</useFile>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ <jvm>${jdk.home}/bin/java</jvm>
</configuration>
</plugin>
<plugin>
@@ -470,6 +473,10 @@
<artifactId>maven-site-plugin</artifactId>
<version>3.4</version>
</plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -546,50 +553,60 @@
</excludes>
</enforceBytecodeVersion>
</rules>
- <fail>true</fail>
</configuration>
</execution>
</executions>
+ <configuration>
+ <fail>true</fail>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.12</version>
- <executions>
- <execution>
- <id>rat-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <excludes combine.children="append">
- <exclude>Jenkinsfile</exclude>
- <exclude>README.md</exclude>
- <exclude>.gitignore</exclude>
- <exclude>.git/**/*</exclude>
- <exclude>**/.idea</exclude>
- <exclude>**/.svn/**/*</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
- <exclude>**/*.versionsBackup</exclude>
- <exclude>**/dependency-reduced-pom.xml</exclude>
- <exclude>.repository/**</exclude> <!-- jenkins with local maven repository -->
- <exclude>src/test/resources/**/*</exclude>
- <exclude>src/test/resources/**/*.css</exclude>
- <exclude>**/*.jj</exclude>
- <exclude>src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
- </exclude>
- <exclude>DEPENDENCIES</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.12</version>
+ <executions>
+ <execution>
+ <id>rat-check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>Jenkinsfile</exclude>
+ <exclude>README.md</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.git/**/*</exclude>
+ <exclude>**/.idea</exclude>
+ <exclude>**/.svn/**/*</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.versionsBackup</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>.repository/**</exclude> <!-- jenkins with local maven repository -->
+ <exclude>src/test/resources/**/*</exclude>
+ <exclude>src/test/resources/**/*.css</exclude>
+ <exclude>**/*.jj</exclude>
+ <exclude>src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
+ </exclude>
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>.m2/**</exclude>
+ <exclude>.m2</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <deployAtEnd>true</deployAtEnd>
+ </configuration>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-api/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
index 00ef758..bfc4203 100644
--- a/surefire-api/pom.xml
+++ b/surefire-api/pom.xml
@@ -52,8 +52,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <jvm>${jdk.home}/bin/java</jvm>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
<includes>
<include>**/JUnit4SuiteTest.java</include>
</includes>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-booter/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
index ef5e26c..a69b38b 100644
--- a/surefire-booter/pom.xml
+++ b/surefire-booter/pom.xml
@@ -116,8 +116,6 @@
</dependency>
</dependencies>
<configuration>
- <jvm>${jdk.home}/bin/java</jvm>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
<includes>
<include>**/JUnit4SuiteTest.java</include>
</includes>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-its/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index e679753..bc097db 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -27,7 +27,7 @@
<version>2.21.0-SNAPSHOT</version>
</parent>
- <artifactId>surefire-is</artifactId>
+ <artifactId>surefire-its</artifactId>
<name>Maven Surefire Integration Tests</name>
<description>Used internally testing MOJOs. The project is not deployed.</description>
@@ -84,8 +84,17 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ </dependency>
+ </dependencies>
<configuration>
- <test>*Test</test>
+ <includes>
+ <include>org/apache/maven/surefire/its/fixture/JUnit4SuiteTest.java</include>
+ </includes>
</configuration>
</plugin>
<plugin>
@@ -120,7 +129,6 @@
<jacoco.agent>${jacoco-it.agent}</jacoco.agent>
</systemPropertyVariables>
<redirectTestOutputToFile>false</redirectTestOutputToFile>
- <useFile>false</useFile>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
index 5aee1a8..fdf75ef 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
@@ -524,7 +524,7 @@ public class JUnit47ParallelIT
@Test
public void forcedShutdownVerifyingLogs()
{
- // executes for 2.5 sec until timeout has elapsed
+ // attempts to run for 2.4 sec until timeout has elapsed
unpack().parallelMethods().threadCountMethods( 3 ).disablePerCoreThreadCount()
.parallelTestsTimeoutForcedInSeconds( 1.05d ).setTestToRun( "Waiting*Test" ).failNever().executeTest()
.verifyTextInLog( "The test run has finished abruptly after timeout of 1.05 seconds." )
@@ -535,6 +535,8 @@ public class JUnit47ParallelIT
private SurefireLauncher unpack()
{
return unpack( "junit47-parallel" )
- .showErrorStackTraces();
+ .showErrorStackTraces()
+ .forkOnce()
+ .redirectToFile( false );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
index 8848dc2..7b008bc 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
@@ -40,25 +40,30 @@ public class UmlautDirIT
public void testUmlaut()
throws Exception
{
- specialUnpack().executeTest().verifyErrorFreeLog().assertTestSuiteResults( 1, 0, 0, 0 );
+ specialUnpack( "1" )
+ .executeTest()
+ .verifyErrorFreeLog()
+ .assertTestSuiteResults( 1, 0, 0, 0 );
}
@Test
public void testUmlautIsolatedClassLoader()
throws Exception
{
- specialUnpack().useSystemClassLoader( false ).executeTest().assertTestSuiteResults( 1, 0, 0, 0 );
+ specialUnpack( "2" )
+ .useSystemClassLoader( false )
+ .executeTest()
+ .assertTestSuiteResults( 1, 0, 0, 0 );
}
- SurefireLauncher specialUnpack()
- throws VerificationException, IOException
+ SurefireLauncher specialUnpack( String postfix )
+ throws IOException
{
SurefireLauncher unpack = unpack( "junit-pathWithUmlaut" );
MavenLauncher maven = unpack.maven();
- File dest = new File( maven.getUnpackedAt().getParentFile().getPath(), "/junit-pathWith\u00DCmlaut" );
+ File dest = new File( maven.getUnpackedAt().getParentFile().getPath(), "/junit-pathWith\u00DCmlaut_" + postfix );
maven.moveUnpackTo( dest );
return unpack;
}
-
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/JUnit4SuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/JUnit4SuiteTest.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/JUnit4SuiteTest.java
new file mode 100644
index 0000000..3961b13
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/JUnit4SuiteTest.java
@@ -0,0 +1,44 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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 junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * Adapt the JUnit4 tests which use only annotations to the JUnit3 test suite.
+ *
+ * @author Tibor Digana (tibor17)
+ * @since 2.21.0
+ */
+@Suite.SuiteClasses( {
+ MavenLauncherTest.class,
+ SurefireLauncherTest.class
+} )
+@RunWith( Suite.class )
+public class JUnit4SuiteTest
+{
+ public static Test suite()
+ {
+ return new JUnit4TestAdapter( JUnit4SuiteTest.class );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
index b5df941..801ebec 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
@@ -19,9 +19,6 @@ package org.apache.maven.surefire.its.fixture;
* under the License.
*/
-import java.io.IOException;
-import org.apache.maven.it.VerificationException;
-
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -33,7 +30,6 @@ public class SurefireLauncherTest
{
@Test
public void launcherGetsProperMethodName()
- throws IOException, VerificationException
{
MavenLauncher mavenLauncher = new MavenLauncher( SurefireLauncherTest.class, "foo", "" );
String method = new SurefireLauncher( mavenLauncher ).getTestMethodName();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
index 3ca758a..e160f7a 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
@@ -19,21 +19,25 @@ package org.apache.maven.surefire.its.jiras;
* under the License.
*/
-import org.apache.maven.it.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.FromDataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
import java.util.Iterator;
-import java.util.concurrent.TimeUnit;
+import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX;
import static org.apache.commons.lang3.SystemUtils.IS_OS_MAC_OSX;
+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_7;
+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8;
+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_10;
import static org.fest.assertions.Assertions.assertThat;
import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
/**
* https://issues.apache.org/jira/browse/SUREFIRE-1295
@@ -42,67 +46,72 @@ import static org.junit.Assume.assumeTrue;
* @author michaeltandy
* @since 2.20
*/
+@RunWith( Theories.class )
public class Surefire1295AttributeJvmCrashesToTestsIT
extends SurefireJUnit4IntegrationTestCase
{
- @Before
- public void skipWindows()
+ public enum ForkMode
{
- assumeTrue( IS_OS_LINUX || IS_OS_MAC_OSX );
+ DEFAULT,
+ ONE_FORK_NO_REUSE,
+ ONE_FORK_REUSE
}
- @Test
- public void crashInFork() throws VerificationException, InterruptedException
- {
- SurefireLauncher launcher = unpack( "crash-during-test" );
+ @DataPoints( "crashStyle" )
+ public static String[] crashStyle = { "exit", "abort", "segfault" };
- checkCrashTypes( launcher );
- }
+ @DataPoints( "forkStyle" )
+ public static ForkMode[] forkStyle = ForkMode.values();
- @Test
- public void crashInSingleUseFork() throws VerificationException, InterruptedException
+ @Theory
+ public void test( @FromDataPoints( "crashStyle" ) String crashStyle,
+ @FromDataPoints( "forkStyle" ) ForkMode forkStyle )
+ throws Exception
{
- SurefireLauncher launcher = unpack( "crash-during-test" )
- .forkCount( 1 )
- .reuseForks( false );
-
- checkCrashTypes( launcher );
- }
+ // JUnit Assumptions not supported by Theories runner.
+ if ( !IS_OS_LINUX && !IS_OS_MAC_OSX && !( IS_OS_WINDOWS_7 || IS_OS_WINDOWS_8 || IS_OS_WINDOWS_10 ) )
+ {
+ return;
+ }
- @Test
- public void crashInReusableFork() throws VerificationException, InterruptedException
- {
- SurefireLauncher launcher = unpack( "crash-during-test" )
- .forkPerThread()
- .reuseForks( true )
- .threadCount( 1 );
+ SurefireLauncher launcher =
+ unpack( "crash-during-test", "_" + crashStyle + "_" + forkStyle.ordinal() )
+ .setForkJvm();
- checkCrashTypes( launcher );
- }
+ switch ( forkStyle )
+ {
+ case DEFAULT:
+ break;
+ case ONE_FORK_NO_REUSE:
+ launcher.forkCount( 1 )
+ .reuseForks( false );
+ break;
+ case ONE_FORK_REUSE:
+ launcher.forkPerThread()
+ .reuseForks( true )
+ .threadCount( 1 );
+ break;
+ default:
+ fail();
+ }
- private static void checkCrashTypes( SurefireLauncher launcher )
- throws VerificationException, InterruptedException
- {
- checkCrash( launcher.addGoal( "-DcrashType=exit" ) );
- checkCrash( launcher.addGoal( "-DcrashType=abort" ) );
- checkCrash( launcher.addGoal( "-DcrashType=segfault" ) );
+ checkCrash( launcher.addGoal( "-DcrashType=" + crashStyle ) );
}
- private static void checkCrash( SurefireLauncher launcher ) throws VerificationException, InterruptedException
+ private static void checkCrash( SurefireLauncher launcher ) throws Exception
{
OutputValidator validator = launcher.maven()
- .withFailure()
- .executeTest()
- .verifyTextInLog( "The forked VM terminated without properly saying "
- + "goodbye. VM crash or System.exit called?"
- )
- .verifyTextInLog( "Crashed tests:" );
+ .withFailure()
+ .executeTest()
+ .verifyTextInLog( "The forked VM terminated without properly saying "
+ + "goodbye. VM crash or System.exit called?" )
+ .verifyTextInLog( "Crashed tests:" );
// Cannot flush log.txt stream because it is consumed internally by Verifier.
// Waiting for the stream to become flushed on disk.
- TimeUnit.SECONDS.sleep( 1L );
+ SECONDS.sleep( 1L );
- for ( Iterator<String> it = validator.loadLogLines().iterator(); it.hasNext(); )
+ for ( Iterator< String > it = validator.loadLogLines().iterator(); it.hasNext(); )
{
String line = it.next();
if ( line.contains( "Crashed tests:" ) )
@@ -110,7 +119,8 @@ public class Surefire1295AttributeJvmCrashesToTestsIT
line = it.next();
if ( it.hasNext() )
{
- assertThat( line ).contains( "junit44.environment.BasicTest" );
+ assertThat( line )
+ .contains( "junit44.environment.Test1CrashedTest" );
}
else
{
@@ -118,8 +128,5 @@ public class Surefire1295AttributeJvmCrashesToTestsIT
}
}
}
-
}
-
-
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-its/src/test/resources/crash-during-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/crash-during-test/pom.xml b/surefire-its/src/test/resources/crash-during-test/pom.xml
index 0d9e3e7..3929e83 100644
--- a/surefire-its/src/test/resources/crash-during-test/pom.xml
+++ b/surefire-its/src/test/resources/crash-during-test/pom.xml
@@ -51,12 +51,25 @@
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <!--
+ mvn clean is called beforehand.
+ The German word Umlaut which is not ASCII must be deleted the same on all M3 versions.
+ -->
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
<forkMode>once</forkMode>
+ <runOrder>alphabetical</runOrder>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/BasicTest.java b/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/BasicTest.java
deleted file mode 100644
index 57d57bb..0000000
--- a/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/BasicTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package junit44.environment;
-
-/*
- * 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 static org.junit.Assert.*;
-import org.junit.Test;
-import uk.me.mjt.CrashJvm;
-
-public class BasicTest
-{
- @Test
- public void testCrashJvm()
- {
- assertTrue(CrashJvm.loadedOk());
-
- String crashType = System.getProperty("crashType");
- assertNotNull(crashType);
- if ( crashType.equals( "exit" ) )
- {
- CrashJvm.exit();
- }
- else if ( crashType.equals( "abort" ) )
- {
- CrashJvm.abort();
- }
- else if (crashType.equals( "segfault" ))
- {
- CrashJvm.segfault();
- }
- else
- {
- fail("Don't recognise crashType " + crashType);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/SomeOtherTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/SomeOtherTest.java b/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/SomeOtherTest.java
deleted file mode 100644
index e10f6aa..0000000
--- a/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/SomeOtherTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-
-package junit44.environment;
-
-/*
- * 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.Test;
-
-public class SomeOtherTest {
- @Test
- public void nonCrashingTest() {}
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/Test1CrashedTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/Test1CrashedTest.java b/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/Test1CrashedTest.java
new file mode 100644
index 0000000..28fe637
--- /dev/null
+++ b/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/Test1CrashedTest.java
@@ -0,0 +1,52 @@
+package junit44.environment;
+
+/*
+ * 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 static org.junit.Assert.*;
+import org.junit.Test;
+import uk.me.mjt.CrashJvm;
+
+public class Test1CrashedTest
+{
+ @Test
+ public void testCrashJvm()
+ {
+ assertTrue(CrashJvm.loadedOk());
+
+ String crashType = System.getProperty("crashType");
+ assertNotNull(crashType);
+ if ( crashType.equals( "exit" ) )
+ {
+ CrashJvm.exit();
+ }
+ else if ( crashType.equals( "abort" ) )
+ {
+ CrashJvm.abort();
+ }
+ else if (crashType.equals( "segfault" ))
+ {
+ CrashJvm.segfault();
+ }
+ else
+ {
+ fail("Don't recognise crashType " + crashType);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/Test2WaitingTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/Test2WaitingTest.java b/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/Test2WaitingTest.java
new file mode 100644
index 0000000..dc3ce47
--- /dev/null
+++ b/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/Test2WaitingTest.java
@@ -0,0 +1,34 @@
+package junit44.environment;
+
+/*
+ * 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.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+public class Test2WaitingTest
+{
+ @Test
+ public void nonCrashingTest()
+ throws InterruptedException
+ {
+ MILLISECONDS.sleep( 1500L );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/Test3FastTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/Test3FastTest.java b/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/Test3FastTest.java
new file mode 100644
index 0000000..3a4d88e
--- /dev/null
+++ b/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/Test3FastTest.java
@@ -0,0 +1,30 @@
+package junit44.environment;
+
+/*
+ * 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.Test;
+
+public class Test3FastTest
+{
+ @Test
+ public void emptyTest()
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-providers/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-providers/pom.xml b/surefire-providers/pom.xml
index 65ae76f..de5214a 100644
--- a/surefire-providers/pom.xml
+++ b/surefire-providers/pom.xml
@@ -56,7 +56,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-providers/surefire-junit3/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/pom.xml b/surefire-providers/surefire-junit3/pom.xml
index 2e906da..93375b2 100644
--- a/surefire-providers/surefire-junit3/pom.xml
+++ b/surefire-providers/surefire-junit3/pom.xml
@@ -72,7 +72,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-providers/surefire-junit4/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit4/pom.xml b/surefire-providers/surefire-junit4/pom.xml
index 870f13c..fe1496f 100644
--- a/surefire-providers/surefire-junit4/pom.xml
+++ b/surefire-providers/surefire-junit4/pom.xml
@@ -55,12 +55,6 @@
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <jvm>${java.home}/bin/java</jvm>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.4</version>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java
index a198887..2e4104c 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputer.java
@@ -67,7 +67,7 @@ public abstract class ParallelComputer
protected abstract ShutdownResult describeStopped( boolean shutdownNow );
- abstract boolean shutdownThreadPoolsAwaitingKilled();
+ protected abstract boolean shutdownThreadPoolsAwaitingKilled();
protected final void beforeRunQuietly()
{
@@ -249,19 +249,23 @@ public abstract class ParallelComputer
{
if ( testsBeforeShutdown != null )
{
- for ( final Description test : testsBeforeShutdown.get().getTriggeredTests() )
+ final ShutdownResult shutdownResult = testsBeforeShutdown.get();
+ if ( shutdownResult != null )
{
- if ( test != null && test.getDisplayName() != null )
+ for ( final Description test : shutdownResult.getTriggeredTests() )
{
- executedTests.add( test.getDisplayName() );
+ if ( test != null && test.getDisplayName() != null )
+ {
+ executedTests.add( test.getDisplayName() );
+ }
}
- }
- for ( final Description test : testsBeforeShutdown.get().getIncompleteTests() )
- {
- if ( test != null && test.getDisplayName() != null )
+ for ( final Description test : shutdownResult.getIncompleteTests() )
{
- incompleteTests.add( test.getDisplayName() );
+ if ( test != null && test.getDisplayName() != null )
+ {
+ incompleteTests.add( test.getDisplayName() );
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
index fd0cab3..22d7eab 100755
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
@@ -333,7 +333,7 @@ public final class ParallelComputerBuilder
}
@Override
- boolean shutdownThreadPoolsAwaitingKilled()
+ protected boolean shutdownThreadPoolsAwaitingKilled()
{
boolean notInterrupted = notThreadSafeTests.shutdownThreadPoolsAwaitingKilled();
final Scheduler m = master;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
index 212e157..b90da87 100755
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilderTest.java
@@ -26,9 +26,7 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.Stopwatch;
import org.junit.runner.Description;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
@@ -54,7 +52,6 @@ import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsNot.not;
import static org.apache.maven.surefire.junitcore.pc.RangeMatcher.between;
import static org.junit.Assert.*;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
/**
* @author Tibor Digana (tibor17)
@@ -70,9 +67,6 @@ public class ParallelComputerBuilderTest
private static final ConsoleStream logger = new DefaultDirectConsoleReporter( System.out );
- @Rule
- public final Stopwatch stopwatch = new Stopwatch() {};
-
private static void testKeepBeforeAfter( ParallelComputerBuilder builder, Class<?>... classes )
{
JUnitCore core = new JUnitCore();
@@ -94,8 +88,16 @@ public class ParallelComputerBuilderTest
}
}
+ @BeforeClass
+ public static void cleanup() throws InterruptedException
+ {
+ System.gc();
+ Thread.sleep( 500L );
+ }
+
@Before
- public void beforeTest() throws InterruptedException {
+ public void beforeTest()
+ {
Class1.maxConcurrentMethods = 0;
Class1.concurrentMethods = 0;
shutdownTask = null;
@@ -104,8 +106,6 @@ public class ParallelComputerBuilderTest
NotThreadSafeTest3.t = null;
NormalTest1.t = null;
NormalTest2.t = null;
- System.gc();
- Thread.sleep( 50L );
}
@Test
@@ -136,8 +136,11 @@ public class ParallelComputerBuilderTest
assertFalse( parallelComputerBuilder.isOptimized() );
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
- Result result = new JUnitCore().run( computer, TestSuite.class );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
+ final JUnitCore core = new JUnitCore();
+ final long t1 = System.currentTimeMillis();
+ final Result result = core.run( computer, TestSuite.class );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
assertThat( computer.getClasses().size(), is( 0 ) );
@@ -171,8 +174,11 @@ public class ParallelComputerBuilderTest
assertFalse( parallelComputerBuilder.isOptimized() );
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
- Result result = new JUnitCore().run( computer, TestSuite.class, Class1.class );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
+ final JUnitCore core = new JUnitCore();
+ final long t1 = System.currentTimeMillis();
+ final Result result = core.run( computer, TestSuite.class, Class1.class );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
assertThat( computer.getClasses().size(), is( 1 ) );
@@ -197,8 +203,11 @@ public class ParallelComputerBuilderTest
assertFalse( parallelComputerBuilder.isOptimized() );
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
- Result result = new JUnitCore().run( computer, TestSuite.class, Class1.class );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
+ final JUnitCore core = new JUnitCore();
+ final long t1 = System.currentTimeMillis();
+ final Result result = core.run( computer, TestSuite.class, Class1.class );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
assertThat( computer.getClasses().size(), is( 1 ) );
@@ -229,8 +238,11 @@ public class ParallelComputerBuilderTest
assertFalse( parallelComputerBuilder.isOptimized() );
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
- Result result = new JUnitCore().run( computer, TestSuite.class );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
+ final JUnitCore core = new JUnitCore();
+ final long t1 = System.currentTimeMillis();
+ final Result result = core.run( computer, TestSuite.class );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
assertThat( computer.getClasses().size(), is( 0 ) );
@@ -253,8 +265,11 @@ public class ParallelComputerBuilderTest
assertFalse( parallelComputerBuilder.isOptimized() );
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
- Result result = new JUnitCore().run( computer, TestSuite.class );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
+ final JUnitCore core = new JUnitCore();
+ final long t1 = System.currentTimeMillis();
+ final Result result = core.run( computer, TestSuite.class );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
assertThat( computer.getClasses().size(), is( 0 ) );
@@ -280,8 +295,11 @@ public class ParallelComputerBuilderTest
// 2 groups with 3 threads.
// Each group takes 0.5s.
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
- Result result = new JUnitCore().run( computer, TestSuite.class, Class1.class );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
+ final JUnitCore core = new JUnitCore();
+ final long t1 = System.currentTimeMillis();
+ final Result result = core.run( computer, TestSuite.class, Class1.class );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
assertThat( computer.getClasses().size(), is( 1 ) );
@@ -304,8 +322,11 @@ public class ParallelComputerBuilderTest
assertFalse( parallelComputerBuilder.isOptimized() );
ParallelComputerBuilder.PC computer = (ParallelComputerBuilder.PC) parallelComputerBuilder.buildComputer();
- Result result = new JUnitCore().run( computer, TestSuite.class, Class1.class );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
+ final JUnitCore core = new JUnitCore();
+ final long t1 = System.currentTimeMillis();
+ final Result result = core.run( computer, TestSuite.class, Class1.class );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
assertThat( computer.getSuites().size(), is( 1 ) );
assertThat( computer.getClasses().size(), is( 1 ) );
@@ -321,8 +342,10 @@ public class ParallelComputerBuilderTest
@Test( timeout = 2000 )
public void shutdown()
{
- Result result = new ShutdownTest().run( false );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
+ final long t1 = System.currentTimeMillis();
+ final Result result = new ShutdownTest().run( false );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
assertTrue( result.wasSuccessful() );
assertTrue( beforeShutdown );
assertThat( timeSpent, between( 450, 1250 ) );
@@ -331,8 +354,10 @@ public class ParallelComputerBuilderTest
@Test( timeout = 2000 )
public void shutdownWithInterrupt()
{
+ final long t1 = System.currentTimeMillis();
new ShutdownTest().run( true );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
assertTrue( beforeShutdown );
assertThat( timeSpent, between( 450, 1250 ) );
}
@@ -717,11 +742,12 @@ public class ParallelComputerBuilderTest
public static class ReportOneTestAtRuntimeRunner
extends ParentRunner
{
- private final Class testClass;
+ private final Class<?> testClass;
private final Description suiteDescription;
private Description myTestMethodDescr;
- public ReportOneTestAtRuntimeRunner( Class testClass ) throws InitializationError
+ @SuppressWarnings( "unchecked" )
+ public ReportOneTestAtRuntimeRunner( Class<?> testClass ) throws InitializationError
{
super( Object.class );
this.testClass = testClass;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
index e41dbaa..df6ca1c 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtilTest.java
@@ -32,7 +32,6 @@ import org.junit.experimental.theories.DataPoint;
import org.junit.experimental.theories.Theories;
import org.junit.experimental.theories.Theory;
import org.junit.rules.ExpectedException;
-import org.junit.rules.Stopwatch;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.RunWith;
@@ -46,7 +45,6 @@ import static org.apache.maven.surefire.junitcore.pc.ParallelComputerUtil.*;
import static org.apache.maven.surefire.junitcore.JUnitCoreParameters.*;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.*;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
/**
* Testing an algorithm in {@link ParallelComputerUtil} which configures
@@ -70,9 +68,6 @@ public final class ParallelComputerUtilTest
@Rule
public final ExpectedException exception = ExpectedException.none();
- @Rule
- public final Stopwatch stopwatch = new Stopwatch() {};
-
@BeforeClass
public static void beforeClass()
{
@@ -968,7 +963,6 @@ public final class ParallelComputerUtilTest
@Test
public void withoutShutdown()
- throws TestSetFailedException, ExecutionException, InterruptedException
{
Map<String, String> properties = new HashMap<String, String>();
properties.put(PARALLEL_KEY, "methods");
@@ -976,9 +970,12 @@ public final class ParallelComputerUtilTest
JUnitCoreParameters params = new JUnitCoreParameters( properties );
ParallelComputerBuilder pcBuilder = new ParallelComputerBuilder( logger, params );
ParallelComputer pc = pcBuilder.buildComputer();
- Result result = new JUnitCore().run( pc, TestClass.class );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
- long deltaTime = 500L;
+ final JUnitCore core = new JUnitCore();
+ final long t1 = System.currentTimeMillis();
+ final Result result = core.run( pc, TestClass.class );
+ final long t2 = System.currentTimeMillis();
+ long timeSpent = t2 - t1;
+ final long deltaTime = 500L;
assertTrue( result.wasSuccessful() );
assertThat( result.getRunCount(), is( 3 ) );
@@ -989,7 +986,7 @@ public final class ParallelComputerUtilTest
@Test
public void shutdown()
- throws TestSetFailedException, ExecutionException, InterruptedException
+ throws TestSetFailedException
{
// The JUnitCore returns after 2.5s.
// The test-methods in TestClass are NOT interrupted, and return normally after 5s.
@@ -1000,9 +997,12 @@ public final class ParallelComputerUtilTest
JUnitCoreParameters params = new JUnitCoreParameters( properties );
ParallelComputerBuilder pcBuilder = new ParallelComputerBuilder( logger, params );
ParallelComputer pc = pcBuilder.buildComputer();
- new JUnitCore().run( pc, TestClass.class );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
- long deltaTime = 500L;
+ final JUnitCore core = new JUnitCore();
+ final long t1 = System.currentTimeMillis();
+ core.run( pc, TestClass.class );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
+ final long deltaTime = 500L;
assertEquals( 5000L, timeSpent, deltaTime );
String description = pc.describeElapsedTimeout();
@@ -1013,19 +1013,22 @@ public final class ParallelComputerUtilTest
@Test
public void forcedShutdown()
- throws TestSetFailedException, ExecutionException, InterruptedException
+ throws TestSetFailedException
{
// The JUnitCore returns after 2.5s, and the test-methods in TestClass are interrupted.
Map<String, String> properties = new HashMap<String, String>();
properties.put(PARALLEL_KEY, "methods");
properties.put(THREADCOUNTMETHODS_KEY, "2");
- properties.put(PARALLEL_TIMEOUTFORCED_KEY, Double.toString(2.5d));
+ properties.put(PARALLEL_TIMEOUTFORCED_KEY, Double.toString( 2.5d ));
JUnitCoreParameters params = new JUnitCoreParameters( properties );
ParallelComputerBuilder pcBuilder = new ParallelComputerBuilder( logger, params );
ParallelComputer pc = pcBuilder.buildComputer();
- new JUnitCore().run( pc, TestClass.class );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
- long deltaTime = 500L;
+ final JUnitCore core = new JUnitCore();
+ final long t1 = System.currentTimeMillis();
+ core.run( pc, TestClass.class );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
+ final long deltaTime = 500L;
assertEquals( 2500L, timeSpent, deltaTime );
String description = pc.describeElapsedTimeout();
@@ -1036,7 +1039,7 @@ public final class ParallelComputerUtilTest
@Test
public void timeoutAndForcedShutdown()
- throws TestSetFailedException, ExecutionException, InterruptedException
+ throws TestSetFailedException
{
// The JUnitCore returns after 3.5s and the test-methods in TestClass are timed out after 2.5s.
// No new test methods are scheduled for execution after 2.5s.
@@ -1044,14 +1047,17 @@ public final class ParallelComputerUtilTest
Map<String, String> properties = new HashMap<String, String>();
properties.put(PARALLEL_KEY, "methods");
properties.put(THREADCOUNTMETHODS_KEY, "2");
- properties.put(PARALLEL_TIMEOUT_KEY, Double.toString(2.5d));
- properties.put(PARALLEL_TIMEOUTFORCED_KEY, Double.toString(3.5d));
+ properties.put(PARALLEL_TIMEOUT_KEY, Double.toString( 2.5d ));
+ properties.put(PARALLEL_TIMEOUTFORCED_KEY, Double.toString( 3.5d ));
JUnitCoreParameters params = new JUnitCoreParameters( properties );
ParallelComputerBuilder pcBuilder = new ParallelComputerBuilder( logger, params );
ParallelComputer pc = pcBuilder.buildComputer();
- new JUnitCore().run( pc, TestClass.class );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
- long deltaTime = 500L;
+ final JUnitCore core = new JUnitCore();
+ final long t1 = System.currentTimeMillis();
+ core.run( pc, TestClass.class );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
+ final long deltaTime = 500L;
assertEquals( 3500L, timeSpent, deltaTime );
String description = pc.describeElapsedTimeout();
@@ -1073,9 +1079,12 @@ public final class ParallelComputerUtilTest
JUnitCoreParameters params = new JUnitCoreParameters( properties );
ParallelComputerBuilder pcBuilder = new ParallelComputerBuilder( logger, params );
ParallelComputer pc = pcBuilder.buildComputer();
- new JUnitCore().run( pc, TestClass.class );
- long timeSpent = stopwatch.runtime( MILLISECONDS );
- long deltaTime = 500L;
+ final JUnitCore core = new JUnitCore();
+ final long t1 = System.currentTimeMillis();
+ core.run( pc, TestClass.class );
+ final long t2 = System.currentTimeMillis();
+ final long timeSpent = t2 - t1;
+ final long deltaTime = 500L;
assertEquals( 3500L, timeSpent, deltaTime );
String description = pc.describeElapsedTimeout();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-report-parser/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml
index 60d570f..c91a9ed 100644
--- a/surefire-report-parser/pom.xml
+++ b/surefire-report-parser/pom.xml
@@ -54,16 +54,18 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>2.12.4</version>
+ <artifactId>surefire-shadefire</artifactId>
+ <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
</dependency>
</dependencies>
+ <configuration>
+ <includes>
+ <include>**/JUnit4SuiteTest.java</include>
+ </includes>
+ </configuration>
</plugin>
<plugin>
<!-- Do we need shading here ?? -->
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/eb210e08/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/JUnit4SuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/JUnit4SuiteTest.java b/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/JUnit4SuiteTest.java
new file mode 100644
index 0000000..142ca9d
--- /dev/null
+++ b/surefire-report-parser/src/test/java/org/apache/maven/plugins/surefire/report/JUnit4SuiteTest.java
@@ -0,0 +1,46 @@
+package org.apache.maven.plugins.surefire.report;
+
+/*
+ * 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 junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * Adapt the JUnit4 tests which use only annotations to the JUnit3 test suite.
+ *
+ * @author Tibor Digana (tibor17)
+ * @since 2.21.0
+ */
+@Suite.SuiteClasses( {
+ ReportTestCaseTest.class,
+ ReportTestSuiteTest.class,
+ SurefireReportParserTest.class,
+ TestSuiteXmlParserTest.class
+} )
+@RunWith( Suite.class )
+public class JUnit4SuiteTest
+{
+ public static Test suite()
+ {
+ return new JUnit4TestAdapter( JUnit4SuiteTest.class );
+ }
+}
[17/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
new file mode 100644
index 0000000..b5df941
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncherTest.java
@@ -0,0 +1,43 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.io.IOException;
+import org.apache.maven.it.VerificationException;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class SurefireLauncherTest
+{
+ @Test
+ public void launcherGetsProperMethodName()
+ throws IOException, VerificationException
+ {
+ MavenLauncher mavenLauncher = new MavenLauncher( SurefireLauncherTest.class, "foo", "" );
+ String method = new SurefireLauncher( mavenLauncher ).getTestMethodName();
+ assertEquals( "launcherGetsProperMethodName", method );
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
new file mode 100644
index 0000000..5201503
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
@@ -0,0 +1,37 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.
+ */
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class SurefireVerifierException
+ extends RuntimeException
+{
+ public SurefireVerifierException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+
+ public SurefireVerifierException( Throwable cause )
+ {
+ super( cause );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
new file mode 100644
index 0000000..cf6ad84
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
@@ -0,0 +1,155 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.util.List;
+import org.apache.commons.io.FileUtils;
+
+import junit.framework.Assert;
+
+import static junit.framework.Assert.assertTrue;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class TestFile
+{
+ private final File file;
+
+ private final Charset encoding;
+
+ private final OutputValidator surefireVerifier;
+
+ public TestFile( File file, OutputValidator surefireVerifier )
+ {
+ this( file, Charset.defaultCharset(), surefireVerifier);
+ }
+
+ public TestFile( File file, Charset charset, OutputValidator surefireVerifier )
+ {
+ this.file = file;
+ this.encoding = charset;
+ this.surefireVerifier = surefireVerifier;
+ }
+
+ public OutputValidator assertFileExists()
+ {
+ assertTrue( "File doesn't exist: " + file.getAbsolutePath(), file.exists() );
+ return surefireVerifier;
+ }
+
+ public OutputValidator assertFileNotExists()
+ {
+ assertTrue( "File doesn't exist: " + file.getAbsolutePath(), !file.exists() );
+ return surefireVerifier;
+ }
+
+ public void delete()
+ {
+ //noinspection ResultOfMethodCallIgnored
+ file.delete();
+ }
+
+ public String getAbsolutePath()
+ {
+ return file.getAbsolutePath();
+ }
+
+ public boolean exists()
+ {
+ return file.exists();
+ }
+
+ public FileInputStream getFileInputStream()
+ throws FileNotFoundException
+ {
+ return new FileInputStream( file );
+ }
+
+ public String slurpFile()
+ {
+ try
+ {
+ StringBuilder sb = new StringBuilder();
+ BufferedReader reader;
+ reader = new BufferedReader( new FileReader( file ) );
+ for ( String line = reader.readLine(); line != null; line = reader.readLine() )
+ {
+ sb.append( line );
+ }
+ reader.close();
+ return sb.toString();
+ }
+ catch ( IOException e )
+ {
+ throw new SurefireVerifierException( e );
+ }
+
+ }
+
+ public String readFileToString()
+ {
+ try
+ {
+ return FileUtils.readFileToString( file );
+ }
+ catch ( IOException e )
+ {
+ throw new SurefireVerifierException( e );
+ }
+ }
+
+ public boolean isFile()
+ {
+ return file.isFile();
+ }
+
+ public TestFile assertContainsText( String text )
+ {
+ final List<String> list = surefireVerifier.loadFile( file, encoding );
+ for ( String line : list )
+ {
+ if ( line.contains( text ) )
+ {
+ return this;
+ }
+ }
+ Assert.fail( "Did not find expected message in log" );
+ return null;
+ }
+
+ public URI toURI()
+ {
+ return file.toURI();
+ }
+
+ public File getFile()
+ {
+ return file;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/TestFramework.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/TestFramework.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/TestFramework.java
new file mode 100644
index 0000000..c544347
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/TestFramework.java
@@ -0,0 +1,29 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.
+ */
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.19
+ */
+public enum TestFramework
+{
+ JUNIT4, JUNIT47, TestNG
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
new file mode 100644
index 0000000..886cd07
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
@@ -0,0 +1,48 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * "verify" goal ignores "dependenciesToScan" parameter when checking tests existence
+ * <p>
+ * Found in Surefire 2.16.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1024">SUREFIRE-1024</a>
+ * @since 2.19
+ */
+public class Surefire1024VerifyFailsafeIfTestedIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void shouldScanAndRunTestsInDependencyJars() throws Exception {
+ SurefireLauncher launcher = unpack( "surefire-1024" );
+ launcher.executeVerify()
+ .verifyTextInLog( "class jiras.surefire1024.A1IT#test() dependency to scan" );
+
+ launcher.getSubProjectValidator( "jiras-surefire-1024-it" )
+ .assertIntegrationTestSuiteResults( 1, 0, 0, 0 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
new file mode 100644
index 0000000..ec63a8a
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
@@ -0,0 +1,59 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * Plugin Configuration: parallel=classes
+ * <br>
+ * With Surefire 2.15
+ * {@code $ mvn test -Dtest=MyTest#testFoo}
+ * Results:
+ * Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+ * <br>
+ * With Surefire 2.16
+ * {@code $ mvn test -Dtest=MyTest#testFoo}
+ * <br>
+ * Results:
+ * Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1028">SUREFIRE-1028</a>
+ * @since 2.18
+ */
+public class Surefire1028UnableToRunSingleIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void methodFilteringParallelExecution()
+ {
+ unpack().setTestToRun( "SomeTest#test" ).parallelClasses().useUnlimitedThreads()
+ .executeTest().verifyErrorFree( 1 ).verifyTextInLog( "OK!" );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-1028-unable-to-run-single-test" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
new file mode 100644
index 0000000..0d6d8b6
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
@@ -0,0 +1,71 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.shared.utils.xml.Xpp3Dom;
+import org.apache.maven.shared.utils.xml.Xpp3DomBuilder;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.Test;
+
+import java.io.FileNotFoundException;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1036">SUREFIRE-1036</a>
+ * @since 2.18
+ */
+public class Surefire1036NonFilterableJUnitRunnerWithCategoriesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void test()
+ throws VerificationException, FileNotFoundException
+ {
+ OutputValidator validator = unpack().maven().executeTest();
+ validator.assertTestSuiteResults( 1, 0, 0, 0 );
+ assertFalse( validator.getSurefireReportsXmlFile(
+ "TEST-jiras.surefire1036.TestSomethingWithMockitoRunner.xml" ).exists() );
+ assertFalse( validator.getSurefireReportsXmlFile( "TEST-jiras.surefire1036.TestSomeUnit.xml" ).exists() );
+ TestFile reportFile =
+ validator.getSurefireReportsXmlFile( "TEST-jiras.surefire1036.TestSomeIntegration.xml" );
+ assertTestCount( reportFile, 1 );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-1036-NonFilterableJUnitRunnerWithCategories" );
+ }
+
+ private void assertTestCount( TestFile reportFile, int tests )
+ throws FileNotFoundException
+ {
+ assertTrue( reportFile.exists() );
+ Xpp3Dom testResult = Xpp3DomBuilder.build( reportFile.getFileInputStream(), "UTF-8" );
+ Xpp3Dom[] children = testResult.getChildren( "testcase" );
+ assertEquals( tests, children.length );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1041FailingJUnitRunnerIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1041FailingJUnitRunnerIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1041FailingJUnitRunnerIT.java
new file mode 100644
index 0000000..bb65682
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1041FailingJUnitRunnerIT.java
@@ -0,0 +1,38 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-1041: An error in a JUnit runner should not lead to an error in Surefire
+ *
+ * @author Andreas Gudian
+ */
+public class Surefire1041FailingJUnitRunnerIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void reportErrorInJUnitRunnerAsTestError()
+ {
+ unpack( "surefire-1041-exception-in-junit-runner" ).mavenTestFailureIgnore( true ).executeTest().assertTestSuiteResults( 1, 1, 0, 0 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
new file mode 100644
index 0000000..b3ed744
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
@@ -0,0 +1,72 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1053">SUREFIRE-1053</a>
+ * @since 2.18
+ */
+public class Surefire1053SystemPropertiesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void checkWarningsFileEncoding()
+ {
+ unpack().sysProp( "file.encoding", "ISO-8859-1" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyTextInLog( "file.encoding cannot be set as system property, use <argLine>-D"
+ + "file.encoding=...</argLine> instead" );
+ }
+ @Test
+ public void checkWarningsSysPropTwice() throws Exception
+ {
+ OutputValidator validator = unpack()
+ .argLine( "-DmyArg=myVal2 -Dfile.encoding=ISO-8859-1" )
+ .sysProp( "file.encoding", "ISO-8859-1" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyTextInLog( "The system property myArg is configured twice! "
+ + "The property appears in <argLine/> and any of <systemPropertyVariables/>, "
+ + "<systemProperties/> or user property." );
+
+ for ( String line : validator.loadLogLines() )
+ {
+ assertFalse( "no warning for file.encoding not in argLine",
+ line.contains( "file.encoding cannot be set as system property, use <argLine>" ) );
+ assertFalse( "no warning for double definition of file.encoding",
+ line.contains( "The system property file.encoding is configured twice!" ) );
+ }
+
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-1053-system-properties" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1055CorrectConcurrentTestCountIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1055CorrectConcurrentTestCountIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1055CorrectConcurrentTestCountIT.java
new file mode 100644
index 0000000..0293a75
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1055CorrectConcurrentTestCountIT.java
@@ -0,0 +1,41 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-1055 Correct test count in parallel run mode.
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire1055CorrectConcurrentTestCountIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testTestNgAndJUnitTogether()
+ {
+ OutputValidator outputValidator = unpack( "surefire-1055-parallelTestCount" ).executeTest();
+ outputValidator.assertTestSuiteResults( 21, 0, 0, 0 );
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
new file mode 100644
index 0000000..d6a38fa
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
@@ -0,0 +1,54 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * Description of SUREFIRE-1080: <br>
+ * <br>
+ * There are 9 tests in total in the attached project, and mvn test will show 9 tests run.
+ * When I use the command " mvn test -Dparallel=classes -DforkCount=2 -DuseUnlimitedThreads=true", it shows 13 tests
+ * run (and sometimes 16), and some tests are run more than once.
+ * If I remove forkCount, or parallel, everything will be fine. But it is problematic when combining together.
+ * Apache Maven 3.2.2-SNAPSHOT
+ * Surefire 2.18-SNAPSHOT
+ * JUnit 4.11
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1080">SUREFIRE-1080</a>
+ * @since 2.18
+ */
+public class Surefire1080ParallelForkDoubleTestIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void test()
+ {
+ unpack().executeTest().assertTestSuiteResults( 9 );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-1080-parallel-fork-double-test" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
new file mode 100644
index 0000000..2669b2f
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
@@ -0,0 +1,212 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.TestFile;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.junit.Test;
+
+import java.nio.charset.Charset;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
+import static org.hamcrest.core.AnyOf.anyOf;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.StringContains.containsString;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1082">SUREFIRE-1082</a>
+ * @since 2.18
+ */
+public class Surefire1082ParallelJUnitParameterizedIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private static Set<String> printOnlyTestLinesFromConsole( OutputValidator validator )
+ throws VerificationException
+ {
+ return printOnlyTestLines( validator.loadLogLines() );
+ }
+
+ private static Set<String> printOnlyTestLinesFromOutFile( OutputValidator validator )
+ throws VerificationException
+ {
+ TestFile report = validator.getSurefireReportsFile( "jiras.surefire1082.Jira1082Test-output.txt" );
+ report.assertFileExists();
+ return printOnlyTestLines( validator.loadFile( report.getFile(), Charset.forName( "UTF-8" ) ) );
+ }
+
+ private static Set<String> printOnlyTestLines( Collection<String> logs )
+ throws VerificationException
+ {
+ Set<String> log = new TreeSet<String>();
+ for ( String line : logs )
+ {
+ if ( line.startsWith( "class jiras.surefire1082." ) )
+ {
+ log.add( line );
+ }
+ }
+ return log;
+ }
+
+ private static Matcher<Set<String>> regex( Set<String> r )
+ {
+ return new IsRegex( r );
+ }
+
+ private static void assertParallelRun( Set<String> log )
+ {
+ assertThat( log.size(), is( 4 ) );
+
+ Set<String> expectedLogs1 = new TreeSet<String>();
+ expectedLogs1.add( "class jiras.surefire1082.Jira1082Test a 0 pool-[\\d]+-thread-1" );
+ expectedLogs1.add( "class jiras.surefire1082.Jira1082Test b 0 pool-[\\d]+-thread-1" );
+ expectedLogs1.add( "class jiras.surefire1082.Jira1082Test a 1 pool-[\\d]+-thread-2" );
+ expectedLogs1.add( "class jiras.surefire1082.Jira1082Test b 1 pool-[\\d]+-thread-2" );
+
+ Set<String> expectedLogs2 = new TreeSet<String>();
+ expectedLogs2.add( "class jiras.surefire1082.Jira1082Test a 1 pool-[\\d]+-thread-1" );
+ expectedLogs2.add( "class jiras.surefire1082.Jira1082Test b 1 pool-[\\d]+-thread-1" );
+ expectedLogs2.add( "class jiras.surefire1082.Jira1082Test a 0 pool-[\\d]+-thread-2" );
+ expectedLogs2.add( "class jiras.surefire1082.Jira1082Test b 0 pool-[\\d]+-thread-2" );
+
+ assertThat( log, anyOf( regex( expectedLogs1 ), regex( expectedLogs2 ) ) );
+ }
+
+ @Test
+ public void checkClassesRunParallel()
+ throws VerificationException
+ {
+ OutputValidator validator = unpack().setTestToRun( "Jira1082Test" )
+ .parallelClasses()
+ .useUnlimitedThreads()
+ .executeTest()
+ .verifyErrorFree( 4 );
+
+ validator.getSurefireReportsXmlFile( "TEST-jiras.surefire1082.Jira1082Test.xml" )
+ .assertFileExists();
+
+ validator.assertThatLogLine( containsString( "Running jiras.surefire1082.Jira1082Test" ), is( 1 ) );
+
+ Set<String> log = printOnlyTestLinesFromConsole( validator );
+ assertParallelRun( log );
+ }
+
+ @Test
+ public void checkOutFileClassesRunParallel()
+ throws VerificationException
+ {
+ OutputValidator validator = unpack().redirectToFile( true )
+ .setTestToRun( "Jira1082Test" )
+ .parallelClasses()
+ .useUnlimitedThreads()
+ .executeTest()
+ .verifyErrorFree( 4 );
+
+ validator.getSurefireReportsXmlFile( "TEST-jiras.surefire1082.Jira1082Test.xml" )
+ .assertFileExists();
+
+ validator.assertThatLogLine( containsString( "Running jiras.surefire1082.Jira1082Test" ), is( 1 ) );
+
+ Set<String> log = printOnlyTestLinesFromOutFile( validator );
+ assertParallelRun( log );
+ }
+
+ @Test
+ public void shouldRunTwo() throws VerificationException
+ {
+ OutputValidator validator = unpack().redirectToFile( true )
+ .parallelClasses()
+ .useUnlimitedThreads()
+ .executeTest()
+ .verifyErrorFree( 8 );
+
+ validator.getSurefireReportsXmlFile( "TEST-jiras.surefire1082.Jira1082Test.xml" )
+ .assertFileExists();
+
+ validator.getSurefireReportsXmlFile( "TEST-jiras.surefire1082.Jira1264Test.xml" )
+ .assertFileExists();
+
+ validator.getSurefireReportsFile( "jiras.surefire1082.Jira1082Test-output.txt" )
+ .assertFileExists();
+
+ validator.getSurefireReportsFile( "jiras.surefire1082.Jira1264Test-output.txt" )
+ .assertFileExists();
+
+ validator.assertThatLogLine( containsString( "Running jiras.surefire1082.Jira1082Test" ), is( 1 ) );
+
+ validator.assertThatLogLine( containsString( "Running jiras.surefire1082.Jira1264Test" ), is( 1 ) );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-1082-parallel-junit-parameterized" );
+ }
+
+ private static class IsRegex
+ extends BaseMatcher<Set<String>>
+ {
+ private final Set<String> expectedRegex;
+
+ IsRegex( Set<String> expectedRegex )
+ {
+ this.expectedRegex = expectedRegex;
+ }
+
+ @Override
+ public boolean matches( Object o )
+ {
+ if ( o != null && o instanceof Set )
+ {
+ Set<String> actual = (Set<String>) o;
+ boolean matches = actual.size() == expectedRegex.size();
+ Iterator<String> regex = expectedRegex.iterator();
+ for ( String s : actual )
+ {
+ if ( s == null || !regex.hasNext() || !s.matches( regex.next() ) )
+ {
+ matches = false;
+ }
+ }
+ return matches;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ @Override
+ public void describeTo( Description description )
+ {
+ description.appendValue( expectedRegex );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
new file mode 100644
index 0000000..f894265
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
@@ -0,0 +1,94 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } )
+/**
+ *
+ * In the surefire plugin, it is possible to specify one or more RunListener when running tests with JUnit.
+ * However, it does not look like the listener is properly called by the plugin. In particular, there is a problem
+ * with the method:
+ * <pre>
+ * public void testRunStarted(Description description)
+ * </pre>
+ * it's javadoc at
+ * <a href="http://junit.sourceforge.net/javadoc/org/junit/runner/notification/RunListener.html#testRunStarted%28org.junit.runner.Description%29"/>
+ * states:
+ * "Parameters:
+ * description - describes the tests to be run "
+ * however, in all maven projects I tried ("mvn test"), the surefire plugin seems like passing a null reference instead
+ * of a Description instance that "describes the tests to be run "
+ * Note: other methods in the RunListener I tested seems fine (i.e., they get a valid Description object as input)
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1095}"/>
+ * @since 2.18
+ */
+public final class Surefire1095NpeInRunListener
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ /**
+ * Method Request.classes( String, Class[] ); exists in JUnit 4.0 - 4.4
+ * See JUnit4Reflector.
+ */
+ @Test
+ public void testRunStartedWithJUnit40()
+ {
+ unpack().setJUnitVersion( "4.0" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyTextInLog( "Running JUnit 4.0" )
+ .verifyTextInLog( "testRunStarted [jiras.surefire1095.SomeTest]" );
+ }
+
+ /**
+ * Method Request.classes( Class[] ); Since of JUnit 4.5
+ * See JUnit4Reflector.
+ */
+ @Test
+ public void testRunStartedWithJUnit45()
+ {
+ unpack().setJUnitVersion( "4.5" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyTextInLog( "Running JUnit 4.5" )
+ .verifyTextInLog( "testRunStarted [jiras.surefire1095.SomeTest]" );
+ }
+
+ @Test
+ public void testRunStartedWithJUnit47()
+ {
+ unpack().setJUnitVersion( "4.7" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyTextInLog( "Running JUnit 4.7" )
+ .verifyTextInLog( "testRunStarted [jiras.surefire1095.SomeTest]" );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-1095-npe-in-runlistener" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
new file mode 100644
index 0000000..e81f066
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
@@ -0,0 +1,119 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import static org.junit.Assert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.AnyOf.anyOf;
+
+/**
+ * The purpose of this IT is to assert that the run order of test classes is according to the settings:<br>
+ *
+ * runOrder=balanced<br>
+ * parallel=classes<br>
+ * threadCount=2<br>
+ * perCoreThreadCount=false<br>
+ * <br>
+ * The list of tests should be reordered to (DTest, CTest, BTest, ATest) in the second run.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1098">SUREFIRE-1098</a>
+ * @since 2.18
+ */
+public class Surefire1098BalancedRunOrderIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void reorderedParallelClasses()
+ throws VerificationException
+ {
+ SurefireLauncher launcher = unpack();
+
+ launcher
+ // .runOrder( "balanced" ) call it in 3.x and remove it in surefire-1098-balanced-runorder/pom.xml
+ // as soon as there is prefix available "failsafe" and "surefire" in system property for this parameter.
+ .parallelClasses().threadCount( 2 ).disablePerCoreThreadCount()
+ .executeTest().verifyErrorFree( 4 );
+
+ OutputValidator validator =
+ launcher
+ // .runOrder( "balanced" ) call it in 3.x and remove it in surefire-1098-balanced-runorder/pom.xml
+ // as soon as there is prefix available "failsafe" and "surefire" in system property for this parameter.
+ .parallelClasses().threadCount( 2 ).disablePerCoreThreadCount()
+ .executeTest().verifyErrorFree( 4 );
+
+ List<String> log = printOnlyTestLines( validator );
+ assertThat( log.size(), is( 4 ) );
+ Collections.sort( log );
+ final int[] threadPoolIdsOfLongestTest = extractThreadPoolIds( log.get( 3 ) );
+ final int pool = threadPoolIdsOfLongestTest[0];
+ int thread = threadPoolIdsOfLongestTest[1];
+ assertThat( thread, anyOf( is( 1 ), is( 2 ) ) );
+ thread = thread == 1 ? 2 : 1;
+ // If the longest test class DTest is running in pool-2-thread-1, the others should run in pool-2-thread-2
+ // and vice versa.
+ assertThat( log.get( 0 ), is( testLine( "A", pool, thread ) ) );
+ assertThat( log.get( 1 ), is( testLine( "B", pool, thread ) ) );
+ assertThat( log.get( 2 ), is( testLine( "C", pool, thread ) ) );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-1098-balanced-runorder" );
+ }
+
+ private static List<String> printOnlyTestLines( OutputValidator validator )
+ throws VerificationException
+ {
+ List<String> log = new ArrayList<String>( validator.loadLogLines() );
+ for ( Iterator<String> it = log.iterator(); it.hasNext(); ) {
+ String line = it.next();
+ if ( !line.startsWith( "class jiras.surefire1098." ) ) {
+ it.remove();
+ }
+ }
+ return log;
+ }
+
+ private static int[] extractThreadPoolIds(String logLine)
+ {
+ //Example to parse "class jiras.surefire1098.DTest pool-2-thread-1" into {2, 1}.
+ String t = logLine.split( " " )[2];
+ String[] ids = t.split( "-" );
+ return new int[]{ Integer.parseInt( ids[1] ), Integer.parseInt( ids[3] )};
+ }
+
+ private String testLine(String test, int pool, int thread)
+ {
+ return String.format( "class jiras.surefire1098.%sTest pool-%d-thread-%d", test, pool, thread );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
new file mode 100644
index 0000000..2f9dca8
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
@@ -0,0 +1,48 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * @author agudian
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1122">SUREFIRE-1122</a>
+ */
+public class Surefire1122ParallelAndFlakyTestsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void nonParallelCreatesCorrectReport()
+ {
+ unpack( "surefire-1122-parallel-and-flakyTests" )
+ .executeTest()
+ .assertTestSuiteResults( 2, 0, 0, 0, 1 );
+ }
+
+ @Test
+ public void parallelCreatesCorrectReport()
+ {
+ unpack( "surefire-1122-parallel-and-flakyTests" )
+ .activateProfile( "parallel" )
+ .executeTest()
+ .assertTestSuiteResults( 2, 0, 0, 0, 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1135ImproveIgnoreMessageForTestNGIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1135ImproveIgnoreMessageForTestNGIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1135ImproveIgnoreMessageForTestNGIT.java
new file mode 100644
index 0000000..f7324c9
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1135ImproveIgnoreMessageForTestNGIT.java
@@ -0,0 +1,152 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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 static org.apache.maven.shared.utils.xml.Xpp3DomBuilder.build;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
+
+import java.io.FileNotFoundException;
+
+import org.apache.maven.shared.utils.xml.Xpp3Dom;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * Test surefire-report on TestNG test
+ *
+ * @author <a href="mailto:michal.bocek@gmail.com">Michal Bocek</a>
+ */
+public class Surefire1135ImproveIgnoreMessageForTestNGIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ private enum ResultType
+ {
+ SKIPPED( "skipped" ), FAILURE( "failure" );
+
+ private final String type;
+
+ ResultType(String type)
+ {
+ this.type = type;
+ }
+
+ public String getType() {
+ return type;
+ }
+ }
+
+ @Test
+ public void testNgReport688() throws Exception {
+ testNgReport( "6.8.8", null, ResultType.SKIPPED,
+ "Skip test",
+ /*"org.testng.SkipException"*/ null,
+ /*"SkipExceptionReportTest.java:30"*/ null );
+ }
+
+ @Test
+ public void testNgReport57() throws Exception {
+ testNgReport( "5.7", "jdk15", ResultType.SKIPPED,
+ "Skip test",
+ /*"org.testng.SkipException"*/ null,
+ /*"SkipExceptionReportTest.java:30"*/ null );
+ }
+
+ private void testNgReport( String version, String classifier, ResultType resultType, String message, String type,
+ String stackTrace )
+ throws Exception
+ {
+ OutputValidator outputValidator =
+ runTest( version, classifier, resultType, "/surefire-1135-improve-ignore-message-for-testng" );
+
+ Xpp3Dom[] children = readTests( outputValidator, "testng.SkipExceptionReportTest" );
+ assertThat( "Report should contains only one test case", children.length, is( 1 ) );
+
+ Xpp3Dom test = children[0];
+ assertThat( "Not expected classname", test.getAttribute( "classname" ),
+ is( "testng.SkipExceptionReportTest" ) );
+
+ assertThat( "Not expected test name", test.getAttribute( "name" ), is( "testSkipException" ) );
+
+ children = test.getChildren( resultType.getType() );
+ assertThat( "Test should contains only one " + resultType.getType() + " element", children,
+ is( arrayWithSize( 1 ) ) );
+
+ Xpp3Dom result = children[0];
+ if ( message == null )
+ {
+ assertThat( "Subelement message attribute must be null", result.getAttribute( "message" ),
+ is( nullValue() ) );
+ }
+ else
+ {
+ assertThat( "Subelement should contains message attribute", result.getAttribute( "message" ),
+ is( message ) );
+ }
+
+ if ( type == null )
+ {
+ assertThat( "Subelement type attribute must be null", result.getAttribute( "type" ), is( nullValue() ) );
+ }
+ else
+ {
+ assertThat( "Subelement should contains type attribute", result.getAttribute( "type" ), is( type ) );
+ }
+
+ if ( stackTrace == null )
+ {
+ assertThat( "Element body must be null", result.getValue() , isEmptyOrNullString() );
+ }
+ else
+ {
+ assertThat( "Element body must contains", result.getValue(), containsString( stackTrace ) );
+ }
+ }
+
+ private OutputValidator runTest( String version, String classifier, ResultType resultType, String resource )
+ {
+ int skipped = ResultType.SKIPPED.equals( resultType ) ? 1 : 0;
+ int failure = ResultType.FAILURE.equals( resultType ) ? 1 : 0;
+
+ SurefireLauncher launcher = unpack( resource ).sysProp( "testNgVersion", version );
+
+ if ( classifier != null )
+ {
+ launcher.sysProp( "testNgClassifier", classifier );
+ }
+
+ return launcher.addSurefireReportGoal()
+ .executeCurrentGoals()
+ .assertTestSuiteResults( 1, 0, failure, skipped );
+ }
+
+ private static Xpp3Dom[] readTests( OutputValidator validator, String className )
+ throws FileNotFoundException
+ {
+ Xpp3Dom testResult =
+ build( validator.getSurefireReportsXmlFile( "TEST-" + className + ".xml" ).getFileInputStream(),
+ "UTF-8"
+ );
+ return testResult.getChildren( "testcase" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java
new file mode 100644
index 0000000..8aaecea
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java
@@ -0,0 +1,43 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-1136 Correct current working directory propagation in forked mode
+ *
+ * Note: variables expansion behaves differently on MVN 2.x since not existing variables
+ * are resolved to 'null' value so that ${surefire.forkNumber} cannot work.
+ *
+ * @author Norbert Wnuk
+ */
+public class Surefire1136CwdPropagationInForkedModeIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testTestNgAndJUnitTogether()
+ {
+ OutputValidator outputValidator = unpack( "surefire-1136-cwd-propagation-in-forked-mode" ).executeTest();
+ outputValidator.assertTestSuiteResults( 1, 0, 0, 0 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1144XmlRunTimeIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1144XmlRunTimeIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1144XmlRunTimeIT.java
new file mode 100644
index 0000000..d81d7c2
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1144XmlRunTimeIT.java
@@ -0,0 +1,58 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.plugins.surefire.report.ReportTestSuite;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.extractReports;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * Test that runtime reported on console matches runtime in XML
+ *
+ * @author <a href="mailto:eloussi2@illinois.edu">Lamyaa Eloussi</a>
+ */
+public class Surefire1144XmlRunTimeIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testXmlRunTime()
+ throws Exception
+ {
+ OutputValidator outputValidator = unpack( "/surefire-1144-xml-runtime" ).forkOnce().executeTest();
+
+ List<ReportTestSuite> reports = extractReports( outputValidator.getBaseDir() );
+ assertThat( reports, hasSize( 1 ) );
+
+ ReportTestSuite report = reports.get( 0 );
+ float xmlTime = report.getTimeElapsed();
+
+ assertThat( xmlTime, is(greaterThanOrEqualTo( 1.6f ) ) ); //include beforeClass and afterClass
+ outputValidator.verifyTextInLog( Float.toString( xmlTime ) ); //same time in console
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
new file mode 100644
index 0000000..f78c16a
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
@@ -0,0 +1,75 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1146">SUREFIRE-1146</a>
+ */
+public class Surefire1146RerunFailedAndParameterized
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void testsAreRerun()
+ {
+ OutputValidator outputValidator = unpack( "surefire-1146-rerunFailingTests-with-Parameterized" ).executeTest();
+ verify(outputValidator, 8, 0, 0, 0, 5);
+ }
+
+ private void verify( OutputValidator outputValidator, int run, int failures, int errors, int skipped, int flakes )
+ {
+ outputValidator.verifyTextInLog( "Flakes:" );
+ outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionParameterizedTest.flakyTest[0: (Test11); Test12; Test13;](jiras.surefire1146.CustomDescriptionParameterizedTest)" );
+ outputValidator.verifyTextInLog( "Run 1: CustomDescriptionParameterizedTest.flakyTest:" );
+ outputValidator.verifyTextInLog( "Run 2: CustomDescriptionParameterizedTest.flakyTest:" );
+ outputValidator.verifyTextInLog( "Run 3: PASS" );
+
+ outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest.flakyTest[0: (Test11), Test12, Test13;](jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest)" );
+ outputValidator.verifyTextInLog( "Run 1: CustomDescriptionWithCommaParameterizedTest.flakyTest:" );
+ outputValidator.verifyTextInLog( "Run 2: CustomDescriptionWithCommaParameterizedTest.flakyTest:" );
+ outputValidator.verifyTextInLog( "Run 3: PASS" );
+
+ outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest.flakyTest[2: (Test31), Test32, Test33;](jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest)" );
+ outputValidator.verifyTextInLog( "Run 1: CustomDescriptionWithCommaParameterizedTest.flakyTest:" );
+ outputValidator.verifyTextInLog( "Run 2: PASS" );
+
+ outputValidator.verifyTextInLog( "jiras.surefire1146.SimpleParameterizedTest.flakyTest[0](jiras.surefire1146.SimpleParameterizedTest)" );
+ outputValidator.verifyTextInLog( "Run 1: SimpleParameterizedTest.flakyTest:" );
+ outputValidator.verifyTextInLog( "Run 2: SimpleParameterizedTest.flakyTest:" );
+ outputValidator.verifyTextInLog( "Run 3: PASS" );
+
+ outputValidator.verifyTextInLog( "jiras.surefire1146.StandardTest.flakyTest(jiras.surefire1146.StandardTest)" );
+ outputValidator.verifyTextInLog( "Run 1: StandardTest.flakyTest:" );
+ outputValidator.verifyTextInLog( "Run 2: PASS" );
+
+ verifyStatistics( outputValidator, run, failures, errors, skipped, flakes );
+ }
+
+ private void verifyStatistics( OutputValidator outputValidator, int run, int failures, int errors, int skipped,
+ int flakes )
+ {
+ outputValidator.verifyTextInLog( "Tests run: " + run + ", Failures: " + failures + ", Errors: " + errors
+ + ", Skipped: " + skipped + ", Flakes: " + flakes );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java
new file mode 100644
index 0000000..58e951a
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java
@@ -0,0 +1,64 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * SUREFIRE-1152 Assert rerunFailingTestsCount works with test suites
+ *
+ * @author Sean Flanigan
+ */
+public class Surefire1152RerunFailingTestsInSuiteIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private static final String RUNNING_WITH_PROVIDER47 =
+ "Using configured provider org.apache.maven.surefire.junitcore.JUnitCoreProvider";
+
+ public OutputValidator runMethodPattern( String projectName, String... goals )
+ {
+ SurefireLauncher launcher = unpack( projectName );
+ for ( String goal : goals )
+ {
+ launcher.addGoal( goal );
+ }
+ OutputValidator outputValidator = launcher.showErrorStackTraces().debugLogging().executeVerify();
+ outputValidator.assertTestSuiteResults( 3, 0, 0, 0, 3 );
+ outputValidator.assertIntegrationTestSuiteResults( 1, 0, 0, 0 );
+ return outputValidator;
+ }
+
+ @Test
+ public void testJUnit48Provider4()
+ {
+ runMethodPattern( "surefire-1152-rerunFailingTestsCount-suite", "-P surefire-junit4" );
+ }
+
+ @Test
+ public void testJUnit48Provider47()
+ {
+ runMethodPattern( "surefire-1152-rerunFailingTestsCount-suite", "-P surefire-junit47" )
+ .verifyTextInLog( RUNNING_WITH_PROVIDER47 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
new file mode 100644
index 0000000..3a2c826
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
@@ -0,0 +1,46 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * 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 Surefire1153IncludesAndSpecifiedTestIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void testSpecifiedTestInIncludes()
+ {
+ unpack( "/surefire-1153-includesAndSpecifiedTest" )
+ .setTestToRun( "#testIncluded" )
+ .executeTest()
+ .verifyErrorFree( 1 );
+ }
+
+ @Test
+ public void testSpecifiedTestNotInIncludes()
+ {
+ unpack( "/surefire-1153-includesAndSpecifiedTest" )
+ .setTestToRun( "#testNotIncluded" )
+ .executeTest()
+ .verifyErrorFree( 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
new file mode 100644
index 0000000..706f6b5
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
@@ -0,0 +1,142 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * 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.SurefireVerifierException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+
+import static org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase.unpack;
+import static org.junit.runners.Parameterized.*;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1158">SUREFIRE-1158</a>
+ * @since 2.19
+ */
+@RunWith( Parameterized.class )
+public class Surefire1158RemoveInfoLinesIT
+{
+
+ @Parameters(name = "{0}")
+ public static Iterable<Object[]> data()
+ {
+ ArrayList<Object[]> args = new ArrayList<Object[]>();
+ args.add( new Object[] { "junit-option-ff", "JUnitTest", "-ff", "surefire-junit47", false, true } );
+ args.add( new Object[] { "testng-option-ff", "TestNGSuiteTest", "-ff", "surefire-testng", false, false } );
+ args.add( new Object[] { "junit-option-X", "JUnitTest", "-X", "surefire-junit47", true, true } );
+ args.add( new Object[] { "testng-option-X", "TestNGSuiteTest", "-X", "surefire-testng", true, false } );
+ args.add( new Object[] { "junit-option-e", "JUnitTest", "-e", "surefire-junit47", true, true } );
+ args.add( new Object[] { "testng-option-e", "TestNGSuiteTest", "-e", "surefire-testng", true, false } );
+ return args;
+ }
+
+ @Parameter(0)
+ public String description;
+
+ @Parameter(1)
+ public String testToRun;
+
+ @Parameter(2)
+ public String cliOption;
+
+ @Parameter(3)
+ public String provider;
+
+ @Parameter(4)
+ public boolean printsInfoLines;
+
+ @Parameter(5)
+ public boolean isJUnit;
+
+ @Test
+ public void shouldRunWithCliOption()
+ throws Exception
+ {
+ OutputValidator validator = assertTest();
+ if ( isJUnit )
+ {
+ assertJUnitTestLogs( validator );
+ }
+ else
+ {
+ assertTestNGTestLogs( validator );
+ }
+ }
+
+ private OutputValidator assertTest()
+ throws Exception
+ {
+ final String[] cli = {"--batch-mode"};
+ return unpack( getClass(), "/surefire-1158-remove-info-lines", "_" + description, cli )
+ .sysProp( "provider", provider ).addGoal( cliOption ).setTestToRun( testToRun )
+ .executeTest()
+ .verifyErrorFreeLog().assertTestSuiteResults( 1, 0, 0, 0 );
+ }
+
+ private void assertJUnitTestLogs( OutputValidator validator )
+ {
+ try
+ {
+ validator.verifyTextInLog( "Surefire report directory:" );
+ validator.verifyTextInLog( "Using configured provider org.apache.maven.surefire.junitcore.JUnitCoreProvider" );
+ validator.verifyTextInLog( "parallel='none', perCoreThreadCount=true, threadCount=0, "
+ + "useUnlimitedThreads=false, threadCountSuites=0, threadCountClasses=0, "
+ + "threadCountMethods=0, parallelOptimized=true" );
+ if ( !printsInfoLines )
+ {
+ fail();
+ }
+ }
+ catch ( SurefireVerifierException e )
+ {
+ if ( printsInfoLines )
+ {
+ fail();
+ }
+ }
+ }
+
+ private void assertTestNGTestLogs( OutputValidator validator )
+ {
+ try
+ {
+ validator.verifyTextInLog( "Surefire report directory:" );
+ validator.verifyTextInLog( "Using configured provider org.apache.maven.surefire.testng.TestNGProvider" );
+ validator.verifyTextInLog( "Configuring TestNG with: TestNGMapConfigurator" );
+ if ( !printsInfoLines )
+ {
+ fail();
+ }
+ }
+ catch ( SurefireVerifierException e )
+ {
+ if ( printsInfoLines )
+ {
+ fail();
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java
new file mode 100644
index 0000000..8c2c213
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java
@@ -0,0 +1,59 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.startsWith;
+
+/**
+ * IT for https://issues.apache.org/jira/browse/SUREFIRE-1177
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.19
+ */
+public class Surefire1177TestngParallelSuitesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void shouldRunTwoSuitesInParallel()
+ throws VerificationException
+ {
+ assumeJavaVersion( 1.7d );
+
+ unpack().executeTest()
+ .verifyErrorFree( 2 )
+ .assertThatLogLine( containsString( "ShouldNotRunTest#shouldNotRun()" ), is( 0 ) )
+ .assertThatLogLine( startsWith( "TestNGSuiteTest#shouldRunAndPrintItself()" ), is( 2 ) )
+ .assertThatLogLine( is( "TestNGSuiteTest#shouldRunAndPrintItself() 1." ), is( 1 ) )
+ .assertThatLogLine( is( "TestNGSuiteTest#shouldRunAndPrintItself() 2." ), is( 1 ) );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "testng-parallel-suites" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1179IT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1179IT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1179IT.java
new file mode 100644
index 0000000..e4e8e31
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1179IT.java
@@ -0,0 +1,43 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * Fix for TestNG parameter -dataproviderthreadcount.
+ */
+public class Surefire1179IT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void suiteXmlForkCountTwoReuse()
+ {
+ unpack().executeTest().verifyErrorFreeLog().verifyTextInLog( " CONCURRENCY=30." );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-1179-testng-parallel-dataprovider" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
new file mode 100644
index 0000000..74a4e46
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
@@ -0,0 +1,62 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * Surefire 2.19 spawns unnecessary tests in surefire-junit4 provider.
+ * https://issues.apache.org/jira/browse/SUREFIRE-1185
+ * Example, UnlistedTest is the problem here because it runs with filtered out methods:
+ *
+ * Running pkg.UnlistedTest
+ * Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in pkg.UnlistedTest
+ * Running pkg.RunningTest
+ * Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in pkg.RunningTest
+ *
+ * Results:
+ *
+ * Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+ */
+public class Surefire1185DoNotSpawnTestsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void doNotSpawnUnwantedTests()
+ throws VerificationException
+ {
+ unpack().setTestToRun( "RunningTest#test" )
+ .executeTest()
+ .assertTestSuiteResults( 1 )
+ .assertThatLogLine( containsString( "in pkg.RunningTest" ), is( 1 ) )
+ .assertThatLogLine( containsString( "in pkg.UnlistedTest" ), is( 0 ) );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-1185" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
new file mode 100644
index 0000000..f886446
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
@@ -0,0 +1,58 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * Allow rerunFailingTestsCount, skipAfterFailureCount together
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1202">SUREFIRE-1202</a>
+ * @since 2.19.1
+ */
+public class Surefire1202RerunAndSkipIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void junit47()
+ throws VerificationException
+ {
+ unpack().executeTest()
+ .assertTestSuiteResults( 5, 0, 0, 3, 4 );
+ }
+
+ @Test
+ public void junit4()
+ throws VerificationException
+ {
+ unpack().addGoal( "-Pjunit4" )
+ .executeTest()
+ .assertTestSuiteResults( 5, 0, 0, 3, 4 );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-1202-rerun-and-failfast" );
+ }
+}
[16/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
new file mode 100644
index 0000000..6ee87fb
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
@@ -0,0 +1,75 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1209">SUREFIRE-1209</a>
+ * @since 2.19
+ */
+public class Surefire1209RerunAndForkCountIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void reusableForksJUnit47()
+ throws VerificationException
+ {
+ unpack().executeTest()
+ .assertTestSuiteResults( 5, 0, 0, 0, 4 );
+ }
+
+ @Test
+ public void notReusableForksJUnit47()
+ throws VerificationException
+ {
+ unpack().reuseForks( false )
+ .executeTest()
+ .assertTestSuiteResults( 5, 0, 0, 0, 4 );
+ }
+
+ @Test
+ public void reusableForksJUnit4()
+ throws VerificationException
+ {
+ unpack().addGoal( "-Pjunit4" )
+ .executeTest()
+ .assertTestSuiteResults( 5, 0, 0, 0, 4 );
+ }
+
+ @Test
+ public void notReusableForksJUnit4()
+ throws VerificationException
+ {
+ unpack().addGoal( "-Pjunit4" )
+ .reuseForks( false )
+ .executeTest()
+ .assertTestSuiteResults( 5, 0, 0, 0, 4 );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-1209-rerun-and-forkcount" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
new file mode 100644
index 0000000..53cd764
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
@@ -0,0 +1,62 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1211">SUREFIRE-1211</a>
+ * @since 2.19.1
+ */
+public class Surefire1211JUnitTestNgIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void withJUnit()
+ {
+ assumeJavaVersion( 1.7d );
+
+ unpack().threadCount( 1 )
+ .executeTest()
+ .verifyErrorFree( 2 );
+ }
+
+ @Test
+ public void withoutJUnit()
+ {
+ assumeJavaVersion( 1.7d );
+
+ unpack().threadCount( 1 )
+ .sysProp( "junit", "false" )
+ .executeTest()
+ .verifyErrorFree( 1 );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-1211" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java
new file mode 100644
index 0000000..c4031c2
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java
@@ -0,0 +1,49 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.*;
+import org.junit.Test;
+
+/**
+ * Added included pattern Tests.java.
+ * <p>
+ * Found in Surefire 2.19.1.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1260">SUREFIRE-1260</a>
+ * @since 2.20
+ */
+public class Surefire1260NewTestsPattern
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void defaultConfig()
+ {
+ unpack()
+ .executeTest()
+ .verifyErrorFree( 5 );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/surefire-1260-new-tests-pattern" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java
new file mode 100644
index 0000000..bd9af17
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java
@@ -0,0 +1,58 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1264">SUREFIRE-1264</a>
+ * @since 2.20.1
+ */
+public class Surefire1264IT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void positiveTests()
+ {
+ unpack( "surefire-1264" )
+ .setForkJvm()
+ .parallelAll()
+ .useUnlimitedThreads()
+ .sysProp( "canFail", "false" )
+ .executeTest()
+ .assertTestSuiteResults( 16, 0, 0, 0 );
+ }
+
+ @Test
+ public void negativeTests()
+ {
+ unpack( "surefire-1264" )
+ .setForkJvm()
+ .parallelAll()
+ .useUnlimitedThreads()
+ .sysProp( "canFail", "true" )
+ .mavenTestFailureIgnore( true )
+ .executeTest()
+ .assertTestSuiteResults( 16, 0, 16, 0 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
new file mode 100644
index 0000000..2e92805
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
@@ -0,0 +1,57 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.AbstractJigsawIT;
+import org.junit.Test;
+
+import java.io.IOException;
+
+@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } )
+/**
+ * IsolatedClassLoader should take platform ClassLoader as a parent ClassLoader if running on the top of JDK9.
+ * The IsolatedClassLoader should not fail like this:
+ *
+ * [ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test (default-test) on project
+ * maven-surefire-plugin-example: Execution default-test of goal
+ * org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test failed:
+ * java.lang.NoClassDefFoundError: java/sql/SQLException: java.sql.SQLException -> [Help 1]
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1265">SUREFIRE-1265</a>
+ * @since 2.20.1
+ */
+public class Surefire1265Java9IT
+ extends AbstractJigsawIT
+{
+ @Test
+ public void shouldRunInPluginJava9() throws IOException
+ {
+ assumeJigsaw()
+ .executeTest()
+ .verifyErrorFree( 2 );
+ }
+
+ @Override
+ protected String getProjectDirectoryName()
+ {
+ return "/surefire-1265";
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1278GroupNameEndingIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1278GroupNameEndingIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1278GroupNameEndingIT.java
new file mode 100644
index 0000000..c0b0339
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1278GroupNameEndingIT.java
@@ -0,0 +1,44 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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 the group filter for TestNG
+ *
+ */
+public class Surefire1278GroupNameEndingIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testOnlyGroups()
+ {
+ unpack().setGroups( "group" ).executeTest().verifyErrorFree( 1 );
+ }
+
+ public SurefireLauncher unpack()
+ {
+ return unpack( "/surefire-1278-group-name-ending" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
new file mode 100644
index 0000000..3ca758a
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
@@ -0,0 +1,125 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
+
+import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX;
+import static org.apache.commons.lang3.SystemUtils.IS_OS_MAC_OSX;
+import static org.fest.assertions.Assertions.assertThat;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+/**
+ * https://issues.apache.org/jira/browse/SUREFIRE-1295
+ * https://github.com/apache/maven-surefire/pull/136
+ *
+ * @author michaeltandy
+ * @since 2.20
+ */
+public class Surefire1295AttributeJvmCrashesToTestsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Before
+ public void skipWindows()
+ {
+ assumeTrue( IS_OS_LINUX || IS_OS_MAC_OSX );
+ }
+
+ @Test
+ public void crashInFork() throws VerificationException, InterruptedException
+ {
+ SurefireLauncher launcher = unpack( "crash-during-test" );
+
+ checkCrashTypes( launcher );
+ }
+
+ @Test
+ public void crashInSingleUseFork() throws VerificationException, InterruptedException
+ {
+ SurefireLauncher launcher = unpack( "crash-during-test" )
+ .forkCount( 1 )
+ .reuseForks( false );
+
+ checkCrashTypes( launcher );
+ }
+
+ @Test
+ public void crashInReusableFork() throws VerificationException, InterruptedException
+ {
+ SurefireLauncher launcher = unpack( "crash-during-test" )
+ .forkPerThread()
+ .reuseForks( true )
+ .threadCount( 1 );
+
+ checkCrashTypes( launcher );
+ }
+
+ private static void checkCrashTypes( SurefireLauncher launcher )
+ throws VerificationException, InterruptedException
+ {
+ checkCrash( launcher.addGoal( "-DcrashType=exit" ) );
+ checkCrash( launcher.addGoal( "-DcrashType=abort" ) );
+ checkCrash( launcher.addGoal( "-DcrashType=segfault" ) );
+ }
+
+ private static void checkCrash( SurefireLauncher launcher ) throws VerificationException, InterruptedException
+ {
+ OutputValidator validator = launcher.maven()
+ .withFailure()
+ .executeTest()
+ .verifyTextInLog( "The forked VM terminated without properly saying "
+ + "goodbye. VM crash or System.exit called?"
+ )
+ .verifyTextInLog( "Crashed tests:" );
+
+ // Cannot flush log.txt stream because it is consumed internally by Verifier.
+ // Waiting for the stream to become flushed on disk.
+ TimeUnit.SECONDS.sleep( 1L );
+
+ for ( Iterator<String> it = validator.loadLogLines().iterator(); it.hasNext(); )
+ {
+ String line = it.next();
+ if ( line.contains( "Crashed tests:" ) )
+ {
+ line = it.next();
+ if ( it.hasNext() )
+ {
+ assertThat( line ).contains( "junit44.environment.BasicTest" );
+ }
+ else
+ {
+ fail( "Could not find any line after 'Crashed tests:'." );
+ }
+ }
+ }
+
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1364SystemPropertiesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1364SystemPropertiesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1364SystemPropertiesIT.java
new file mode 100644
index 0000000..d13b0f2
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1364SystemPropertiesIT.java
@@ -0,0 +1,203 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * Report XML should contain system properties of forked JVM.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.20.1
+ */
+public class Surefire1364SystemPropertiesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void junit3Forked()
+ {
+ SurefireLauncher launcher = unpack( "surefire-1364" );
+ OutputValidator validator = launcher.setForkJvm()
+ .activateProfile( "junit3" )
+ .forkMode( "once" )
+ .executeTest()
+ .verifyErrorFree( 2 );
+
+ validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+
+ validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+ }
+
+ @Test
+ public void junit3InProcess()
+ {
+ SurefireLauncher launcher = unpack( "surefire-1364" );
+ OutputValidator validator = launcher.setForkJvm()
+ .activateProfile( "junit3" )
+ .forkMode( "never" )
+ .executeTest()
+ .verifyErrorFree( 2 );
+
+ validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+
+ validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+ }
+
+ @Test
+ public void junit4Forked()
+ {
+ SurefireLauncher launcher = unpack( "surefire-1364" );
+ OutputValidator validator = launcher.setForkJvm()
+ .forkMode( "once" )
+ .executeTest()
+ .verifyErrorFree( 2 );
+
+ validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+
+ validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+ }
+
+ @Test
+ public void junit4InProcess()
+ {
+ SurefireLauncher launcher = unpack( "surefire-1364" );
+ OutputValidator validator = launcher.setForkJvm()
+ .forkMode( "never" )
+ .executeTest()
+ .verifyErrorFree( 2 );
+
+ validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+
+ validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+ }
+
+ @Test
+ public void junit47Forked()
+ {
+ SurefireLauncher launcher = unpack( "surefire-1364" );
+ OutputValidator validator = launcher.setForkJvm()
+ .activateProfile( "junit47" )
+ .forkMode( "once" )
+ .executeTest()
+ .verifyErrorFree( 2 );
+
+ validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+
+ validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+ }
+
+ @Test
+ public void junit47InProcess()
+ {
+ SurefireLauncher launcher = unpack( "surefire-1364" );
+ OutputValidator validator = launcher.setForkJvm()
+ .activateProfile( "junit47" )
+ .forkMode( "never" )
+ .executeTest()
+ .verifyErrorFree( 2 );
+
+ validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+
+ validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+ }
+
+ @Test
+ public void junit47ForkedParallel()
+ {
+ SurefireLauncher launcher = unpack( "surefire-1364" );
+ OutputValidator validator = launcher.setForkJvm()
+ .activateProfile( "junit47" )
+ .forkMode( "once" )
+ .parallelClasses()
+ .threadCount( 2 )
+ .disablePerCoreThreadCount()
+ .executeTest()
+ .verifyErrorFree( 2 );
+
+ validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+
+ validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+ }
+
+ @Test
+ public void junit47InProcessParallel()
+ {
+ SurefireLauncher launcher = unpack( "surefire-1364" );
+ OutputValidator validator = launcher.setForkJvm()
+ .activateProfile( "junit47" )
+ .forkMode( "never" )
+ .parallelClasses()
+ .threadCount( 2 )
+ .disablePerCoreThreadCount()
+ .executeTest()
+ .verifyErrorFree( 2 );
+
+ validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+
+ validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+ }
+
+ @Test
+ public void testNg()
+ {
+ SurefireLauncher launcher = unpack( "surefire-1364" );
+ OutputValidator validator = launcher.setForkJvm()
+ .activateProfile( "testng" )
+ .forkMode( "once" )
+ .executeTest()
+ .verifyErrorFree( 3 );
+
+ validator.getSurefireReportsXmlFile( "TEST-TestSuite.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+ }
+
+ @Test
+ public void testNgInProcess()
+ {
+ SurefireLauncher launcher = unpack( "surefire-1364" );
+ OutputValidator validator = launcher.setForkJvm()
+ .activateProfile( "testng" )
+ .forkMode( "never" )
+ .executeTest()
+ .verifyErrorFree( 3 );
+
+ validator.getSurefireReportsXmlFile( "TEST-TestSuite.xml" )
+ .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1367AssumptionLogsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1367AssumptionLogsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1367AssumptionLogsIT.java
new file mode 100644
index 0000000..48564fb
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1367AssumptionLogsIT.java
@@ -0,0 +1,157 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import static org.fest.assertions.Assertions.assertThat;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1367">SUREFIRE-1367</a>
+ * @since 2.20.1
+ */
+public class Surefire1367AssumptionLogsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private static final String NL = System.getProperty( "line.separator" );
+
+ @Test
+ public void shouldSeeLogsParallelForked()
+ {
+ OutputValidator outputValidator = unpack().setForkJvm()
+ .forkMode( "once" )
+ .parallelClassesAndMethods()
+ .disablePerCoreThreadCount()
+ .threadCountClasses( 2 )
+ .threadCountMethods( 2 )
+ .executeTest()
+ .assertTestSuiteResults( 2, 0, 0, 2 );
+
+ verifyReportA( outputValidator );
+ verifyReportB( outputValidator );
+ }
+
+ @Test
+ public void shouldSeeLogsParallelInPlugin()
+ {
+ OutputValidator outputValidator = unpack().setForkJvm()
+ .forkMode( "never" )
+ .parallelClassesAndMethods()
+ .disablePerCoreThreadCount()
+ .threadCountClasses( 2 )
+ .threadCountMethods( 2 )
+ .executeTest()
+ .assertTestSuiteResults( 2, 0, 0, 2 );
+
+ verifyReportA( outputValidator );
+ verifyReportB( outputValidator );
+ }
+
+ @Test
+ public void shouldSeeLogsForked()
+ {
+ OutputValidator outputValidator = unpack().setForkJvm()
+ .forkMode( "once" )
+ .executeTest()
+ .assertTestSuiteResults( 2, 0, 0, 2 );
+
+ verifyReportA( outputValidator );
+ verifyReportB( outputValidator );
+ }
+
+ @Test
+ public void shouldSeeLogsInPlugin()
+ {
+ OutputValidator outputValidator = unpack().setForkJvm()
+ .forkMode( "never" )
+ .executeTest()
+ .assertTestSuiteResults( 2, 0, 0, 2 );
+
+ verifyReportA( outputValidator );
+ verifyReportB( outputValidator );
+ }
+
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/surefire-1367" );
+ }
+
+ private void verifyReportA( OutputValidator outputValidator )
+ {
+ String xmlReport = outputValidator.getSurefireReportsXmlFile( "TEST-ATest.xml" )
+ .readFileToString();
+
+ String outputCData = "<system-out><![CDATA[Hi" + NL +
+ NL +
+ "There!" + NL +
+ "]]></system-out>" + NL +
+ " <system-err><![CDATA[Hello" + NL +
+ NL +
+ "What's up!" + NL +
+ "]]></system-err>";
+
+ assertThat( xmlReport )
+ .contains( outputCData );
+
+
+ String output = outputValidator.getSurefireReportsFile( "ATest-output.txt" )
+ .readFileToString();
+
+ String outputExpected = "Hi" + NL +
+ NL +
+ "There!" + NL +
+ "Hello" + NL +
+ NL +
+ "What's up!" + NL;
+
+ assertThat( output )
+ .isEqualTo( outputExpected );
+ }
+
+ private void verifyReportB( OutputValidator outputValidator )
+ {
+ String xmlReport = outputValidator.getSurefireReportsXmlFile( "TEST-BTest.xml" )
+ .readFileToString();
+
+ String outputCData = "<system-out><![CDATA[Hey" + NL +
+ NL +
+ "you!" + NL +
+ "]]></system-out>";
+
+ assertThat( xmlReport )
+ .contains( outputCData );
+
+
+ String output = outputValidator.getSurefireReportsFile( "BTest-output.txt" )
+ .readFileToString();
+
+ String outputExpected = "Hey" + NL +
+ NL +
+ "you!" + NL;
+
+ assertThat( output )
+ .isEqualTo( outputExpected );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1396CustomProviderClassPathIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1396CustomProviderClassPathIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1396CustomProviderClassPathIT.java
new file mode 100644
index 0000000..4a27688
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1396CustomProviderClassPathIT.java
@@ -0,0 +1,52 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author Jonathan Bell
+ */
+public class Surefire1396CustomProviderClassPathIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @BeforeClass
+ public static void installProvider()
+ throws VerificationException
+ {
+ unpack( Surefire1396CustomProviderClassPathIT.class, "surefire-1396-pluggableproviders-classpath-provider", "prov" ).executeInstall();
+ }
+
+ @Test
+ public void pluggableProviderClasspathCorrect()
+ throws Exception
+ {
+ unpack( "surefire-1396-pluggableproviders-classpath" )
+ .setForkJvm()
+ .maven()
+ .showExceptionMessages()
+ .debugLogging()
+ .executeVerify()
+ .verifyErrorFreeLog();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
new file mode 100644
index 0000000..b185217
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
@@ -0,0 +1,179 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireVerifierException;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import static org.fest.assertions.Assertions.assertThat;
+
+/**
+ * SUREFIRE-613 Asserts proper test counts when running in parallel
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire141PluggableProvidersIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @BeforeClass
+ public static void installProvider()
+ throws VerificationException
+ {
+ unpack( Surefire141PluggableProvidersIT.class, "surefire-141-pluggableproviders-provider", "prov" )
+ .executeInstall();
+ }
+
+ @Test
+ public void pluggableProviderPresent()
+ throws Exception
+ {
+ unpack( "surefire-141-pluggableproviders" )
+ .setForkJvm()
+ .maven()
+ .showExceptionMessages()
+ .debugLogging()
+ .executeTest()
+ .verifyTextInLog( "Using configured provider org.apache.maven.surefire.testprovider.TestProvider" )
+ .verifyTextInLog( "Using configured provider org.apache.maven.surefire.junit.JUnit3Provider" )
+ .verifyErrorFreeLog();
+ }
+
+ @Test
+ public void invokeRuntimeException()
+ throws Exception
+ {
+ final String errorText = "Let's fail with a runtimeException";
+
+ OutputValidator validator = unpack( "surefire-141-pluggableproviders" )
+ .setForkJvm()
+ .sysProp( "invokeCrash", "runtimeException" )
+ .maven()
+ .withFailure()
+ .executeTest();
+
+ assertErrorMessage( validator, errorText );
+
+ boolean hasErrorInLog = verifiedErrorInLog( validator, "There was an error in the forked process" );
+ boolean verifiedInLog = verifiedErrorInLog( validator, errorText );
+ assertThat( hasErrorInLog && verifiedInLog )
+ .describedAs( "'" + errorText + "' could not be verified in log.txt nor *.dump file. ("
+ + hasErrorInLog + ", " + verifiedInLog + ")" )
+ .isTrue();
+ }
+
+ @Test
+ public void invokeReporterException()
+ throws Exception
+ {
+ final String errorText = "Let's fail with a reporterexception";
+
+ OutputValidator validator = unpack( "surefire-141-pluggableproviders" )
+ .setForkJvm()
+ .sysProp( "invokeCrash", "reporterException" )
+ .maven()
+ .withFailure()
+ .executeTest();
+
+ assertErrorMessage( validator, errorText );
+
+ boolean hasErrorInLog = verifiedErrorInLog( validator, "There was an error in the forked process" );
+ boolean verifiedInLog = verifiedErrorInLog( validator, errorText );
+ assertThat( hasErrorInLog && verifiedInLog )
+ .describedAs( "'" + errorText + "' could not be verified in log.txt nor *.dump file. ("
+ + hasErrorInLog + ", " + verifiedInLog + ")" )
+ .isTrue();
+ }
+
+ @Test
+ public void constructorRuntimeException()
+ throws Exception
+ {
+ final String errorText = "Let's fail with a runtimeException";
+
+ OutputValidator validator = unpack( "surefire-141-pluggableproviders" )
+ .setForkJvm()
+ .sysProp( "constructorCrash", "runtimeException" )
+ .maven()
+ .withFailure()
+ .executeTest();
+
+ assertErrorMessage( validator, errorText );
+
+ boolean hasErrorInLog = verifiedErrorInLog( validator, "There was an error in the forked process" );
+ boolean verifiedInLog = verifiedErrorInLog( validator, errorText );
+ assertThat( hasErrorInLog && verifiedInLog )
+ .describedAs( "'" + errorText + "' could not be verified in log.txt nor *.dump file. ("
+ + hasErrorInLog + ", " + verifiedInLog + ")" )
+ .isTrue();
+ }
+
+ private static void assertErrorMessage( OutputValidator validator, String message )
+ {
+ File reportDir = validator.getSurefireReportsDirectory();
+ String[] dumpFiles = reportDir.list( new FilenameFilter()
+ {
+ @Override
+ public boolean accept( File dir, String name )
+ {
+ return name.endsWith( ".dump" );
+ }
+ });
+ assertThat( dumpFiles ).isNotEmpty();
+ for ( String dump : dumpFiles )
+ {
+ validator.getSurefireReportsFile( dump )
+ .assertContainsText( message );
+ }
+ }
+
+ private static boolean verifiedErrorInLog( OutputValidator validator, String errorText )
+ {
+ try
+ {
+ validator.verifyTextInLog( errorText );
+ return true;
+ }
+ catch ( SurefireVerifierException e )
+ {
+ return false;
+ }
+ }
+
+ private static boolean verifiedErrorInDump( OutputValidator validator, String errorText )
+ {
+ try
+ {
+ assertErrorMessage( validator, errorText );
+ return true;
+ }
+ catch ( AssertionError e )
+ {
+ return false;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java
new file mode 100644
index 0000000..7e50f25
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java
@@ -0,0 +1,38 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * Test Surefire-146 (forkMode=pertest fails to call setUp)
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class Surefire146ForkPerTestNoSetupIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testForkPerTestNoSetup()
+ {
+ executeErrorFreeTest( "surefire-146-forkPerTestNoSetup", 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java
new file mode 100644
index 0000000..e13483a
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java
@@ -0,0 +1,51 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.io.File;
+
+import org.apache.maven.surefire.its.fixture.*;
+import org.codehaus.plexus.util.FileUtils;
+import org.junit.Test;
+
+/**
+ * Test charset provider (SUREFIRE-162)
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class Surefire162CharsetProviderIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @SuppressWarnings( { "ResultOfMethodCallIgnored" } )
+ @Test
+ public void testCharsetProvider()
+ throws Exception
+ {
+ SurefireLauncher unpack = unpack( "/surefire-162-charsetProvider" );
+ MavenLauncher maven = unpack.maven();
+ OutputValidator verifier = maven.getValidator();
+ File jarFile = maven.getArtifactPath( "jcharset", "jcharset", "1.2.1", "jar" );
+ File pomFile = maven.getArtifactPath( "jcharset", "jcharset", "1.2.1", "pom" );
+ jarFile.getParentFile().mkdirs();
+ FileUtils.copyFile( verifier.getSubFile( "repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar" ), jarFile );
+ FileUtils.copyFile( verifier.getSubFile( "repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom" ), pomFile );
+ unpack.executeTest().verifyErrorFree( 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java
new file mode 100644
index 0000000..1bdb3cb
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java
@@ -0,0 +1,78 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.plugins.surefire.report.ReportTestCase;
+import org.apache.maven.plugins.surefire.report.ReportTestSuite;
+import org.apache.maven.surefire.its.fixture.HelperAssertions;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Test Surefire-224 (XML test reports are not well-formed when failure message contains quotes)
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class Surefire224WellFormedXmlFailuresIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @SuppressWarnings("ConstantConditions")
+ @Test
+ public void testWellFormedXmlFailures()
+ {
+ OutputValidator outputValidator = unpack( "/surefire-224-wellFormedXmlFailures" ).executeTest();
+
+ outputValidator.assertTestSuiteResults( 4, 0, 4, 0 );
+
+ ReportTestSuite suite = HelperAssertions.extractReports( outputValidator.getBaseDir() ).get( 0 );
+ List<org.apache.maven.plugins.surefire.report.ReportTestCase> testCases = suite.getTestCases();
+ assertEquals( "Wrong number of test case objects", 4, testCases.size() );
+ ReportTestCase testQuote = null, testLower = null, testGreater = null, testU0000 = null;
+ for ( ReportTestCase current : testCases )
+ {
+ if ( "testQuote".equals( current.getName() ) )
+ {
+ testQuote = current;
+ }
+ else if ( "testLower".equals( current.getName() ) )
+ {
+ testLower = current;
+ }
+ else if ( "testGreater".equals( current.getName() ) )
+ {
+ testGreater = current;
+ }
+ else if ( "testU0000".equals( current.getName() ) )
+ {
+ testU0000 = current;
+ }
+ }
+ assertEquals( "Wrong error message", "\"", testQuote.getFailureMessage() );
+ assertEquals( "Wrong error message", "<", testLower.getFailureMessage() );
+ assertEquals( "Wrong error message", ">", testGreater.getFailureMessage() );
+ // SUREFIRE-456 we have to doubly-escape non-visible control characters like \u0000
+ assertEquals( "Wrong error message", "�", testU0000.getFailureMessage() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java
new file mode 100644
index 0000000..2796b92
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java
@@ -0,0 +1,41 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * Test Surefire-257 Verifies that surefire does not re-run tests in site build
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire257NotRerunningTestsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void shouldNotRerun()
+ throws Exception
+ {
+ unpack(
+ "/surefire-257-rerunningTests" ).addSurefireReportGoal().addSurefireReportGoal().executeCurrentGoals().verifyTextInLog(
+ "Skipping execution of surefire because it has already been run for this configuration" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
new file mode 100644
index 0000000..aab3380
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
@@ -0,0 +1,72 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.io.IOException;
+import java.net.URI;
+
+import org.apache.maven.surefire.its.fixture.*;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
+import com.gargoylesoftware.htmlunit.html.HtmlDivision;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test Surefire-570 Multiple report directories
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire260TestWithIdenticalNamesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void testWithIdenticalNames()
+ throws IOException
+ {
+ SurefireLauncher surefireLauncher = unpack( "surefire-260-testWithIdenticalNames" ).failNever();
+ surefireLauncher.executeTest();
+ surefireLauncher.reset();
+ OutputValidator validator = surefireLauncher.addSurefireReportGoal().executeCurrentGoals();
+
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ final URI uri = siteFile.toURI();
+
+ final WebClient webClient = new WebClient();
+ webClient.setJavaScriptEnabled( true );
+ final HtmlPage page = webClient.getPage( uri.toURL() );
+
+ final HtmlAnchor a =
+ (HtmlAnchor) page.getByXPath( "//a[@href = \"javascript:toggleDisplay('surefire260.TestB.testDup');\"]" )
+ .get( 0 );
+ final HtmlDivision content = (HtmlDivision) page.getElementById( "surefire260.TestB.testDup-failure" );
+ assertNotNull( content );
+ assertTrue( content.getAttribute( "style" ).contains( "none" ) );
+ a.click();
+ assertFalse( content.getAttribute( "style" ).contains( "none" ) );
+ webClient.closeAllWindows();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
new file mode 100644
index 0000000..bb80aec
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
@@ -0,0 +1,48 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire34SecurityManagerIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testSecurityManager()
+ {
+ SurefireLauncher surefireLauncher = unpack( "surefire-34-securityManager" ).failNever();
+ surefireLauncher.executeTest().assertTestSuiteResults( 2, 1, 0, 0 );
+ }
+
+ @Test
+ public void testSecurityManagerSuccessful()
+ {
+ SurefireLauncher surefireLauncher = unpack( "surefire-34-securityManager-success" );
+ surefireLauncher.executeTest().assertTestSuiteResults( 2, 0, 0, 0 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java
new file mode 100644
index 0000000..ebc0e1e
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java
@@ -0,0 +1,44 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * Test Surefire-376 (TestNG @AfterSuite failures are ignored)
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class Surefire376TestNgAfterSuiteFailureIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testAfterSuiteFailure()
+ {
+ unpack( "/testng-afterSuiteFailure" )
+ .maven()
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .withFailure()
+ .executeTest()
+ .assertTestSuiteResults( 2, 0, 1, 0 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java
new file mode 100644
index 0000000..a29d030
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java
@@ -0,0 +1,52 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-377 (When JUnit and TestNG tests are in same project, only one set gets run).
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class Surefire377TestNgAndJUnitTogetherIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testTestNgAndJUnitTogether()
+ {
+ unpack( "/testng-junit-together" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .executeTest()
+ .verifyErrorFree( 2 );
+ }
+
+ @Test
+ public void testTestNgAndJUnit4Together()
+ {
+ unpack( "/testng-junit4-together" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .executeTest()
+ .verifyErrorFree( 3 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java
new file mode 100644
index 0000000..3287ab4
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java
@@ -0,0 +1,42 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-613 Asserts proper test counts when running in parallel
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire408ManualProviderSelectionIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testParallelBuildResultCount()
+ {
+ unpack( "/surefire-408-manual-provider-selection" )
+ .showErrorStackTraces()
+ .debugLogging()
+ .executeTest()
+ .verifyTextInLog( "Using configured provider org.apache.maven.surefire.junit.JUnit3Provider" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java
new file mode 100644
index 0000000..00c2aee
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java
@@ -0,0 +1,38 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * Test JUnit test that contains inner classes
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class Surefire42NotExtendingTestCaseIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testInnerClass()
+ {
+ executeErrorFreeTest( "junit-notExtendingTestCase", 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java
new file mode 100644
index 0000000..928019a
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java
@@ -0,0 +1,38 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * Test JUnit test that contains inner classes
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class Surefire44InnerClassTestIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testInnerClass()
+ {
+ executeErrorFreeTest( "/junit-innerClass", 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java
new file mode 100644
index 0000000..9356f68
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java
@@ -0,0 +1,42 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.Test;
+
+/**
+ * SUREFIRE-500 Asserts correct error handling for the "odd" surefire-500 (and 625) issues.
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire500PuzzlingErrorIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testBuildFailingWhenErrors()
+ {
+ OutputValidator outputValidator = unpack( "/surefire-500-puzzling-error" ).failNever().executeTest();
+ TestFile surefireReportsFile = outputValidator.getSurefireReportsFile( "surefire500.ExplodingTest.txt" );
+ surefireReportsFile.assertContainsText( "java.lang.NoClassDefFoundError: whoops!" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java
new file mode 100644
index 0000000..4e4fd13
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java
@@ -0,0 +1,53 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire510TestClassPathForkModesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void testForkAlways()
+ {
+ unpack().forkAlways().executeTest().
+ verifyTextInLog( "tcp is set" );
+ }
+
+ @Test
+ public void testForkOnce()
+ {
+ unpack().forkOnce().executeTest().
+ verifyTextInLog( "tcp is set" );
+ }
+
+ public SurefireLauncher unpack()
+ {
+ return unpack( "/surefire-510-testClassPath" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java
new file mode 100644
index 0000000..3e53cca
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java
@@ -0,0 +1,44 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * SUREFIRE-569 Add support for scanning Dependencies for TestClasses
+ *
+ * @author Aslak Knutsen
+ */
+public class Surefire569RunTestFromDependencyJarsIT
+ extends SurefireJUnit4IntegrationTestCase {
+
+ @Test
+ public void shouldScanAndRunTestsInDependencyJars() throws Exception {
+ SurefireLauncher launcher = unpack( "surefire-569-RunTestFromDependencyJars" );
+ launcher.addGoal("test").addGoal("install");
+ launcher.executeCurrentGoals();
+
+ OutputValidator module1 = launcher.getSubProjectValidator("module1");
+ module1.assertTestSuiteResults(1, 0, 0, 0);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
new file mode 100644
index 0000000..a9b437e
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
@@ -0,0 +1,68 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.*;
+import org.junit.Test;
+
+/**
+ * Test Surefire-570 Multiple report directories
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire570MultipleReportDirectoriesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void testReportWithAggregate()
+ throws Exception
+ {
+
+ SurefireLauncher surefireLauncher = unpack().failNever();
+ surefireLauncher.executeTest();
+ surefireLauncher.addGoal( "-Daggregate=true" );
+ OutputValidator validator = surefireLauncher.executeSurefireReport( );
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ siteFile.assertContainsText( "MyModule1ClassTest" );
+ siteFile.assertContainsText( "MyModule2ClassTest" );
+ siteFile.assertContainsText( "MyDummyClassM1Test" );
+ }
+
+ @Test
+ public void testReportWithoutAggregate()
+ throws Exception
+ {
+ SurefireLauncher surefireLauncher = unpack().failNever();
+ surefireLauncher.executeTest();
+ surefireLauncher.reset();
+ surefireLauncher.executeSurefireReport( );
+ OutputValidator module1 = surefireLauncher.getSubProjectValidator( "module1" );
+ TestFile siteFile = module1.getSiteFile( "surefire-report.html" );
+ siteFile.assertContainsText( "MyModule1ClassTest" );
+ siteFile.assertContainsText( "MyDummyClassM1Test" );
+ }
+
+ public SurefireLauncher unpack()
+ {
+ return unpack( "/surefire-570-multipleReportDirectories" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java
new file mode 100644
index 0000000..7b74409
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java
@@ -0,0 +1,45 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-613 Asserts proper test counts when running in parallel
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire613TestCountInParallelIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testParallelBuildResultCount()
+ {
+ OutputValidator validator = unpack( "/surefire-613-testCount-in-parallel" ).failNever().executeTest();
+
+ validator.verifyTextInLog( "testAllok to stdout" );
+ validator.verifyTextInLog( "testAllok to stderr" );
+ validator.verifyTextInLog( "testWithException1 to stdout" );
+ validator.verifyTextInLog( "testWithException1 to stderr" );
+ validator.assertTestSuiteResults( 30, 8, 4, 17 );
+ }
+}
[41/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml b/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml
deleted file mode 100644
index 5dec5d8..0000000
--- a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml
+++ /dev/null
@@ -1,71 +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/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>consoleOutputEncodingsTest</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>consoleOutputTest</name>
- <url>http://maven.apache.org</url>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <printSummary>${printSummary}</printSummary>
- <reportFormat>${reportFormat}</reportFormat>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
- <properties>
- <junit.version>4.8.1</junit.version>
- <forkMode>once</forkMode>
- <printSummary>true</printSummary>
- <reportFormat>brief</reportFormat>
- </properties>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java b/surefire-integration-tests/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java
deleted file mode 100644
index dfcfb97..0000000
--- a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package consoleOutput;
-
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.nio.charset.Charset;
-
-public class Test1
-{
- @Test
- public void testSystemOut()
- throws IOException
- {
- PrintStream out = System.out;
- out.print( getS( "print" ));
- out.write( getS( "utf-8" ).getBytes( Charset.forName( "UTF-8" ) ) );
- out.write( getS( "8859-1" ).getBytes( Charset.forName( "ISO-8859-1" ) ) );
- out.write( getS( "utf-16" ).getBytes( Charset.forName( "UTF-16" ) ) );
- }
-
- private String getS( String s )
- {
- return " Hell\u00d8 " + s + "\n";
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
deleted file mode 100644
index e80b978..0000000
--- a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-consoleOutput-noisy</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>consoleOutput-noisy</name>
- <url>http://maven.apache.org</url>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <printSummary>${printSummary}</printSummary>
- <useFile>${useFile}</useFile>
- <parallel>${parallel}</parallel>
- <threadCount>${threadCount}</threadCount>
- <reportFormat>${reportFormat}</reportFormat>
- <redirectTestOutputToFile>${redirect.to.file}</redirectTestOutputToFile>
- <trimStackTrace>${trimStackTrace}</trimStackTrace>
- <!-- argLine>-agentpath:/opt/yjp-9.5.4/bin/linux-x86-64/libyjpagent.so=tracing,monitors,onexit=snapshot</argLine -->
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
- <properties>
- <useFile>true</useFile>
- <junit.version>4.8.1</junit.version>
- <redirect.to.file>true</redirect.to.file>
- <forkMode>once</forkMode>
- <printSummary>true</printSummary>
- <parallel></parallel>
- <reportFormat>brief</reportFormat>
- <trimStackTrace>true</trimStackTrace>
- <threadCount>4</threadCount>
- </properties>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
deleted file mode 100644
index 888cd22..0000000
--- a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package consoleoutput_noisy;
-
-/*
- * 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.Test;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-
-public class Test1
-{
-
- public static final int thousand = Integer.parseInt( System.getProperty( "thousand", "1000" ) );
-
- @Test
- public void test1MillionBytes()
- {
- for ( int i = 0; i < ( 10 * thousand ); i++ )
- {
- System.out.println( "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" );
- }
- }
-
- @Test
- public void testHundredThousand()
- {
- printAlot();
- }
-
- private static void printAlot()
- {
- for ( int i = 0; i < thousand; i++ )
- {
- System.out.println( "AAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJ" );
- }
- }
-
- @Test
- public void testAnotherHundredThousand()
- {
- printAlot();
- }
-
- @Before
- public void before()
- {
- printAlot();
- }
-
- @BeforeClass
- public static void beforeClass()
- {
- printAlot();
- }
-
- @After
- public void after()
- {
- printAlot();
- }
-
- @AfterClass
- public static void afterClass()
- {
- printAlot();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java
deleted file mode 100644
index 10f607f..0000000
--- a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package consoleoutput_noisy;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class Test2
- extends TestCase
-{
- public void test2MillionBytes()
- {
- for ( int i = 0; i < 20 * Test1.thousand; i++ )
- {
- System.out.println(
- "0-2-3-6-8-012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" );
- }
- }
-
- public static void testHundredThousand()
- {
- for ( int i = 0; i < Test1.thousand; i++ )
- {
- System.out.println(
- "A-A-3-A-A-BBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJ" );
- }
- }
-
- public static void testAnotherHundredThousand()
- {
- for ( int i = 0; i < Test1.thousand; i++ )
- {
- System.out.println(
- "A-A-A-3-3-ABBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJ" );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/crash-detection/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/crash-detection/pom.xml b/surefire-integration-tests/src/test/resources/crash-detection/pom.xml
deleted file mode 100644
index 81e9c6a..0000000
--- a/surefire-integration-tests/src/test/resources/crash-detection/pom.xml
+++ /dev/null
@@ -1,58 +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/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>crash-detection</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Tests vm crash</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/crash-detection/src/test/java/junit44/environment/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/crash-detection/src/test/java/junit44/environment/BasicTest.java b/surefire-integration-tests/src/test/resources/crash-detection/src/test/java/junit44/environment/BasicTest.java
deleted file mode 100644
index 2c97a7f..0000000
--- a/surefire-integration-tests/src/test/resources/crash-detection/src/test/java/junit44/environment/BasicTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package junit44.environment;
-
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
-
- @Test
- public void testNothing()
- {
- }
-
- @AfterClass
- public static void killTheVm(){
- if ( Boolean.getBoolean( "killHard" ))
- {
- Runtime.getRuntime().halt( 0 );
- }
- else {
- System.exit( 0 );
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/crash-during-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/crash-during-test/pom.xml b/surefire-integration-tests/src/test/resources/crash-during-test/pom.xml
deleted file mode 100644
index 0d9e3e7..0000000
--- a/surefire-integration-tests/src/test/resources/crash-during-test/pom.xml
+++ /dev/null
@@ -1,65 +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/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>crash-during-test</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Tests vm crash while a test is in progress</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>uk.me.mjt</groupId>
- <artifactId>crashjvm</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- <type>jar</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/crash-during-test/src/test/java/junit44/environment/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/crash-during-test/src/test/java/junit44/environment/BasicTest.java b/surefire-integration-tests/src/test/resources/crash-during-test/src/test/java/junit44/environment/BasicTest.java
deleted file mode 100644
index 57d57bb..0000000
--- a/surefire-integration-tests/src/test/resources/crash-during-test/src/test/java/junit44/environment/BasicTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package junit44.environment;
-
-/*
- * 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 static org.junit.Assert.*;
-import org.junit.Test;
-import uk.me.mjt.CrashJvm;
-
-public class BasicTest
-{
- @Test
- public void testCrashJvm()
- {
- assertTrue(CrashJvm.loadedOk());
-
- String crashType = System.getProperty("crashType");
- assertNotNull(crashType);
- if ( crashType.equals( "exit" ) )
- {
- CrashJvm.exit();
- }
- else if ( crashType.equals( "abort" ) )
- {
- CrashJvm.abort();
- }
- else if (crashType.equals( "segfault" ))
- {
- CrashJvm.segfault();
- }
- else
- {
- fail("Don't recognise crashType " + crashType);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/crash-during-test/src/test/java/junit44/environment/SomeOtherTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/crash-during-test/src/test/java/junit44/environment/SomeOtherTest.java b/surefire-integration-tests/src/test/resources/crash-during-test/src/test/java/junit44/environment/SomeOtherTest.java
deleted file mode 100644
index e10f6aa..0000000
--- a/surefire-integration-tests/src/test/resources/crash-during-test/src/test/java/junit44/environment/SomeOtherTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-
-package junit44.environment;
-
-/*
- * 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.Test;
-
-public class SomeOtherTest {
- @Test
- public void nonCrashingTest() {}
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml b/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml
deleted file mode 100644
index 1bd1f91..0000000
--- a/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml
+++ /dev/null
@@ -1,47 +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/xsd/maven-4.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>default-configuration-abstract</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for default configuration with abstract classes</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java b/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java
deleted file mode 100644
index d7a7fa5..0000000
--- a/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package abstractClasses;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AbstractConcreteBasicTest // not really abstract!
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public AbstractConcreteBasicTest( String name, String extraName )
- {
- super( name );
- }
-
- public static Test suite()
- {
- System.out.println( "suite" );
- TestSuite suite = new TestSuite();
- Test test = new AbstractConcreteBasicTest( "testSetUp", "dummy" );
- suite.addTest( test );
-
- return new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/NonInstantiableTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/NonInstantiableTest.java b/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/NonInstantiableTest.java
deleted file mode 100644
index f08f888..0000000
--- a/surefire-integration-tests/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/NonInstantiableTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package abstractClasses;
-
-/*
- * 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 junit.framework.TestCase;
-
-public abstract class NonInstantiableTest
- extends TestCase
-{
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml b/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml
deleted file mode 100644
index dafe6e5..0000000
--- a/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml
+++ /dev/null
@@ -1,47 +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/xsd/maven-4.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>default-configuration-classWithNoTests</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for class with no tests</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/src/test/java/classWithNoTests/NoMethodsTestCase.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/src/test/java/classWithNoTests/NoMethodsTestCase.java b/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/src/test/java/classWithNoTests/NoMethodsTestCase.java
deleted file mode 100644
index 217a04f..0000000
--- a/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/src/test/java/classWithNoTests/NoMethodsTestCase.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package classWithNoTests;
-
-/*
- * 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.
- */
-
-public class NoMethodsTestCase {}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml b/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml
deleted file mode 100644
index fc77535..0000000
--- a/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml
+++ /dev/null
@@ -1,72 +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/xsd/maven-4.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>default-configuration-noTests</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for no test directory</name>
-
- <properties>
- <junit.version>3.8.1</junit.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>junit47</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
-
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/default-configuration/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration/pom.xml b/surefire-integration-tests/src/test/resources/default-configuration/pom.xml
deleted file mode 100644
index 1d9587a..0000000
--- a/surefire-integration-tests/src/test/resources/default-configuration/pom.xml
+++ /dev/null
@@ -1,47 +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/xsd/maven-4.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>default-configuration</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for default configuration</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java b/surefire-integration-tests/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java
deleted file mode 100644
index 00d4ea2..0000000
--- a/surefire-integration-tests/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package defaultConfiguration;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public BasicTest( String name, String extraName )
- {
- super( name );
- }
-
- public static Test suite()
- {
- System.out.println( "suite" );
- TestSuite suite = new TestSuite();
- Test test = new BasicTest( "testSetUp", "dummy" );
- suite.addTest( test );
-
- return new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/environment-variables/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/environment-variables/pom.xml b/surefire-integration-tests/src/test/resources/environment-variables/pom.xml
deleted file mode 100644
index 902e97e..0000000
--- a/surefire-integration-tests/src/test/resources/environment-variables/pom.xml
+++ /dev/null
@@ -1,64 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>environment-variables</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for checking environment variables into forks</name>
-
- <properties>
- <forkMode>always</forkMode>
- <useSystemClassLoader>false</useSystemClassLoader>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <useSystemClassLoader>${useSystemClassLoader}</useSystemClassLoader>
- <environmentVariables>
- <DUMMY_ENV_VAR>foo</DUMMY_ENV_VAR>
- <EMPTY_VAR></EMPTY_VAR>
- <UNSET_VAR />
- </environmentVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/environment-variables/src/test/java/environment/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/environment-variables/src/test/java/environment/BasicTest.java b/surefire-integration-tests/src/test/resources/environment-variables/src/test/java/environment/BasicTest.java
deleted file mode 100644
index e1a0f79..0000000
--- a/surefire-integration-tests/src/test/resources/environment-variables/src/test/java/environment/BasicTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package environment;
-
-/*
- * 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.hamcrest.core.IsNull;
-import org.junit.Assert;
-import org.junit.Test;
-
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.hamcrest.core.IsNull.nullValue;
-
-
-public class BasicTest
-{
-
-
- @Test
- public void testEnvVar()
- {
- Assert.assertThat( System.getenv( "PATH" ), notNullValue() );
- Assert.assertThat( System.getenv( "DUMMY_ENV_VAR" ), is( "foo" ) );
- Assert.assertThat( System.getenv( "EMPTY_VAR" ), is( "" ) );
- Assert.assertThat( System.getenv( "UNSET_VAR" ), is( "" ) );
- Assert.assertThat( System.getenv( "UNDEFINED_VAR" ), nullValue() );
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml b/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml
deleted file mode 100644
index b82448e..0000000
--- a/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml
+++ /dev/null
@@ -1,104 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-580-junit</artifactId>
- <version>1.0</version>
-
- <properties>
- <junit>4.0</junit>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <runOrder>alphabetical</runOrder>
- <forkMode>once</forkMode><!--override to default value in order to enable forkCount-->
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>junit4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>junit47</id>
- <properties>
- <junit>4.7</junit>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java
deleted file mode 100644
index 4d09bab..0000000
--- a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package pkg;
-
-import org.junit.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public class ATest
-{
-
- @Test
- public void someMethod()
- throws Exception
- {
- // checking processros # due to very slow Windows Jenkins machines
- TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3600 : 1500 );
- throw new RuntimeException( "assert \"foo\" == \"bar\"\n" +
- " |\n"
- + " false" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java
deleted file mode 100644
index 1dc76b7..0000000
--- a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package pkg;
-
-import org.junit.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public class BTest
-{
- @Test
- public void test()
- throws InterruptedException
- {
- // checking processros # due to very slow Windows Jenkins machines
- TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
- throw new RuntimeException();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java
deleted file mode 100644
index 2660779..0000000
--- a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package pkg;
-
-import org.junit.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public class CTest
-{
- @Test
- public void test()
- throws InterruptedException
- {
- // checking processros # due to very slow Windows Jenkins machines
- TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java
deleted file mode 100644
index 12a9bc7..0000000
--- a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package pkg;
-
-import org.junit.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public class DTest
-{
- @Test
- public void test()
- throws InterruptedException
- {
- // checking processros # due to very slow Windows Jenkins machines
- TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ETest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ETest.java b/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ETest.java
deleted file mode 100644
index 61c7516..0000000
--- a/surefire-integration-tests/src/test/resources/fail-fast-junit/src/test/java/pkg/ETest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package pkg;
-
-import org.junit.Test;
-
-public class ETest
-{
- @Test
- public void test()
- {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml b/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml
deleted file mode 100644
index d52ad12..0000000
--- a/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml
+++ /dev/null
@@ -1,59 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-580-testng</artifactId>
- <version>1.0</version>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.10</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <runOrder>alphabetical</runOrder>
- <forkMode>once</forkMode><!--override to default value in order to enable forkCount-->
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java
deleted file mode 100644
index 46b9d09..0000000
--- a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package pkg;
-
-import org.testng.annotations.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public class ATest
-{
- @Test
- public void someMethod()
- throws InterruptedException
- {
- // checking processros # due to very slow Windows Jenkins machines
- TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3600 : 1500 );
- throw new RuntimeException( "assert \"foo\" == \"bar\"\n"
- + " |\n"
- + " false" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java
deleted file mode 100644
index 90e2fdb..0000000
--- a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package pkg;
-
-import org.testng.annotations.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public class BTest
-{
- @Test
- public void test()
- throws InterruptedException
- {
- // checking processros # due to very slow Windows Jenkins machines
- TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
- throw new RuntimeException();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java
deleted file mode 100644
index d407aa3..0000000
--- a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package pkg;
-
-import org.testng.annotations.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public class CTest
-{
- @Test
- public void test()
- throws InterruptedException
- {
- // checking processros # due to very slow Windows Jenkins machines
- TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java
deleted file mode 100644
index a00260f..0000000
--- a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package pkg;
-
-import org.testng.annotations.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public class DTest
-{
- @Test
- public void test()
- throws InterruptedException
- {
- // checking processros # due to very slow Windows Jenkins machines
- TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ETest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ETest.java b/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ETest.java
deleted file mode 100644
index ff71562..0000000
--- a/surefire-integration-tests/src/test/resources/fail-fast-testng/src/test/java/pkg/ETest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package pkg;
-
-import org.testng.annotations.Test;
-
-public class ETest
-{
- @Test
- public void test()
- {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml b/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml
deleted file mode 100644
index 8e988ad..0000000
--- a/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>failingBuilds-test</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>failingBuilds</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- <include>**/MySuiteTest1.java</include>
- <include>**/MySuiteTest2.java</include>
- <include>**/MySuiteTest3.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <junit.version>4.8.1</junit.version>
- <forkMode>once</forkMode>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java b/surefire-integration-tests/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java
deleted file mode 100644
index fe47279..0000000
--- a/surefire-integration-tests/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package failingbuilds;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assume.*;
-
-import junit.framework.TestCase;
-
-public class ExceptionsTest
- extends TestCase
-{
- public void testWithMultiLineExceptionBeingThrown()
- {
- throw new RuntimeException( "A very very long exception message indeed, which is to demonstrate truncation. It will be truncated somewhere\nA cat\nAnd a dog\nTried to make a\nParrot swim" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-buildfail/invoker.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-buildfail/invoker.properties b/surefire-integration-tests/src/test/resources/failsafe-buildfail/invoker.properties
deleted file mode 100644
index ab6608f..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-buildfail/invoker.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
-invoker.buildResult=failure
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-buildfail/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-buildfail/pom.xml b/surefire-integration-tests/src/test/resources/failsafe-buildfail/pom.xml
deleted file mode 100644
index c28972f..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-buildfail/pom.xml
+++ /dev/null
@@ -1,83 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>localhost</groupId>
- <artifactId>working-directory-test</artifactId>
- <version>1.0</version>
- <name>Run tests multiple times</name>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.version}</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
- </configuration>
- </execution>
- <execution>
- <id>acceptance-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/AT*.java</include>
- <include>**/*AT.java</include>
- <include>**/*ATCase.java</include>
- </includes>
- <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
- </configuration>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- <configuration>
- <summaryFiles>
- <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
- <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
- </summaryFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-buildfail/src/test/java/MyAT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-buildfail/src/test/java/MyAT.java b/surefire-integration-tests/src/test/resources/failsafe-buildfail/src/test/java/MyAT.java
deleted file mode 100644
index 40a8a34..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-buildfail/src/test/java/MyAT.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-
-public class MyAT extends TestCase {
- public void testSomething() {
- assertTrue(false);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-buildfail/src/test/java/MyIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-buildfail/src/test/java/MyIT.java b/surefire-integration-tests/src/test/resources/failsafe-buildfail/src/test/java/MyIT.java
deleted file mode 100644
index c74feb1..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-buildfail/src/test/java/MyIT.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-
-public class MyIT extends TestCase {
- public void testSomething() {
- assertTrue(true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-nofail/invoker.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-nofail/invoker.properties b/surefire-integration-tests/src/test/resources/failsafe-nofail/invoker.properties
deleted file mode 100644
index ab6608f..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-nofail/invoker.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
-invoker.buildResult=failure
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-nofail/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-nofail/pom.xml b/surefire-integration-tests/src/test/resources/failsafe-nofail/pom.xml
deleted file mode 100644
index c28972f..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-nofail/pom.xml
+++ /dev/null
@@ -1,83 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>localhost</groupId>
- <artifactId>working-directory-test</artifactId>
- <version>1.0</version>
- <name>Run tests multiple times</name>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.version}</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
- </configuration>
- </execution>
- <execution>
- <id>acceptance-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/AT*.java</include>
- <include>**/*AT.java</include>
- <include>**/*ATCase.java</include>
- </includes>
- <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
- </configuration>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- <configuration>
- <summaryFiles>
- <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
- <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
- </summaryFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-nofail/src/test/java/MyAT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-nofail/src/test/java/MyAT.java b/surefire-integration-tests/src/test/resources/failsafe-nofail/src/test/java/MyAT.java
deleted file mode 100644
index b447e94..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-nofail/src/test/java/MyAT.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-
-public class MyAT extends TestCase {
- public void testSomething() {
- assertTrue(true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-nofail/src/test/java/MyIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-nofail/src/test/java/MyIT.java b/surefire-integration-tests/src/test/resources/failsafe-nofail/src/test/java/MyIT.java
deleted file mode 100644
index c74feb1..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-nofail/src/test/java/MyIT.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-
-public class MyIT extends TestCase {
- public void testSomething() {
- assertTrue(true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml b/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml
deleted file mode 100644
index 24d1dec..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-notests/pom.xml
+++ /dev/null
@@ -1,61 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>localhost</groupId>
- <artifactId>failsafe-notests</artifactId>
- <version>1.0</version>
- <name>failsafe-notests</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
[32/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/RunningTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/RunningTest.java b/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/RunningTest.java
deleted file mode 100644
index 2469bd3..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/RunningTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-public class RunningTest {
- @Test
- public void test()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/UnlistedTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/UnlistedTest.java b/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/UnlistedTest.java
deleted file mode 100644
index 8348673..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1185/src/test/java/pkg/UnlistedTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-public class UnlistedTest {
- @Test
- public void test()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
deleted file mode 100644
index 4fb9d72..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/pom.xml
+++ /dev/null
@@ -1,118 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-1202</artifactId>
- <version>1.0</version>
-
- <url>http://maven.apache.org</url>
-
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>PMC</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>once</forkMode>
- <forkCount>1</forkCount>
- <skipAfterFailureCount>2</skipAfterFailureCount>
- <rerunFailingTestsCount>3</rerunFailingTestsCount>
- <runOrder>alphabetical</runOrder>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>junit47</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>junit4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java b/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java
deleted file mode 100644
index cbe3f6f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ATest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-public class ATest
-{
- private static int count;
-
- @Test
- public void testA()
- throws Exception
- {
- MILLISECONDS.sleep( 500 );
- if ( count++ != 2 )
- {
- throw new RuntimeException( "assert \"foo\" == \"bar\"\n"
- + " |\n"
- + " false"
- );
- }
- SECONDS.sleep( 5 );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/BTest.java b/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/BTest.java
deleted file mode 100644
index f44d396..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/BTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-public class BTest
-{
-
- private static int count;
-
- @Test
- public void testB()
- throws InterruptedException
- {
- SECONDS.sleep( 2 );
- if ( count++ != 2 )
- {
- throw new RuntimeException();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/CTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/CTest.java b/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/CTest.java
deleted file mode 100644
index e51a29d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/CTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-public class CTest
-{
- @Test
- public void testC()
- throws InterruptedException
- {
- MILLISECONDS.sleep( 500 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/DTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/DTest.java b/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/DTest.java
deleted file mode 100644
index 85bc666..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/DTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-public class DTest
-{
- @Test
- public void testD()
- throws InterruptedException
- {
- MILLISECONDS.sleep( 500 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ETest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ETest.java b/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ETest.java
deleted file mode 100644
index a74e734..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1202-rerun-and-failfast/src/test/java/pkg/ETest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-public class ETest
-{
- @Test
- public void test()
- throws InterruptedException
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
deleted file mode 100644
index 9bb5c27..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
+++ /dev/null
@@ -1,115 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-1209</artifactId>
- <version>1.0</version>
-
- <url>http://maven.apache.org</url>
-
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>PMC</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkCount>2</forkCount>
- <rerunFailingTestsCount>3</rerunFailingTestsCount>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>junit47</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>junit4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ATest.java b/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ATest.java
deleted file mode 100644
index cbe3f6f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ATest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-public class ATest
-{
- private static int count;
-
- @Test
- public void testA()
- throws Exception
- {
- MILLISECONDS.sleep( 500 );
- if ( count++ != 2 )
- {
- throw new RuntimeException( "assert \"foo\" == \"bar\"\n"
- + " |\n"
- + " false"
- );
- }
- SECONDS.sleep( 5 );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/BTest.java b/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/BTest.java
deleted file mode 100644
index f44d396..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/BTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-
-public class BTest
-{
-
- private static int count;
-
- @Test
- public void testB()
- throws InterruptedException
- {
- SECONDS.sleep( 2 );
- if ( count++ != 2 )
- {
- throw new RuntimeException();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/CTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/CTest.java b/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/CTest.java
deleted file mode 100644
index e51a29d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/CTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-public class CTest
-{
- @Test
- public void testC()
- throws InterruptedException
- {
- MILLISECONDS.sleep( 500 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/DTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/DTest.java b/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/DTest.java
deleted file mode 100644
index 85bc666..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/DTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-public class DTest
-{
- @Test
- public void testD()
- throws InterruptedException
- {
- MILLISECONDS.sleep( 500 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ETest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ETest.java b/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ETest.java
deleted file mode 100644
index a74e734..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1209-rerun-and-forkcount/src/test/java/pkg/ETest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-public class ETest
-{
- @Test
- public void test()
- throws InterruptedException
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml
deleted file mode 100644
index 98db2a7..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml
+++ /dev/null
@@ -1,71 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-1211</artifactId>
- <version>1.0</version>
-
- <properties>
- <junit/>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.9.4</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <properties>
- <property>
- <name>junit</name>
- <value>${junit}</value>
- </property>
- </properties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1211/src/test/java/jira1211/JUnitTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1211/src/test/java/jira1211/JUnitTest.java b/surefire-integration-tests/src/test/resources/surefire-1211/src/test/java/jira1211/JUnitTest.java
deleted file mode 100644
index 1580e8a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1211/src/test/java/jira1211/JUnitTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package jira1211;
-
-/*
- * 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.Test;
-
-public class JUnitTest {
-
- @Test
- public void doNothing()
- {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1211/src/test/java/jira1211/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1211/src/test/java/jira1211/TestNGSuiteTest.java b/surefire-integration-tests/src/test/resources/surefire-1211/src/test/java/jira1211/TestNGSuiteTest.java
deleted file mode 100644
index 46959c7..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1211/src/test/java/jira1211/TestNGSuiteTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package jira1211;
-
-/*
- * 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.testng.annotations.Test;
-
-
-public class TestNGSuiteTest {
-
- @Test
- public void doNothing()
- {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/pom.xml
deleted file mode 100644
index 5f3df66..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/pom.xml
+++ /dev/null
@@ -1,60 +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/xsd/maven-4.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>surefire-1260</artifactId>
- <version>1.0</version>
-
- <url>http://maven.apache.org</url>
-
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Diga??a (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>PMC</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit3Tests.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit3Tests.java b/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit3Tests.java
deleted file mode 100644
index d607a3b..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit3Tests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package pkg;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class JUnit3Tests extends TestCase
-{
- public void test1()
- {
- }
-
- public void test2()
- {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit4Tests.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit4Tests.java b/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit4Tests.java
deleted file mode 100644
index f34aee7..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/src/test/java/pkg/JUnit4Tests.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package pkg;
-
-/*
- * 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.Test;
-
-public class JUnit4Tests
-{
-
- @Test
- public void shouldTestA()
- {
- }
-
- @Test
- public void shouldTestB()
- {
- }
-
- @Test
- public void shouldTestC()
- {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1264/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1264/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1264/pom.xml
deleted file mode 100644
index 320401d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1264/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>com.appnexus.viewability.core.surefireJunitTests</groupId>
- <artifactId>main</artifactId>
- <version>1.0.0</version>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <threadCount>2</threadCount>
- <parallel>all</parallel>
- <runOrder>balanced</runOrder>
- <forkMode>once</forkMode>
- <systemPropertyVariables>
- <canFail>${canFail}</canFail>
- </systemPropertyVariables>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/ATest.java b/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/ATest.java
deleted file mode 100644
index 18c129e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/ATest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.appnexus.viewability.core.surefireJunitTests;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ATest
- extends BaseTest
-{
- public ATest( String param )
- {
- super( param );
- }
-
- @Test
- public void methodA1() throws InterruptedException
- {
- sleep( 10 );
- if ( Boolean.getBoolean( "canFail" ) )
- {
- Assert.fail( "Failing test: ATest.methodA1[" + param + "]" );
- }
- }
-
- @Test
- public void methodA2() throws InterruptedException
- {
- sleep( 10 );
- if ( Boolean.getBoolean( "canFail" ) )
- {
- Assert.fail( "Failing test: ATest.methodA2[" + param + "]" );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BTest.java b/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BTest.java
deleted file mode 100644
index 3ebf05c..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.appnexus.viewability.core.surefireJunitTests;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class BTest
- extends BaseTest
-{
- public BTest( String param )
- {
- super( param );
- }
-
- @Test
- public void methodB1() throws InterruptedException
- {
- sleep( 10 );
- if ( Boolean.getBoolean( "canFail" ) )
- {
- Assert.fail( "Failing test: BTest.methodB1[" + param + "]" );
- }
- }
-
- @Test
- public void methodB2() throws InterruptedException
- {
- sleep( 10 );
- if ( Boolean.getBoolean( "canFail" ) )
- {
- Assert.fail( "Failing test: BTest.methodB2[" + param + "]" );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BaseTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BaseTest.java b/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BaseTest.java
deleted file mode 100644
index bff4077..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/BaseTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.appnexus.viewability.core.surefireJunitTests;
-
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.Collection;
-
-import org.junit.Rule;
-import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
-
-
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-
-@RunWith( Parameterized.class )
-public abstract class BaseTest
-{
- protected final String param;
-
- public BaseTest( String param )
- {
- this.param = param;
- }
-
- @Rule
- public TestName testName = new TestName();
-
- @Parameters( name = "{0}" )
- public static Collection< String > parameterList() throws Exception
- {
- Collection< String > c = new ConcurrentLinkedQueue< String >();
- c.add( "p0" );
- c.add( "p1" );
-
- return c;
- }
-
- public void sleep( int time )
- {
- System.err.println( "Start: " + this.getClass().getSimpleName() + "." + testName.getMethodName() );
- try
- {
- Thread.sleep( time * 100 );
- }
- catch ( InterruptedException e )
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- System.err.println( "End: " + this.getClass().getSimpleName() + "." + testName.getMethodName() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/CTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/CTest.java b/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/CTest.java
deleted file mode 100644
index 3adb4ab..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/CTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.appnexus.viewability.core.surefireJunitTests;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class CTest
- extends BaseTest
-{
- public CTest( String param )
- {
- super( param );
- }
-
- @Test
- public void methodC1() throws InterruptedException
- {
- sleep( 1 );
- if ( Boolean.getBoolean( "canFail" ) )
- {
- Assert.fail( "Failing test: CTest.methodC1[" + param + "]" );
- }
- }
-
- @Test
- public void methodC2() throws InterruptedException
- {
- sleep( 1 );
- if ( Boolean.getBoolean( "canFail" ) )
- {
- Assert.fail( "Failing test: CTest.methodC2[" + param + "]" );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/DTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/DTest.java b/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/DTest.java
deleted file mode 100644
index 38ed7b7..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1264/src/test/java/com/appnexus/viewability/core/surefireJunitTests/DTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.appnexus.viewability.core.surefireJunitTests;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class DTest
- extends BaseTest
-{
- public DTest( String param )
- {
- super( param );
- }
-
- @Test
- public void methodC1() throws InterruptedException
- {
- sleep( 1 );
- if ( Boolean.getBoolean( "canFail" ) )
- {
- Assert.fail( "Failing test: DTest.methodD1[" + param + "]" );
- }
- }
-
- @Test
- public void methodC2() throws InterruptedException
- {
- sleep( 1 );
- if ( Boolean.getBoolean( "canFail" ) )
- {
- Assert.fail( "Failing test: DTest.methodD2[" + param + "]" );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1265/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1265/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1265/pom.xml
deleted file mode 100644
index ec74a49..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1265/pom.xml
+++ /dev/null
@@ -1,49 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-1265</artifactId>
- <version>1.0</version>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>9</maven.compiler.source>
- <maven.compiler.target>9</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1265/src/test/java/J9Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1265/src/test/java/J9Test.java b/surefire-integration-tests/src/test/resources/surefire-1265/src/test/java/J9Test.java
deleted file mode 100644
index 3d41aea..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1265/src/test/java/J9Test.java
+++ /dev/null
@@ -1,15 +0,0 @@
-import org.junit.Test;
-
-public class J9Test
-{
- @Test
- public void test_sql_mod() throws java.sql.SQLException
- {
- System.out.println( System.getProperty( "java.specification.version" ) );
- }
-
- @Test
- public void test_corba_mod() /*throws org.omg.CORBA.BAD_INV_ORDER*/
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml
deleted file mode 100644
index d262525..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml
+++ /dev/null
@@ -1,58 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-1278</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for testng groups</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <groups>group</groups>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/src/test/java/pkg/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/src/test/java/pkg/ATest.java b/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/src/test/java/pkg/ATest.java
deleted file mode 100644
index 28c7e30..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/src/test/java/pkg/ATest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package pkg;
-
-/*
- * 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.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * Tests grouping
- */
-public class ATest
-{
- @Test(groups = {"group"})
- public void group()
- {
- }
-
- @Test(groups = {"agroup"})
- public void agroup()
- {
- Assert.fail("Group should not be run");
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1364/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1364/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1364/pom.xml
deleted file mode 100644
index 952ca06..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1364/pom.xml
+++ /dev/null
@@ -1,155 +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>
- </parent>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-1364</artifactId>
- <version>1.0</version>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <forkedMode>once</forkedMode>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
- <configuration>
- <testIncludes>
- <testInclude>FirstTest.java</testInclude>
- <testInclude>SecondTest.java</testInclude>
- </testIncludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>${forkedMode}</forkMode>
- <systemPropertyVariables>
- <forkedProp>forkedValue${surefire.forkNumber}</forkedProp>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <profiles>
- <profile>
- <id>junit3</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit3</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
- <id>junit47</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
- <id>testng</id>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.21</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testIncludes>
- <testInclude>*.java</testInclude>
- </testIncludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-testng</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/FirstTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/FirstTest.java b/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/FirstTest.java
deleted file mode 100644
index f2a9e66..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/FirstTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-import org.junit.Test;
-
-public class FirstTest extends TestCase
-{
- @Test
- public void test() throws InterruptedException
- {
- Thread.sleep( 100 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/SecondTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/SecondTest.java b/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/SecondTest.java
deleted file mode 100644
index cfd9b51..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/SecondTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-import org.junit.Test;
-
-public class SecondTest extends TestCase
-{
- @Test
- public void test() throws InterruptedException
- {
- Thread.sleep( 100 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/ThirdTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/ThirdTest.java b/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/ThirdTest.java
deleted file mode 100644
index f3633d6..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1364/src/test/java/ThirdTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.testng.annotations.Test;
-
-
-public class ThirdTest
-{
- @Test
- public void test() throws InterruptedException
- {
- Thread.sleep( 100 );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1367/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1367/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1367/pom.xml
deleted file mode 100644
index b1d3ac3..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1367/pom.xml
+++ /dev/null
@@ -1,59 +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/xsd/maven-4.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>surefire-1367</artifactId>
- <version>1.0</version>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1367/src/test/java/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1367/src/test/java/ATest.java b/surefire-integration-tests/src/test/resources/surefire-1367/src/test/java/ATest.java
deleted file mode 100644
index df5231e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1367/src/test/java/ATest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.Test;
-
-import static org.junit.Assume.assumeTrue;
-
-public class ATest {
-
- @Test
- public void test() {
- System.out.println("Hi");
- System.out.println();
- System.out.println("There!");
-
- System.err.println("Hello");
- System.err.println();
- System.err.println("What's up!");
-
- assumeTrue( false );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1367/src/test/java/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1367/src/test/java/BTest.java b/surefire-integration-tests/src/test/resources/surefire-1367/src/test/java/BTest.java
deleted file mode 100644
index bec4da8..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1367/src/test/java/BTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.Test;
-
-import static org.junit.Assume.assumeTrue;
-
-public class BTest {
-
- @Test
- public void test() {
- System.out.println("Hey");
- System.out.println();
- System.out.println("you!");
-
- assumeTrue( false );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
deleted file mode 100644
index 30e5199..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
- ~ 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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-test-classpath-provider</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test provider</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-api</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources/META-INF</directory>
- <targetPath>META-INF</targetPath>
- </resource>
- </resources>
- </build>
-
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/java/org/apache/maven/surefire/testprovider/ClassPathTestProvider.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/java/org/apache/maven/surefire/testprovider/ClassPathTestProvider.java b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/java/org/apache/maven/surefire/testprovider/ClassPathTestProvider.java
deleted file mode 100644
index eeea397..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/java/org/apache/maven/surefire/testprovider/ClassPathTestProvider.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.apache.maven.surefire.testprovider;
-
-/*
- * 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.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
-import java.util.Map.Entry;
-
-import org.apache.maven.surefire.providerapi.AbstractProvider;
-import org.apache.maven.surefire.providerapi.ProviderParameters;
-import org.apache.maven.surefire.report.ReporterException;
-import org.apache.maven.surefire.suite.RunResult;
-import org.apache.maven.surefire.testset.TestSetFailedException;
-
-/**
- * @author Jonathan Bell
- */
-public class ClassPathTestProvider
- extends AbstractProvider
-{
- boolean hasSLF4J; // SLF4J is not being included in our deps, so if it's in the classpath, that's a problem...
-
- public ClassPathTestProvider( ProviderParameters params )
- {
- for ( Entry<String, String> propEntry : params.getProviderProperties().entrySet() )
- {
- if ( propEntry.getKey().startsWith( "surefireClassPathUrl" ) && propEntry.getValue().contains( "slf4j" ) )
- hasSLF4J = true;
- }
- }
-
- public Iterable<Class<?>> getSuites()
- {
- LinkedList<Class<?>> ret = new LinkedList<Class<?>>();
- return ret;
- }
-
- public RunResult invoke( Object arg0 )
- throws TestSetFailedException, ReporterException, InvocationTargetException
- {
- if ( hasSLF4J )
- throw new TestSetFailedException( "SLF4J was found on the boot classpath" );
- return new RunResult( 1, 0, 0, 0 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
deleted file mode 100644
index fd31063..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.maven.surefire.testprovider.ClassPathTestProvider
[06/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/sibling-aggregator/aggregator/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/sibling-aggregator/aggregator/pom.xml b/surefire-its/src/test/resources/sibling-aggregator/aggregator/pom.xml
new file mode 100644
index 0000000..b12b118
--- /dev/null
+++ b/surefire-its/src/test/resources/sibling-aggregator/aggregator/pom.xml
@@ -0,0 +1,51 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire.its.sibling-aggregator</groupId>
+ <artifactId>aggregator</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for aggregator whose modules are in ../child</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <modules>
+ <module>../child1</module>
+ <module>../child2</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/sibling-aggregator/child1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/sibling-aggregator/child1/pom.xml b/surefire-its/src/test/resources/sibling-aggregator/child1/pom.xml
new file mode 100644
index 0000000..be2f9df
--- /dev/null
+++ b/surefire-its/src/test/resources/sibling-aggregator/child1/pom.xml
@@ -0,0 +1,44 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire.its.sibling-aggregator</groupId>
+ <artifactId>child1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for aggregated child1</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java b/surefire-its/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
new file mode 100644
index 0000000..ec5d886
--- /dev/null
+++ b/surefire-its/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
@@ -0,0 +1,24 @@
+package siblingAggregator;
+
+/*
+ * 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.
+ */
+
+public class FooHolder {
+ public static String getFoo() { return "foo"; }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/sibling-aggregator/child2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/sibling-aggregator/child2/pom.xml b/surefire-its/src/test/resources/sibling-aggregator/child2/pom.xml
new file mode 100644
index 0000000..b8c21bf
--- /dev/null
+++ b/surefire-its/src/test/resources/sibling-aggregator/child2/pom.xml
@@ -0,0 +1,49 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire.its.sibling-aggregator</groupId>
+ <artifactId>child2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for aggregated child2</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins.surefire.its.sibling-aggregator</groupId>
+ <artifactId>child1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/sibling-aggregator/child2/src/test/java/siblingAggregator/FooHolderTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/sibling-aggregator/child2/src/test/java/siblingAggregator/FooHolderTest.java b/surefire-its/src/test/resources/sibling-aggregator/child2/src/test/java/siblingAggregator/FooHolderTest.java
new file mode 100644
index 0000000..c001619
--- /dev/null
+++ b/surefire-its/src/test/resources/sibling-aggregator/child2/src/test/java/siblingAggregator/FooHolderTest.java
@@ -0,0 +1,27 @@
+package siblingAggregator;
+
+/*
+ * 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.
+ */
+
+public class FooHolderTest extends junit.framework.TestCase {
+
+ public void testFoo() {
+ FooHolder.getFoo();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/small-result-counting/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/small-result-counting/pom.xml b/surefire-its/src/test/resources/small-result-counting/pom.xml
new file mode 100644
index 0000000..e06061c
--- /dev/null
+++ b/surefire-its/src/test/resources/small-result-counting/pom.xml
@@ -0,0 +1,38 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-surefire</groupId>
+ <artifactId>small-result-counting</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>small-result-counting</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <forkMode>once</forkMode>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java b/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java
new file mode 100644
index 0000000..c79f746
--- /dev/null
+++ b/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java
@@ -0,0 +1,66 @@
+package smallresultcounting;
+
+/*
+ * 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.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assume.assumeThat;
+
+public class Test1
+{
+ @Test
+ public void testWithFailingAssumption1()
+ {
+ assumeThat( 2, is( 3 ) );
+ }
+
+ @Test
+ public void testWithFailingAssumption2()
+ {
+ try
+ {
+ Thread.sleep( 150 );
+ }
+ catch ( InterruptedException ignore )
+ {
+ }
+
+ assumeThat( 2, is( 3 ) );
+ }
+
+ @Test
+ public void testWithFailingAssumption3()
+ {
+ assumeThat( 2, is( 3 ) );
+ }
+
+ @Test
+ public void testWithFailingAssumption4()
+ {
+ assumeThat( 2, is( 3 ) );
+ }
+
+ @Test
+ public void testWithFailingAssumption5()
+ {
+ assumeThat( 2, is( 3 ) );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java b/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java
new file mode 100644
index 0000000..5b3494f
--- /dev/null
+++ b/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java
@@ -0,0 +1,107 @@
+package smallresultcounting;
+
+/*
+ * 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.Ignore;
+import org.junit.Test;
+
+import static junit.framework.Assert.fail;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Test2
+{
+ @Test
+ public void testiWithFail1()
+ {
+ fail( "We excpect this1" );
+ }
+
+ @Test
+ public void testWithException1()
+ {
+ System.out.println( "testWithException1 to stdout" );
+ System.err.println( "testWithException1 to stderr" );
+ throw new RuntimeException( "We expect this1-1" );
+ }
+
+ @Test
+ public void testWithException2()
+ {
+ throw new RuntimeException( "We expect this1-2" );
+ }
+
+
+ @Ignore( "We do this for a reason1" )
+ @Test
+ public void testWithIgnore1()
+ {
+ }
+
+ @Ignore( "We do this for a reason2" )
+ @Test
+ public void testWithIgnore2()
+ {
+ }
+
+ @Ignore
+ @Test
+ public void testWithIgnore3()
+ {
+ }
+
+ @Test
+ public void testAllok1()
+ {
+ System.out.println( "testAllok1 to stdout" );
+ System.err.println( "testAllok1 to stderr" );
+ try
+ {
+ Thread.sleep( 100 );
+ }
+ catch ( InterruptedException ignore )
+ {
+ }
+ }
+
+ @Test
+ public void testAllok2()
+ {
+ }
+
+ @Test
+ public void testAllok3()
+ {
+ try
+ {
+ Thread.sleep( 250 );
+ }
+ catch ( InterruptedException ignore )
+ {
+ }
+ }
+
+ @Test
+ public void testAllok4()
+ {
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml b/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml
new file mode 100644
index 0000000..5285fb1
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml
@@ -0,0 +1,79 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1024</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>jiras-surefire-1024-it</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1024-testjar</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <dependenciesToScan>
+ <dependency>org.apache.maven.plugins.surefire:jiras-surefire-1024-testjar</dependency>
+ </dependenciesToScan>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml b/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
new file mode 100644
index 0000000..5bf2bad
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
@@ -0,0 +1,47 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1024</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>jiras-surefire-1024-testjar</artifactId>
+ <version>1.0</version>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/src/main/java/jiras/surefire1024/A1IT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/src/main/java/jiras/surefire1024/A1IT.java b/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/src/main/java/jiras/surefire1024/A1IT.java
new file mode 100644
index 0000000..e5d71a2
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/src/main/java/jiras/surefire1024/A1IT.java
@@ -0,0 +1,12 @@
+package jiras.surefire1024;
+
+import org.junit.Test;
+
+public class A1IT
+{
+ @Test
+ public void test()
+ {
+ System.out.println( getClass() + "#test() dependency to scan" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1024/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1024/pom.xml b/surefire-its/src/test/resources/surefire-1024/pom.xml
new file mode 100644
index 0000000..340c494
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1024/pom.xml
@@ -0,0 +1,51 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1024</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+ <url>http://maven.apache.org</url>
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+
+ <modules>
+ <module>jiras-surefire-1024-testjar</module>
+ <module>jiras-surefire-1024-it</module>
+ </modules>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml b/surefire-its/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
new file mode 100644
index 0000000..8598f1e
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
@@ -0,0 +1,53 @@
+<?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/xsd/maven-4.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>jiras-surefire-1028</artifactId>
+ <version>1.0</version>
+ <name>jiras-surefire-1028</name>
+ <url>http://maven.apache.org</url>
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1028-unable-to-run-single-test/src/test/java/jiras/surefire1028/SomeTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1028-unable-to-run-single-test/src/test/java/jiras/surefire1028/SomeTest.java b/surefire-its/src/test/resources/surefire-1028-unable-to-run-single-test/src/test/java/jiras/surefire1028/SomeTest.java
new file mode 100644
index 0000000..71cc102
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1028-unable-to-run-single-test/src/test/java/jiras/surefire1028/SomeTest.java
@@ -0,0 +1,36 @@
+package jiras.surefire1028;
+
+/*
+ * 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.Assert;
+import org.junit.Test;
+
+public class SomeTest {
+
+ @Test
+ public void test() {
+ System.out.println("OK!");
+ }
+
+ @Test
+ public void filteredOutTest() {
+ Assert.fail();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml b/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
new file mode 100644
index 0000000..6fefa7d
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
@@ -0,0 +1,69 @@
+<?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/xsd/maven-4.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>jiras-surefire-1036</artifactId>
+ <version>1.0</version>
+ <name>jiras-surefire-1036</name>
+ <url>http://maven.apache.org</url>
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <groups>jiras.surefire1036.IntegrationTest</groups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/IntegrationTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/IntegrationTest.java b/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/IntegrationTest.java
new file mode 100644
index 0000000..e1953e4
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/IntegrationTest.java
@@ -0,0 +1,24 @@
+package jiras.surefire1036;
+
+/*
+ * 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.
+ */
+
+public interface IntegrationTest
+{
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeIntegration.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeIntegration.java b/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeIntegration.java
new file mode 100644
index 0000000..64dc71e
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeIntegration.java
@@ -0,0 +1,37 @@
+package jiras.surefire1036;
+
+/*
+ * 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 static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category( IntegrationTest.class )
+public class TestSomeIntegration
+{
+ @Test
+ public void thisIsAnIntegrationTest() throws Exception
+ {
+ String message = "This integration test will always pass";
+ System.out.println( message );
+ assertTrue( message, true );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeUnit.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeUnit.java b/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeUnit.java
new file mode 100644
index 0000000..1ea26e8
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeUnit.java
@@ -0,0 +1,36 @@
+package jiras.surefire1036;
+
+/*
+ * 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.Test;
+
+import static org.junit.Assert.fail;
+
+public class TestSomeUnit
+{
+ @Test
+ public void thisIsJustAUnitTest()
+ throws Exception
+ {
+ String message = "This unit test will never pass";
+ System.out.println( message );
+ fail();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomethingWithMockitoRunner.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomethingWithMockitoRunner.java b/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomethingWithMockitoRunner.java
new file mode 100644
index 0000000..5122bca
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomethingWithMockitoRunner.java
@@ -0,0 +1,52 @@
+package jiras.surefire1036;
+
+/*
+ * 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.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+@RunWith( MockitoJUnitRunner.class )
+public class TestSomethingWithMockitoRunner
+{
+ @Mock
+ private List<Integer> mTestList;
+
+ @Before
+ public void setUp()
+ throws Exception
+ {
+ when( mTestList.size() ).thenReturn( 5 );
+ }
+
+ @Test
+ public void thisTestUsesMockitoRunnerButIsPrettyUseless()
+ throws Exception
+ {
+ assertEquals( 5, mTestList.size() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml b/surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
new file mode 100644
index 0000000..efd19e8
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>surefire-1041</artifactId>
+ <name>Tests that test reporter does not fail with NPE when a JUnit-Runner has an error.</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ <forkCount>1</forkCount>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/AppTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/AppTest.java b/surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/AppTest.java
new file mode 100644
index 0000000..978da1a
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/AppTest.java
@@ -0,0 +1,38 @@
+package test;
+
+/*
+ * 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.Test;
+import org.junit.runner.RunWith;
+
+/**
+ *
+ * @author Dan Fabulich
+ *
+ */
+@RunWith(BadRunner.class)
+public class AppTest
+{
+
+ @Test
+ public void testApp()
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/BadRunner.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/BadRunner.java b/surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/BadRunner.java
new file mode 100644
index 0000000..759c0f4
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/BadRunner.java
@@ -0,0 +1,43 @@
+package test;
+
+/*
+ * 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.runner.notification.RunNotifier;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.InitializationError;
+
+/**
+ *
+ * @author Dan Fabulich
+ *
+ */
+public class BadRunner extends BlockJUnit4ClassRunner{
+
+ public BadRunner(Class<?> testClass) throws InitializationError {
+ super(testClass);
+ }
+
+ @Override
+ public void run(RunNotifier notifier) {
+ String x = null;
+ if (false) x = "";
+ x.toString();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1053-system-properties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1053-system-properties/pom.xml b/surefire-its/src/test/resources/surefire-1053-system-properties/pom.xml
new file mode 100644
index 0000000..1774dc4
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1053-system-properties/pom.xml
@@ -0,0 +1,65 @@
+<?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/xsd/maven-4.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>jiras-surefire-1053</artifactId>
+ <version>1.0</version>
+ <url>http://maven.apache.org</url>
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ <systemPropertyVariables>
+ <myArg>myVal1</myArg>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1053-system-properties/src/test/java/jiras/surefire1053/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1053-system-properties/src/test/java/jiras/surefire1053/ATest.java b/surefire-its/src/test/resources/surefire-1053-system-properties/src/test/java/jiras/surefire1053/ATest.java
new file mode 100644
index 0000000..367adc5
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1053-system-properties/src/test/java/jiras/surefire1053/ATest.java
@@ -0,0 +1,32 @@
+package jiras.surefire1053;
+
+/*
+ * 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.Test;
+
+public final class ATest {
+
+ @Test
+ public void someMethod() throws InterruptedException {
+ System.out.println( "file.encoding=" + System.getProperty( "file.encoding" ) );
+ System.out.println( "myArg=" + System.getProperty( "myArg" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/pom.xml b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/pom.xml
new file mode 100644
index 0000000..51ef7bc
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/pom.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ 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/xsd/maven-4.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>foo</groupId>
+ <artifactId>foo</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>foo</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ <parallel>classesAndMethods</parallel>
+ <perCoreThreadCount>false</perCoreThreadCount>
+ <useUnlimitedThreads>true</useUnlimitedThreads>
+ <threadCountMethods>3</threadCountMethods>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Method1Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Method1Test.java b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Method1Test.java
new file mode 100644
index 0000000..1ab584a
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Method1Test.java
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+package foo;
+
+import org.junit.Test;
+
+public class Method1Test
+{
+ @Test
+ public void only()
+ {
+ SleepUtil.sleep();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods2Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods2Test.java b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods2Test.java
new file mode 100644
index 0000000..36ea93b
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods2Test.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+package foo;
+
+import org.junit.Test;
+
+public class Methods2Test
+{
+ @Test
+ public void first()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void second()
+ {
+ SleepUtil.sleep();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods3Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods3Test.java b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods3Test.java
new file mode 100644
index 0000000..c1283b8
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods3Test.java
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+package foo;
+
+import org.junit.Test;
+
+public class Methods3Test
+{
+ @Test
+ public void first()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void second()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void third()
+ {
+ SleepUtil.sleep();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods4Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods4Test.java b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods4Test.java
new file mode 100644
index 0000000..b2415e0
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods4Test.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+package foo;
+
+import org.junit.Test;
+
+public class Methods4Test
+{
+ @Test
+ public void first()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void second()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void third()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void fourth()
+ {
+ SleepUtil.sleep();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods5Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods5Test.java b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods5Test.java
new file mode 100644
index 0000000..bb47e40
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods5Test.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+package foo;
+
+import org.junit.Test;
+
+public class Methods5Test
+{
+ @Test
+ public void first()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void second()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void third()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void fourth()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void fifth()
+ {
+ SleepUtil.sleep();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods6Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods6Test.java b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods6Test.java
new file mode 100644
index 0000000..ee1d53c
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods6Test.java
@@ -0,0 +1,42 @@
+package foo;
+
+import org.junit.Test;
+
+public class Methods6Test
+{
+ @Test
+ public void first()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void second()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void third()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void fourth()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void fifth()
+ {
+ SleepUtil.sleep();
+ }
+
+ @Test
+ public void sixth()
+ {
+ SleepUtil.sleep();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/SleepUtil.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/SleepUtil.java b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/SleepUtil.java
new file mode 100644
index 0000000..c7a188a
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/SleepUtil.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package foo;
+
+public class SleepUtil
+{
+ public static void sleep()
+ {
+ /* a sleep seems to make the issue less likely to occur */
+// try
+// {
+// Thread.sleep(2000);
+// }
+// catch (InterruptedException e)
+// {
+// Thread.currentThread().interrupt();
+// }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml b/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
new file mode 100644
index 0000000..2f24bc4
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
@@ -0,0 +1,74 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1080</artifactId>
+ <version>1.0</version>
+
+ <url>http://maven.apache.org</url>
+
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Qingzhou Luo</name>
+ </contributor>
+ </contributors>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <parallel>classes</parallel>
+ <forkCount>2</forkCount>
+ <useUnlimitedThreads>true</useUnlimitedThreads>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyCotTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyCotTest.java b/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyCotTest.java
new file mode 100644
index 0000000..1147ecd
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyCotTest.java
@@ -0,0 +1,35 @@
+package com.cal;
+
+/*
+ * 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.Test;
+
+public class HelloWorldFlakyCotTest
+{
+ @Test
+ public void testHelloWorldTextFlaky20()
+ {
+ }
+
+ @Test
+ public void testHelloWorldText2Flaky20()
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyErrorTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyErrorTest.java b/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyErrorTest.java
new file mode 100644
index 0000000..9856fc8
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyErrorTest.java
@@ -0,0 +1,35 @@
+package com.cal;
+
+/*
+ * 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.Test;
+
+public class HelloWorldFlakyErrorTest
+{
+ @Test
+ public void testHelloWorldTextFlaky20()
+ {
+ }
+
+ @Test
+ public void testHelloWorldText2Flaky20()
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldTest.java b/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldTest.java
new file mode 100644
index 0000000..0bd3aca
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldTest.java
@@ -0,0 +1,40 @@
+package com.cal;
+
+/*
+ * 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.Test;
+
+public class HelloWorldTest
+{
+ @Test
+ public void testHelloWorldText()
+ {
+ }
+
+ @Test
+ public void testHelloWorldTextFlaky20()
+ {
+ }
+
+ @Test
+ public void testHelloWorldText2Flaky20()
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/SimpleTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/SimpleTest.java b/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/SimpleTest.java
new file mode 100644
index 0000000..02cd79b
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/SimpleTest.java
@@ -0,0 +1,46 @@
+package com.cal;
+
+/*
+ * 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.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class SimpleTest
+{
+
+ /**
+ * Make sure the universe hasn't broken.
+ */
+ @Test
+ public void testAddition()
+ {
+ assertEquals( 2, 1 + 1 );
+ }
+
+ /**
+ * Now try to break the universe :D
+ */
+ @Test(expected = ArithmeticException.class)
+ public void testDivision()
+ {
+ int i = 1 / 0;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml b/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
new file mode 100644
index 0000000..4229cc9
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
@@ -0,0 +1,64 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1082</artifactId>
+ <version>1.0</version>
+
+ <url>http://maven.apache.org</url>
+
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1082Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1082Test.java b/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1082Test.java
new file mode 100644
index 0000000..e8cef99
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1082Test.java
@@ -0,0 +1,60 @@
+package jiras.surefire1082;
+
+/*
+ * 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.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+@RunWith( Parameterized.class )
+public class Jira1082Test
+{
+ private final int x;
+
+ public Jira1082Test( int x )
+ {
+ this.x = x;
+ }
+
+ @Parameterized.Parameters
+ public static Iterable<Object[]> data()
+ {
+ return Arrays.asList( new Object[][]{ { 0 }, { 1 } } );
+ }
+
+ @Test
+ public void a()
+ throws InterruptedException
+ {
+ TimeUnit.MILLISECONDS.sleep( 500 );
+ System.out.println( getClass() + " a " + x + " " + Thread.currentThread().getName() );
+ }
+
+ @Test
+ public void b()
+ throws InterruptedException
+ {
+ TimeUnit.MILLISECONDS.sleep( 500 );
+ System.out.println( getClass() + " b " + x + " " + Thread.currentThread().getName() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1264Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1264Test.java b/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1264Test.java
new file mode 100644
index 0000000..56e7644
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1264Test.java
@@ -0,0 +1,36 @@
+package jiras.surefire1082;
+
+/*
+ * 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.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+@RunWith( Parameterized.class )
+public final class Jira1264Test extends Jira1082Test
+{
+ public Jira1264Test( int x )
+ {
+ super( x );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml b/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
new file mode 100644
index 0000000..8a39f12
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
@@ -0,0 +1,70 @@
+<?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/xsd/maven-4.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>jiras-surefire-1095</artifactId>
+ <version>1.0</version>
+ <url>http://maven.apache.org</url>
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/SomeTest.java</include>
+ </includes>
+ <properties>
+ <property>
+ <name>listener</name>
+ <value>jiras.surefire1095.Listener</value>
+ </property>
+ </properties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
[21/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
new file mode 100644
index 0000000..0819196
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
@@ -0,0 +1,39 @@
+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;
+
+/**
+ * Test additionalClasspathElements
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class AdditionalClasspathIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void additionalClasspath()
+ {
+ unpack( "/additional-classpath" ).executeTest().verifyErrorFree( 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
new file mode 100644
index 0000000..ab8f64c
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
@@ -0,0 +1,57 @@
+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.io.File;
+
+import org.apache.maven.surefire.its.fixture.IntegrationTestSuiteResults;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.Test;
+
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.parseTestResults;
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assertTestSuiteResults;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test report aggregation
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class AggregateReportIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void aggregateReport()
+ {
+ OutputValidator outputValidator = unpack( "/aggregate-report" ).addSurefireReportGoal().executeCurrentGoals();
+ TestFile surefireReportHtml = outputValidator.getSiteFile( "surefire-report.html" );
+ assertTrue( "surefire report missing: " + surefireReportHtml.getAbsolutePath(), surefireReportHtml.exists() );
+
+ // TODO HtmlUnit tests on the surefire report
+
+ IntegrationTestSuiteResults suite = parseTestResults( new File( outputValidator.getBaseDir(), "child1" ),
+ new File( outputValidator.getBaseDir(), "child2" ) );
+ assertTestSuiteResults( 2, 0, 1, 0, suite );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
new file mode 100644
index 0000000..c1ad8f7
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
@@ -0,0 +1,39 @@
+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;
+
+/**
+ * Test passing an argLine parameter
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class ArgLineIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void argLine()
+ {
+ unpack( "/argLine-parameter" ).executeTest().verifyErrorFree( 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ArgLinePropertiesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ArgLinePropertiesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ArgLinePropertiesIT.java
new file mode 100644
index 0000000..cf1074e
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ArgLinePropertiesIT.java
@@ -0,0 +1,39 @@
+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;
+
+/**
+ * Test passing an argLine parameter
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class ArgLinePropertiesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void argLine()
+ {
+ unpack( "/argLine-properties" ).executeTest().verifyErrorFree( 4 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/AssumptionFailureReportIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AssumptionFailureReportIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AssumptionFailureReportIT.java
new file mode 100644
index 0000000..856cd8c
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AssumptionFailureReportIT.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.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.Test;
+
+public class AssumptionFailureReportIT extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testWriteSkippedMessageToReport()
+ {
+ final OutputValidator outputValidator = unpack( "/assumpationFailureReport" ).executeTest();
+ TestFile xmlReportFile = outputValidator.getSurefireReportsXmlFile( "TEST-assumptionFailure.Test1.xml" );
+ xmlReportFile.assertContainsText( "The test is skipped if it is false" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
new file mode 100644
index 0000000..85d0f95
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
@@ -0,0 +1,70 @@
+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.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+
+/**
+ * Test running a single test with -Dtest=BasicTest
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class CheckSingleTestIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void singleTest()
+ {
+ unpack().setTestToRun( "BasicTest" ).executeTest().verifyErrorFree( 1 );
+ }
+
+ @Test
+ public void singleTestDotJava()
+ {
+ unpack().setTestToRun( "BasicTest.java" ).executeTest().verifyErrorFree( 1 );
+ }
+
+ @Test
+ public void singleTestNonExistent()
+ {
+ final OutputValidator output = unpack().setTestToRun( "DoesNotExist" ).maven().withFailure().executeTest();
+ TestFile reportsDir = output.getTargetFile( "surefire-reports" );
+ assertFalse( "Unexpected reports directory", reportsDir.exists() );
+ }
+
+ @Test
+ public void singleTestNonExistentOverride()
+ {
+ final OutputValidator output =
+ unpack().setTestToRun( "DoesNotExist" ).failIfNoTests( false ).executeTest().verifyErrorFreeLog();
+ output.getTargetFile( "surefire-reports" );
+ // assertFalse( "Unexpected reports directory", reportsDir.exists() ); Hmpf. Not really a good test
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/default-configuration" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
new file mode 100644
index 0000000..6e2a67a
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
@@ -0,0 +1,81 @@
+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 failIfNoTests with various forkModes.
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class CheckTestFailIfNoTestsForkModeIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void failIfNoTestsForkModeAlways()
+ {
+ unpack().forkAlways().failIfNoTests( true ).maven().withFailure().executeTest();
+ }
+
+ @Test
+ public void failIfNoTestsForkModeNever()
+ {
+ unpack().forkNever().failIfNoTests( true ).maven().withFailure().executeTest();
+ }
+
+ @Test
+ public void failIfNoTestsForkModeOnce()
+ {
+ unpack().forkOnce().failIfNoTests( true ).maven().withFailure().executeTest();
+ }
+
+ @Test
+ public void dontFailIfNoTestsForkModeAlways()
+ {
+ doTest( unpack().forkAlways().failIfNoTests( false ) );
+ }
+
+ @Test
+ public void dontFailIfNoTestsForkModeNever()
+ {
+ doTest( unpack().forkNever().failIfNoTests( false ) );
+ }
+
+ @Test
+ public void dontFailIfNoTestsForkModeOnce()
+ {
+ doTest( unpack().forkOnce().failIfNoTests( false ) );
+ }
+
+ private void doTest( SurefireLauncher launcher )
+ {
+ launcher.executeTest().verifyErrorFreeLog().assertTestSuiteResults( 0, 0, 0, 0 );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "default-configuration-classWithNoTests" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
new file mode 100644
index 0000000..787037c
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
@@ -0,0 +1,63 @@
+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.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+
+/**
+ * Test failIfNoTests
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class CheckTestFailIfNoTestsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/default-configuration-noTests" );
+ }
+
+ @Test
+ public void failIfNoTests()
+ {
+ unpack().failIfNoTests( true ).maven().withFailure().executeTest();
+ }
+
+ @Test
+ public void dontFailIfNoTests()
+ {
+ final OutputValidator outputValidator = unpack().failIfNoTests( false ).executeTest();
+ outputValidator.verifyErrorFreeLog();
+ TestFile reportsDir = outputValidator.getSurefireReportsFile( "" );
+ assertFalse( "Unexpected reports directory", reportsDir.exists() );
+ }
+
+ @Test
+ public void jUnit48CategoriesFailWhenNoTests()
+ {
+ unpack().failIfNoTests( false ).activateProfile( "junit47" ).setJUnitVersion(
+ "4.8.1" ).executeTest().verifyErrorFreeLog();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
new file mode 100644
index 0000000..440955c
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
@@ -0,0 +1,47 @@
+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;
+
+/**
+ * Test failures in @BeforeMethod annotation on TestNg suite
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class CheckTestNgBeforeMethodFailureIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void TestNgBeforeMethodFailure()
+ throws Exception
+ {
+ unpack( "/testng-beforeMethodFailure" )
+ .maven()
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .withFailure()
+ .executeTest()
+ .assertTestSuiteResults( 2, 0, 1, 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
new file mode 100644
index 0000000..d96fefc
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
@@ -0,0 +1,44 @@
+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;
+
+/**
+ * Test @BeforeMethod annotation on TestNg suite
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class CheckTestNgBeforeMethodIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void TestNgBeforeMethod()
+ throws Exception
+ {
+ unpack( "/testng-beforeMethod" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .executeTest()
+ .verifyErrorFree( 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomObjectFactoryIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomObjectFactoryIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomObjectFactoryIT.java
new file mode 100644
index 0000000..2e2b646
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomObjectFactoryIT.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.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import java.io.File;
+
+import static org.fest.assertions.Assertions.assertThat;
+
+/**
+ * Test TestNG with custom object factory defined.
+ *
+ * @author <a href="mailto:orien@codehaus.org">Orien Madgwick</a>
+ */
+public class CheckTestNgCustomObjectFactoryIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testTestNgListenerReporter()
+ throws Exception
+ {
+ File baseDir = unpack()
+ .executeTest()
+ .verifyErrorFreeLog()
+ .assertTestSuiteResults( 1, 0, 0, 0 )
+ .getBaseDir();
+
+ baseDir = baseDir.getCanonicalFile();
+
+ File targetDir = new File( baseDir, "target" );
+ assertThat( targetDir ).isDirectory();
+ assertThat( new File( targetDir, "objectFactory-output.txt" ) ).isFile();
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/testng-objectFactory" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomTestRunnerFactoryIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomTestRunnerFactoryIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomTestRunnerFactoryIT.java
new file mode 100644
index 0000000..4cf5afa
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomTestRunnerFactoryIT.java
@@ -0,0 +1,59 @@
+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;
+
+import java.io.File;
+
+import static org.fest.assertions.Assertions.assertThat;
+
+/**
+ * Test TestNG with custom test runner factory defined.
+ *
+ * @author <a href="mailto:orien@codehaus.org">Orien Madgwick</a>
+ */
+public class CheckTestNgCustomTestRunnerFactoryIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testTestNgListenerReporter()
+ throws Exception
+ {
+ File baseDir = unpack()
+ .executeTest()
+ .verifyErrorFreeLog()
+ .assertTestSuiteResults( 1, 0, 0, 0 )
+ .getBaseDir();
+
+ baseDir = baseDir.getCanonicalFile();
+
+ File targetDir = new File( baseDir, "target" );
+ assertThat( targetDir ).isDirectory();
+ assertThat( new File( targetDir, "testrunnerfactory-output.txt" ) ).isFile();
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/testng-testRunnerFactory" );
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java
new file mode 100644
index 0000000..24ee3e6
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java
@@ -0,0 +1,69 @@
+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 java.io.File;
+import java.io.FilenameFilter;
+
+import static org.fest.assertions.Assertions.assertThat;
+
+
+/**
+ * Test for checking that the output from a forked suite is properly captured even if the suite encounters a severe error.
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class CheckTestNgExecuteErrorIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void executionError()
+ throws Exception
+ {
+ OutputValidator outputValidator = unpack( "/testng-execute-error" )
+ .maven()
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .showErrorStackTraces()
+ .withFailure()
+ .executeTest();
+
+ File reportDir = outputValidator.getSurefireReportsDirectory();
+ String[] dumpFiles = reportDir.list( new FilenameFilter()
+ {
+ @Override
+ public boolean accept( File dir, String name )
+ {
+ return name.endsWith( ".dump" );
+ }
+ });
+ assertThat( dumpFiles ).isNotEmpty();
+ for ( String dump : dumpFiles )
+ {
+ outputValidator.getSurefireReportsFile( dump )
+ .assertContainsText( "at org.apache.maven.surefire.testng.TestNGExecutor.run" );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
new file mode 100644
index 0000000..f56e2e4
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
@@ -0,0 +1,43 @@
+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;
+
+/**
+ * Test TestNG groups, together with TestNG parallelism
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class CheckTestNgGroupThreadParallelIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void TestNgGroupThreadParallel()
+ {
+ unpack( "testng-group-thread-parallel" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .executeTest()
+ .verifyErrorFree( 3 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
new file mode 100644
index 0000000..9cabd7e
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
@@ -0,0 +1,41 @@
+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;
+
+/**
+ * Test TestNG running in the JDK 1.4 JavaDoc style
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class CheckTestNgJdk14IT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void TestNgJdk14()
+ throws Exception
+ {
+ unpack( "/testng-jdk14" ).executeTest().verifyErrorFree( 1 );
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
new file mode 100644
index 0000000..2c618d0
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
@@ -0,0 +1,105 @@
+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;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
+import static org.junit.runners.Parameterized.Parameter;
+import static org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Test simple TestNG listener and reporter
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+@RunWith( Parameterized.class )
+public class CheckTestNgListenerReporterIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Parameters( name = "{index}: TestNG {0}" )
+ public static Collection<Object[]> data()
+ {
+ return Arrays.asList(new Object[][] {
+ { "5.6", "jdk15", 1.5d }, // First TestNG version with reporter support
+ { "5.7", "jdk15", 1.5d }, // default version from pom of the test case
+ { "5.10", "jdk15", 1.5d },
+ { "5.13", null, 1.5d }, // "reporterslist" param becomes String instead of List<ReporterConfig>
+ // "listener" param becomes String instead of List<Class>
+
+ // configure(Map) in 5.14.1 and 5.14.2 is transforming List<Class> into a String with a space as separator.
+ // Then configure(CommandLineArgs) splits this String into a List<String> with , or ; as separator => fail.
+ // If we used configure(CommandLineArgs), we would not have the problem with white spaces.
+ //{ "5.14.1", null, "1.5" }, // "listener" param becomes List instead of String
+ // Fails: Issue with 5.14.1 and 5.14.2 => join with <space>, split with ","
+ // TODO will work with "configure(CommandLineArgs)"
+ //{ "5.14.2", null, "1.5" }, // ReporterConfig is not available
+
+ //{ "5.14.3", null, "1.5" }, // TestNG uses "reporter" instead of "reporterslist"
+ // Both String or List are possible for "listener"
+ // Fails: not able to test due to system dependency org.testng:guice missed the path and use to break CI
+ // ClassNotFoundException: com.beust.jcommander.ParameterException
+
+ //{ "5.14.4", null, "1.5" }, { "5.14.5", null, "1.5" }, // Fails: not able to test due to system dependency org.testng:guice missed the path and use to break CI
+ // ClassNotFoundException: com.beust.jcommander.ParameterException
+
+ { "5.14.6", null, 1.5d }, // Usage of org.testng:guice removed
+ { "5.14.9", null, 1.5d }, // Latest 5.14.x TestNG version
+ { "6.0", null, 1.5d },
+ { "6.9.9", null, 1.7d } // Currently latest TestNG version
+ });
+ }
+
+ @Parameter
+ public String version;
+
+ @Parameter(1)
+ public String classifier;
+
+ @Parameter(2)
+ public double javaVersion;
+
+ @Test
+ public void testNgListenerReporter()
+ {
+ assumeJavaVersion( javaVersion );
+ final SurefireLauncher launcher = unpack( "testng-listener-reporter", "_" + version )
+ .sysProp( "testNgVersion", version );
+
+ if ( classifier != null )
+ {
+ launcher.sysProp( "testNgClassifier", "jdk15" );
+ }
+
+ launcher.executeTest()
+ .verifyErrorFree( 1 )
+ .getTargetFile( "resultlistener-output.txt" ).assertFileExists()
+ .getTargetFile( "suitelistener-output.txt" ).assertFileExists()
+ .getTargetFile( "reporter-output.txt" ).assertFileExists();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenersIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenersIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenersIT.java
new file mode 100644
index 0000000..cc1bb74
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenersIT.java
@@ -0,0 +1,37 @@
+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;
+
+/**
+ * Test annotation-based TestNG listener
+ */
+public class CheckTestNgListenersIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void TestNgListenerReporter()
+ {
+ unpack( "testng-listeners" ).mavenTestFailureIgnore( true ).executeTest().assertTestSuiteResults( 1, 0, 1, 0 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
new file mode 100644
index 0000000..aa77d1b
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
@@ -0,0 +1,42 @@
+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;
+
+/**
+ * Test TestNG test in a directory with spaces
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class CheckTestNgPathWithSpacesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void TestWithSpaces()
+ {
+ unpack( "testng-path with spaces" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .executeTest()
+ .verifyErrorFree( 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
new file mode 100644
index 0000000..a358172
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
@@ -0,0 +1,74 @@
+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;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * Test surefire-report on TestNG test
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class CheckTestNgReportTestIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testNgReport()
+ throws Exception
+ {
+ unpack( "/testng-simple" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .addSurefireReportGoal()
+ .executeCurrentGoals()
+ .verifyErrorFree( 3 )
+ .getSiteFile( "surefire-report.html" )
+ .assertFileExists();
+ }
+
+ @Test
+ public void shouldNotBeVerbose()
+ throws Exception
+ {
+ unpack( "/testng-simple" )
+ .sysProp( "testNgVersion", "5.10" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .executeTest()
+ .verifyErrorFreeLog()
+ .assertThatLogLine( containsString( "[Parser] Running:" ), is( 0 ) );
+ }
+
+ @Test
+ public void shouldBeVerbose()
+ throws Exception
+ {
+ unpack( "/testng-simple" )
+ .sysProp( "testNgVersion", "5.10" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .sysProp( "surefire.testng.verbose", "10" )
+ .executeTest()
+ .verifyErrorFreeLog()
+ .assertThatLogLine( containsString( "[Parser] Running:" ), is( 1 ) );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
new file mode 100644
index 0000000..2e56dc9
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
@@ -0,0 +1,60 @@
+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.Ignore;
+import org.junit.Test;
+
+/**
+ * Test simple TestNG suite XML file
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class CheckTestNgSuiteXmlIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void suiteXml()
+ {
+ unpack().executeTest().verifyErrorFree( 2 );
+ }
+
+ @Test
+ @Ignore( "Fails - see SUREFIRE-1123" )
+ public void suiteXmlForkModeAlways()
+ {
+ unpack().forkAlways().executeTest().verifyErrorFree( 2 );
+ }
+
+ @Test
+ public void suiteXmlForkCountTwoReuse()
+ {
+ unpack().forkCount( 2 ).reuseForks( true ).executeTest().verifyErrorFree( 2 );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "testng-suite-xml" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
new file mode 100644
index 0000000..e2b63b6
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
@@ -0,0 +1,44 @@
+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;
+
+/**
+ * Use -Dtest to run a single TestNG test, overriding the suite XML parameter.
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class CheckTestNgSuiteXmlSingleIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void TestNgSuite()
+ {
+ unpack( "/testng-twoTestCaseSuite" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .setTestToRun( "TestNGTestTwo" )
+ .executeTest()
+ .verifyErrorFree( 1 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
new file mode 100644
index 0000000..6d2bbfa
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
@@ -0,0 +1,223 @@
+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.List;
+
+import org.apache.maven.plugins.surefire.report.ReportTestSuite;
+import org.apache.maven.surefire.its.fixture.HelperAssertions;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Basic suite test using all known versions of TestNG. Used for regression testing Surefire against old versions. To
+ * check new versions of TestNG work with current versions of Surefire, instead run the full test suite with
+ * -Dtestng.version=5.14.2 (for example)
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class CheckTestNgVersionsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test public void test47()
+ throws Exception
+ {
+ runTestNgTest( "4.7", "jdk15" );
+ }
+
+ @Test @Ignore( "5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024" ) public void XXXtest50()
+ throws Exception
+ {
+ runTestNgTest( "5.0", "jdk15" );
+ }
+
+ @Test @Ignore( "5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024" ) public void XXXtest501()
+ throws Exception
+ {
+ runTestNgTest( "5.0.1", "jdk15" );
+ }
+
+ @Test public void test502()
+ throws Exception
+ {
+ runTestNgTest( "5.0.2", "jdk15" );
+ }
+
+ @Test public void test51()
+ throws Exception
+ {
+ runTestNgTest( "5.1", "jdk15" );
+ }
+
+ @Test public void test55()
+ throws Exception
+ {
+ runTestNgTest( "5.5", "jdk15" );
+ }
+
+ @Test public void test56()
+ throws Exception
+ {
+ runTestNgTest( "5.6", "jdk15" );
+ }
+
+ @Test public void test57()
+ throws Exception
+ {
+ runTestNgTest( "5.7", "jdk15" );
+ }
+
+ @Test public void test58()
+ throws Exception
+ {
+ runTestNgTest( "5.8", "jdk15" );
+ }
+
+ @Test public void test59()
+ throws Exception
+ {
+ runTestNgTest( "5.9", "jdk15" );
+ }
+
+ @Test public void test510()
+ throws Exception
+ {
+ runTestNgTest( "5.10", "jdk15" );
+ }
+
+ @Test public void test511()
+ throws Exception
+ {
+ runTestNgTest( "5.11", "jdk15" );
+ }
+
+ @Test public void test512()
+ throws Exception
+ {
+ runTestNgTest( "5.12.1" );
+ }
+
+ @Test public void test513()
+ throws Exception
+ {
+ runTestNgTest( "5.13" );
+ }
+
+ @Test public void test5131()
+ throws Exception
+ {
+ runTestNgTest( "5.13.1" );
+ }
+
+ @Test public void test514()
+ throws Exception
+ {
+ runTestNgTest( "5.14" );
+ }
+
+ @Test public void test5141()
+ throws Exception
+ {
+ runTestNgTest( "5.14.1" );
+ }
+
+ @Test public void test5142()
+ throws Exception
+ {
+ runTestNgTest( "5.14.2" );
+ }
+
+ @Test public void test60()
+ throws Exception
+ {
+ runTestNgTest( "6.0" );
+ }
+
+ @Test public void test685()
+ throws Exception
+ {
+ runTestNgTestWithRunOrder( "6.8.5" );
+ }
+
+ private void runTestNgTestWithRunOrder( String version )
+ throws Exception
+ {
+ runTestNgTest( version, null, true );
+ }
+
+ private void runTestNgTest( String version )
+ throws Exception
+ {
+ runTestNgTest( version, null, false );
+ }
+
+ private void runTestNgTest( String version, boolean validateRunOrder )
+ throws Exception
+ {
+ runTestNgTest( version, null, validateRunOrder );
+ }
+
+ private void runTestNgTest( String version, String classifier )
+ throws Exception
+ {
+ runTestNgTest( version, classifier, false );
+ }
+
+ private void runTestNgTest( String version, String classifier, boolean validateRunOrder )
+ throws Exception
+ {
+ final SurefireLauncher launcher = unpack( "testng-simple" )
+ .sysProp( "testNgVersion", version );
+
+ if ( classifier != null )
+ {
+ launcher.sysProp( "testNgClassifier", classifier );
+ }
+
+ final OutputValidator outputValidator = launcher.executeTest();
+
+ outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 );
+
+ if ( validateRunOrder )
+ {
+ // assert correct run order of tests
+ List<ReportTestSuite> report = HelperAssertions.extractReports( outputValidator.getBaseDir() );
+
+ assertEquals( 3, report.size() );
+
+ assertTrue( "TestNGSuiteTestC was executed first", getTestClass( report, 0 ).endsWith( "TestNGSuiteTestC" ) );
+ assertTrue( "TestNGSuiteTestB was executed second", getTestClass( report, 1 ).endsWith( "TestNGSuiteTestB" ) );
+ assertTrue( "TestNGSuiteTestA was executed last", getTestClass( report, 2 ).endsWith( "TestNGSuiteTestA" ) );
+ }
+ }
+
+ private String getTestClass( List<ReportTestSuite> report, int i )
+ {
+ return report.get( i ).getFullClassName();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
new file mode 100644
index 0000000..dfea90a
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
@@ -0,0 +1,39 @@
+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;
+
+/**
+ * Test for checking the order of class path elements
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class ClassPathOrderIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void classPathOrder()
+ {
+ unpack( "/classpath-order" ).executeTest().verifyErrorFree( 2 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
new file mode 100644
index 0000000..89aada7
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
@@ -0,0 +1,39 @@
+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;
+
+/**
+ * Test additionalClasspathElements
+ *
+ * @author pgier
+ */
+public class ClasspathFilteringIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void additionalClasspath()
+ throws Exception
+ {
+ unpack( "classpath-filtering" ).debugLogging().executeTest().verifyErrorFree( 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
new file mode 100644
index 0000000..ca64d87
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
@@ -0,0 +1,39 @@
+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;
+
+/**
+ * Test additionalClasspathElements
+ *
+ * @author pgier
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class ClasspathScopeFilteringIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void additionalClasspath()
+ {
+ unpack( "classpath-scope-filtering" ).executeTest().verifyErrorFree( 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
new file mode 100644
index 0000000..e01d798
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
@@ -0,0 +1,106 @@
+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.nio.charset.Charset;
+
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.Test;
+
+/**
+ * Basic suite test using all known versions of JUnit 4.x
+ *
+ * @author Kristian Rosenvold
+ */
+public class ConsoleOutputIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void properNewlinesAndEncodingWithDefaultEncodings()
+ {
+ final OutputValidator outputValidator =
+ unpack( "/consoleOutput" ).forkOnce().executeTest();
+
+ validate( outputValidator, true );
+ }
+
+ @Test
+ public void properNewlinesAndEncodingWithDifferentEncoding()
+ {
+ final OutputValidator outputValidator =
+ unpack( "/consoleOutput" ).forkOnce().argLine( "-Dfile.encoding=UTF-16" ).executeTest();
+
+ validate( outputValidator, true );
+ }
+
+ @Test
+ public void properNewlinesAndEncodingWithoutFork()
+ {
+ final OutputValidator outputValidator =
+ unpack( "/consoleOutput" ).forkNever().executeTest();
+
+ validate( outputValidator, false );
+ }
+
+ private void validate( final OutputValidator outputValidator, boolean includeShutdownHook )
+ {
+ TestFile xmlReportFile = outputValidator.getSurefireReportsXmlFile( "TEST-consoleOutput.Test1.xml" );
+ xmlReportFile.assertContainsText( "SoutLine" );
+ xmlReportFile.assertContainsText( normalizeToDefaultCharset( "äöüß" ) );
+ xmlReportFile.assertContainsText( normalizeToDefaultCharset( "failing with ü" ) );
+
+ TestFile outputFile = outputValidator.getSurefireReportsFile( "consoleOutput.Test1-output.txt" );
+ outputFile.assertContainsText( "SoutAgain" );
+ outputFile.assertContainsText( "SoutLine" );
+ outputFile.assertContainsText( normalizeToDefaultCharset( "äöüß" ) );
+
+ if ( includeShutdownHook )
+ {
+ outputFile.assertContainsText( "Printline in shutdown hook" );
+ }
+ }
+
+ /**
+ * @param string the string to normalize
+ * @return the string with all characters not available in the current charset being replaced, e.g. for US-ASCII,
+ * German umlauts would be replaced to ?
+ */
+ private String normalizeToDefaultCharset( String string )
+ {
+ Charset cs = Charset.defaultCharset();
+ if ( cs.canEncode() )
+ {
+ string = cs.decode( cs.encode( string ) ).toString();
+ }
+
+ return string;
+ }
+
+ @Test
+ public void largerSoutThanMemory()
+ throws Exception
+ {
+ unpack( "consoleoutput-noisy" ).setMavenOpts( "-Xmx64m" ).sysProp( "thousand", "32000" ).executeTest();
+ }
+
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java
new file mode 100644
index 0000000..b5489d1
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java
@@ -0,0 +1,61 @@
+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;
+
+/**
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class CrashDetectionIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void crashInFork()
+ {
+ unpack( "crash-detection" ).maven().withFailure().executeTest();
+ }
+
+ @Test
+ public void crashInReusableFork()
+ {
+ unpack( "crash-detection" )
+ .forkPerThread()
+ .reuseForks( true )
+ .threadCount( 1 )
+ .maven()
+ .withFailure()
+ .executeTest();
+ }
+
+ @Test
+ public void hardCrashInReusableFork()
+ {
+ unpack( "crash-detection" )
+ .forkPerThread()
+ .reuseForks( true )
+ .threadCount( 1 )
+ .addGoal( "-DkillHard=true" )
+ .maven()
+ .withFailure()
+ .executeTest();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
new file mode 100644
index 0000000..b0907b8
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
@@ -0,0 +1,38 @@
+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;
+
+/**
+ * Test basic default configuration, runs the JUnit 3 test in the src/test directory.
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class DefaultConfigurationIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void defaultConfiguration()
+ {
+ executeErrorFreeTest( "default-configuration", 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
new file mode 100644
index 0000000..7f38a73
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
@@ -0,0 +1,40 @@
+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;
+
+/**
+ * Test basic default configuration, runs the JUnit 3 test in the src/test directory.
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class EnvironmentVariableIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void environmentVariable()
+ {
+
+ executeErrorFreeTest( "junit44-environment", 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/EnvironmentVariablesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/EnvironmentVariablesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/EnvironmentVariablesIT.java
new file mode 100644
index 0000000..651200f
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/EnvironmentVariablesIT.java
@@ -0,0 +1,47 @@
+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;
+
+/**
+ * SUREFIRE-763 Asserts that environment variables are correctly populated using "useSystemClassLoader=false"
+ * SUREFIRE-963 Asserts that empty environment variables are read as "".
+ *
+ * @author Kristian Rosenvold
+ * @author Christophe Deneux
+ */
+public class EnvironmentVariablesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testWhenUseSystemClassLoader()
+ {
+ unpack( "/environment-variables" ).addGoal( "-DuseSystemClassLoader=true" ).executeTest();
+ }
+
+ @Test
+ public void testWhenDontUseSystemClassLoader()
+ {
+ unpack( "/environment-variables" ).addGoal( "-DuseSystemClassLoader=false" ).executeTest();
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
new file mode 100644
index 0000000..beb1e32
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
@@ -0,0 +1,77 @@
+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.ArrayList;
+
+import static org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Test class for SUREFIRE-580, configuration parameter {@code skipAfterFailureCount}.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.19
+ */
+public class FailFastJUnitIT
+ extends AbstractFailFastIT
+{
+
+ @Parameters(name = "{0}")
+ public static Iterable<Object[]> data()
+ {
+ /**
+ * reuseForks=false is not used because of race conditions and unpredictable commands received by
+ * MasterProcessReader, this feature has significant limitation.
+ */
+ ArrayList<Object[]> args = new ArrayList<Object[]>();
+ // description
+ // profile
+ // forkCount,
+ // fail-fast-count,
+ // reuseForks
+ // total
+ // failures
+ // errors
+ // skipped
+ args.add( new Object[] { "junit4-oneFork-ff1", "junit4", props( 1, 1, true ), 5, 0, 1, 4 } );
+ args.add( new Object[] { "junit47-oneFork-ff1", "junit47", props( 1, 1, true ), 5, 0, 1, 4 } );
+ args.add( new Object[] { "junit4-oneFork-ff2", "junit4", props( 1, 2, true ), 5, 0, 2, 3 } );
+ args.add( new Object[] { "junit47-oneFork-ff2", "junit47", props( 1, 2, true ), 5, 0, 2, 3 } );
+ args.add( new Object[] { "junit4-twoForks-ff1", "junit4", props( 2, 1, true ), 5, 0, 2, 3 } );
+ args.add( new Object[] { "junit47-twoForks-ff1", "junit47",props( 2, 1, true ), 5, 0, 2, 3 } );
+ args.add( new Object[] { "junit4-twoForks-ff2", "junit4", props( 2, 2, true ), 5, 0, 2, 2 } );
+ args.add( new Object[] { "junit47-twoForks-ff2", "junit47",props( 2, 2, true ), 5, 0, 2, 2 } );
+ args.add( new Object[] { "junit4-oneFork-ff3", "junit4", props( 1, 3, true ), 5, 0, 2, 0 } );
+ args.add( new Object[] { "junit47-oneFork-ff3", "junit47", props( 1, 3, true ), 5, 0, 2, 0 } );
+ args.add( new Object[] { "junit4-twoForks-ff3", "junit4", props( 2, 3, true ), 5, 0, 2, 0 } );
+ args.add( new Object[] { "junit47-twoForks-ff3", "junit47",props( 2, 3, true ), 5, 0, 2, 0 } );
+ /*args.add( new Object[] { "junit4-twoForks-ff1x","junit4", props( 2, 1, false ), 5, 0, 2, 3 } );
+ args.add( new Object[] { "junit47-twoForks-ff1x","junit47",props( 2, 1, false ), 5, 0, 2, 3 } );
+ args.add( new Object[] { "junit4-twoForks-ff2x","junit4", props( 2, 2, false ), 5, 0, 2, 2 } );
+ args.add( new Object[] { "junit47-twoForks-ff2x","junit47",props( 2, 2, false ), 5, 0, 2, 2 } );*/
+ return args;
+ }
+
+ @Override
+ protected String withProvider()
+ {
+ return "junit";
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
new file mode 100644
index 0000000..f4aa2b7
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
@@ -0,0 +1,69 @@
+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.ArrayList;
+
+import static org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Test class for SUREFIRE-580, configuration parameter {@code skipAfterFailureCount}.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.19
+ */
+public class FailFastTestNgIT
+ extends AbstractFailFastIT
+{
+
+ @Parameters(name = "{0}")
+ public static Iterable<Object[]> data()
+ {
+ /**
+ * reuseForks=false is not used because of race conditions and unpredictable commands received by
+ * MasterProcessReader, this feature has significant limitation.
+ */
+ ArrayList<Object[]> args = new ArrayList<Object[]>();
+ // description
+ // profile
+ // forkCount,
+ // fail-fast-count,
+ // reuseForks
+ // total
+ // failures
+ // errors
+ // skipped
+ args.add( new Object[] { "testng-oneFork-ff1", null, props( 1, 1, true ), 5, 1, 0, 4 } );
+ args.add( new Object[] { "testng-oneFork-ff2", null, props( 1, 2, true ), 5, 2, 0, 3 } );
+ args.add( new Object[] { "testng-twoForks-ff1", null, props( 2, 1, true ), 5, 2, 0, 3 } );
+ args.add( new Object[] { "testng-twoForks-ff2", null, props( 2, 2, true ), 5, 2, 0, 2 } );
+ args.add( new Object[] { "testng-oneFork-ff3", null, props( 1, 3, true ), 5, 2, 0, 0 } );
+ args.add( new Object[] { "testng-twoForks-ff3", null, props( 2, 3, true ), 5, 2, 0, 0 } );
+ /*args.add( new Object[] { "testng-twoForks-ff1x", null, props( 2, 1, false ), 5, 2, 0, 3 } );
+ args.add( new Object[] { "testng-twoForks-ff2x", null, props( 2, 2, false ), 5, 2, 0, 2 } );*/
+ return args;
+ }
+
+ @Override
+ protected String withProvider()
+ {
+ return "testng";
+ }
+}
[50/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index 01eabca..c080713 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -116,11 +116,11 @@ oses.eachWithIndex { os, indexOfOs ->
// zip(zipFile: "it--maven-failsafe-plugin--${stageKey}.zip", dir: 'build/maven-failsafe-plugin/target/it', archive: true)
// }
//
-// if (fileExists('build/surefire-integration-tests/target') {
-// zip(zipFile: "it--surefire-integration-tests--${stageKey}.zip", dir: 'build/surefire-integration-tests/target', archive: true)
+// if (fileExists('build/surefire-its/target') {
+// zip(zipFile: "it--surefire-its--${stageKey}.zip", dir: 'build/surefire-its/target', archive: true)
// }
-// archiveArtifacts(artifacts: 'build/surefire-integration-tests/target/**/log.txt', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: false)
+// archiveArtifacts(artifacts: 'build/surefire-its/target/**/log.txt', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: false)
stage("cleanup ${stageKey}") {
// clean up after ourselves to reduce disk space
@@ -214,12 +214,12 @@ oses.eachWithIndex { os, indexOfOs ->
// zip(zipFile: "it--maven-failsafe-plugin--${stageKey}.zip", dir: 'build/maven-failsafe-plugin/target/it', archive: true)
// }
//
-// if (fileExists('build/surefire-integration-tests/target') {
-// zip(zipFile: "it--surefire-integration-tests--${stageKey}.zip", dir: 'build/surefire-integration-tests/target', archive: true)
+// if (fileExists('build/surefire-its/target') {
+// zip(zipFile: "it--surefire-its--${stageKey}.zip", dir: 'build/surefire-its/target', archive: true)
// }
//
// sh 'tar czvf it1.tgz build/maven-failsafe-plugin/target/it'
-// sh 'tar czvf it2.tgz build/surefire-integration-tests/target'
+// sh 'tar czvf it2.tgz build/surefire-its/target'
// archiveArtifacts(artifacts: '**/*.tgz', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: false)
// archiveArtifacts(artifacts: '*.tgz', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: false)
@@ -303,7 +303,7 @@ def sourcesPatternCsv() {
'**/surefire-api/src/main/java,' +
'**/surefire-booter/src/main/java,' +
'**/surefire-grouper/src/main/java,' +
- '**/surefire-integration-tests/src/main/java,' +
+ '**/surefire-its/src/main/java,' +
'**/surefire-logger-api/src/main/java,' +
'**/surefire-providers/**/src/main/java,' +
'**/surefire-report-parser/src/main/java'
@@ -318,7 +318,7 @@ def classPatternCsv() {
'**/surefire-api/target/classes,' +
'**/surefire-booter/target/classes,' +
'**/surefire-grouper/target/classes,' +
- '**/surefire-integration-tests/target/classes,' +
+ '**/surefire-its/target/classes,' +
'**/surefire-logger-api/target/classes,' +
'**/surefire-providers/**/target/classes,' +
'**/surefire-report-parser/target/classes'
@@ -349,9 +349,9 @@ def testReportsPatternCsv() {
'**/surefire-api/target/surefire-reports/*.xml,' +
'**/surefire-booter/target/surefire-reports/*.xml,' +
'**/surefire-grouper/target/surefire-reports/*.xml,' +
- '**/surefire-integration-tests/target/surefire-reports/*.xml,' +
+ '**/surefire-its/target/surefire-reports/*.xml,' +
'**/surefire-logger-api/target/surefire-reports/*.xml,' +
'**/surefire-providers/**/target/surefire-reports/*.xml,' +
'**/surefire-report-parser/target/surefire-reports/*.xml,' +
- '**/surefire-integration-tests/target/failsafe-reports/*.xml'
+ '**/surefire-its/target/failsafe-reports/*.xml'
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8a9a405..f5af360 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<module>maven-failsafe-plugin</module>
<module>maven-surefire-report-plugin</module>
<module>surefire-setup-integration-tests</module>
- <module>surefire-integration-tests</module>
+ <module>surefire-its</module>
</modules>
<scm>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
deleted file mode 100644
index 9f5a9a0..0000000
--- a/surefire-integration-tests/pom.xml
+++ /dev/null
@@ -1,202 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire</artifactId>
- <version>2.21.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>surefire-integration-tests</artifactId>
-
- <name>Maven Surefire Integration Tests</name>
- <description>Used internally testing MOJOs. The project is not deployed.</description>
-
- <properties>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-report-parser</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-verifier</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-settings</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <!-- Java 9 requires version 3.6+ (todo use in parent POM. Note: versions 3.6, 3.7 are compiled with Java 7) -->
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.7</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <test>*Test</test>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
- <configuration>
- <jvm>${jdk.home}/bin/java</jvm>
- <runOrder>alphabetical</runOrder>
- <threadCount>1</threadCount>
- <perCoreThreadCount>false</perCoreThreadCount>
- <forkMode>once</forkMode>
- <argLine>-server -Xmx64m -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.awt.headless=true</argLine>
- <includes>
- <include>org/apache/**/*IT*.java</include>
- </includes>
- <!-- Pass current surefire version to the main suite so that it -->
- <!-- can forward to all integration test projects. SUREFIRE-513 -->
- <systemPropertyVariables>
- <surefire.version>${project.version}</surefire.version>
- <maven.home>${maven.home}</maven.home>
- <maven.settings.file>${project.basedir}/../surefire-setup-integration-tests/target/private/it-settings.xml
- </maven.settings.file>
- <maven.toolchains.file>${project.basedir}/../surefire-setup-integration-tests/target/private/toolchains.xml
- </maven.toolchains.file>
- <maven.repo.local>${project.basedir}/../surefire-setup-integration-tests/target/it-repo</maven.repo.local>
- <maven.test.tmpdir>${project.build.directory}</maven.test.tmpdir>
- <user.localRepository>${settings.localRepository}</user.localRepository>
- <useInterpolatedSettings>false</useInterpolatedSettings>
- <testBuildDirectory>${project.build.testOutputDirectory}</testBuildDirectory>
- <verifier.forkMode>forked</verifier.forkMode>
- <jdk.home>${jdk.home}</jdk.home>
- <jacoco.agent>${jacoco-it.agent}</jacoco.agent>
- </systemPropertyVariables>
- <redirectTestOutputToFile>false</redirectTestOutputToFile>
- <useFile>false</useFile>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>require-maven-2.1.0</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <!-- Some plugin features require a recent Maven runtime to work (e.g. SystemPropertiesTest) -->
- <version>[2.1.0,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <!-- todo dont skip since of failsafe:2.19 internal use if having src/main/java/... -->
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>jacoco-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>jacoco-agent-it</id>
- <goals>
- <goal>prepare-agent-integration</goal>
- </goals>
- <configuration>
- <propertyName>jacoco-it.agent</propertyName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
deleted file mode 100644
index 9a49d1a..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
+++ /dev/null
@@ -1,105 +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.MavenLauncher;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.runners.Parameterized.Parameter;
-
-/**
- * Base test class for SUREFIRE-580, configuration parameter {@code skipAfterFailureCount}.
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19
- */
-@RunWith( Parameterized.class )
-public abstract class AbstractFailFastIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Parameter( 0 )
- public String description;
-
- @Parameter( 1 )
- public String profile;
-
- @Parameter( 2 )
- public Map<String, String> properties;
-
- @Parameter( 3 )
- public int total;
-
- @Parameter( 4 )
- public int failures;
-
- @Parameter( 5 )
- public int errors;
-
- @Parameter( 6 )
- public int skipped;
-
- protected abstract String withProvider();
-
- protected final OutputValidator prepare( String description, String profile, Map<String, String> properties )
- {
- MavenLauncher launcher = unpack( "/fail-fast-" + withProvider(), "_" + description )
- .maven();
-
- if ( profile != null )
- {
- launcher.addGoal( "-P " + profile );
- }
-
- if ( failures != 0 || errors != 0 )
- {
- launcher.withFailure();
- }
-
- return launcher.sysProp( properties ).executeTest();
- }
-
- protected final OutputValidator prepare( String description, Map<String, String> properties )
- {
- return prepare( description, null, properties );
- }
-
- protected static Map<String, String> props( int forkCount, int skipAfterFailureCount, boolean reuseForks )
- {
- Map<String, String> props = new HashMap<String, String>( 3 );
- props.put( "surefire.skipAfterFailureCount", "" + skipAfterFailureCount );
- props.put( "forkCount", "" + forkCount );
- props.put( "reuseForks", "" + reuseForks );
- return props;
- }
-
- @Test
- public void test()
- {
- prepare( description, profile, properties )
- .assertTestSuiteResults( total, errors, failures, skipped );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
deleted file mode 100644
index 7f73d48..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
+++ /dev/null
@@ -1,111 +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 java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
-import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME;
-import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME_KEY;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-
-/**
- * Abstract test class for Jigsaw tests.
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.20.1
- */
-public abstract class AbstractJigsawIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private static final double JIGSAW_JAVA_VERSION = 9.0d;
-
- protected abstract String getProjectDirectoryName();
-
- protected SurefireLauncher assumeJigsaw() throws IOException
- {
- assumeTrue( "There's no JDK 9 provided.",
- isJavaVersion9AtLeast() || EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() );
- // fail( EXT_JDK_HOME_KEY + " was provided with value " + EXT_JDK_HOME + " but it is not Jigsaw Java 9." );
-
- SurefireLauncher launcher = unpack();
-
- return EXT_JDK_HOME == null ? launcher : launcher.setLauncherJavaHome( EXT_JDK_HOME );
- }
-
- protected SurefireLauncher assumeJava9Property() throws IOException
- {
- assumeTrue( "There's no JDK 9 provided.", EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() );
- return unpack();
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( getProjectDirectoryName() );
- }
-
- private static boolean isJavaVersion9AtLeast()
- {
- return Double.valueOf( System.getProperty( "java.specification.version" ) ) >= JIGSAW_JAVA_VERSION;
- }
-
- private static boolean isExtJavaVerion9AtLeast() throws IOException
- {
- File release = new File( EXT_JDK_HOME, "release" );
-
- if ( !release.isFile() )
- {
- fail( EXT_JDK_HOME_KEY + " was provided with value " + EXT_JDK_HOME + " but file does not exist "
- + EXT_JDK_HOME + File.separator + "release"
- );
- }
-
- Properties properties = new Properties();
- try ( InputStream is = new FileInputStream( release ) )
- {
- properties.load( is );
- }
- String javaVersion = properties.getProperty( "JAVA_VERSION" ).replace( "\"", "" );
- StringTokenizer versions = new StringTokenizer( javaVersion, "._" );
-
- if ( versions.countTokens() == 1 )
- {
- javaVersion = versions.nextToken();
- }
- else if ( versions.countTokens() >= 2 )
- {
- javaVersion = versions.nextToken() + "." + versions.nextToken();
- }
- else
- {
- fail( "unexpected java version format" );
- }
-
- return Double.valueOf( javaVersion ) >= JIGSAW_JAVA_VERSION;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
deleted file mode 100644
index 0260ba0..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
+++ /dev/null
@@ -1,41 +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;
-
-/**
- * Test files with "Abstract" in their name that aren't really abstract,
- * and abstract classes that don't say "Abstract" in their name
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class AbstractTestCaseIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void abstractTestCase()
- {
- unpack( "/default-configuration-abstract" ).executeTest().verifyErrorFree( 1 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java
deleted file mode 100644
index 01932fa..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java
+++ /dev/null
@@ -1,483 +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.Settings;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import static org.apache.maven.surefire.its.fixture.TestFramework.*;
-import static org.apache.maven.surefire.its.fixture.Configuration.*;
-import static org.hamcrest.core.AnyOf.anyOf;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assume.assumeThat;
-
-/**
- * Test project using multiple method patterns, including wildcards in class and method names.
- */
-public abstract class AbstractTestMultipleMethodPatterns
- extends SurefireJUnit4IntegrationTestCase
-{
- private static final String CSV_DELIMITER_SHORT = ",";
- private static final String CSV_DELIMITER_LONG = ", ";
- private static final String NOT_DELIMITER = "!";
-
- protected abstract Settings getSettings();
-
- protected abstract SurefireLauncher unpack();
-
- protected SurefireLauncher prepare( String tests )
- {
- SurefireLauncher launcher = unpack().addGoal( "-P " + getSettings().profile() );
- String[] includedExcluded = splitIncludesExcludes( tests );
- switch ( getSettings().getConfiguration() ) {
- case TEST:
- launcher.setTestToRun( tests );
- break;
- case INCLUDES:
- launcher.sysProp( "included", tests );
- break;
- case INCLUDES_EXCLUDES:
- launcher.sysProp( "included", includedExcluded[0] );
- launcher.sysProp( "excluded", includedExcluded[1] );
- break;
- default:
- throw new IllegalArgumentException( "Unsupported configuration " + getSettings().getConfiguration() );
- }
- return launcher;
- }
-
- private static String[] splitIncludesExcludes( String patterns )
- {
- String included = "";
- String excluded = "";
- for ( String pattern : patterns.split( CSV_DELIMITER_SHORT ) )
- {
- pattern = pattern.trim();
- if ( pattern.startsWith( NOT_DELIMITER ) )
- {
- excluded += pattern.substring( NOT_DELIMITER.length() ).trim();
- excluded += CSV_DELIMITER_LONG;
- }
- else
- {
- included += pattern;
- included += CSV_DELIMITER_LONG;
- }
- }
- return new String[]{ trimEndComma( included ), trimEndComma( excluded ) };
- }
-
- private static String trimEndComma( String pattern )
- {
- pattern = pattern.trim();
- return pattern.endsWith( CSV_DELIMITER_LONG )
- ? pattern.substring( 0, pattern.length() - CSV_DELIMITER_LONG.length() ) : pattern;
- }
-
- @Test
- public void simpleNameTest()
- throws Exception
- {
- prepare( "TestTwo" )
- .executeTest()
- .verifyErrorFree( 2 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
- }
-
- @Test
- public void simpleNameTestAsParallel()
- throws Exception
- {
- assumeThat( getSettings().getFramework(), anyOf( is( JUNIT47 ), is( TestNG ) ) );
- prepare( "TestTwo" )
- .parallel( "classes" )
- .useUnlimitedThreads()
- .executeTest()
- .verifyErrorFree( 2 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
- }
-
- @Test
- public void simpleNameTestWithJavaExt()
- throws Exception
- {
- prepare( "TestTwo.java" )
- .executeTest()
- .verifyErrorFree( 2 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
- }
-
- @Test
- public void simpleNameTestWithWildcardPkg()
- throws Exception
- {
- prepare( "**/TestTwo" )
- .executeTest()
- .verifyErrorFree( 2 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
- }
-
- @Test
- public void simpleNameTestWithJavaExtWildcardPkg()
- throws Exception
- {
- prepare( "**/TestTwo.java" )
- .executeTest()
- .verifyErrorFree( 2 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
- }
-
- @Test
- public void fullyQualifiedTest()
- throws Exception
- {
- prepare( "jiras/surefire745/TestTwo.java" )
- .executeTest()
- .verifyErrorFree( 2 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
- }
-
- @Test
- public void shouldMatchSimpleClassNameAndMethod()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "BasicTest#testSuccessTwo" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
- }
-
- /**
- * This method name was shorten because it cause 261 character long path on Windows with Jenkins Pipeline.
- */
- @Test
- public void matchSimpleClassAndMethodWithJavaExt()
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "BasicTest.java#testSuccessTwo" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
- }
-
- /**
- * This method name was shorten because it cause 261 character long path on Windows with Jenkins Pipeline.
- */
- @Test
- public void matchSimpleClassAndMethodWithWildcardPkg()
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "**/BasicTest#testSuccessTwo" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
- }
-
- /**
- * This method name was shorten because it cause 261 character long path on Windows with Jenkins Pipeline.
- */
- @Test
- public void matchSimpleClassAndMethodWithJavaExtWildcardPkg()
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "**/BasicTest.java#testSuccessTwo" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
- }
-
- @Test
- public void shouldMatchWildcardPackageAndClassAndMethod()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "jiras/**/BasicTest#testSuccessTwo" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
- }
-
- @Test
- public void regexClass()
- throws Exception
- {
- prepare( "%regex[.*.TestTwo.*]" )
- .executeTest()
- .verifyErrorFree( 2 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
- .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
- }
-
- @Test
- public void testSuccessTwo()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "#testSuccessTwo" )
- .maven().debugLogging()
- .executeTest()
- .verifyErrorFree( 5 )
- .verifyErrorFreeLog();
- }
-
- @Test
- public void testRegexSuccessTwo()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "%regex[#testSuccessTwo]" )
- .executeTest()
- .verifyErrorFree( 5 )
- .verifyErrorFreeLog();
- }
-
- @Test
- public void regexClassAndMethod()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "%regex[.*.BasicTest.*#testSuccessTwo]" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
- }
-
- @Test
- public void shouldMatchExactClassAndMethodWildcard()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "BasicTest#test*One" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessOne" );
- }
-
- @Test
- public void shouldMatchExactClassAndMethodsWildcard()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "BasicTest#testSuccess*" )
- .executeTest()
- .verifyErrorFree( 2 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessOne" )
- .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
- }
-
- @Test
- public void shouldMatchExactClassAndMethodCharacters()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "BasicTest#test???????One" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessOne" );
- }
-
- @Test
- public void shouldMatchExactClassAndMethodsPostfix()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "TestFive#testSuccess???" )
- .executeTest()
- .verifyErrorFree( 2 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.TestFive#testSuccessOne" )
- .verifyTextInLog( "jiras.surefire745.TestFive#testSuccessTwo" );
- }
-
- @Test
- public void shouldMatchExactClassAndMethodPostfix()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "TestFive#testSuccess?????" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.TestFive#testSuccessThree" );
- }
-
- @Test
- public void shouldMatchExactClassAndMultipleMethods()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "TestFive#testSuccessOne+testSuccessThree" )
- .executeTest()
- .verifyErrorFree( 2 )
- .verifyErrorFreeLog()
- .verifyTextInLog( "jiras.surefire745.TestFive#testSuccessOne" )
- .verifyTextInLog( "jiras.surefire745.TestFive#testSuccessThree" );
- }
-
- @Test
- public void shouldMatchMultiplePatterns()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- String test = "jiras/surefire745/BasicTest#testSuccessOne+testSuccessTwo"//2
- + ',' + "jiras/**/TestTwo"//2
- + ',' + "jiras/surefire745/TestThree#testSuccess*"//2
- + ',' + "TestFour#testSuccess???"//2
- + ',' + "jiras/surefire745/*Five#test*One";//1
-
- prepare( test )
- .executeTest()
- .verifyErrorFree( 9 )
- .verifyErrorFreeLog();
- }
-
- @Test
- public void shouldMatchMultiplePatternsAsParallel()
- throws Exception
- {
- assumeThat( getSettings().getFramework(), anyOf( is( JUNIT47 ), is( TestNG ) ) );
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- String test = "jiras/surefire745/BasicTest#testSuccessOne+testSuccessTwo"//2
- + ',' + "jiras/**/TestTwo"//2
- + ',' + "jiras/surefire745/TestThree#testSuccess*"//2
- + ',' + "TestFour#testSuccess???"//2
- + ',' + "jiras/surefire745/*Five#test*One";//1
-
- prepare( test )
- .parallel( "classes" )
- .useUnlimitedThreads()
- .executeTest()
- .verifyErrorFree( 9 )
- .verifyErrorFreeLog();
- }
-
- @Test
- public void shouldMatchMultiplePatternsComplex()
- throws Exception
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- String test = "**/BasicTest#testSuccessOne+testSuccessTwo"//2
- + ',' + "jiras/**/TestTwo"//2
- + ',' + "?????/surefire745/TestThree#testSuccess*"//2
- + ',' + "jiras/surefire745/TestFour.java#testSuccess???"//2
- + ',' + "jiras/surefire745/*Five#test*One";//1
-
- prepare( test )
- .executeTest()
- .verifyErrorFree( 9 )
- .verifyErrorFreeLog();
- }
-
- @Test
- public void shouldMatchMultiplePatternsComplexAsParallel()
- throws Exception
- {
- assumeThat( getSettings().getFramework(), anyOf( is( JUNIT47 ), is( TestNG ) ) );
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- String test = "**/BasicTest#testSuccessOne+testSuccessTwo"//2
- + ',' + "jiras/**/TestTwo"//2
- + ',' + "?????/surefire745/TestThree#testSuccess*"//2
- + ',' + "jiras/surefire745/TestFour.java#testSuccess???"//2
- + ',' + "jiras/surefire745/*Five#test*One";//1
-
- prepare( test )
- .parallel( "classes" )
- .useUnlimitedThreads()
- .executeTest()
- .verifyErrorFree( 9 )
- .verifyErrorFreeLog();
- }
-
- @Test
- public void shouldNotRunExcludedClasses()
- {
- prepare( "!BasicTest, !**/TestTwo, !**/TestThree.java" )
- .executeTest()
- .verifyErrorFree( 6 )
- .verifyErrorFreeLog();
- }
-
- @Test
- public void shouldNotRunExcludedClassesIfIncluded()
- {
- prepare( "TestF*.java, !**/TestFour.java" )
- .executeTest()
- .verifyErrorFree( 3 )
- .verifyErrorFreeLog();
- }
-
- @Test
- public void shouldNotRunExcludedMethods()
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "!#*Fail*, !%regex[#.*One], !#testSuccessThree" )
- .executeTest()
- .verifyErrorFree( 5 )
- .verifyErrorFreeLog();
- }
-
- @Test
- public void shouldNotRunExcludedClassesAndMethods()
- {
- assumeThat( getSettings().getConfiguration(), is( TEST ) );
- prepare( "!#*Fail*, !TestFour#testSuccessTwo" )
- .executeTest()
- .verifyErrorFree( 11 )
- .verifyErrorFreeLog();
- }
-
- @Test
- public void negativeTest()
- {
- assumeThat( getSettings().getConfiguration(), anyOf( is( INCLUDES ), is( INCLUDES_EXCLUDES ),
- is( INCLUDES_FILE ), is( INCLUDES_EXCLUDES_FILE ) ) );
- String pattern = "TestFive#testSuccessOne+testSuccessThree";
- prepare( pattern )
- .failNever()
- .executeTest()
- .verifyTextInLog( "Method filter prohibited in includes|excludes|includesFile|excludesFile parameter: "
- + pattern );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
deleted file mode 100644
index 0819196..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
+++ /dev/null
@@ -1,39 +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;
-
-/**
- * Test additionalClasspathElements
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class AdditionalClasspathIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void additionalClasspath()
- {
- unpack( "/additional-classpath" ).executeTest().verifyErrorFree( 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
deleted file mode 100644
index ab8f64c..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
+++ /dev/null
@@ -1,57 +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.io.File;
-
-import org.apache.maven.surefire.its.fixture.IntegrationTestSuiteResults;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.TestFile;
-import org.junit.Test;
-
-import static org.apache.maven.surefire.its.fixture.HelperAssertions.parseTestResults;
-import static org.apache.maven.surefire.its.fixture.HelperAssertions.assertTestSuiteResults;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test report aggregation
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class AggregateReportIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void aggregateReport()
- {
- OutputValidator outputValidator = unpack( "/aggregate-report" ).addSurefireReportGoal().executeCurrentGoals();
- TestFile surefireReportHtml = outputValidator.getSiteFile( "surefire-report.html" );
- assertTrue( "surefire report missing: " + surefireReportHtml.getAbsolutePath(), surefireReportHtml.exists() );
-
- // TODO HtmlUnit tests on the surefire report
-
- IntegrationTestSuiteResults suite = parseTestResults( new File( outputValidator.getBaseDir(), "child1" ),
- new File( outputValidator.getBaseDir(), "child2" ) );
- assertTestSuiteResults( 2, 0, 1, 0, suite );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
deleted file mode 100644
index c1ad8f7..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
+++ /dev/null
@@ -1,39 +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;
-
-/**
- * Test passing an argLine parameter
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class ArgLineIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void argLine()
- {
- unpack( "/argLine-parameter" ).executeTest().verifyErrorFree( 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLinePropertiesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLinePropertiesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLinePropertiesIT.java
deleted file mode 100644
index cf1074e..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLinePropertiesIT.java
+++ /dev/null
@@ -1,39 +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;
-
-/**
- * Test passing an argLine parameter
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class ArgLinePropertiesIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void argLine()
- {
- unpack( "/argLine-properties" ).executeTest().verifyErrorFree( 4 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AssumptionFailureReportIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AssumptionFailureReportIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AssumptionFailureReportIT.java
deleted file mode 100644
index 856cd8c..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AssumptionFailureReportIT.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.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.TestFile;
-import org.junit.Test;
-
-public class AssumptionFailureReportIT extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testWriteSkippedMessageToReport()
- {
- final OutputValidator outputValidator = unpack( "/assumpationFailureReport" ).executeTest();
- TestFile xmlReportFile = outputValidator.getSurefireReportsXmlFile( "TEST-assumptionFailure.Test1.xml" );
- xmlReportFile.assertContainsText( "The test is skipped if it is false" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
deleted file mode 100644
index 85d0f95..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
+++ /dev/null
@@ -1,70 +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.*;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-
-/**
- * Test running a single test with -Dtest=BasicTest
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class CheckSingleTestIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void singleTest()
- {
- unpack().setTestToRun( "BasicTest" ).executeTest().verifyErrorFree( 1 );
- }
-
- @Test
- public void singleTestDotJava()
- {
- unpack().setTestToRun( "BasicTest.java" ).executeTest().verifyErrorFree( 1 );
- }
-
- @Test
- public void singleTestNonExistent()
- {
- final OutputValidator output = unpack().setTestToRun( "DoesNotExist" ).maven().withFailure().executeTest();
- TestFile reportsDir = output.getTargetFile( "surefire-reports" );
- assertFalse( "Unexpected reports directory", reportsDir.exists() );
- }
-
- @Test
- public void singleTestNonExistentOverride()
- {
- final OutputValidator output =
- unpack().setTestToRun( "DoesNotExist" ).failIfNoTests( false ).executeTest().verifyErrorFreeLog();
- output.getTargetFile( "surefire-reports" );
- // assertFalse( "Unexpected reports directory", reportsDir.exists() ); Hmpf. Not really a good test
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "/default-configuration" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
deleted file mode 100644
index 6e2a67a..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
+++ /dev/null
@@ -1,81 +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 failIfNoTests with various forkModes.
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class CheckTestFailIfNoTestsForkModeIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void failIfNoTestsForkModeAlways()
- {
- unpack().forkAlways().failIfNoTests( true ).maven().withFailure().executeTest();
- }
-
- @Test
- public void failIfNoTestsForkModeNever()
- {
- unpack().forkNever().failIfNoTests( true ).maven().withFailure().executeTest();
- }
-
- @Test
- public void failIfNoTestsForkModeOnce()
- {
- unpack().forkOnce().failIfNoTests( true ).maven().withFailure().executeTest();
- }
-
- @Test
- public void dontFailIfNoTestsForkModeAlways()
- {
- doTest( unpack().forkAlways().failIfNoTests( false ) );
- }
-
- @Test
- public void dontFailIfNoTestsForkModeNever()
- {
- doTest( unpack().forkNever().failIfNoTests( false ) );
- }
-
- @Test
- public void dontFailIfNoTestsForkModeOnce()
- {
- doTest( unpack().forkOnce().failIfNoTests( false ) );
- }
-
- private void doTest( SurefireLauncher launcher )
- {
- launcher.executeTest().verifyErrorFreeLog().assertTestSuiteResults( 0, 0, 0, 0 );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "default-configuration-classWithNoTests" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
deleted file mode 100644
index 787037c..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
+++ /dev/null
@@ -1,63 +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.*;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-
-/**
- * Test failIfNoTests
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class CheckTestFailIfNoTestsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private SurefireLauncher unpack()
- {
- return unpack( "/default-configuration-noTests" );
- }
-
- @Test
- public void failIfNoTests()
- {
- unpack().failIfNoTests( true ).maven().withFailure().executeTest();
- }
-
- @Test
- public void dontFailIfNoTests()
- {
- final OutputValidator outputValidator = unpack().failIfNoTests( false ).executeTest();
- outputValidator.verifyErrorFreeLog();
- TestFile reportsDir = outputValidator.getSurefireReportsFile( "" );
- assertFalse( "Unexpected reports directory", reportsDir.exists() );
- }
-
- @Test
- public void jUnit48CategoriesFailWhenNoTests()
- {
- unpack().failIfNoTests( false ).activateProfile( "junit47" ).setJUnitVersion(
- "4.8.1" ).executeTest().verifyErrorFreeLog();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
deleted file mode 100644
index 440955c..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
+++ /dev/null
@@ -1,47 +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;
-
-/**
- * Test failures in @BeforeMethod annotation on TestNg suite
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class CheckTestNgBeforeMethodFailureIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void TestNgBeforeMethodFailure()
- throws Exception
- {
- unpack( "/testng-beforeMethodFailure" )
- .maven()
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .withFailure()
- .executeTest()
- .assertTestSuiteResults( 2, 0, 1, 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
deleted file mode 100644
index d96fefc..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
+++ /dev/null
@@ -1,44 +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;
-
-/**
- * Test @BeforeMethod annotation on TestNg suite
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class CheckTestNgBeforeMethodIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void TestNgBeforeMethod()
- throws Exception
- {
- unpack( "/testng-beforeMethod" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .executeTest()
- .verifyErrorFree( 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomObjectFactoryIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomObjectFactoryIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomObjectFactoryIT.java
deleted file mode 100644
index 2e2b646..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomObjectFactoryIT.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.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import java.io.File;
-
-import static org.fest.assertions.Assertions.assertThat;
-
-/**
- * Test TestNG with custom object factory defined.
- *
- * @author <a href="mailto:orien@codehaus.org">Orien Madgwick</a>
- */
-public class CheckTestNgCustomObjectFactoryIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testTestNgListenerReporter()
- throws Exception
- {
- File baseDir = unpack()
- .executeTest()
- .verifyErrorFreeLog()
- .assertTestSuiteResults( 1, 0, 0, 0 )
- .getBaseDir();
-
- baseDir = baseDir.getCanonicalFile();
-
- File targetDir = new File( baseDir, "target" );
- assertThat( targetDir ).isDirectory();
- assertThat( new File( targetDir, "objectFactory-output.txt" ) ).isFile();
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "/testng-objectFactory" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomTestRunnerFactoryIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomTestRunnerFactoryIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomTestRunnerFactoryIT.java
deleted file mode 100644
index 4cf5afa..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgCustomTestRunnerFactoryIT.java
+++ /dev/null
@@ -1,59 +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;
-
-import java.io.File;
-
-import static org.fest.assertions.Assertions.assertThat;
-
-/**
- * Test TestNG with custom test runner factory defined.
- *
- * @author <a href="mailto:orien@codehaus.org">Orien Madgwick</a>
- */
-public class CheckTestNgCustomTestRunnerFactoryIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testTestNgListenerReporter()
- throws Exception
- {
- File baseDir = unpack()
- .executeTest()
- .verifyErrorFreeLog()
- .assertTestSuiteResults( 1, 0, 0, 0 )
- .getBaseDir();
-
- baseDir = baseDir.getCanonicalFile();
-
- File targetDir = new File( baseDir, "target" );
- assertThat( targetDir ).isDirectory();
- assertThat( new File( targetDir, "testrunnerfactory-output.txt" ) ).isFile();
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "/testng-testRunnerFactory" );
- }
-}
-
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java
deleted file mode 100644
index 24ee3e6..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java
+++ /dev/null
@@ -1,69 +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 java.io.File;
-import java.io.FilenameFilter;
-
-import static org.fest.assertions.Assertions.assertThat;
-
-
-/**
- * Test for checking that the output from a forked suite is properly captured even if the suite encounters a severe error.
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class CheckTestNgExecuteErrorIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void executionError()
- throws Exception
- {
- OutputValidator outputValidator = unpack( "/testng-execute-error" )
- .maven()
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .showErrorStackTraces()
- .withFailure()
- .executeTest();
-
- File reportDir = outputValidator.getSurefireReportsDirectory();
- String[] dumpFiles = reportDir.list( new FilenameFilter()
- {
- @Override
- public boolean accept( File dir, String name )
- {
- return name.endsWith( ".dump" );
- }
- });
- assertThat( dumpFiles ).isNotEmpty();
- for ( String dump : dumpFiles )
- {
- outputValidator.getSurefireReportsFile( dump )
- .assertContainsText( "at org.apache.maven.surefire.testng.TestNGExecutor.run" );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
deleted file mode 100644
index f56e2e4..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
+++ /dev/null
@@ -1,43 +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;
-
-/**
- * Test TestNG groups, together with TestNG parallelism
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class CheckTestNgGroupThreadParallelIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void TestNgGroupThreadParallel()
- {
- unpack( "testng-group-thread-parallel" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .executeTest()
- .verifyErrorFree( 3 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
deleted file mode 100644
index 9cabd7e..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
+++ /dev/null
@@ -1,41 +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;
-
-/**
- * Test TestNG running in the JDK 1.4 JavaDoc style
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class CheckTestNgJdk14IT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void TestNgJdk14()
- throws Exception
- {
- unpack( "/testng-jdk14" ).executeTest().verifyErrorFree( 1 );
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
deleted file mode 100644
index 2c618d0..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
+++ /dev/null
@@ -1,105 +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;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
-import static org.junit.runners.Parameterized.Parameter;
-import static org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test simple TestNG listener and reporter
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-@RunWith( Parameterized.class )
-public class CheckTestNgListenerReporterIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Parameters( name = "{index}: TestNG {0}" )
- public static Collection<Object[]> data()
- {
- return Arrays.asList(new Object[][] {
- { "5.6", "jdk15", 1.5d }, // First TestNG version with reporter support
- { "5.7", "jdk15", 1.5d }, // default version from pom of the test case
- { "5.10", "jdk15", 1.5d },
- { "5.13", null, 1.5d }, // "reporterslist" param becomes String instead of List<ReporterConfig>
- // "listener" param becomes String instead of List<Class>
-
- // configure(Map) in 5.14.1 and 5.14.2 is transforming List<Class> into a String with a space as separator.
- // Then configure(CommandLineArgs) splits this String into a List<String> with , or ; as separator => fail.
- // If we used configure(CommandLineArgs), we would not have the problem with white spaces.
- //{ "5.14.1", null, "1.5" }, // "listener" param becomes List instead of String
- // Fails: Issue with 5.14.1 and 5.14.2 => join with <space>, split with ","
- // TODO will work with "configure(CommandLineArgs)"
- //{ "5.14.2", null, "1.5" }, // ReporterConfig is not available
-
- //{ "5.14.3", null, "1.5" }, // TestNG uses "reporter" instead of "reporterslist"
- // Both String or List are possible for "listener"
- // Fails: not able to test due to system dependency org.testng:guice missed the path and use to break CI
- // ClassNotFoundException: com.beust.jcommander.ParameterException
-
- //{ "5.14.4", null, "1.5" }, { "5.14.5", null, "1.5" }, // Fails: not able to test due to system dependency org.testng:guice missed the path and use to break CI
- // ClassNotFoundException: com.beust.jcommander.ParameterException
-
- { "5.14.6", null, 1.5d }, // Usage of org.testng:guice removed
- { "5.14.9", null, 1.5d }, // Latest 5.14.x TestNG version
- { "6.0", null, 1.5d },
- { "6.9.9", null, 1.7d } // Currently latest TestNG version
- });
- }
-
- @Parameter
- public String version;
-
- @Parameter(1)
- public String classifier;
-
- @Parameter(2)
- public double javaVersion;
-
- @Test
- public void testNgListenerReporter()
- {
- assumeJavaVersion( javaVersion );
- final SurefireLauncher launcher = unpack( "testng-listener-reporter", "_" + version )
- .sysProp( "testNgVersion", version );
-
- if ( classifier != null )
- {
- launcher.sysProp( "testNgClassifier", "jdk15" );
- }
-
- launcher.executeTest()
- .verifyErrorFree( 1 )
- .getTargetFile( "resultlistener-output.txt" ).assertFileExists()
- .getTargetFile( "suitelistener-output.txt" ).assertFileExists()
- .getTargetFile( "reporter-output.txt" ).assertFileExists();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenersIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenersIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenersIT.java
deleted file mode 100644
index cc1bb74..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenersIT.java
+++ /dev/null
@@ -1,37 +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;
-
-/**
- * Test annotation-based TestNG listener
- */
-public class CheckTestNgListenersIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void TestNgListenerReporter()
- {
- unpack( "testng-listeners" ).mavenTestFailureIgnore( true ).executeTest().assertTestSuiteResults( 1, 0, 1, 0 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
deleted file mode 100644
index aa77d1b..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
+++ /dev/null
@@ -1,42 +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;
-
-/**
- * Test TestNG test in a directory with spaces
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class CheckTestNgPathWithSpacesIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void TestWithSpaces()
- {
- unpack( "testng-path with spaces" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .executeTest()
- .verifyErrorFree( 1 );
- }
-}
[05/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java b/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
new file mode 100644
index 0000000..f16c04a
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
@@ -0,0 +1,38 @@
+package jiras.surefire1095;
+
+/*
+ * 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.runner.Description;
+import org.junit.runner.notification.RunListener;
+
+public class Listener
+ extends RunListener
+{
+ @Override
+ public void testRunStarted( Description description )
+ throws Exception
+ {
+ String described = description.getDisplayName();
+ System.out.println( "testRunStarted " +
+ ( described == null || described.equals( "null" )
+ ? description.getChildren()
+ : description ) );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java b/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
new file mode 100644
index 0000000..923917a
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
@@ -0,0 +1,31 @@
+package jiras.surefire1095;
+
+/*
+ * 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 junit.runner.Version;
+import org.junit.Test;
+
+public class SomeTest {
+ @Test
+ public void test()
+ {
+ System.out.println( "Running JUnit " + Version.id() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1098-balanced-runorder/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1098-balanced-runorder/pom.xml b/surefire-its/src/test/resources/surefire-1098-balanced-runorder/pom.xml
new file mode 100644
index 0000000..75f1c8e
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1098-balanced-runorder/pom.xml
@@ -0,0 +1,62 @@
+<?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/xsd/maven-4.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>jiras-surefire-1098</artifactId>
+ <version>1.0</version>
+ <url>http://maven.apache.org</url>
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <runOrder>balanced</runOrder>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/ATest.java b/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/ATest.java
new file mode 100644
index 0000000..34bb895
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/ATest.java
@@ -0,0 +1,34 @@
+package jiras.surefire1098;
+
+/*
+ * 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.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public final class ATest {
+
+ @Test
+ public void someMethod() throws InterruptedException {
+ System.out.println(getClass() + " " + Thread.currentThread().getName());
+ TimeUnit.MILLISECONDS.sleep(100);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/BTest.java b/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/BTest.java
new file mode 100644
index 0000000..a9a52b8
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/BTest.java
@@ -0,0 +1,34 @@
+package jiras.surefire1098;
+
+/*
+ * 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.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public final class BTest {
+
+ @Test
+ public void someMethod() throws InterruptedException {
+ System.out.println(getClass() + " " + Thread.currentThread().getName());
+ TimeUnit.SECONDS.sleep(2);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/CTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/CTest.java b/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/CTest.java
new file mode 100644
index 0000000..63e4e0f
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/CTest.java
@@ -0,0 +1,34 @@
+package jiras.surefire1098;
+
+/*
+ * 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.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public final class CTest {
+
+ @Test
+ public void someMethod() throws InterruptedException {
+ System.out.println(getClass() + " " + Thread.currentThread().getName());
+ TimeUnit.SECONDS.sleep(4);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/DTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/DTest.java b/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/DTest.java
new file mode 100644
index 0000000..a97640e
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/DTest.java
@@ -0,0 +1,34 @@
+package jiras.surefire1098;
+
+/*
+ * 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.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public final class DTest {
+
+ @Test
+ public void someMethod() throws InterruptedException {
+ System.out.println(getClass() + " " + Thread.currentThread().getName());
+ TimeUnit.SECONDS.sleep(8);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml b/surefire-its/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
new file mode 100644
index 0000000..0efc935
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
@@ -0,0 +1,78 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1122</artifactId>
+ <version>1.0</version>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <rerunFailingTestsCount>2</rerunFailingTestsCount>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>parallel</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <useUnlimitedThreads>true</useUnlimitedThreads>
+ <forkCount>0</forkCount>
+ <parallel>classes</parallel>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1122-parallel-and-flakyTests/src/test/java/test/FlakyTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1122-parallel-and-flakyTests/src/test/java/test/FlakyTest.java b/surefire-its/src/test/resources/surefire-1122-parallel-and-flakyTests/src/test/java/test/FlakyTest.java
new file mode 100644
index 0000000..fc7b443
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1122-parallel-and-flakyTests/src/test/java/test/FlakyTest.java
@@ -0,0 +1,41 @@
+package test;
+
+/*
+ * 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.Test;
+
+public class FlakyTest
+{
+ private static int x = 1;
+
+ @Test
+ public void failsOnFirstExecution()
+ {
+ if ( x++ < 2 )
+ {
+ org.junit.Assert.fail( "First execution always fails. Try again." );
+ }
+ }
+
+ @Test
+ public void alwaysPasses()
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml b/surefire-its/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
new file mode 100644
index 0000000..daecfc0
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
@@ -0,0 +1,79 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-1135-improve-ignore-message-for-testng</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Surefire 1135</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>testng-old</id>
+ <activation>
+ <property><name>testNgClassifier</name></property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${testNgVersion}</version>
+ <classifier>${testNgClassifier}</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>testng-new</id>
+ <activation>
+ <property><name>!testNgClassifier</name></property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${testNgVersion}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <test>SkipExceptionReportTest</test>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1135-improve-ignore-message-for-testng/src/test/java/testng/SkipExceptionReportTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1135-improve-ignore-message-for-testng/src/test/java/testng/SkipExceptionReportTest.java b/surefire-its/src/test/resources/surefire-1135-improve-ignore-message-for-testng/src/test/java/testng/SkipExceptionReportTest.java
new file mode 100644
index 0000000..abb555f
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1135-improve-ignore-message-for-testng/src/test/java/testng/SkipExceptionReportTest.java
@@ -0,0 +1 @@
+/*
* 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.
*/
package testng;
import org.testng.annotations.Test;
import org.testng.SkipException;
public class SkipExceptionReportTest
{
@Test
public void testSkipException()
{
throw new SkipException("Skip test");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml b/surefire-its/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
new file mode 100644
index 0000000..d8c5a01
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
@@ -0,0 +1,69 @@
+<!--
+ ~ 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/xsd/maven-4.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>cwd</groupId>
+ <artifactId>cwd</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <name>cwd</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- To override fork mode from parrent pom.xml -->
+ <forkMode>once</forkMode>
+ <forkCount>1</forkCount>
+ <!-- To ensure proper variables expansion for both standard maven and surefire specific variables -->
+ <workingDirectory>${project.name}_${surefire.forkNumber}</workingDirectory>
+ <systemPropertyVariables>
+ <maven.project.base.directory>${basedir}</maven.project.base.directory>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java b/surefire-its/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
new file mode 100644
index 0000000..6a82ee3
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
@@ -0,0 +1,51 @@
+package cwd;
+
+/*
+ * 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.Test;
+
+import java.io.File;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+public class CurrentWorkingDirectoryInForkedModeTest
+{
+
+ @Test
+ public void testCurrentWorkingDirectoryPropagation()
+ throws Exception
+ {
+
+ File projectDirectory = new File( System.getProperty( "maven.project.base.directory" ) );
+ File forkDirectory = new File( projectDirectory, "cwd_1" );
+ forkDirectory.deleteOnExit();
+
+ // user.dir and current working directory must be aligned, base directory is not affected
+ assertEquals( projectDirectory.getCanonicalPath(), System.getProperty( "basedir" ) );
+ assertEquals( forkDirectory.getCanonicalPath(), System.getProperty( "user.dir" ) );
+ assertEquals( forkDirectory.getCanonicalPath(), new File( "." ).getCanonicalPath() );
+
+ // original working directory (before variable expansion) should not be created
+ assertFalse( new File( "cwd_${surefire.forkNumber}" ).exists() );
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1144-xml-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1144-xml-runtime/pom.xml b/surefire-its/src/test/resources/surefire-1144-xml-runtime/pom.xml
new file mode 100644
index 0000000..b183414
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1144-xml-runtime/pom.xml
@@ -0,0 +1,50 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire1144-xml-runtime</artifactId>
+ <version>1.0</version>
+
+ <url>http://maven.apache.org</url>
+
+ <contributors>
+ <contributor>
+ <name>lamyaa (Lamyaa Eloussi)</name>
+ <email>eloussi2@illinois.edu</email>
+ </contributor>
+ </contributors>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1144-xml-runtime/src/test/java/surefire1144/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1144-xml-runtime/src/test/java/surefire1144/Test1.java b/surefire-its/src/test/resources/surefire-1144-xml-runtime/src/test/java/surefire1144/Test1.java
new file mode 100644
index 0000000..047a741
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1144-xml-runtime/src/test/java/surefire1144/Test1.java
@@ -0,0 +1,82 @@
+package surefire1144;
+
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class Test1
+{
+ static void sleep( int ms )
+ {
+ long target = System.currentTimeMillis() + ms;
+ try
+ {
+ do
+ {
+ Thread.sleep( 1L );
+ }
+ while ( System.currentTimeMillis() < target );
+ }
+ catch ( InterruptedException e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
+
+ static void printTimeAndSleep( String msg, int ms )
+ {
+ System.out.println( msg + " started @ " + System.currentTimeMillis() );
+ sleep( ms );
+ }
+
+ @Test
+ public void testSleep100()
+ {
+ printTimeAndSleep( "Test1.sleep100", 100 );
+ }
+
+ @Test
+ public void testSleep200()
+ {
+ printTimeAndSleep( "Test1.sleep200", 200 );
+ }
+
+ @Test
+ public void testSleep300()
+ {
+ printTimeAndSleep( "Test1.sleep300", 300 );
+ }
+
+ @BeforeClass
+ public static void setUpBeforeClass()
+ throws Exception
+ {
+ printTimeAndSleep( "beforeClass sleep 500", 500 );
+ }
+
+ @AfterClass
+ public static void tearDownAfterClass()
+ throws Exception
+ {
+ printTimeAndSleep( "afterClass sleep 500", 500 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml b/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
new file mode 100644
index 0000000..77e10e7
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
@@ -0,0 +1,62 @@
+<?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/xsd/maven-4.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>jiras-surefire-1146</artifactId>
+ <version>1.0</version>
+ <url>http://maven.apache.org</url>
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <rerunFailingTestsCount>2</rerunFailingTestsCount>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionParameterizedTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionParameterizedTest.java b/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionParameterizedTest.java
new file mode 100644
index 0000000..ffdfa87
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionParameterizedTest.java
@@ -0,0 +1,62 @@
+package jiras.surefire1146;
+
+/*
+ * 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.ArrayList;
+import java.util.List;
+
+import junit.runner.Version;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import static org.junit.Assert.*;
+
+@RunWith( Parameterized.class )
+public class CustomDescriptionParameterizedTest
+{
+
+ private static boolean success;
+
+ public CustomDescriptionParameterizedTest( String test1, String test2, String test3 )
+ {
+
+ }
+
+ @Parameters( name = "{index}: ({0}); {1}; {2};" )
+ public static List getParameters()
+ {
+ List parameters = new ArrayList();
+ parameters.add( new String[]{ "Test11", "Test12", "Test13" } );
+ parameters.add( new String[]{ "Test21", "Test22", "Test23" } );
+ return parameters;
+ }
+
+ @Test
+ public void flakyTest()
+ {
+ System.out.println( "Running JUnit " + Version.id() );
+ boolean current = success;
+ success = !success;
+ assertTrue( current );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionWithCommaParameterizedTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionWithCommaParameterizedTest.java b/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionWithCommaParameterizedTest.java
new file mode 100644
index 0000000..39563df
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionWithCommaParameterizedTest.java
@@ -0,0 +1,63 @@
+package jiras.surefire1146;
+
+/*
+ * 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.ArrayList;
+import java.util.List;
+
+import junit.runner.Version;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import static org.junit.Assert.*;
+
+@RunWith( Parameterized.class )
+public class CustomDescriptionWithCommaParameterizedTest
+{
+
+ private static boolean success;
+
+ public CustomDescriptionWithCommaParameterizedTest( String test1, String test2, String test3 )
+ {
+
+ }
+
+ @Parameters( name = "{index}: ({0}), {1}, {2};" )
+ public static List getParameters()
+ {
+ List parameters = new ArrayList();
+ parameters.add( new String[]{ "Test11", "Test12", "Test13" } );
+ parameters.add( new String[]{ "Test21", "Test22", "Test23" } );
+ parameters.add( new String[]{ "Test31", "Test32", "Test33" } );
+ return parameters;
+ }
+
+ @Test
+ public void flakyTest()
+ {
+ System.out.println( "Running JUnit " + Version.id() );
+ boolean current = success;
+ success = !success;
+ assertTrue( current );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/SimpleParameterizedTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/SimpleParameterizedTest.java b/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/SimpleParameterizedTest.java
new file mode 100644
index 0000000..f278c34
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/SimpleParameterizedTest.java
@@ -0,0 +1,62 @@
+package jiras.surefire1146;
+
+/*
+ * 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.ArrayList;
+import java.util.List;
+
+import junit.runner.Version;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import static org.junit.Assert.*;
+
+@RunWith( Parameterized.class )
+public class SimpleParameterizedTest
+{
+
+ private static boolean success;
+
+ public SimpleParameterizedTest( String test )
+ {
+
+ }
+
+ @Parameters
+ public static List getParameters()
+ {
+ List parameters = new ArrayList();
+ parameters.add( new String[]{ "Test1" } );
+ parameters.add( new String[]{ "Test2" } );
+ return parameters;
+ }
+
+ @Test
+ public void flakyTest()
+ {
+ System.out.println( "Running JUnit " + Version.id() );
+ boolean current = success;
+ success = !success;
+ assertTrue( current );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/StandardTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/StandardTest.java b/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/StandardTest.java
new file mode 100644
index 0000000..f96cdd8
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/StandardTest.java
@@ -0,0 +1,40 @@
+package jiras.surefire1146;
+
+/*
+ * 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 junit.runner.Version;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class StandardTest
+{
+ private static boolean success;
+
+ @Test
+ public void flakyTest()
+ {
+ System.out.println( "Running JUnit " + Version.id() );
+ boolean current = success;
+ success = !success;
+ assertTrue( current );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml b/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml
new file mode 100644
index 0000000..bdba56b
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml
@@ -0,0 +1,143 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1152</artifactId>
+
+ <version>1.0</version>
+
+ <properties>
+ <failIfNoTests>true</failIfNoTests>
+ <failsafe.rerunFailingTestsCount>2</failsafe.rerunFailingTestsCount>
+ <surefire.rerunFailingTestsCount>2</surefire.rerunFailingTestsCount>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>FlakyTestSuite</include>
+ </includes>
+ <!--<skip>true</skip>-->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>
+ <include>FlakyITSuite</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>surefire-junit47</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>surefire-junit4</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java b/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java
new file mode 100644
index 0000000..27d5b5f
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java
@@ -0,0 +1,39 @@
+package jiras.surefire1152;
+
+/*
+ * 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.Test;
+
+import static org.junit.Assert.fail;
+
+public class FlakyIT
+{
+ private static int n;
+
+ @Test
+ public void testFlaky()
+ {
+ if ( n++ == 0 )
+ {
+ fail( "deliberately flaky test (should pass the next time)" );
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java b/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java
new file mode 100644
index 0000000..0ebd03c
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java
@@ -0,0 +1,29 @@
+package jiras.surefire1152;
+
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith( Suite.class )
+@Suite.SuiteClasses( { FlakyIT.class } )
+public class FlakyITSuite
+{
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java b/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java
new file mode 100644
index 0000000..86a08db
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java
@@ -0,0 +1,45 @@
+package jiras.surefire1152;
+
+/*
+ * 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.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.fail;
+
+public class FlakyParent
+{
+ // set of test classes which have previously invoked testFlakyParent
+ private static final Set<Class<?>> previouslyRun = new HashSet<Class<?>>();
+
+ @Test
+ public void testFlakyParent()
+ {
+ Class<?> clazz = getClass();
+ if ( !previouslyRun.contains( clazz ) )
+ {
+ previouslyRun.add( clazz );
+ fail( "deliberately flaky test (should pass the next time)" );
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java b/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java
new file mode 100644
index 0000000..ee20f9e
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java
@@ -0,0 +1,39 @@
+package jiras.surefire1152;
+
+/*
+ * 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.Test;
+
+import static org.junit.Assert.fail;
+
+public class FlakyTest extends FlakyParent
+{
+ private static int n;
+
+ @Test
+ public void testFlaky()
+ {
+ if ( n++ == 0 )
+ {
+ fail( "deliberately flaky test (should pass the next time)" );
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java b/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java
new file mode 100644
index 0000000..f4a7d67
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java
@@ -0,0 +1,29 @@
+package jiras.surefire1152;
+
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith( Suite.class )
+@Suite.SuiteClasses( { FlakyTest.class, FlakyParent.class } )
+public class FlakyTestSuite
+{
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml b/surefire-its/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
new file mode 100644
index 0000000..13ae6b6
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1153</artifactId>
+ <version>1.0</version>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*UT.java</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/IncludedUT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/IncludedUT.java b/surefire-its/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/IncludedUT.java
new file mode 100644
index 0000000..042cf37
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/IncludedUT.java
@@ -0,0 +1,30 @@
+package jiras.surefire1153;
+
+/*
+ * 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.Test;
+
+public class IncludedUT
+{
+ @Test
+ public void testIncluded()
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/NotIncludedTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/NotIncludedTest.java b/surefire-its/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/NotIncludedTest.java
new file mode 100644
index 0000000..b03d0af
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/NotIncludedTest.java
@@ -0,0 +1,30 @@
+package jiras.surefire1153;
+
+/*
+ * 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.Test;
+
+public class NotIncludedTest
+{
+ @Test
+ public void testNotIncluded()
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1158-remove-info-lines/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1158-remove-info-lines/pom.xml b/surefire-its/src/test/resources/surefire-1158-remove-info-lines/pom.xml
new file mode 100644
index 0000000..37e65bf
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1158-remove-info-lines/pom.xml
@@ -0,0 +1,69 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-1158</artifactId>
+ <version>1.0</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.7</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>always</forkMode>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>${provider}</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/JUnitTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/JUnitTest.java b/surefire-its/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/JUnitTest.java
new file mode 100644
index 0000000..5bfb834
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/JUnitTest.java
@@ -0,0 +1,31 @@
+package jira1158;
+
+/*
+ * 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.Test;
+
+public class JUnitTest {
+
+ @Test
+ public void doNothing()
+ {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/TestNGSuiteTest.java b/surefire-its/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/TestNGSuiteTest.java
new file mode 100644
index 0000000..65cc8c4
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/TestNGSuiteTest.java
@@ -0,0 +1,32 @@
+package jira1158;
+
+/*
+ * 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.testng.annotations.Test;
+
+
+public class TestNGSuiteTest {
+
+ @Test
+ public void doNothing()
+ {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml b/surefire-its/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml
new file mode 100644
index 0000000..e61abeb
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml
@@ -0,0 +1,73 @@
+<?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/xsd/maven-4.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>surefire-1179-testng-parallel-dataprovider</artifactId>
+ <version>1.0</version>
+ <url>http://maven.apache.org</url>
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.10</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <properties>
+ <property>
+ <name>parallel</name>
+ <value>methods</value>
+ </property>
+ <property>
+ <name>dataproviderthreadcount</name>
+ <value>30</value>
+ </property>
+ </properties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1179-testng-parallel-dataprovider/src/test/java/debug/ParallelTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1179-testng-parallel-dataprovider/src/test/java/debug/ParallelTest.java b/surefire-its/src/test/resources/surefire-1179-testng-parallel-dataprovider/src/test/java/debug/ParallelTest.java
new file mode 100644
index 0000000..6863f62
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1179-testng-parallel-dataprovider/src/test/java/debug/ParallelTest.java
@@ -0,0 +1,45 @@
+package debug;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class ParallelTest
+{
+ private static final AtomicInteger concurrency = new AtomicInteger();
+
+ private static final AtomicInteger counter = new AtomicInteger();
+
+ @DataProvider( parallel = true, name = "dataProvider" )
+ public Iterator<Object[]> dataProvider()
+ {
+ List<Object[]> data = new ArrayList<Object[]>();
+ for ( int i = 0; i < 5000; i++ )
+ {
+ data.add( new Object[]{ "ID_" + i } );
+ }
+ return data.iterator();
+ }
+
+ @Test( dataProvider = "dataProvider" )
+ public void testParallelDataProvider( String iterId )
+ throws Exception
+ {
+ int methodCount = counter.incrementAndGet();
+ int currentlyParallelCalls = concurrency.incrementAndGet();
+ if ( methodCount % 100 == 0 )
+ {
+ System.out.println( iterId + ": CONCURRENCY=" + currentlyParallelCalls + "." );
+ }
+ TimeUnit.MILLISECONDS.sleep( 20 );
+ concurrency.decrementAndGet();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1185/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1185/pom.xml b/surefire-its/src/test/resources/surefire-1185/pom.xml
new file mode 100644
index 0000000..ca15310
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1185/pom.xml
@@ -0,0 +1,66 @@
+<?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/xsd/maven-4.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>jiras-surefire-1185</artifactId>
+ <version>1.0</version>
+ <url>http://maven.apache.org</url>
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>PMC</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1185/src/test/java/pkg/RunningTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1185/src/test/java/pkg/RunningTest.java b/surefire-its/src/test/resources/surefire-1185/src/test/java/pkg/RunningTest.java
new file mode 100644
index 0000000..2469bd3
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1185/src/test/java/pkg/RunningTest.java
@@ -0,0 +1,29 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+public class RunningTest {
+ @Test
+ public void test()
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-1185/src/test/java/pkg/UnlistedTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-1185/src/test/java/pkg/UnlistedTest.java b/surefire-its/src/test/resources/surefire-1185/src/test/java/pkg/UnlistedTest.java
new file mode 100644
index 0000000..8348673
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-1185/src/test/java/pkg/UnlistedTest.java
@@ -0,0 +1,29 @@
+package pkg;
+
+/*
+ * 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.Test;
+
+public class UnlistedTest {
+ @Test
+ public void test()
+ {
+ }
+}
[30/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml b/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
deleted file mode 100644
index 5cb7b92..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
+++ /dev/null
@@ -1,57 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>Surefire-510-systemprops</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Surefire-510-systemprops</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/src/test/java/surefire510/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/src/test/java/surefire510/Test1.java b/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/src/test/java/surefire510/Test1.java
deleted file mode 100644
index 012b1fb..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/src/test/java/surefire510/Test1.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package surefire510;
-
-/*
- * 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 junit.framework.TestCase;
-
-import java.io.IOException;
-
-public class Test1
- extends TestCase
-{
-
- public void test1()
- throws IOException
- {
- String tcp = System.getProperty( "surefire.test.class.path" );
- if ( tcp != null )
- {
- System.out.println( "tcp is set" );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
deleted file mode 100644
index d173770..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-569-RunTestFromDependencyJars</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <groupId>org.apache.maven.plugins.surefire.dependency-jar</groupId>
- <artifactId>module1</artifactId>
- <version>0.0.1-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.plugins.surefire.dependency-jar</groupId>
- <artifactId>testjar</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*A*.java</include>
- </includes>
- <dependenciesToScan>
- <dependency>org.apache.maven.plugins.surefire.dependency-jar:testjar</dependency>
- </dependenciesToScan>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
deleted file mode 100644
index e69ac9d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
- <artifactId>surefire-569-RunTestFromDependencyJars</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <modules>
- <module>testjar</module>
- <module>module1</module>
- </modules>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
deleted file mode 100644
index 7778331..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-569-RunTestFromDependencyJars</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <groupId>org.apache.maven.plugins.surefire.dependency-jar</groupId>
- <artifactId>testjar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestA.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestA.java b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestA.java
deleted file mode 100644
index 404377a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestA.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.test;
-
-/*
- * 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.Test;
-
-public class TestA {
-
- @Test
- public void shouldRun() {
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestB.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestB.java b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestB.java
deleted file mode 100644
index 1295e97..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestB.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.test;
-
-/*
- * 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.Test;
-
-public class TestB {
-
- @Test
- public void shouldRun() {
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
deleted file mode 100644
index 5b8fd7c..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire-report</groupId>
- <artifactId>surefire-570-multipleReportDirectories</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.maven.surefire-report.module1</groupId>
- <artifactId>module1</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java
deleted file mode 100644
index 830d0f0..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.maven.surefire570;
-
-/*
- * 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.
- */
-
-public class MyModule1Class {
- public int getFoo() {
- return 42;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java
deleted file mode 100644
index 521fb6c..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.maven.surefire570;
-
-/*
- * 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 junit.framework.Assert;
-import junit.framework.TestCase;
-import org.apache.maven.surefire570.MyModule1Class;
-
-public class MyModule1ClassTest extends TestCase {
-
- public void testGetFooKO() {
- MyModule1Class mc = new MyModule1Class();
- Assert.assertEquals(18, mc.getFoo());
- }
-
- public void testGetFooOK() {
- MyModule1Class mc = new MyModule1Class();
- Assert.assertEquals(42, mc.getFoo());
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
deleted file mode 100644
index 6f7c3c5..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="1" time="0.04" errors="0" skipped="0" tests="2" name="org.apache.maven.surefireReport.surefireReportTest.MyClassTest">
- <properties>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386"/>
- <property name="java.vm.version" value="14.0-b16"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="FR"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test"/>
- <property name="java.runtime.version" value="1.6.0_14-b08"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/endorsed"/>
- <property name="os.arch" value="i386"/>
- <property name="surefire.real.class.path" value="/tmp/surefirebooter5998945456175966466.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386/server:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/test-classes:/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/classes:/home/tsauzedde/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot Tiered Compilers"/>
- <property name="os.version" value="2.6.28-15-generic"/>
- <property name="user.home" value="/home/tsauzedde"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="user.name" value="tsauzedde"/>
- <property name="java.class.path" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/test-classes:/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/classes:/home/tsauzedde/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="32"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="fr"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_14"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/tsauzedde/.m2/repository"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0.005" classname="org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassM1Test" name="testGetFooKO">
- <failure message="expected:<18> but was:<42>" type="junit.framework.AssertionFailedError">junit.framework.AssertionFailedError: expected:<18> but was:<42>
- at junit.framework.Assert.fail(Assert.java:47)
- at junit.framework.Assert.failNotEquals(Assert.java:280)
- at junit.framework.Assert.assertEquals(Assert.java:64)
- at junit.framework.Assert.assertEquals(Assert.java:198)
- at junit.framework.Assert.assertEquals(Assert.java:204)
- at org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest.testGetFooKO(MyClassTest.java:10)
-</failure>
- </testcase>
- <testcase time="0" classname="org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassM1Test" name="testGetFooOK"/>
-</testsuite>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
deleted file mode 100644
index 9964f13..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
+++ /dev/null
@@ -1,13 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest
--------------------------------------------------------------------------------
-Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.049 sec <<< FAILURE!
-testGetFooKO(org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest) Time elapsed: 0.01 sec <<< FAILURE!
-junit.framework.AssertionFailedError: expected:<18> but was:<42>
- at junit.framework.Assert.fail(Assert.java:47)
- at junit.framework.Assert.failNotEquals(Assert.java:280)
- at junit.framework.Assert.assertEquals(Assert.java:64)
- at junit.framework.Assert.assertEquals(Assert.java:198)
- at junit.framework.Assert.assertEquals(Assert.java:204)
- at org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest.testGetFooKO(MyClassTest.java:10)
-
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml
deleted file mode 100644
index 9972a51..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire-report</groupId>
- <artifactId>surefire-570-multipleReportDirectories</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.maven.surefire-report.module2</groupId>
- <artifactId>module2</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java
deleted file mode 100644
index 54a1fe3..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.apache.maven.surefire570.module2;
-public class MyModule2Class {
- public int getFoo() {
- return 42;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java
deleted file mode 100644
index 4f0194a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.apache.maven.surefire570.module2;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-import org.apache.maven.surefire570.module2.MyModule2Class;
-
-public class MyModule2ClassTest extends TestCase {
-
- public void testGetFooKO() {
- MyModule2Class mc = new MyModule2Class();
- Assert.assertEquals(18, mc.getFoo());
- }
-
- public void testGetFooOK() {
- MyModule2Class mc = new MyModule2Class();
- Assert.assertEquals(42, mc.getFoo());
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
deleted file mode 100644
index 2c9cbed..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="1" time="0.04" errors="0" skipped="0" tests="2" name="org.apache.maven.surefireReport.surefireReportTest.MyClassTest">
- <properties>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386"/>
- <property name="java.vm.version" value="14.0-b16"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="FR"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test"/>
- <property name="java.runtime.version" value="1.6.0_14-b08"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/endorsed"/>
- <property name="os.arch" value="i386"/>
- <property name="surefire.real.class.path" value="/tmp/surefirebooter5998945456175966466.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386/server:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/test-classes:/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/classes:/home/tsauzedde/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot Tiered Compilers"/>
- <property name="os.version" value="2.6.28-15-generic"/>
- <property name="user.home" value="/home/tsauzedde"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="user.name" value="tsauzedde"/>
- <property name="java.class.path" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/test-classes:/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/classes:/home/tsauzedde/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="32"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="fr"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_14"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/tsauzedde/.m2/repository"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0.005" classname="org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassM2Test" name="testGetFooKO">
- <failure message="expected:<18> but was:<42>" type="junit.framework.AssertionFailedError">junit.framework.AssertionFailedError: expected:<18> but was:<42>
- at junit.framework.Assert.fail(Assert.java:47)
- at junit.framework.Assert.failNotEquals(Assert.java:280)
- at junit.framework.Assert.assertEquals(Assert.java:64)
- at junit.framework.Assert.assertEquals(<Assert class="ja"></Assert>va:198)
- at junit.framework.Assert.assertEquals(Assert.java:204)
- at org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest.testGetFooKO(MyClassTest.java:10)
-</failure>
- </testcase>
- <testcase time="0" classname="org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassM2Test" name="testGetFooOK"/>
-</testsuite>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
deleted file mode 100644
index 9964f13..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
+++ /dev/null
@@ -1,13 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest
--------------------------------------------------------------------------------
-Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.049 sec <<< FAILURE!
-testGetFooKO(org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest) Time elapsed: 0.01 sec <<< FAILURE!
-junit.framework.AssertionFailedError: expected:<18> but was:<42>
- at junit.framework.Assert.fail(Assert.java:47)
- at junit.framework.Assert.failNotEquals(Assert.java:280)
- at junit.framework.Assert.assertEquals(Assert.java:64)
- at junit.framework.Assert.assertEquals(Assert.java:198)
- at junit.framework.Assert.assertEquals(Assert.java:204)
- at org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest.testGetFooKO(MyClassTest.java:10)
-
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
deleted file mode 100644
index b3238ea..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.surefire-report</groupId>
- <artifactId>surefire-570-multipleReportDirectories</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
-
- <profiles>
- <profile>
- <id>maven-3</id>
- <activation>
- <file>
- <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
- <exists>${basedir}</exists>
- </file>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <reportsDirectories>
- <reportsDirectory>${basedir}/target/surefire-reports</reportsDirectory>
- <reportsDirectory>${basedir}/src/test/resources/surefire-reports</reportsDirectory>
- </reportsDirectories>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <reportsDirectories>
- <reportsDirectory>${basedir}/target/surefire-reports</reportsDirectory>
- <reportsDirectory>${basedir}/src/test/resources/surefire-reports</reportsDirectory>
- </reportsDirectories>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>report-only</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
- <modules>
- <module>module1</module>
- <module>module2</module>
- </modules>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml b/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
deleted file mode 100644
index 8175d3f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4-test</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>junit4-test</name>
- <url>http://maven.apache.org</url>
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>once</forkMode>
- <parallel>methods</parallel>
- <threadCount>10</threadCount>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test1.java b/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test1.java
deleted file mode 100644
index 6256635..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test1.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package surefire613;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assume.*;
-public class Test1
-{
- @Test
- public void testWithFailingAssumption1() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption2() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption3() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption4() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption5() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption6() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption7() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption8() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption9() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption10() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption11() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption12() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption13() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption14() {
- assumeThat( 2, is(3));
- }
- @Test
- public void testWithFailingAssumption15() {
- assumeThat( 2, is(3));
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test2.java b/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test2.java
deleted file mode 100644
index c6d5840..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test2.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package surefire613;
-
-/*
- * 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.Ignore;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assume.*;
-import static junit.framework.Assert.fail;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Test2
-{
- @Test
- public void testAllok()
- {
- System.out.println( "testAllok to stdout" );
- System.err.println( "testAllok to stderr" );
- }
-
- @Ignore
- @Test
- public void testWithIgnore1()
- {
- }
-
- @Ignore("Ignorance is bliss2")
- @Test
- public void testWithIgnore2()
- {
- }
-
- @Test
- public void testiWithFail1()
- {
- fail( "We excpect this" );
- }
-
- @Test
- public void testiWithFail2()
- {
- fail( "We excpect this" );
- }
-
- @Test
- public void testiWithFail3()
- {
- fail( "We excpect this" );
- }
-
- @Test
- public void testiWithFail4()
- {
- fail( "We excpect this" );
- }
-
- @Test
- public void testWithException1()
- {
- System.out.println( "testWithException1 to stdout" );
- System.err.println( "testWithException1 to stderr" );
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException2()
- {
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException3()
- {
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException4()
- {
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException5()
- {
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException6()
- {
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException7()
- {
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException8()
- {
- throw new RuntimeException( "We expect this" );
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
deleted file mode 100644
index 412035d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-test</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>junit-test</name>
- <url>http://maven.apache.org</url>
- <properties>
- <junit.version>4.8.1</junit.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <testSourceDirectory>src/it/java</testSourceDirectory>
- </build>
-
- <profiles>
- <profile>
- <id>all-parallel-junit3-testcases</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <skip>true</skip>
- <parallel>all</parallel>
- <threadCount>10</threadCount>
- <perCoreThreadCount>false</perCoreThreadCount>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>**/MySuiteTest1.java</include>
- <include>**/MySuiteTest2.java</include>
- <include>**/MySuiteTest3.java</include>
- </includes>
- <forkMode>once</forkMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>parallel-junit3-testcases</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <skip>true</skip>
- <parallel>classes</parallel>
- <threadCount>10</threadCount>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>**/MySuiteTest1.java</include>
- <include>**/MySuiteTest2.java</include>
- <include>**/MySuiteTest3.java</include>
- </includes>
- <forkMode>once</forkMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>junit3-testcases</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>**/MySuiteTest1.java</include>
- <include>**/MySuiteTest2.java</include>
- <include>**/MySuiteTest3.java</include>
- </includes>
- <forkMode>once</forkMode>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>parallel-junit3-testsuite</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <skip>true</skip>
- <parallel>all</parallel>
- <threadCount>10</threadCount>
- <perCoreThreadCount>false</perCoreThreadCount>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>JUnit4AdapterSuiteTest</include>
- </includes>
- <forkMode>once</forkMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>junit3-testsuite</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>JUnit4AdapterSuiteTest</include>
- </includes>
- <forkMode>once</forkMode>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/JUnit4AdapterSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/JUnit4AdapterSuiteTest.java b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/JUnit4AdapterSuiteTest.java
deleted file mode 100644
index 47c2d75..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/JUnit4AdapterSuiteTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package mho;
-
-/*
- * 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 junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@Suite.SuiteClasses( {
- MySuiteTest1.class,
- MySuiteTest2.class,
- MySuiteTest3.class
-} )
-@RunWith( Suite.class )
-public class JUnit4AdapterSuiteTest
-{
- public static Test suite()
- {
- return new JUnit4TestAdapter( JUnit4AdapterSuiteTest.class );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
deleted file mode 100644
index edd5781..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package mho;
-
-/*
- * 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 junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-public class MySuiteTest1 extends TestCase {
-
- public static Test suite () {
- TestSuite suite = new TestSuite();
-
- suite.addTest (new MySuiteTest1("testMe", 1));
-
- return suite;
- }
-
- private final int number;
-
- public MySuiteTest1(String name, int number) {
- super (name);
- this.number = number;
- }
-
- public void testMe() {
- System.out.println ("### "+ this.getClass().getName()+":"+this.getName()+" - number "+number);
- assertTrue (true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
deleted file mode 100644
index 6ef92f6..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package mho;
-
-/*
- * 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 junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-public class MySuiteTest2 extends TestCase {
-
- public static Test suite () {
- TestSuite suite = new TestSuite();
-
- suite.addTest (new MySuiteTest2("testMe", 1));
- suite.addTest (new MySuiteTest2("testMe", 2));
-
- return suite;
- }
-
- private final int number;
-
- public MySuiteTest2(String name, int number) {
- super (name);
- this.number = number;
- }
-
- public void testMe() {
- System.out.println ("### "+ this.getClass().getName()+":"+this.getName()+" - number "+number);
- assertTrue (true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java
deleted file mode 100644
index 6618566..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package mho;
-
-/*
- * 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 junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class MySuiteTest3 extends TestCase {
-
- public static Test suite () {
- TestSuite suite = new TestSuite();
-
- suite.addTest (new MySuiteTest3("testMe", 1));
- suite.addTest (new MySuiteTest3("testMe", 2));
- suite.addTest (new MySuiteTest3("testMe", 3));
-
- return suite;
- }
-
- private final int number;
-
- public MySuiteTest3(String name, int number) {
- super (name);
- this.number = number;
- }
-
- public void testMe() {
- System.out.println ("### "+ this.getClass().getName()+":"+this.getName()+" - number "+number);
- assertTrue (true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml b/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
deleted file mode 100644
index 9c975a8..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4-test</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>junit4-test</name>
- <url>http://maven.apache.org</url>
- <properties>
- <junit.version>4.8.1</junit.version>
- <parallel>methods</parallel>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>once</forkMode>
- <threadCount>5</threadCount>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test1.java b/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test1.java
deleted file mode 100644
index 91d1201..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test1.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package surefire628;
-
-/*
- * 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.Test;
-import org.junit.BeforeClass;
-import org.junit.AfterClass;
-
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assume.*;
-public class Test1
-{
- @Test
- public void test6281() {
- System.out.println( "628Test1 on" + Thread.currentThread().getName());
- }
-
- @BeforeClass
- public static void testWithFailingAssumption2() {
- System.out.println( "Before628Test1 on" + Thread.currentThread().getName());
- }
-
- @AfterClass
- public static void testWithFailingAssumption3() {
- System.out.println( "After628Test1 on" + Thread.currentThread().getName());
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test2.java b/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test2.java
deleted file mode 100644
index 5be3fa3..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test2.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package surefire628;
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-public class Test2
-{
- @Test
- public void test6281() {
- System.out.println( "628Test2 on" + Thread.currentThread().getName());
- }
-
- @BeforeClass
- public static void testWithFailingAssumption2() {
- System.out.println( "BeforeClass628Test2 on" + Thread.currentThread().getName());
- }
-
- @AfterClass
- public static void testWithFailingAssumption3() {
- System.out.println( "AfterClass628Test2 on" + Thread.currentThread().getName());
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml b/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
deleted file mode 100644
index 211a99d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
+++ /dev/null
@@ -1,61 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-634-propertiesWarning</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for warning about system properties that cannot be set</name>
-
- <properties>
- <junitVersion>4.4</junitVersion>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <systemPropertyVariables>
- <java.library.path>${basedir}/src/main</java.library.path>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index 2d43f8f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package junit4;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml b/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml
deleted file mode 100644
index 985d8df..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml
+++ /dev/null
@@ -1,67 +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/xsd/maven-4.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>jiras-surefire-649-sys-props</artifactId>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>emptyProperty</name>
- <value/>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
[14/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
new file mode 100644
index 0000000..14e278e
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
@@ -0,0 +1,39 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * Failsafe should work with early return when no tests
+ * s
+ */
+public class Surefire901MIssingResultfileWhenNoTestsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void failsafeWithNoTests()
+ {
+ unpack( "failsafe-notests" ).executeVerify();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
new file mode 100755
index 0000000..8317c52
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
@@ -0,0 +1,42 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * 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;
+
+public class Surefire907PerThreadWithoutThreadCountIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void categoryAB()
+ {
+ OutputValidator validator = unpack( "fork-mode" )
+ .forkPerThread()
+ .reuseForks( false )
+ .maven()
+ .withFailure()
+ .executeTest();
+
+ validator.verifyTextInLog( "Fork mode perthread requires a thread count" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire920TestFailureIgnoreWithTimeoutIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire920TestFailureIgnoreWithTimeoutIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire920TestFailureIgnoreWithTimeoutIT.java
new file mode 100755
index 0000000..4f60895
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire920TestFailureIgnoreWithTimeoutIT.java
@@ -0,0 +1,45 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * 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;
+
+public class Surefire920TestFailureIgnoreWithTimeoutIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void timeoutInForkWithBuildFail()
+ {
+ OutputValidator validator =
+ unpack( "fork-timeout" ).sysProp( "junit.parallel", "none" ).maven().withFailure().executeTest();
+ validator.verifyTextInLog( "There was a timeout or other error in the fork" );
+ }
+
+ @Test
+ public void timeoutInForkWithNoBuildFail()
+ {
+ OutputValidator validator =
+ unpack( "fork-timeout" ).sysProp( "junit.parallel", "none" ).mavenTestFailureIgnore( true ).executeTest();
+ validator.verifyTextInLog( "[ERROR] There was a timeout or other error in the fork" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
new file mode 100644
index 0000000..e6f9dc6
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
@@ -0,0 +1,36 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Surefire926FailureWith2ProvidersIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testBuildFailingWhenErrors()
+ {
+ unpack( "surefire-926-2-provider-failure" ).maven().withFailure().executeTest();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire930TestNgSuiteXmlIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire930TestNgSuiteXmlIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire930TestNgSuiteXmlIT.java
new file mode 100644
index 0000000..5963662
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire930TestNgSuiteXmlIT.java
@@ -0,0 +1,37 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * 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 Surefire930TestNgSuiteXmlIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void suiteXmlRun()
+ {
+ unpack(
+ "surefire-930-failsafe-runtests" ).maven().withFailure().executeVerify().assertIntegrationTestSuiteResults(
+ 1, 0, 1, 0 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
new file mode 100644
index 0000000..59d2170
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
@@ -0,0 +1,159 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.io.FileNotFoundException;
+
+import org.apache.maven.shared.utils.xml.Xpp3Dom;
+import org.apache.maven.shared.utils.xml.Xpp3DomBuilder;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class Surefire943ReportContentIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void test_noParallel()
+ throws Exception
+ {
+ doTest( "none" );
+ }
+
+ @Test
+ public void test_parallelBoth()
+ throws Exception
+ {
+ doTest( "both" );
+ }
+
+ private void doTest( String parallelMode )
+ throws Exception
+ {
+ OutputValidator validator =
+ unpack( "surefire-943-report-content" ).maven()
+ .sysProp( "parallel", parallelMode )
+ .sysProp( "threadCount", 4 )
+ .withFailure().executeTest();
+
+ validator.assertTestSuiteResults( 10, 1, 3, 3 );
+
+ validate( validator, "org.sample.module.My1Test", 1 );
+ validate( validator, "org.sample.module.My2Test", 1 );
+ validate( validator, "org.sample.module.My3Test", 0 );
+ validateSkipped( validator, "org.sample.module.My4Test" );
+ validateFailInBeforeClass( validator, "org.sample.module.My5Test" );
+ }
+
+ private void validateFailInBeforeClass( OutputValidator validator, String className )
+ throws FileNotFoundException
+ {
+ Xpp3Dom[] children = readTests( validator, className );
+
+ Assert.assertEquals( 1, children.length );
+
+ Xpp3Dom child = children[0];
+
+ Assert.assertEquals( className, child.getAttribute( "classname" ) );
+ Assert.assertEquals( className, child.getAttribute( "name" ) );
+
+ Assert.assertEquals( "Expected error tag for failed BeforeClass method for " + className, 1,
+ child.getChildren( "error" ).length );
+
+ Assert.assertTrue( "time for test failure in BeforeClass is expected to be positive",
+ Double.compare( Double.parseDouble( child.getAttribute( "time" ) ), 0.0d ) >= 0 );
+
+ Assert.assertTrue( "time for test failure in BeforeClass is expected to be resonably low",
+ Double.compare( Double.parseDouble( child.getAttribute( "time" ) ), 2.0d ) <= 0 );
+
+ }
+
+ private void validateSkipped( OutputValidator validator, String className )
+ throws FileNotFoundException
+ {
+ Xpp3Dom[] children = readTests( validator, className );
+
+ Assert.assertEquals( 1, children.length );
+
+ Xpp3Dom child = children[0];
+
+ Assert.assertEquals( className, child.getAttribute( "classname" ) );
+ Assert.assertEquals( className, child.getAttribute( "name" ) );
+
+ Assert.assertEquals( "Expected skipped tag for ignored method for " + className, 1,
+ child.getChildren( "skipped" ).length );
+
+ Assert.assertTrue( "time for ignored test is expected to be zero",
+ Double.compare( Double.parseDouble( child.getAttribute( "time" ) ), 0.0d ) == 0 );
+ }
+
+ private void validate( OutputValidator validator, String className, int ignored )
+ throws FileNotFoundException
+ {
+ Xpp3Dom[] children = readTests( validator, className );
+
+ Assert.assertEquals( 2 + ignored, children.length );
+
+ for ( Xpp3Dom child : children )
+ {
+ Assert.assertEquals( className, child.getAttribute( "classname" ) );
+
+ if ( "alwaysSuccessful".equals( child.getAttribute( "name" ) ) )
+ {
+ Assert.assertEquals( "Expected no failures for method alwaysSuccessful for " + className, 0,
+ child.getChildCount() );
+
+ Assert.assertTrue( "time for successful test is expected to be positive",
+ Double.compare( Double.parseDouble( child.getAttribute( "time" ) ), 0.0d ) > 0 );
+ }
+ else if ( child.getAttribute( "name" ).contains( "Ignored" ) )
+ {
+ Assert.assertEquals( "Expected skipped-tag for ignored method for " + className, 1,
+ child.getChildren( "skipped" ).length );
+
+ Assert.assertTrue( "time for ignored test is expected to be zero",
+ Double.compare( Double.parseDouble( child.getAttribute( "time" ) ), 0.0d ) == 0 );
+
+ }
+ else
+ {
+ Assert.assertEquals( "Expected methods \"alwaysSuccessful\", \"*Ignored\" and \"fails\" in "
+ + className, "fails", child.getAttribute( "name" ) );
+ Assert.assertEquals( "Expected failure description for method \"fails\" in " + className, 1,
+ child.getChildren( "failure" ).length );
+ Assert.assertTrue( "time for failed test is expected to be positive",
+ Double.compare( Double.parseDouble( child.getAttribute( "time" ) ), 0.0d ) > 0 );
+ }
+ }
+ }
+
+ private Xpp3Dom[] readTests( OutputValidator validator, String className )
+ throws FileNotFoundException
+ {
+ Xpp3Dom testResult =
+ Xpp3DomBuilder.build( validator.getSurefireReportsXmlFile( "TEST-" + className + ".xml" ).getFileInputStream(),
+ "UTF-8" );
+ Xpp3Dom[] children = testResult.getChildren( "testcase" );
+ return children;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire946KillMainProcessInReusableForkIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire946KillMainProcessInReusableForkIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire946KillMainProcessInReusableForkIT.java
new file mode 100644
index 0000000..ea663ab
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire946KillMainProcessInReusableForkIT.java
@@ -0,0 +1,71 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.BeforeClass;
+import org.junit.Test;
+
+public class Surefire946KillMainProcessInReusableForkIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ // there are 10 test classes that each would wait 2 seconds.
+ private static final int TEST_SLEEP_TIME = 2000;
+
+ @BeforeClass
+ public static void installSelfdestructPlugin()
+ throws Exception
+ {
+ unpack( Surefire946KillMainProcessInReusableForkIT.class, "surefire-946-self-destruct-plugin", "plugin" ).executeInstall();
+ }
+
+ @Test( timeout = 30000 )
+ public void testHalt()
+ throws Exception
+ {
+ doTest( "halt" );
+ }
+
+ @Test( timeout = 30000 )
+ public void testExit()
+ throws Exception
+ {
+ doTest( "exit" );
+ }
+
+ @Test( timeout = 30000 )
+ public void testInterrupt()
+ throws Exception
+ {
+ doTest( "interrupt" );
+ }
+
+ private void doTest( String method )
+ {
+ unpack( "surefire-946-killMainProcessInReusableFork" )
+ .sysProp( "selfdestruct.timeoutInMillis", "5000" )
+ .sysProp( "selfdestruct.method", method )
+ .sysProp( "testSleepTime", String.valueOf( TEST_SLEEP_TIME ) )
+ .addGoal( "org.apache.maven.plugins.surefire:maven-selfdestruct-plugin:selfdestruct" )
+ .setForkJvm()
+ .forkPerThread().threadCount( 1 ).reuseForks( true ).maven().withFailure().executeTest();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire972BizarreNoClassDefIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire972BizarreNoClassDefIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire972BizarreNoClassDefIT.java
new file mode 100644
index 0000000..94db9f8
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire972BizarreNoClassDefIT.java
@@ -0,0 +1,32 @@
+package org.apache.maven.surefire.its.jiras;
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+/*
+ * 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.
+ */
+public class Surefire972BizarreNoClassDefIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testJunit3ParallelBuildResultCount()
+ {
+ unpack( "surefire-972-bizarre-noclassdef" ).maven().withFailure().executeVerify();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java
new file mode 100644
index 0000000..0f30dbc
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java
@@ -0,0 +1,40 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+public class Surefire975DefaultVMEncodingIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void runWithRussian1251()
+ throws Exception
+ {
+ OutputValidator outputValidator =
+ unpack( "surefire-975-wrong-encoding" ).setMavenOpts( "-Dfile.encoding=windows-1251" ).executeTest();
+ outputValidator.getSurefireReportsXmlFile( "TEST-EncodingInReportTest.xml" ).assertContainsText(
+ "\u043A\u0438\u0440\u0438\u043B\u043B\u0438\u0446\u0435" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire979WrongClassLoaderIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire979WrongClassLoaderIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire979WrongClassLoaderIT.java
new file mode 100644
index 0000000..d648576
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire979WrongClassLoaderIT.java
@@ -0,0 +1,39 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+public class Surefire979WrongClassLoaderIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void wrongClassloaderUSedInSmartStacktraceparser()
+ throws Exception
+ {
+ OutputValidator outputValidator =
+ unpack( "surefire-979-smartStackTrace-wrongClassloader" ).failNever().executeTest();
+ outputValidator.verifyTextInLog( "java.lang.NoClassDefFoundError: org/apache/commons/io/input/AutoCloseInputStream" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire985ParameterizedRunnerAndCategoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire985ParameterizedRunnerAndCategoriesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire985ParameterizedRunnerAndCategoriesIT.java
new file mode 100644
index 0000000..b86b291
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire985ParameterizedRunnerAndCategoriesIT.java
@@ -0,0 +1,68 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.io.FileNotFoundException;
+
+import org.apache.maven.shared.utils.xml.Xpp3Dom;
+import org.apache.maven.shared.utils.xml.Xpp3DomBuilder;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class Surefire985ParameterizedRunnerAndCategoriesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void test()
+ throws Exception
+ {
+ OutputValidator validator = unpack( "surefire-985-parameterized-and-categories" ).maven().executeTest();
+ validator.assertTestSuiteResults( 12, 0, 0, 0 );
+
+ assertFalse( validator.getSurefireReportsXmlFile( "TEST-sample.parameterized.Parameterized01Test.xml" ).exists() );
+
+ TestFile reportFile2 =
+ validator.getSurefireReportsXmlFile( "TEST-sample.parameterized.Parameterized02Test.xml" );
+ assertTestCount( reportFile2, 4 );
+
+ TestFile reportFile3 =
+ validator.getSurefireReportsXmlFile( "TEST-sample.parameterized.Parameterized03Test.xml" );
+ assertTestCount( reportFile3, 8 );
+
+ }
+
+ private void assertTestCount( TestFile reportFile, int tests )
+ throws FileNotFoundException
+ {
+ assertTrue( reportFile.exists() );
+
+ Xpp3Dom testResult = Xpp3DomBuilder.build( reportFile.getFileInputStream(), "UTF-8" );
+ Xpp3Dom[] children = testResult.getChildren( "testcase" );
+ assertEquals( tests, children.length );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
new file mode 100644
index 0000000..d776724
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
@@ -0,0 +1,90 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-995">SUREFIRE-995</a>
+ * @since 2.18.1
+ */
+public class Surefire995CategoryInheritanceIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void negativeTestShouldRunAllCategories()
+ {
+ unpack()
+ .setTestToRun( "Special*Test" )
+ .executeTest()
+ .verifyErrorFree( 3 );
+ }
+
+ @Test
+ public void junit411ShouldRunExplicitCategory()
+ {
+ unpack()
+ .addGoal( "-Ppositive-tests" )
+ .sysProp( "version.junit", "4.11" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyTextInLog( "CategorizedTest#a" );
+ }
+
+ @Test
+ public void junit411ShouldExcludeExplicitCategory()
+ {
+ unpack()
+ .addGoal( "-Ppositive-tests-excluded-categories" )
+ .sysProp( "version.junit", "4.11" )
+ .executeTest()
+ .verifyErrorFree( 2 );
+ }
+
+ @Test
+ public void junit412ShouldRunInheritedCategory()
+ {
+ unpack()
+ .setTestToRun( "Special*Test" )
+ .addGoal( "-Ppositive-tests" )
+ .executeTest()
+ .verifyErrorFree( 2 );
+ }
+
+ @Test
+ public void junit412ShouldExcludeInheritedCategory()
+ {
+ unpack()
+ .setTestToRun( "Special*Test" )
+ .addGoal( "-Ppositive-tests-excluded-categories" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyTextInLog( "SpecialNonCategoryTest#test" );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-995-categoryInheritance" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/SurefireToolchains/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/SurefireToolchains/pom.xml b/surefire-its/src/test/resources/SurefireToolchains/pom.xml
new file mode 100644
index 0000000..2d066eb
--- /dev/null
+++ b/surefire-its/src/test/resources/SurefireToolchains/pom.xml
@@ -0,0 +1,72 @@
+
+<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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>SurefireToolchains</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test :: SurefireToolchains</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <prerequisites>
+ <maven>2.2.1</maven>
+ </prerequisites>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>1.5</version>
+ <vendor>sun</vendor>
+ </jdk>
+ </toolchains>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/SurefireToolchains/src/main/java/test/surefiretoolchains/App.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/SurefireToolchains/src/main/java/test/surefiretoolchains/App.java b/surefire-its/src/test/resources/SurefireToolchains/src/main/java/test/surefiretoolchains/App.java
new file mode 100644
index 0000000..0a56a54
--- /dev/null
+++ b/surefire-its/src/test/resources/SurefireToolchains/src/main/java/test/surefiretoolchains/App.java
@@ -0,0 +1,29 @@
+package test.surefiretoolchains;
+
+/*
+ * 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.
+ */
+
+public final class App
+{
+
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/SurefireToolchains/src/test/java/test/surefiretoolchains/AppTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/SurefireToolchains/src/test/java/test/surefiretoolchains/AppTest.java b/surefire-its/src/test/resources/SurefireToolchains/src/test/java/test/surefiretoolchains/AppTest.java
new file mode 100644
index 0000000..1c061d0
--- /dev/null
+++ b/surefire-its/src/test/resources/SurefireToolchains/src/test/java/test/surefiretoolchains/AppTest.java
@@ -0,0 +1,36 @@
+package test.surefiretoolchains;
+
+/*
+ * 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.Test;
+
+import static org.junit.Assert.*;
+
+public class AppTest
+{
+
+ @Test
+ public void testApp()
+ {
+ // 1.5.0_19-b02
+ assertEquals( "1.5.0_19", System.getProperty( "java.version" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/additional-classpath/extraResource/test.txt
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/additional-classpath/extraResource/test.txt b/surefire-its/src/test/resources/additional-classpath/extraResource/test.txt
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/additional-classpath/extraResource2/test2.txt
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/additional-classpath/extraResource2/test2.txt b/surefire-its/src/test/resources/additional-classpath/extraResource2/test2.txt
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/additional-classpath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/additional-classpath/pom.xml b/surefire-its/src/test/resources/additional-classpath/pom.xml
new file mode 100644
index 0000000..01ce10c
--- /dev/null
+++ b/surefire-its/src/test/resources/additional-classpath/pom.xml
@@ -0,0 +1,65 @@
+<?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/xsd/maven-4.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>additional-classpath</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for additionalClasspathElements</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/extraResource</additionalClasspathElement>
+ <additionalClasspathElement>${abc}, ${basedir}/extraResource2</additionalClasspathElement>
+ <!-- SUREFIRE-694 -->
+ <additionalClasspathElement></additionalClasspathElement>
+ <!-- SUREFIRE-694 -->
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/additional-classpath/src/test/java/additionalClasspath/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/additional-classpath/src/test/java/additionalClasspath/BasicTest.java b/surefire-its/src/test/resources/additional-classpath/src/test/java/additionalClasspath/BasicTest.java
new file mode 100644
index 0000000..43826b8
--- /dev/null
+++ b/surefire-its/src/test/resources/additional-classpath/src/test/java/additionalClasspath/BasicTest.java
@@ -0,0 +1,34 @@
+package additionalClasspath;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class BasicTest
+ extends TestCase
+{
+
+ public void testExtraResource()
+ {
+ assertNotNull( BasicTest.class.getResourceAsStream( "/test.txt" ) );
+ assertNotNull( BasicTest.class.getResourceAsStream( "/test2.txt" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/aggregate-report/child1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/aggregate-report/child1/pom.xml b/surefire-its/src/test/resources/aggregate-report/child1/pom.xml
new file mode 100644
index 0000000..9897a25
--- /dev/null
+++ b/surefire-its/src/test/resources/aggregate-report/child1/pom.xml
@@ -0,0 +1,52 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>aggregate-report</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>aggregate-child1</artifactId>
+ <name>child1 for aggregate-reports</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/aggregate-report/child1/src/test/java/aggregateReport/FailingTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/aggregate-report/child1/src/test/java/aggregateReport/FailingTest.java b/surefire-its/src/test/resources/aggregate-report/child1/src/test/java/aggregateReport/FailingTest.java
new file mode 100644
index 0000000..440ade7
--- /dev/null
+++ b/surefire-its/src/test/resources/aggregate-report/child1/src/test/java/aggregateReport/FailingTest.java
@@ -0,0 +1,33 @@
+package aggregateReport;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class FailingTest
+ extends TestCase
+{
+
+ public void testFailure()
+ {
+ fail( "This test is supposed to fail" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/aggregate-report/child2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/aggregate-report/child2/pom.xml b/surefire-its/src/test/resources/aggregate-report/child2/pom.xml
new file mode 100644
index 0000000..b67c49a
--- /dev/null
+++ b/surefire-its/src/test/resources/aggregate-report/child2/pom.xml
@@ -0,0 +1,52 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>aggregate-report</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>aggregate-child2</artifactId>
+ <name>child2 for aggregate-reports</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java b/surefire-its/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java
new file mode 100644
index 0000000..529e7ca
--- /dev/null
+++ b/surefire-its/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java
@@ -0,0 +1,87 @@
+package aggregateReport;
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public BasicTest( String name, String extraName )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ System.out.println( "suite" );
+ TestSuite suite = new TestSuite();
+ Test test = new BasicTest( "testSetUp", "dummy" );
+ suite.addTest( test );
+
+ return new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/aggregate-report/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/aggregate-report/pom.xml b/surefire-its/src/test/resources/aggregate-report/pom.xml
new file mode 100644
index 0000000..42f0f32
--- /dev/null
+++ b/surefire-its/src/test/resources/aggregate-report/pom.xml
@@ -0,0 +1,67 @@
+<?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/xsd/maven-4.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>aggregate-report</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for aggregate-report</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/ant-ignore/.gitignore
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/ant-ignore/.gitignore b/surefire-its/src/test/resources/ant-ignore/.gitignore
new file mode 100644
index 0000000..2d7276b
--- /dev/null
+++ b/surefire-its/src/test/resources/ant-ignore/.gitignore
@@ -0,0 +1,3 @@
+*.jar
+TEST*
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/ant-ignore/build.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/ant-ignore/build.xml b/surefire-its/src/test/resources/ant-ignore/build.xml
new file mode 100644
index 0000000..69795d0
--- /dev/null
+++ b/surefire-its/src/test/resources/ant-ignore/build.xml
@@ -0,0 +1,52 @@
+<project name="MyProject" xmlns:ivy="antlib:org.apache.ivy.ant" default="dist" basedir=".">
+ <description>
+ simple example build file
+ </description>
+ <!-- set global properties for this build -->
+ <property name="src" location="src/test"/>
+ <property name="build" location="build"/>
+ <property name="dist" location="dist"/>
+
+
+ <target name="resolve" description="--> retrieve dependencies with ivy">
+ <ivy:retrieve />
+ </target>
+
+ <target name="init">
+ <!-- Create the time stamp -->
+ <tstamp/>
+ <!-- Create the build directory structure used by compile -->
+ <mkdir dir="${build}"/>
+ </target>
+
+ <target name="compile" depends="init, resolve"
+ description="compile the source " >
+ <javac srcdir="${src}" destdir="${build}" includeantruntime="true" classpath="lib/junit-4.8.1.jar" />
+ </target>
+
+ <target name="dist" depends="compile"
+ description="generate the distribution" >
+ <!-- Create the distribution directory -->
+ <mkdir dir="${dist}/lib"/>
+
+ <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
+ <jar jarfile="${dist}/lib/MyProject-${DSTAMP}.jar" basedir="${build}"/>
+ </target>
+
+ <target name="test" depends="compile">
+ <junit>
+ <classpath path="build:lib/junit-4.8.1.jar"/>
+ <formatter type="brief" usefile="true" />
+ <formatter type="xml" usefile="true" />
+ <test name="antignore.BasicTest" />
+ </junit>
+</target>
+
+ <target name="clean"
+ description="clean up" >
+ <!-- Delete the ${build} and ${dist} directory trees -->
+ <delete dir="${build}"/>
+ <delete dir="${dist}"/>
+ </target>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/ant-ignore/ivy.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/ant-ignore/ivy.xml b/surefire-its/src/test/resources/ant-ignore/ivy.xml
new file mode 100644
index 0000000..64df19c
--- /dev/null
+++ b/surefire-its/src/test/resources/ant-ignore/ivy.xml
@@ -0,0 +1,6 @@
+<ivy-module version="2.0">
+ <info organisation="org.apache" module="hello-ivy"/>
+ <dependencies>
+ <dependency org="junit" name="junit" rev="4.8.1"/>
+ </dependencies>
+</ivy-module>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/ant-ignore/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/ant-ignore/pom.xml b/surefire-its/src/test/resources/ant-ignore/pom.xml
new file mode 100644
index 0000000..6360bed
--- /dev/null
+++ b/surefire-its/src/test/resources/ant-ignore/pom.xml
@@ -0,0 +1,47 @@
+<?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/xsd/maven-4.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>ant-ignore</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test of @Ignore annotation, can be used side-by-side with maven and ant </name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/ant-ignore/src/ivy.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/ant-ignore/src/ivy.xml b/surefire-its/src/test/resources/ant-ignore/src/ivy.xml
new file mode 100644
index 0000000..64df19c
--- /dev/null
+++ b/surefire-its/src/test/resources/ant-ignore/src/ivy.xml
@@ -0,0 +1,6 @@
+<ivy-module version="2.0">
+ <info organisation="org.apache" module="hello-ivy"/>
+ <dependencies>
+ <dependency org="junit" name="junit" rev="4.8.1"/>
+ </dependencies>
+</ivy-module>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java b/surefire-its/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
new file mode 100644
index 0000000..750bd60
--- /dev/null
+++ b/surefire-its/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
@@ -0,0 +1,42 @@
+package antignore;
+
+/*
+ * 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.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class BasicTest
+{
+
+ @Test
+ @Ignore
+ public void testIgnorable()
+ {
+ Assert.fail( "you should have ignored me!" );
+ }
+
+ @Test
+ public void testSomethingElse()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/argLine-parameter/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/argLine-parameter/pom.xml b/surefire-its/src/test/resources/argLine-parameter/pom.xml
new file mode 100644
index 0000000..0cce4c9
--- /dev/null
+++ b/surefire-its/src/test/resources/argLine-parameter/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/xsd/maven-4.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>testArgLine</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for argLine configuration</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ <argLine>-Dfoo.property="foo foo/foo/bar/1.0" -Dbar.property="bar bar/foo/bar/2.0"</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/argLine-parameter/src/test/java/argLine/TestSurefireArgLine.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/argLine-parameter/src/test/java/argLine/TestSurefireArgLine.java b/surefire-its/src/test/resources/argLine-parameter/src/test/java/argLine/TestSurefireArgLine.java
new file mode 100644
index 0000000..1765c84
--- /dev/null
+++ b/surefire-its/src/test/resources/argLine-parameter/src/test/java/argLine/TestSurefireArgLine.java
@@ -0,0 +1,40 @@
+package argLine;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class TestSurefireArgLine
+ extends TestCase
+{
+
+ public void testArgLine()
+ {
+ String fooProperty = System.getProperty( "foo.property" );
+ assertEquals( "incorrect foo.property; " +
+ "Surefire should have passed this in correctly",
+ "foo foo/foo/bar/1.0", fooProperty );
+ String barProperty = System.getProperty( "bar.property" );
+ assertEquals( "incorrect bar.property; " +
+ "Surefire should have passed this in correctly",
+ "bar bar/foo/bar/2.0", barProperty );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/argLine-properties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/argLine-properties/pom.xml b/surefire-its/src/test/resources/argLine-properties/pom.xml
new file mode 100644
index 0000000..2a6d6c2
--- /dev/null
+++ b/surefire-its/src/test/resources/argLine-properties/pom.xml
@@ -0,0 +1,84 @@
+<?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/xsd/maven-4.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>testArgProperties</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for late replacement argLine properties.</name>
+
+ <properties>
+ <from.prop>from-prop-value</from.prop>
+ <override.prop>not-override-prop-value</override.prop>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <id>default</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+ <file>${project.basedir}/src/test/resources/it.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ <argLine>-Dp1=@{from.prop} -Dp2=@{override.prop} -Dp3=@{undefined.prop} -Dp4=@{generated.prop}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/argLine-properties/src/test/java/argLine-properties/TestSurefireArgLineProperties.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/argLine-properties/src/test/java/argLine-properties/TestSurefireArgLineProperties.java b/surefire-its/src/test/resources/argLine-properties/src/test/java/argLine-properties/TestSurefireArgLineProperties.java
new file mode 100644
index 0000000..a16fceb
--- /dev/null
+++ b/surefire-its/src/test/resources/argLine-properties/src/test/java/argLine-properties/TestSurefireArgLineProperties.java
@@ -0,0 +1,58 @@
+package argLine;
+
+/*
+ * 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.Assert;
+import org.junit.Test;
+
+public class TestSurefireArgLineProperties
+{
+ @Test
+ public void testFromProp()
+ {
+ String fromProp = System.getProperty("p1");
+ Assert.assertNotNull(fromProp, "incorrect arg line, no p1 present?");
+ Assert.assertEquals("from-prop-value", fromProp);
+ }
+
+ @Test
+ public void testOverrideProp()
+ {
+ String overrideProp = System.getProperty("p2");
+ Assert.assertNotNull(overrideProp, "incorrect arg line, no p2 present?");
+ Assert.assertEquals("override-prop-value", overrideProp);
+ }
+
+ @Test
+ public void testUndefinedProp()
+ {
+ String undefinedProp = System.getProperty("p3");
+ Assert.assertNotNull(undefinedProp, "incorrect arg line, no p3 present?");
+ Assert.assertEquals("@{undefined.prop}", undefinedProp);
+ }
+
+ @Test
+ public void testGeneratedProp()
+ {
+ String generatedProp = System.getProperty("p4");
+ Assert.assertNotNull(generatedProp, "incorrect arg line, no p4 present?");
+ Assert.assertEquals("generated-prop-value", generatedProp);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/argLine-properties/src/test/resources/it.properties
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/argLine-properties/src/test/resources/it.properties b/surefire-its/src/test/resources/argLine-properties/src/test/resources/it.properties
new file mode 100644
index 0000000..dd889a2
--- /dev/null
+++ b/surefire-its/src/test/resources/argLine-properties/src/test/resources/it.properties
@@ -0,0 +1,19 @@
+# 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.
+
+override.prop=override-prop-value
+generated.prop=generated-prop-value
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/assumpationFailureReport/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/assumpationFailureReport/pom.xml b/surefire-its/src/test/resources/assumpationFailureReport/pom.xml
new file mode 100644
index 0000000..8530eca
--- /dev/null
+++ b/surefire-its/src/test/resources/assumpationFailureReport/pom.xml
@@ -0,0 +1,63 @@
+<?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/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>assumpationFailure</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>assumpationFailureReportTest</name>
+ <url>http://maven.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/assumpationFailureReport/src/test/java/assumpationFailure/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/assumpationFailureReport/src/test/java/assumpationFailure/Test1.java b/surefire-its/src/test/resources/assumpationFailureReport/src/test/java/assumpationFailure/Test1.java
new file mode 100644
index 0000000..3653ce6
--- /dev/null
+++ b/surefire-its/src/test/resources/assumpationFailureReport/src/test/java/assumpationFailure/Test1.java
@@ -0,0 +1,35 @@
+package assumptionFailure;
+
+/*
+ * 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.Test;
+import org.junit.Assume;
+
+import static org.junit.Assert.fail;
+
+public class Test1
+{
+ @Test
+ public void testAssumptionFailureReport()
+ {
+ Assume.assumeTrue( "The test is skipped if it is false" , false );
+ fail( "This is not expected to test" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-filtering/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/classpath-filtering/pom.xml b/surefire-its/src/test/resources/classpath-filtering/pom.xml
new file mode 100644
index 0000000..49c4e34
--- /dev/null
+++ b/surefire-its/src/test/resources/classpath-filtering/pom.xml
@@ -0,0 +1,65 @@
+<?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/xsd/maven-4.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>classpath-dependency-filter</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for filtering classpath dependencies</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <classpathDependencyExcludes>
+ <exclude>org.apache.commons:*</exclude>
+ </classpathDependencyExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-email</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-filtering/src/test/java/classpathFiltering/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/classpath-filtering/src/test/java/classpathFiltering/BasicTest.java b/surefire-its/src/test/resources/classpath-filtering/src/test/java/classpathFiltering/BasicTest.java
new file mode 100644
index 0000000..5f8b23a
--- /dev/null
+++ b/surefire-its/src/test/resources/classpath-filtering/src/test/java/classpathFiltering/BasicTest.java
@@ -0,0 +1,44 @@
+package classpathFiltering;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class BasicTest
+ extends TestCase
+{
+
+ public void testDependencyFilter() {
+
+ Class testClass = null;
+ String testClassName = "org.apache.commons.mail.Email";
+ try
+ {
+ testClass = Class.forName( testClassName );
+ System.out.println( "Able to load class " + testClass );
+ }
+ catch ( ClassNotFoundException e )
+ {
+ System.out.println( "Couldn't load " + testClassName );
+ }
+ assertNull( testClass );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-order/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/classpath-order/pom.xml b/surefire-its/src/test/resources/classpath-order/pom.xml
new file mode 100644
index 0000000..b49fda7
--- /dev/null
+++ b/surefire-its/src/test/resources/classpath-order/pom.xml
@@ -0,0 +1,64 @@
+<?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/xsd/maven-4.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>classpath-order</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test proper order of class path elements: test-classes, classes, dependencies</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
[15/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
new file mode 100644
index 0000000..a47b9d8
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
@@ -0,0 +1,98 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel<br>
+ * SUREFIRE-1264 Some tests can be lost when running in parallel with parameterized tests<br>
+ * <br>
+ * Removed decision making with JUnit3 in {@code TestSet} class during Jira activity of <tt>SUREFIRE-1264</tt>
+ * which results in one hot spot where the test class is determined (see JUnitCoreRunListener#fillTestCountMap()).
+ *
+ * @author Kristian Rosenvold
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ */
+public class Surefire621TestCountingJunit3InParallelIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ /**
+ * SUREFIRE-1264
+ */
+ @Test
+ public void testJunit3AllParallelBuildResultCount()
+ {
+ unpack( "surefire-621-testCounting-junit3-in-parallel" )
+ .activateProfile( "all-parallel-junit3-testcases" )
+ .execute( "integration-test" )
+ .assertTestSuiteResults( 6, 0, 0, 0 );
+ }
+
+ /**
+ * SUREFIRE-621
+ */
+ @Test
+ public void testJunit3ParallelBuildResultCount()
+ {
+ unpack( "surefire-621-testCounting-junit3-in-parallel" )
+ .failNever()
+ .activateProfile( "parallel-junit3-testcases" )
+ .execute( "install" )
+ .assertTestSuiteResults( 6, 0, 0, 0 );
+ }
+
+ /**
+ * SUREFIRE-1264
+ */
+ @Test
+ public void testJunit3BuildResultCount()
+ {
+ unpack( "surefire-621-testCounting-junit3-in-parallel" )
+ .activateProfile( "junit3-testcases" )
+ .execute( "integration-test" )
+ .assertTestSuiteResults( 6, 0, 0, 0 );
+ }
+
+ /**
+ * SUREFIRE-1264
+ */
+ @Test
+ public void testJunit3ParallelSuiteBuildResultCount()
+ {
+ unpack( "surefire-621-testCounting-junit3-in-parallel" )
+ .activateProfile( "parallel-junit3-testsuite" )
+ .execute( "integration-test" )
+ .assertTestSuiteResults( 6, 0, 0, 0 );
+ }
+
+ /**
+ * SUREFIRE-1264
+ */
+ @Test
+ public void testJunit3SuiteBuildResultCount()
+ {
+ unpack( "surefire-621-testCounting-junit3-in-parallel" )
+ .activateProfile( "junit3-testsuite" )
+ .execute( "integration-test" )
+ .assertTestSuiteResults( 6, 0, 0, 0 );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
new file mode 100644
index 0000000..27f9572
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
@@ -0,0 +1,48 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * Asserts that console output always goes somewhere ;)
+ *
+ * @author Kristian Rosenvold assertContainsText
+ */
+public class Surefire628ConsoleOutputBeforeAndAfterClassIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void testJunit3ParallelBuildResultCount()
+ {
+ OutputValidator validator =
+ unpack( "surefire-628-consoleoutputbeforeandafterclass" ).failNever().parallelMethods().executeTest();
+
+ validator.verifyTextInLog( "628Test1" );
+ validator.verifyTextInLog( "Before628Test1" );
+ validator.verifyTextInLog( "After628Test1" );
+ validator.verifyTextInLog( "628Test2" );
+ validator.verifyTextInLog( "BeforeClass628Test2" );
+ validator.verifyTextInLog( "AfterClass628Test2" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java
new file mode 100644
index 0000000..778e776
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java
@@ -0,0 +1,39 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-634 Verifies error message on unsettable system properties
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire634UnsettableSystemPropertiesWarningIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testJunit3ParallelBuildResultCount()
+ {
+ unpack( "/surefire-634-systemPropertiesWarning" ).executeTest().verifyTextInLog(
+ "java.library.path cannot be set as system property" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
new file mode 100644
index 0000000..d6f0a0e
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
@@ -0,0 +1,84 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import static org.junit.Assert.fail;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-649">SUREFIRE-649</a>
+ * @since 2.18
+ */
+public class Surefire649EmptyStringSystemPropertiesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void systemProperties()
+ throws VerificationException
+ {
+ SurefireLauncher launcher = unpack1();
+
+ OutputValidator validator = launcher.executeTest().verifyErrorFree( 1 );
+
+ for ( String line : validator.loadLogLines() )
+ {
+ if ( "emptyProperty=''".equals( line ) )
+ {
+ return;
+ }
+ }
+ fail("Could not find text in log: emptyProperty=''");
+ }
+
+ @Test
+ public void systemPropertyVariables()
+ throws VerificationException
+ {
+ SurefireLauncher launcher = unpack2();
+
+ OutputValidator validator = launcher.executeTest().verifyErrorFree( 1 );
+
+ for ( String line : validator.loadLogLines() )
+ {
+ if ( "emptyProperty=''".equals( line ) )
+ {
+ return;
+ }
+ }
+ fail("Could not find text in log: emptyProperty=''");
+ }
+
+ private SurefireLauncher unpack1()
+ {
+ return unpack( "surefire-649-systemProperties" );
+ }
+
+ private SurefireLauncher unpack2()
+ {
+ return unpack( "surefire-649-systemPropertyVariables" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
new file mode 100644
index 0000000..7f3e2ca
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
@@ -0,0 +1,38 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-673 Asserts that a given mockito build works as it should (classloader problem in 2.7)
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire673MockitoIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testBuildFailingWhenErrors()
+ {
+ unpack( "/surefire-673-mockito" ).executeTest().verifyErrorFreeLog();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java
new file mode 100644
index 0000000..5aa342f
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java
@@ -0,0 +1,39 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-674 Asserts that the build fails when tests have errors
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire674BuildFailingWhenErrorsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testBuildFailingWhenErrors()
+ {
+ unpack( "/surefire-674-buildFailingWhenErrors" ).maven().withFailure().executeTest().verifyTextInLog(
+ "BUILD FAILURE" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java
new file mode 100644
index 0000000..57c8648
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java
@@ -0,0 +1,38 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-674 Asserts that the build fails when tests have errors
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire674BuildFailingWhenFailsafeErrorsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testBuildFailingWhenErrors()
+ {
+ unpack( "/failsafe-buildfail" ).maven().withFailure().executeVerify().verifyTextInLog( "BUILD FAILURE" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java
new file mode 100644
index 0000000..3d7a684
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java
@@ -0,0 +1,38 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-685 Asserts that only the specified tests are run with comma separated includes
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire685CommaSeparatedIncludesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testBuildFailingWhenErrors()
+ {
+ executeErrorFreeTest( "/surefire-685-commaseparatedIncludes", 2 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
new file mode 100644
index 0000000..3175196
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
@@ -0,0 +1,39 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-697 Asserts proper truncation of long exception messages Some say testing this is a bit over the top.
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire697NiceSummaryIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testBuildFailingWhenErrors()
+ {
+ unpack( "/surefire-697-niceSummary" ).failNever().executeTest().verifyTextInLog(
+ "junit.surefire697.BasicTest#testShortMultiline RuntimeException A very short m" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
new file mode 100644
index 0000000..e1a258a
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
@@ -0,0 +1,40 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * Test
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire705ParallelForkTimeoutIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testTimeoutForked()
+ {
+ unpack( "/fork-timeout" ).setJUnitVersion( "4.8.1" ).addGoal( "-Djunit.version=4.8.1" ).addGoal(
+ "-Djunit.parallel=classes" ).addGoal( "-DtimeOut=1" ).maven().withFailure().executeTest()
+ .verifyTextInLog( "There was a timeout or other error in the fork" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java
new file mode 100644
index 0000000..aabb05d
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java
@@ -0,0 +1,36 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Surefire733AllOverrridesCapturedIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testLogOutput()
+ {
+ unpack( "surefire-733-allOverridesCaptured" ).executeTest().verifyTextInLog( "abc" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
new file mode 100644
index 0000000..34504c1
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
@@ -0,0 +1,80 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import static org.fest.assertions.Assertions.assertThat;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Surefire735ForkFailWithRedirectConsoleOutputIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void vmStartFail()
+ throws Exception
+ {
+ OutputValidator outputValidator = unpack().failNever().executeTest();
+ assertJvmCrashed( outputValidator );
+ }
+
+ @Test
+ public void vmStartFailShouldFailBuildk()
+ throws Exception
+ {
+ OutputValidator outputValidator = unpack().maven().withFailure().executeTest();
+ assertJvmCrashed( outputValidator );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "fork-fail" );
+ }
+
+ private static void assertJvmCrashed( OutputValidator outputValidator )
+ {
+ File reportDir = outputValidator.getSurefireReportsDirectory();
+ String[] dumpFiles = reportDir.list( new FilenameFilter()
+ {
+ @Override
+ public boolean accept( File dir, String name )
+ {
+ return name.endsWith( ".dumpstream" );
+ }
+ }
+ );
+ assertThat( dumpFiles ).isNotEmpty();
+ for ( String dump : dumpFiles )
+ {
+ outputValidator.getSurefireReportsFile( dump )
+ .assertContainsText( "Invalid maximum heap size: -Xmxxxx712743m" );
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
new file mode 100644
index 0000000..e05cee7
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
@@ -0,0 +1,48 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test Surefire-740 Truncated comma with non us locale
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire740TruncatedCommaIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testRussianLocaleReport()
+ {
+ OutputValidator validator = unpack( "/surefire-740-comma-truncated" ).setMavenOpts(
+ "-Duser.language=ru -Duser.country=RU" ).failNever().addSurefireReportGoal().executeCurrentGoals();
+
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ assertTrue( "Expecting file", siteFile.exists() );
+ siteFile.assertContainsText( "027" ); // Avoid asserting with the "," or "." ;)
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
new file mode 100644
index 0000000..c5dbc84
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
@@ -0,0 +1,168 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.text.Format;
+import java.text.NumberFormat;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
+import static java.lang.String.format;
+import static java.math.RoundingMode.DOWN;
+import static java.util.Locale.ROOT;
+import static org.hamcrest.CoreMatchers.anyOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.endsWith;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Surefire747MethodParallelWithSuiteCountIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ // if you want to change his constant, change it in SuiteTest1.java and SuiteTest2.java as well
+ private static final int PERFORMANCE_TEST_MULTIPLICATION_FACTOR = 4;
+
+ private Format lowerScaleFormatter, noFractionalDigitsFormatter;
+
+ private static Set<String> printTestLines( OutputValidator validator, String pattern )
+ throws VerificationException
+ {
+ Set<String> log = new TreeSet<String>( validator.loadLogLines() );
+ for ( Iterator<String> it = log.iterator(); it.hasNext(); )
+ {
+ String line = it.next();
+ if ( !line.contains( pattern ) )
+ {
+ it.remove();
+ }
+ }
+ return log;
+ }
+
+ private static long duration( String logLine )
+ {
+ return Integer.decode( logLine.split( "=" )[1] );
+ }
+
+ @Before
+ public void init()
+ {
+ NumberFormat lowScaleFormatter = NumberFormat.getInstance( ROOT );
+ lowScaleFormatter.setRoundingMode( DOWN );
+ lowScaleFormatter.setMinimumFractionDigits( 1 );
+ lowScaleFormatter.setMaximumFractionDigits( 1 );
+ this.lowerScaleFormatter = lowScaleFormatter;
+
+ NumberFormat noFractionalDigitsFormatter = NumberFormat.getInstance( ROOT );
+ noFractionalDigitsFormatter.setRoundingMode( DOWN );
+ noFractionalDigitsFormatter.setMinimumFractionDigits( 0 );
+ noFractionalDigitsFormatter.setMaximumFractionDigits( 0 );
+ this.noFractionalDigitsFormatter = noFractionalDigitsFormatter;
+ }
+
+ @Test
+ public void testMethodsParallelWithSuite()
+ throws VerificationException
+ {
+ OutputValidator validator = unpack().executeTest().verifyErrorFree( 6 );
+ Set<String> testLines = printTestLines( validator, "test finished after duration=" );
+ assertThat( testLines.size(), is( 2 ) );
+ for ( String testLine : testLines )
+ {
+ long duration = duration( testLine );
+ long min = 250 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
+ long max = 750 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
+ assertTrue( format( "duration %d should be between %d and %d ms", duration, min, max ),
+ duration > min && duration < max
+ );
+ }
+ Set<String> suiteLines = printTestLines( validator, "suite finished after duration=" );
+ assertThat( suiteLines.size(), is( 1 ) );
+ long duration = duration( suiteLines.iterator().next() );
+ long min = 750 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
+ long max = 1250 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
+ assertTrue( format( "duration %d should be between %d and %d ms", duration, min, max ),
+ duration > min && duration < max
+ );
+
+ String delayMin = lowerScaleFormatter.format( 0.98 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR * 0.5 );
+ String delayMax = noFractionalDigitsFormatter.format( PERFORMANCE_TEST_MULTIPLICATION_FACTOR * 0.5 ) + ".";
+
+ for ( String line : validator.loadLogLines() )
+ {
+ if ( line.startsWith( "Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:" ) )
+ {
+ assertThat( line, anyOf( // 1.9xx to 2.xxx can vary depending on CI jobs
+ containsString( "Time elapsed: " + delayMin ),
+ containsString( "Time elapsed: " + delayMax )
+ )
+ );
+ assertThat( line, anyOf(
+ endsWith( " s - in surefire747.SuiteTest1" ),
+ endsWith( " s - in surefire747.SuiteTest2" )
+ )
+ );
+ }
+ }
+ }
+
+ @Test
+ public void testClassesParallelWithSuite()
+ throws VerificationException
+ {
+ OutputValidator validator = unpack().parallelClasses().executeTest().verifyErrorFree( 6 );
+ Set<String> testLines = printTestLines( validator, "test finished after duration=" );
+ assertThat( testLines.size(), is( 2 ) );
+ for ( String testLine : testLines )
+ {
+ long duration = duration( testLine );
+ long min = 1450 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
+ long max = 1750 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
+ assertTrue( format( "duration %d should be between %d and %d ms", duration, min, max ),
+ duration > min && duration < max
+ );
+ }
+ Set<String> suiteLines = printTestLines( validator, "suite finished after duration=" );
+ assertThat( suiteLines.size(), is( 1 ) );
+ long duration = duration( suiteLines.iterator().next() );
+ long min = 1450 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
+ long max = 1750 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
+ assertTrue( format( "duration %d should be between %d and %d ms", duration, min, max ),
+ duration > min && duration < max
+ );
+ }
+
+ public SurefireLauncher unpack()
+ {
+ return unpack( "junit47-parallel-with-suite" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
new file mode 100644
index 0000000..96d31c1
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
@@ -0,0 +1,87 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test Surefire-740 Truncated comma with non us locale
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire772BothReportsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ public SurefireLauncher unpack()
+ {
+ SurefireLauncher unpack = unpack( "/surefire-772-both-reports" );
+ unpack.maven().deleteSiteDir().skipClean().failNever();
+ return unpack;
+ }
+
+ @Test
+ public void testReportGeneration()
+ throws Exception
+ {
+ OutputValidator outputValidator =
+ unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+
+ TestFile siteFile = outputValidator.getSiteFile( "surefire-report.html" );
+ assertTrue( "Expecting surefire report file", siteFile.isFile() );
+
+ siteFile = outputValidator.getSiteFile( "failsafe-report.html" );
+ assertTrue( "Expecting failsafe report file", siteFile.isFile() );
+ }
+
+ @Test
+ public void testSkippedFailsafeReportGeneration()
+ throws Exception
+ {
+ OutputValidator validator = unpack().
+ activateProfile(
+ "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ assertTrue( "Expecting surefire report file", siteFile.isFile() );
+
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
+ assertFalse( "Expecting no failsafe report file", siteFile.isFile() );
+ }
+
+ @Test
+ public void testSkippedSurefireReportGeneration()
+ throws Exception
+ {
+ OutputValidator validator = unpack().failNever().
+ activateProfile(
+ "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ assertFalse( "Expecting no surefire report file", siteFile.isFile() );
+
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
+ assertTrue( "Expecting failsafe report file", siteFile.isFile() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
new file mode 100644
index 0000000..af18336
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
@@ -0,0 +1,108 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.io.IOException;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test Surefire-740 Truncated comma with non us locale
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire772NoFailsafeReportsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void testReportGeneration()
+ throws Exception
+ {
+ final OutputValidator site =
+ unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+
+ assertSurefireReportPresent( site );
+ assertNoFailsefeReport( site );
+ }
+
+ @Test
+ public void testSkippedFailsafeReportGeneration()
+ throws Exception
+ {
+ final OutputValidator validator = unpack().activateProfile(
+ "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ assertSurefireReportPresent( validator );
+ assertNoFailsefeReport( validator );
+
+ }
+
+ @Test
+ public void testForcedFailsafeReportGeneration()
+ throws Exception
+ {
+ final OutputValidator validator = unpack().activateProfile(
+ "forceFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+ assertSurefireReportPresent( validator );
+ assertFailsafeReport( validator );
+ }
+
+ @Test
+ public void testSkipForcedFailsafeReportGeneration()
+ throws Exception
+ {
+ final OutputValidator validator = unpack().activateProfile( "forceFailsafe" ).activateProfile(
+ "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+
+ assertSurefireReportPresent( validator );
+ assertNoFailsefeReport( validator );
+ }
+
+ private void assertNoFailsefeReport( OutputValidator site )
+ {
+ TestFile siteFile = site.getSiteFile( "failsafe-report.html" );
+ assertFalse( "Expecting no failsafe report file", siteFile.isFile() );
+ }
+
+ private void assertFailsafeReport( OutputValidator site )
+ {
+ TestFile siteFile = site.getSiteFile( "failsafe-report.html" );
+ assertTrue( "Expecting no failsafe report file", siteFile.isFile() );
+ }
+
+ private void assertSurefireReportPresent( OutputValidator site )
+ {
+ TestFile siteFile = site.getSiteFile( "surefire-report.html" );
+ assertTrue( "Expecting surefire report file", siteFile.isFile() );
+ }
+
+ private SurefireLauncher unpack()
+ throws VerificationException, IOException
+ {
+ final SurefireLauncher unpack = unpack( "surefire-772-no-failsafe-reports" );
+ unpack.maven().deleteSiteDir().skipClean().failNever().assertNotPresent( "site" );
+ return unpack;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
new file mode 100644
index 0000000..6b59ba2
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
@@ -0,0 +1,98 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test Surefire-740 Truncated comma with non us locale
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire772NoSurefireReportsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testReportGeneration()
+ {
+ OutputValidator validator =
+ unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ assertTrue( "Expecting surefire report file", siteFile.isFile() );
+
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
+ assertTrue( "Expecting failsafe report file", siteFile.isFile() );
+ }
+
+ @Test
+ public void testSkippedSurefireReportGeneration()
+ {
+ OutputValidator validator = unpack().activateProfile(
+ "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ assertFalse( "Expecting no surefire report file", siteFile.isFile() );
+
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
+ assertTrue( "Expecting failsafe report file", siteFile.isFile() );
+ }
+
+ @Test
+ public void testOptionalSurefireReportGeneration()
+ {
+ OutputValidator validator = unpack().activateProfile(
+ "optionalSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ assertFalse( "Expecting no surefire report file", siteFile.isFile() );
+
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
+ assertTrue( "Expecting failsafe report file", siteFile.isFile() );
+ }
+
+ @Test
+ public void testSkipOptionalSurefireReportGeneration()
+ {
+ OutputValidator validator = unpack().activateProfile( "optionalSurefire" ).activateProfile(
+ "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ assertFalse( "Expecting no surefire report file", siteFile.isFile() );
+
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
+ assertTrue( "Expecting failsafe report file", siteFile.isFile() );
+ }
+
+ public SurefireLauncher unpack()
+ {
+ SurefireLauncher unpack = unpack( "/surefire-772-no-surefire-reports" );
+ unpack.maven().failNever().deleteSiteDir().skipClean( );
+ return unpack;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
new file mode 100644
index 0000000..a709f7d
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
@@ -0,0 +1,82 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test Surefire-740 Truncated comma with non us locale
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire772SpecifiedReportsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testReportGeneration()
+ {
+ OutputValidator validator =
+ unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ assertTrue( "Expecting surefire report file", siteFile.isFile() );
+
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
+ assertTrue( "Expecting failsafe report file", siteFile.isFile() );
+ }
+
+ @Test
+ public void testSkippedFailsafeReportGeneration()
+ {
+ OutputValidator validator = unpack().activateProfile(
+ "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ assertTrue( "Expecting surefire report file", siteFile.isFile() );
+
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
+ assertFalse( "Expecting no failsafe report file", siteFile.isFile() );
+ }
+
+ @Test
+ public void testSkippedSurefireReportGeneration()
+ {
+ OutputValidator validator = unpack().activateProfile(
+ "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
+
+ TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
+ assertFalse( "Expecting no surefire report file", siteFile.isFile() );
+
+ siteFile = validator.getSiteFile( "failsafe-report.html" );
+ assertTrue( "Expecting failsafe report file", siteFile.isFile() );
+ }
+
+ public SurefireLauncher unpack()
+ {
+ SurefireLauncher unpack = unpack( "/surefire-772-specified-reports" );
+ unpack.maven().deleteSiteDir().skipClean().failNever();
+ return unpack;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java
new file mode 100644
index 0000000..910cfc5
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java
@@ -0,0 +1,38 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * Test
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire801ForkModeNoneClassLoaderIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testSHouldBeOkWithForkNever()
+ {
+ unpack( "fork-mode-resource-loading" ).forkNever().executeTest();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java
new file mode 100644
index 0000000..658befd
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java
@@ -0,0 +1,47 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * 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;
+
+public class Surefire803MultiFailsafeExecsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void testSecondExecutionRunsAfterFirstExecutionFails()
+ {
+ unpack(
+ "/surefire-803-multiFailsafeExec-failureInFirst" ).maven().withFailure().executeVerify().assertIntegrationTestSuiteResults(
+ 4, 0, 2, 0 );
+ }
+
+ @Test
+ public void testOneExecutionRunInTwoBuilds()
+ {
+ SurefireLauncher launcher = unpack( "/surefire-803-multiFailsafeExec-rebuildOverwrites" );
+ launcher.sysProp( "success", "false" ).maven().withFailure().executeVerify().assertIntegrationTestSuiteResults(
+ 1, 0, 1, 0 );
+ launcher.reset();
+ launcher.sysProp( "success", "true" ).executeVerify().assertIntegrationTestSuiteResults( 1, 0, 0, 0 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
new file mode 100644
index 0000000..aedb82b
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
@@ -0,0 +1,52 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * 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.Ignore;
+import org.junit.Test;
+
+public class Surefire806SpecifiedTestControlsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ @Ignore( "since SUREFIRE-1153 the includes/excludes are overridden by -Dtest or it.test for whatever execution" )
+ public void singleTestInOneExecutionOfMultiExecutionProject()
+ {
+ unpack( "/surefire-806-specifiedTests-multi" ).setTestToRun( "FirstTest" ).failIfNoSpecifiedTests(
+ false ).executeTest().verifyErrorFree( 1 );
+ }
+
+ @Test
+ @Ignore( "since SUREFIRE-1153 the includes/excludes are overridden by -Dtest or it.test for whatever execution" )
+ public void twoSpecifiedTestExecutionsInCorrectExecutionBlocks()
+ {
+ unpack( "/surefire-806-specifiedTests-multi" ).setTestToRun(
+ "FirstTest,SecondTest" ).executeTest().verifyErrorFree( 2 );
+ }
+
+ @Test
+ public void singleTestInSingleExecutionProject()
+ {
+ unpack( "/surefire-806-specifiedTests-single" ).setTestToRun( "ThirdTest" ).failIfNoSpecifiedTests(
+ false ).executeTest().verifyErrorFree( 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
new file mode 100755
index 0000000..5ab103b
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
@@ -0,0 +1,114 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
+
+import org.junit.Test;
+
+public class Surefire809GroupExpressionsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void categoryAB()
+ {
+ OutputValidator validator = unpackJUnit().groups( "junit4.CategoryA AND junit4.CategoryB" ).executeTest();
+ validator.verifyErrorFreeLog();
+ validator.assertTestSuiteResults( 2, 0, 0, 0 );
+ validator.verifyTextInLog( "catA: 1" );
+ validator.verifyTextInLog( "catB: 1" );
+ validator.verifyTextInLog( "catC: 0" );
+ validator.verifyTextInLog( "catNone: 0" );
+ validator.verifyTextInLog( "mA: 1" );
+ validator.verifyTextInLog( "mB: 1" );
+ validator.verifyTextInLog( "mC: 0" );
+ }
+
+ @Test
+ public void incorrectJUnitVersions()
+ {
+ unpackJUnit().setJUnitVersion( "4.5" ).groups(
+ "junit4.CategoryA AND junit4.CategoryB" ).maven().withFailure().executeTest();
+ }
+
+ @Test
+ public void testJUnitRunCategoryNotC()
+ {
+ OutputValidator validator = unpackJUnit().groups( "!junit4.CategoryC" ).executeTest();
+ validator.verifyErrorFreeLog();
+ validator.assertTestSuiteResults( 5, 0, 0, 0 );
+ validator.verifyTextInLog( "catA: 2" );
+ validator.verifyTextInLog( "catB: 2" );
+ validator.verifyTextInLog( "catC: 0" );
+ validator.verifyTextInLog( "catNone: 1" );
+ validator.verifyTextInLog( "NoCategoryTest.CatNone: 1" );
+ }
+
+ @Test
+ public void testExcludedGroups()
+ {
+ OutputValidator validator = unpackJUnit().setExcludedGroups( "junit4.CategoryC" ).executeTest();
+ validator.verifyErrorFreeLog();
+ validator.assertTestSuiteResults( 5, 0, 0, 0 );
+ validator.verifyTextInLog( "catA: 2" );
+ validator.verifyTextInLog( "catB: 2" );
+ validator.verifyTextInLog( "catC: 0" );
+ validator.verifyTextInLog( "catNone: 1" );
+ validator.verifyTextInLog( "NoCategoryTest.CatNone: 1" );
+ }
+
+ @Test
+ public void testNGRunCategoryAB()
+ {
+ OutputValidator validator = unpackTestNG().groups( "CategoryA AND CategoryB" ).debugLogging().executeTest();
+ validator.verifyErrorFreeLog();
+ validator.assertTestSuiteResults( 2, 0, 0, 0 );
+ validator.verifyTextInLog( "BasicTest.testInCategoriesAB()" );
+ validator.verifyTextInLog( "CategoryCTest.testInCategoriesAB()" );
+ }
+
+ @Test
+ public void testNGRunCategoryNotC()
+ {
+ OutputValidator validator = unpackTestNG().groups( "!CategoryC" ).debugLogging().executeTest();
+ validator.verifyErrorFreeLog();
+ validator.assertTestSuiteResults( 8, 0, 0, 0 );
+ validator.verifyTextInLog( "catA: 2" );
+ validator.verifyTextInLog( "catB: 2" );
+ validator.verifyTextInLog( "catC: 0" );
+ validator.verifyTextInLog( "catNone: 1" );
+ validator.verifyTextInLog( "mA: 2" );
+ validator.verifyTextInLog( "mB: 2" );
+ validator.verifyTextInLog( "mC: 0" );
+ validator.verifyTextInLog( "NoCategoryTest.CatNone: 1" );
+ }
+
+ private SurefireLauncher unpackJUnit()
+ {
+ return unpack( "surefire-809-groupExpr-junit48" );
+ }
+
+ private SurefireLauncher unpackTestNG()
+ {
+ return unpack( "surefire-809-groupExpr-testng" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
new file mode 100644
index 0000000..065ec19
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
@@ -0,0 +1,36 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Surefire812Log4JClassLoaderIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testJunit3ParallelBuildResultCount()
+ {
+ executeErrorFreeTest( "surefire-812-log4j-classloader", 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java
new file mode 100644
index 0000000..215bd5d
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java
@@ -0,0 +1,47 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-817">SUREFIRE-817</a>
+ * @since 2.18
+ */
+public class Surefire817SystemExitIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void systemExit1()
+ throws VerificationException
+ {
+ unpack().maven().withFailure().executeTest().verifyTextInLog( "class jiras.surefire817.Test main" );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "surefire-817-system-exit" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
new file mode 100644
index 0000000..1bf4c8d
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
@@ -0,0 +1,39 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * SUREFIRE-818
+ *
+ * @author Kristian Rosenvold
+ */
+public class Surefire818NpeIgnoresTestsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testBuildFailingWhenErrors()
+ {
+ unpack( "surefire-818-ignored-tests-on-npe" ).maven().withFailure().executeTest().assertTestSuiteResults( 2, 0,
+ 1, 0 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
new file mode 100644
index 0000000..b59bc6a
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
@@ -0,0 +1,97 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+public class Surefire828EmptyGroupExprIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ // !CategoryC
+ @Test
+ public void testJUnitRunEmptyGroups()
+ {
+ OutputValidator validator = unpackJUnit().sysProp( "profile", "emptyGroups" ).executeTest();
+ validator.verifyErrorFreeLog();
+ validator.assertTestSuiteResults( 5, 0, 0, 0 );
+ validator.verifyTextInLog( "catA: 2" );
+ validator.verifyTextInLog( "catB: 2" );
+ validator.verifyTextInLog( "catC: 0" );
+ validator.verifyTextInLog( "catNone: 1" );
+ validator.verifyTextInLog( "NoCategoryTest.CatNone: 1" );
+ }
+
+ // CategoryA && CategoryB
+ @Test
+ public void testJUnitRunEmptyExcludeGroups()
+ {
+ OutputValidator validator = unpackJUnit().sysProp( "profile", "emptyExcludedGroups" ).executeTest();
+ validator.verifyErrorFreeLog();
+ validator.assertTestSuiteResults( 2, 0, 0, 0 );
+ validator.verifyTextInLog( "catA: 1" );
+ validator.verifyTextInLog( "catB: 1" );
+ validator.verifyTextInLog( "catC: 0" );
+ validator.verifyTextInLog( "catNone: 0" );
+ validator.verifyTextInLog( "mA: 1" );
+ validator.verifyTextInLog( "mB: 1" );
+ validator.verifyTextInLog( "mC: 0" );
+ }
+
+ // CategoryA && CategoryB
+ @Test
+ public void testTestNGRunEmptyExcludeGroups()
+ {
+ OutputValidator validator = unpackTestNG().sysProp( "profile", "emptyExcludedGroups" ).executeTest();
+ validator.verifyErrorFreeLog();
+ validator.assertTestSuiteResults( 2, 0, 0, 0 );
+ validator.verifyTextInLog( "BasicTest.testInCategoriesAB()" );
+ validator.verifyTextInLog( "CategoryCTest.testInCategoriesAB()" );
+ }
+
+ // !CategoryC
+ @Test
+ public void testTestNGRunEmptyGroups()
+ {
+ OutputValidator validator = unpackTestNG().sysProp( "profile", "emptyGroups" ).executeTest();
+ validator.verifyErrorFreeLog();
+ validator.assertTestSuiteResults( 8, 0, 0, 0 );
+ validator.verifyTextInLog( "catA: 2" );
+ validator.verifyTextInLog( "catB: 2" );
+ validator.verifyTextInLog( "catC: 0" );
+ validator.verifyTextInLog( "catNone: 1" );
+ validator.verifyTextInLog( "mA: 2" );
+ validator.verifyTextInLog( "mB: 2" );
+ validator.verifyTextInLog( "mC: 0" );
+ validator.verifyTextInLog( "NoCategoryTest.CatNone: 1" );
+ }
+
+ private SurefireLauncher unpackJUnit()
+ {
+ return unpack( "surefire-828-emptyGroupExpr-junit48" );
+ }
+
+ private SurefireLauncher unpackTestNG()
+ {
+ return unpack( "surefire-828-emptyGroupExpr-testng" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java
new file mode 100755
index 0000000..c694a3d
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java
@@ -0,0 +1,49 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+public class Surefire832ProviderSelectionIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testJUnitRunCategoryAB()
+ {
+ OutputValidator validator = unpackJUnit().groups( "junit4.CategoryA AND junit4.CategoryB" ).executeTest();
+ validator.verifyErrorFreeLog();
+ validator.assertTestSuiteResults( 2, 0, 0, 0 );
+ validator.verifyTextInLog( "catA: 1" );
+ validator.verifyTextInLog( "catB: 1" );
+ validator.verifyTextInLog( "catC: 0" );
+ validator.verifyTextInLog( "catNone: 0" );
+ validator.verifyTextInLog( "mA: 1" );
+ validator.verifyTextInLog( "mB: 1" );
+ validator.verifyTextInLog( "mC: 0" );
+ }
+
+ private SurefireLauncher unpackJUnit()
+ {
+ return unpack( "surefire-832-provider-selection" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire839TestWithoutCategoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire839TestWithoutCategoriesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire839TestWithoutCategoriesIT.java
new file mode 100755
index 0000000..0babe66
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire839TestWithoutCategoriesIT.java
@@ -0,0 +1,45 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * 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 Surefire839TestWithoutCategoriesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void classWithoutCategory()
+ {
+ unpack( "junit48-categories" ).setJUnitVersion( "4.11" ).executeTest().verifyErrorFree( 3 );
+ }
+
+ @Test
+ public void classWithoutCategoryForked()
+ {
+ unpack( "junit48-categories" )
+ .setJUnitVersion( "4.11" )
+ .forkPerThread()
+ .reuseForks( true )
+ .threadCount( 2 )
+ .executeTest()
+ .verifyErrorFree( 3 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java
new file mode 100755
index 0000000..eaecc90
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java
@@ -0,0 +1,33 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * 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 Surefire847AdditionalFailureIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testJUnitRunCategoryAB()
+ {
+ unpack( "surefire-847-testngfail" ).setTestToRun(
+ "org/codehaus/SomePassedTest" ).executeTest().verifyErrorFreeLog();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
new file mode 100644
index 0000000..1263ab3
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
@@ -0,0 +1,58 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-855">SUREFIRE-855</a>
+ * @since 2.19
+ */
+public class Surefire855AllowFailsafeUseArtifactFileIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void warShouldUseClasses()
+ {
+ unpack( "surefire-855-failsafe-use-war" ).maven().executeVerify().verifyErrorFree( 2 );
+ }
+
+ @Test
+ public void jarShouldUseFile()
+ {
+ unpack( "surefire-855-failsafe-use-jar" )
+ .maven().sysProp( "forkMode", "once" ).executeVerify().assertIntegrationTestSuiteResults( 3, 0, 0, 1 );
+ }
+
+ @Test
+ public void jarNotForkingShouldUseFile()
+ {
+ unpack( "surefire-855-failsafe-use-jar" )
+ .maven().sysProp( "forkMode", "never" ).executeVerify().assertIntegrationTestSuiteResults( 3, 0, 0, 1 );
+ }
+
+ @Test
+ public void osgiBundleShouldUseFile()
+ {
+ unpack( "surefire-855-failsafe-use-bundle" ).maven().executeVerify().verifyErrorFree( 2 );
+ }
+}
\ No newline at end of file
[49/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
deleted file mode 100644
index a358172..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
+++ /dev/null
@@ -1,74 +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;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
-
-/**
- * Test surefire-report on TestNG test
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class CheckTestNgReportTestIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testNgReport()
- throws Exception
- {
- unpack( "/testng-simple" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .addSurefireReportGoal()
- .executeCurrentGoals()
- .verifyErrorFree( 3 )
- .getSiteFile( "surefire-report.html" )
- .assertFileExists();
- }
-
- @Test
- public void shouldNotBeVerbose()
- throws Exception
- {
- unpack( "/testng-simple" )
- .sysProp( "testNgVersion", "5.10" )
- .sysProp( "testNgClassifier", "jdk15" )
- .executeTest()
- .verifyErrorFreeLog()
- .assertThatLogLine( containsString( "[Parser] Running:" ), is( 0 ) );
- }
-
- @Test
- public void shouldBeVerbose()
- throws Exception
- {
- unpack( "/testng-simple" )
- .sysProp( "testNgVersion", "5.10" )
- .sysProp( "testNgClassifier", "jdk15" )
- .sysProp( "surefire.testng.verbose", "10" )
- .executeTest()
- .verifyErrorFreeLog()
- .assertThatLogLine( containsString( "[Parser] Running:" ), is( 1 ) );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
deleted file mode 100644
index 2e56dc9..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
+++ /dev/null
@@ -1,60 +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.Ignore;
-import org.junit.Test;
-
-/**
- * Test simple TestNG suite XML file
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class CheckTestNgSuiteXmlIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void suiteXml()
- {
- unpack().executeTest().verifyErrorFree( 2 );
- }
-
- @Test
- @Ignore( "Fails - see SUREFIRE-1123" )
- public void suiteXmlForkModeAlways()
- {
- unpack().forkAlways().executeTest().verifyErrorFree( 2 );
- }
-
- @Test
- public void suiteXmlForkCountTwoReuse()
- {
- unpack().forkCount( 2 ).reuseForks( true ).executeTest().verifyErrorFree( 2 );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "testng-suite-xml" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
deleted file mode 100644
index e2b63b6..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
+++ /dev/null
@@ -1,44 +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;
-
-/**
- * Use -Dtest to run a single TestNG test, overriding the suite XML parameter.
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class CheckTestNgSuiteXmlSingleIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void TestNgSuite()
- {
- unpack( "/testng-twoTestCaseSuite" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .setTestToRun( "TestNGTestTwo" )
- .executeTest()
- .verifyErrorFree( 1 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
deleted file mode 100644
index 6d2bbfa..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
+++ /dev/null
@@ -1,223 +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.List;
-
-import org.apache.maven.plugins.surefire.report.ReportTestSuite;
-import org.apache.maven.surefire.its.fixture.HelperAssertions;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Basic suite test using all known versions of TestNG. Used for regression testing Surefire against old versions. To
- * check new versions of TestNG work with current versions of Surefire, instead run the full test suite with
- * -Dtestng.version=5.14.2 (for example)
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class CheckTestNgVersionsIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test public void test47()
- throws Exception
- {
- runTestNgTest( "4.7", "jdk15" );
- }
-
- @Test @Ignore( "5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024" ) public void XXXtest50()
- throws Exception
- {
- runTestNgTest( "5.0", "jdk15" );
- }
-
- @Test @Ignore( "5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024" ) public void XXXtest501()
- throws Exception
- {
- runTestNgTest( "5.0.1", "jdk15" );
- }
-
- @Test public void test502()
- throws Exception
- {
- runTestNgTest( "5.0.2", "jdk15" );
- }
-
- @Test public void test51()
- throws Exception
- {
- runTestNgTest( "5.1", "jdk15" );
- }
-
- @Test public void test55()
- throws Exception
- {
- runTestNgTest( "5.5", "jdk15" );
- }
-
- @Test public void test56()
- throws Exception
- {
- runTestNgTest( "5.6", "jdk15" );
- }
-
- @Test public void test57()
- throws Exception
- {
- runTestNgTest( "5.7", "jdk15" );
- }
-
- @Test public void test58()
- throws Exception
- {
- runTestNgTest( "5.8", "jdk15" );
- }
-
- @Test public void test59()
- throws Exception
- {
- runTestNgTest( "5.9", "jdk15" );
- }
-
- @Test public void test510()
- throws Exception
- {
- runTestNgTest( "5.10", "jdk15" );
- }
-
- @Test public void test511()
- throws Exception
- {
- runTestNgTest( "5.11", "jdk15" );
- }
-
- @Test public void test512()
- throws Exception
- {
- runTestNgTest( "5.12.1" );
- }
-
- @Test public void test513()
- throws Exception
- {
- runTestNgTest( "5.13" );
- }
-
- @Test public void test5131()
- throws Exception
- {
- runTestNgTest( "5.13.1" );
- }
-
- @Test public void test514()
- throws Exception
- {
- runTestNgTest( "5.14" );
- }
-
- @Test public void test5141()
- throws Exception
- {
- runTestNgTest( "5.14.1" );
- }
-
- @Test public void test5142()
- throws Exception
- {
- runTestNgTest( "5.14.2" );
- }
-
- @Test public void test60()
- throws Exception
- {
- runTestNgTest( "6.0" );
- }
-
- @Test public void test685()
- throws Exception
- {
- runTestNgTestWithRunOrder( "6.8.5" );
- }
-
- private void runTestNgTestWithRunOrder( String version )
- throws Exception
- {
- runTestNgTest( version, null, true );
- }
-
- private void runTestNgTest( String version )
- throws Exception
- {
- runTestNgTest( version, null, false );
- }
-
- private void runTestNgTest( String version, boolean validateRunOrder )
- throws Exception
- {
- runTestNgTest( version, null, validateRunOrder );
- }
-
- private void runTestNgTest( String version, String classifier )
- throws Exception
- {
- runTestNgTest( version, classifier, false );
- }
-
- private void runTestNgTest( String version, String classifier, boolean validateRunOrder )
- throws Exception
- {
- final SurefireLauncher launcher = unpack( "testng-simple" )
- .sysProp( "testNgVersion", version );
-
- if ( classifier != null )
- {
- launcher.sysProp( "testNgClassifier", classifier );
- }
-
- final OutputValidator outputValidator = launcher.executeTest();
-
- outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 );
-
- if ( validateRunOrder )
- {
- // assert correct run order of tests
- List<ReportTestSuite> report = HelperAssertions.extractReports( outputValidator.getBaseDir() );
-
- assertEquals( 3, report.size() );
-
- assertTrue( "TestNGSuiteTestC was executed first", getTestClass( report, 0 ).endsWith( "TestNGSuiteTestC" ) );
- assertTrue( "TestNGSuiteTestB was executed second", getTestClass( report, 1 ).endsWith( "TestNGSuiteTestB" ) );
- assertTrue( "TestNGSuiteTestA was executed last", getTestClass( report, 2 ).endsWith( "TestNGSuiteTestA" ) );
- }
- }
-
- private String getTestClass( List<ReportTestSuite> report, int i )
- {
- return report.get( i ).getFullClassName();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
deleted file mode 100644
index dfea90a..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
+++ /dev/null
@@ -1,39 +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;
-
-/**
- * Test for checking the order of class path elements
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class ClassPathOrderIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void classPathOrder()
- {
- unpack( "/classpath-order" ).executeTest().verifyErrorFree( 2 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
deleted file mode 100644
index 89aada7..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
+++ /dev/null
@@ -1,39 +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;
-
-/**
- * Test additionalClasspathElements
- *
- * @author pgier
- */
-public class ClasspathFilteringIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void additionalClasspath()
- throws Exception
- {
- unpack( "classpath-filtering" ).debugLogging().executeTest().verifyErrorFree( 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
deleted file mode 100644
index ca64d87..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
+++ /dev/null
@@ -1,39 +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;
-
-/**
- * Test additionalClasspathElements
- *
- * @author pgier
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class ClasspathScopeFilteringIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void additionalClasspath()
- {
- unpack( "classpath-scope-filtering" ).executeTest().verifyErrorFree( 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
deleted file mode 100644
index e01d798..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
+++ /dev/null
@@ -1,106 +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.nio.charset.Charset;
-
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.TestFile;
-import org.junit.Test;
-
-/**
- * Basic suite test using all known versions of JUnit 4.x
- *
- * @author Kristian Rosenvold
- */
-public class ConsoleOutputIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void properNewlinesAndEncodingWithDefaultEncodings()
- {
- final OutputValidator outputValidator =
- unpack( "/consoleOutput" ).forkOnce().executeTest();
-
- validate( outputValidator, true );
- }
-
- @Test
- public void properNewlinesAndEncodingWithDifferentEncoding()
- {
- final OutputValidator outputValidator =
- unpack( "/consoleOutput" ).forkOnce().argLine( "-Dfile.encoding=UTF-16" ).executeTest();
-
- validate( outputValidator, true );
- }
-
- @Test
- public void properNewlinesAndEncodingWithoutFork()
- {
- final OutputValidator outputValidator =
- unpack( "/consoleOutput" ).forkNever().executeTest();
-
- validate( outputValidator, false );
- }
-
- private void validate( final OutputValidator outputValidator, boolean includeShutdownHook )
- {
- TestFile xmlReportFile = outputValidator.getSurefireReportsXmlFile( "TEST-consoleOutput.Test1.xml" );
- xmlReportFile.assertContainsText( "SoutLine" );
- xmlReportFile.assertContainsText( normalizeToDefaultCharset( "äöüß" ) );
- xmlReportFile.assertContainsText( normalizeToDefaultCharset( "failing with ü" ) );
-
- TestFile outputFile = outputValidator.getSurefireReportsFile( "consoleOutput.Test1-output.txt" );
- outputFile.assertContainsText( "SoutAgain" );
- outputFile.assertContainsText( "SoutLine" );
- outputFile.assertContainsText( normalizeToDefaultCharset( "äöüß" ) );
-
- if ( includeShutdownHook )
- {
- outputFile.assertContainsText( "Printline in shutdown hook" );
- }
- }
-
- /**
- * @param string the string to normalize
- * @return the string with all characters not available in the current charset being replaced, e.g. for US-ASCII,
- * German umlauts would be replaced to ?
- */
- private String normalizeToDefaultCharset( String string )
- {
- Charset cs = Charset.defaultCharset();
- if ( cs.canEncode() )
- {
- string = cs.decode( cs.encode( string ) ).toString();
- }
-
- return string;
- }
-
- @Test
- public void largerSoutThanMemory()
- throws Exception
- {
- unpack( "consoleoutput-noisy" ).setMavenOpts( "-Xmx64m" ).sysProp( "thousand", "32000" ).executeTest();
- }
-
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java
deleted file mode 100644
index b5489d1..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CrashDetectionIT.java
+++ /dev/null
@@ -1,61 +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;
-
-/**
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class CrashDetectionIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void crashInFork()
- {
- unpack( "crash-detection" ).maven().withFailure().executeTest();
- }
-
- @Test
- public void crashInReusableFork()
- {
- unpack( "crash-detection" )
- .forkPerThread()
- .reuseForks( true )
- .threadCount( 1 )
- .maven()
- .withFailure()
- .executeTest();
- }
-
- @Test
- public void hardCrashInReusableFork()
- {
- unpack( "crash-detection" )
- .forkPerThread()
- .reuseForks( true )
- .threadCount( 1 )
- .addGoal( "-DkillHard=true" )
- .maven()
- .withFailure()
- .executeTest();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
deleted file mode 100644
index b0907b8..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
+++ /dev/null
@@ -1,38 +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;
-
-/**
- * Test basic default configuration, runs the JUnit 3 test in the src/test directory.
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class DefaultConfigurationIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void defaultConfiguration()
- {
- executeErrorFreeTest( "default-configuration", 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
deleted file mode 100644
index 7f38a73..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
+++ /dev/null
@@ -1,40 +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;
-
-/**
- * Test basic default configuration, runs the JUnit 3 test in the src/test directory.
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class EnvironmentVariableIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void environmentVariable()
- {
-
- executeErrorFreeTest( "junit44-environment", 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariablesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariablesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariablesIT.java
deleted file mode 100644
index 651200f..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariablesIT.java
+++ /dev/null
@@ -1,47 +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;
-
-/**
- * SUREFIRE-763 Asserts that environment variables are correctly populated using "useSystemClassLoader=false"
- * SUREFIRE-963 Asserts that empty environment variables are read as "".
- *
- * @author Kristian Rosenvold
- * @author Christophe Deneux
- */
-public class EnvironmentVariablesIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testWhenUseSystemClassLoader()
- {
- unpack( "/environment-variables" ).addGoal( "-DuseSystemClassLoader=true" ).executeTest();
- }
-
- @Test
- public void testWhenDontUseSystemClassLoader()
- {
- unpack( "/environment-variables" ).addGoal( "-DuseSystemClassLoader=false" ).executeTest();
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
deleted file mode 100644
index beb1e32..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
+++ /dev/null
@@ -1,77 +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.ArrayList;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test class for SUREFIRE-580, configuration parameter {@code skipAfterFailureCount}.
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19
- */
-public class FailFastJUnitIT
- extends AbstractFailFastIT
-{
-
- @Parameters(name = "{0}")
- public static Iterable<Object[]> data()
- {
- /**
- * reuseForks=false is not used because of race conditions and unpredictable commands received by
- * MasterProcessReader, this feature has significant limitation.
- */
- ArrayList<Object[]> args = new ArrayList<Object[]>();
- // description
- // profile
- // forkCount,
- // fail-fast-count,
- // reuseForks
- // total
- // failures
- // errors
- // skipped
- args.add( new Object[] { "junit4-oneFork-ff1", "junit4", props( 1, 1, true ), 5, 0, 1, 4 } );
- args.add( new Object[] { "junit47-oneFork-ff1", "junit47", props( 1, 1, true ), 5, 0, 1, 4 } );
- args.add( new Object[] { "junit4-oneFork-ff2", "junit4", props( 1, 2, true ), 5, 0, 2, 3 } );
- args.add( new Object[] { "junit47-oneFork-ff2", "junit47", props( 1, 2, true ), 5, 0, 2, 3 } );
- args.add( new Object[] { "junit4-twoForks-ff1", "junit4", props( 2, 1, true ), 5, 0, 2, 3 } );
- args.add( new Object[] { "junit47-twoForks-ff1", "junit47",props( 2, 1, true ), 5, 0, 2, 3 } );
- args.add( new Object[] { "junit4-twoForks-ff2", "junit4", props( 2, 2, true ), 5, 0, 2, 2 } );
- args.add( new Object[] { "junit47-twoForks-ff2", "junit47",props( 2, 2, true ), 5, 0, 2, 2 } );
- args.add( new Object[] { "junit4-oneFork-ff3", "junit4", props( 1, 3, true ), 5, 0, 2, 0 } );
- args.add( new Object[] { "junit47-oneFork-ff3", "junit47", props( 1, 3, true ), 5, 0, 2, 0 } );
- args.add( new Object[] { "junit4-twoForks-ff3", "junit4", props( 2, 3, true ), 5, 0, 2, 0 } );
- args.add( new Object[] { "junit47-twoForks-ff3", "junit47",props( 2, 3, true ), 5, 0, 2, 0 } );
- /*args.add( new Object[] { "junit4-twoForks-ff1x","junit4", props( 2, 1, false ), 5, 0, 2, 3 } );
- args.add( new Object[] { "junit47-twoForks-ff1x","junit47",props( 2, 1, false ), 5, 0, 2, 3 } );
- args.add( new Object[] { "junit4-twoForks-ff2x","junit4", props( 2, 2, false ), 5, 0, 2, 2 } );
- args.add( new Object[] { "junit47-twoForks-ff2x","junit47",props( 2, 2, false ), 5, 0, 2, 2 } );*/
- return args;
- }
-
- @Override
- protected String withProvider()
- {
- return "junit";
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
deleted file mode 100644
index f4aa2b7..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
+++ /dev/null
@@ -1,69 +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.ArrayList;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test class for SUREFIRE-580, configuration parameter {@code skipAfterFailureCount}.
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19
- */
-public class FailFastTestNgIT
- extends AbstractFailFastIT
-{
-
- @Parameters(name = "{0}")
- public static Iterable<Object[]> data()
- {
- /**
- * reuseForks=false is not used because of race conditions and unpredictable commands received by
- * MasterProcessReader, this feature has significant limitation.
- */
- ArrayList<Object[]> args = new ArrayList<Object[]>();
- // description
- // profile
- // forkCount,
- // fail-fast-count,
- // reuseForks
- // total
- // failures
- // errors
- // skipped
- args.add( new Object[] { "testng-oneFork-ff1", null, props( 1, 1, true ), 5, 1, 0, 4 } );
- args.add( new Object[] { "testng-oneFork-ff2", null, props( 1, 2, true ), 5, 2, 0, 3 } );
- args.add( new Object[] { "testng-twoForks-ff1", null, props( 2, 1, true ), 5, 2, 0, 3 } );
- args.add( new Object[] { "testng-twoForks-ff2", null, props( 2, 2, true ), 5, 2, 0, 2 } );
- args.add( new Object[] { "testng-oneFork-ff3", null, props( 1, 3, true ), 5, 2, 0, 0 } );
- args.add( new Object[] { "testng-twoForks-ff3", null, props( 2, 3, true ), 5, 2, 0, 0 } );
- /*args.add( new Object[] { "testng-twoForks-ff1x", null, props( 2, 1, false ), 5, 2, 0, 3 } );
- args.add( new Object[] { "testng-twoForks-ff2x", null, props( 2, 2, false ), 5, 2, 0, 2 } );*/
- return args;
- }
-
- @Override
- protected String withProvider()
- {
- return "testng";
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
deleted file mode 100644
index 6aac330..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.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 org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * Asserts proper behaviour of console output when forking
- * SUREFIRE-639
- * SUREFIRE-651
- *
- * @author Kristian Rosenvold
- */
-public class ForkConsoleOutputIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void printSummaryTrueWithRedirect()
- {
- unpack().setForkJvm()
- .redirectToFile( true )
- .printSummary( true )
- .executeTest()
- .getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
- .assertFileExists();
- }
-
- @Test
- public void printSummaryTrueWithoutRedirect()
- {
- unpack().setForkJvm()
- .redirectToFile( false )
- .printSummary( true )
- .executeTest()
- .getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
- .assertFileNotExists();
- }
-
- @Test
- public void printSummaryFalseWithRedirect()
- {
- unpack().setForkJvm()
- .redirectToFile( true )
- .printSummary( false )
- .debugLogging()
- .showErrorStackTraces()
- .executeTest()
- .getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
- .assertFileExists();
- }
-
- @Test
- public void printSummaryFalseWithoutRedirect()
- {
- unpack().setForkJvm()
- .redirectToFile( false )
- .printSummary( false )
- .executeTest()
- .getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
- .assertFileNotExists();
- }
-
-
- private SurefireLauncher unpack()
- {
- return unpack( "/fork-consoleOutput" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
deleted file mode 100644
index e5feb7f..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
+++ /dev/null
@@ -1,47 +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;
-
-/**
- * Asserts proper behaviour of console output when forking
- * SUREFIRE-639
- * SUREFIRE-651
- *
- * @author Kristian Rosenvold
- */
-public class ForkConsoleOutputWithErrorsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void xmlFileContainsConsoleOutput()
- {
- unpack( "/fork-consoleOutputWithErrors" )
- .setForkJvm()
- .failNever()
- .redirectToFile( true )
- .executeTest()
- .getSurefireReportsXmlFile( "TEST-forkConsoleOutput.Test2.xml" )
- .assertContainsText( "sout: Will Fail soon" )
- .assertContainsText( "serr: Will Fail now" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
deleted file mode 100644
index 574d144..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
+++ /dev/null
@@ -1,241 +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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.TestFile;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Test forkMode
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class ForkModeIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- private OutputValidator outputValidator;
-
- @BeforeClass
- public static void installDumpPidPlugin()
- throws Exception
- {
- unpack( ForkModeIT.class, "test-helper-dump-pid-plugin", "plugin" ).executeInstall();
- }
-
- @Test
- public void testForkModeAlways()
- {
- String[] pids = doTest( unpack( getProject() ).setForkJvm().forkAlways() );
- assertDifferentPids( pids );
- assertEndWith( pids, "_1_1", 3 );
- assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
- }
-
- @Test
- public void testForkModePerTest()
- {
- String[] pids = doTest( unpack( getProject() ).setForkJvm().forkPerTest() );
- assertDifferentPids( pids );
- assertEndWith( pids, "_1_1", 3 );
- assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
- }
-
- @Test
- public void testForkModeNever()
- {
- String[] pids = doTest( unpack( getProject() ).forkNever() );
- assertSamePids( pids );
- assertEndWith( pids, "_1_1", 3 );
- assertEquals( "my pid is equal to pid 1 of the test", getMainPID(), pids[0] );
- }
-
- @Test
- public void testForkModeNone()
- {
- String[] pids = doTest( unpack( getProject() ).forkMode( "none" ) );
- assertSamePids( pids );
- assertEndWith( pids, "_1_1", 3 );
- assertEquals( "my pid is equal to pid 1 of the test", getMainPID(), pids[0] );
- }
-
- @Test
- public void testForkModeOncePerThreadSingleThread()
- {
- String[] pids = doTest( unpack( getProject() )
- .setForkJvm()
- .forkPerThread()
- .reuseForks( true )
- .threadCount( 1 ) );
- assertSamePids( pids );
- assertEndWith( pids, "_1_1", 3 );
- assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
- }
-
- @Test
- public void testForkModeOncePerThreadTwoThreads()
- {
- String[] pids = doTest( unpack( getProject() )
- .forkPerThread()
- .reuseForks( true )
- .threadCount( 2 )
- .addGoal( "-DsleepLength=1200" ) );
- assertDifferentPids( pids, 2 );
- assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
- }
-
- @Test
- public void testForkCountZero()
- {
- String[] pids = doTest( unpack( getProject() ).forkCount( 0 ) );
- assertSamePids( pids );
- assertEndWith( pids, "_1_1", 3 );
- assertEquals( "my pid is equal to pid 1 of the test", getMainPID(), pids[0] );
- }
-
- @Test
- public void testForkCountOneNoReuse()
- {
- String[] pids = doTest( unpack( getProject() ).setForkJvm().forkCount( 1 ).reuseForks( false ) );
- assertDifferentPids( pids );
- assertEndWith( pids, "_1_1", 3 );
- assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
- }
-
- @Test
- public void testForkCountOneReuse()
- {
- String[] pids = doTest( unpack( getProject() ).setForkJvm().forkCount( 1 ).reuseForks( true ) );
- assertSamePids( pids );
- assertEndWith( pids, "_1_1", 3 );
- assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
- }
-
- @Test
- public void testForkCountTwoNoReuse()
- {
- String[] pids =
- doTest( unpack( getProject() ).setForkJvm().forkCount( 2 ).reuseForks( false ).addGoal( "-DsleepLength=1200" ) );
- assertDifferentPids( pids );
- assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
- }
-
- @Test
- public void testForkCountTwoReuse()
- {
- String[] pids =
- doTest( unpack( getProject() ).forkCount( 2 ).reuseForks( true ).addGoal( "-DsleepLength=1200" ) );
- assertDifferentPids( pids, 2 );
- assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
- }
-
- private void assertEndWith( String[] pids, String suffix, int expectedMatches )
- {
- int matches = 0;
- for ( String pid : pids )
- {
- if ( pid.endsWith( suffix ) )
- {
- matches++;
- }
- }
-
- assertEquals( "suffix " + suffix + " matched the correct number of pids", expectedMatches, matches );
- }
-
- private void assertDifferentPids( String[] pids, int numOfDifferentPids )
- {
- Set<String> pidSet = new HashSet<String>( Arrays.asList( pids ) );
- assertEquals( "number of different pids is not as expected", numOfDifferentPids, pidSet.size() );
- }
-
- @Test
- public void testForkModeOnce()
- {
- String[] pids = doTest( unpack( getProject() ).forkOnce() );
- assertSamePids( pids );
- assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
- }
-
- private String getMainPID()
- {
- final TestFile targetFile = outputValidator.getTargetFile( "maven.pid" );
- String pid = targetFile.slurpFile();
- return pid + " testValue_1_1";
- }
-
- private void assertSamePids( String[] pids )
- {
- assertEquals( "pid 1 didn't match pid 2", pids[0], pids[1] );
- assertEquals( "pid 1 didn't match pid 3", pids[0], pids[2] );
- }
-
- private void assertDifferentPids( String[] pids )
- {
- if ( pids[0].equals( pids[1] ) )
- {
- fail( "pid 1 matched pid 2: " + pids[0] );
- }
-
- if ( pids[0].equals( pids[2] ) )
- {
- fail( "pid 1 matched pid 3: " + pids[0] );
- }
-
- if ( pids[1].equals( pids[2] ) )
- {
- fail( "pid 2 matched pid 3: " + pids[0] );
- }
- }
-
- private String[] doTest( SurefireLauncher forkMode )
- {
- forkMode.sysProp( "testProperty", "testValue_${surefire.threadNumber}_${surefire.forkNumber}" );
- forkMode.addGoal( "org.apache.maven.plugins.surefire:maven-dump-pid-plugin:dump-pid" );
- outputValidator = forkMode.executeTest();
- outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 );
- String[] pids = new String[3];
- for ( int i = 1; i <= pids.length; i++ )
- {
- final TestFile targetFile = outputValidator.getTargetFile( "test" + i + "-pid" );
- String pid = targetFile.slurpFile();
- pids[i - 1] = pid;
- }
- return pids;
- }
-
- protected String getProject()
- {
- return "fork-mode";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
deleted file mode 100644
index 22588cc..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
+++ /dev/null
@@ -1,162 +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.*;
-import org.junit.Test;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test forkMode in a multi module project with parallel maven builds
- *
- * @author Andreas Gudian
- */
-public class ForkModeMultiModuleIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testForkCountOneNoReuse()
- {
- List<String> pids = doTest( unpack( getProject() ).forkCount( 1 ).reuseForks( false ) );
- assertAllDifferentPids( pids );
- int matchesOne = countSuffixMatches( pids, "_1_1");
- int matchesTwo = countSuffixMatches( pids, "_2_2" );
- assertTrue( "At least one fork had forkNumber 1", matchesOne >= 1 );
- assertTrue( "At least one fork had forkNumber 2", matchesTwo >= 1 );
- assertEquals( "No other forkNumbers than 1 and 2 have been used", 6, matchesOne + matchesTwo);
- }
-
-
- @Test
- public void testForkCountOneReuse()
- {
- List<String> pids = doTest( unpack( getProject() ).forkCount( 1 ).reuseForks( true ) );
- assertDifferentPids( pids, 2 );
- assertEndWith( pids, "_1_1", 3 );
- assertEndWith( pids, "_2_2", 3 );
- }
-
- @Test
- public void testForkCountTwoNoReuse()
- {
- List<String> pids = doTest( unpack( getProject() ).forkCount( 2 ).reuseForks( false ) );
- assertAllDifferentPids( pids );
- int matchesOne = countSuffixMatches( pids, "_1_1");
- int matchesTwo = countSuffixMatches( pids, "_2_2" );
- int matchesThree = countSuffixMatches( pids, "_3_3");
- int matchesFour = countSuffixMatches( pids, "_4_4" );
- assertTrue( "At least one fork had forkNumber 1", matchesOne >= 1 );
- assertTrue( "At least one fork had forkNumber 2", matchesTwo >= 1 );
- assertTrue( "At least one fork had forkNumber 3", matchesThree >= 1 );
- assertTrue( "At least one fork had forkNumber 4", matchesFour >= 1 );
- assertEquals( "No other forkNumbers than 1, 2, 3, or 4 have been used", 6, matchesOne + matchesTwo + matchesThree + matchesFour );
- }
-
- @Test
- public void testForkCountTwoReuse()
- {
- List<String> pids =
- doTest( unpack( getProject() ).forkCount( 2 ).reuseForks( true ) );
- assertDifferentPids( pids, 4 );
-
- int matchesOne = countSuffixMatches( pids, "_1_1");
- int matchesTwo = countSuffixMatches( pids, "_2_2" );
- int matchesThree = countSuffixMatches( pids, "_3_3");
- int matchesFour = countSuffixMatches( pids, "_4_4" );
- assertTrue( "At least one fork had forkNumber 1", matchesOne >= 1 );
- assertTrue( "At least one fork had forkNumber 2", matchesTwo >= 1 );
- assertTrue( "At least one fork had forkNumber 3", matchesThree >= 1 );
- assertTrue( "At least one fork had forkNumber 4", matchesFour >= 1 );
- assertEquals( "No other forkNumbers than 1, 2, 3, or 4 have been used", 6, matchesOne + matchesTwo + matchesThree + matchesFour );
- }
-
- private void assertEndWith( List<String> pids, String suffix, int expectedMatches )
- {
- int matches = countSuffixMatches( pids, suffix );
-
- assertEquals( "suffix " + suffix + " matched the correct number of pids", expectedMatches, matches );
- }
-
- private int countSuffixMatches( List<String> pids, String suffix )
- {
- int matches = 0;
- for ( String pid : pids )
- {
- if ( pid.endsWith( suffix ) )
- {
- matches++;
- }
- }
- return matches;
- }
-
- private void assertDifferentPids( List<String> pids, int numOfDifferentPids )
- {
- Set<String> pidSet = new HashSet<String>( pids );
- assertEquals( "number of different pids is not as expected", numOfDifferentPids, pidSet.size() );
- }
-
- private void assertAllDifferentPids( List<String> pids )
- {
- assertDifferentPids( pids, pids.size() );
- }
-
- private List<String> doTest( SurefireLauncher forkMode )
- {
- forkMode.addGoal( "-T2" );
- forkMode.sysProp( "testProperty", "testValue_${surefire.threadNumber}_${surefire.forkNumber}" );
- final OutputValidator outputValidator = forkMode.setForkJvm().executeTest();
- List<String> pids = new ArrayList<String>( 6 );
- pids.addAll( validateModule( outputValidator, "module-a" ) );
- pids.addAll( validateModule( outputValidator, "module-b" ) );
-
- return pids;
- }
-
- private List<String> validateModule( OutputValidator outputValidator, String module )
- {
- HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, new File( outputValidator.getBaseDir(), module ) );
-
- List<String> pids = new ArrayList<String>( 3 );
- for ( int i = 1; i <= 3; i++ )
- {
- final TestFile targetFile = outputValidator.getTargetFile( module, "test" + i + "-pid" );
- String pid = targetFile.slurpFile();
- pids.add( pid );
- }
-
- return pids;
- }
-
- protected String getProject()
- {
- return "fork-mode-multimodule";
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java
deleted file mode 100644
index 5ba0577..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java
+++ /dev/null
@@ -1,35 +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.
- */
-
-/**
- * Test forkMode
- *
- * @author <a href="mailto:velo.br@gmail.com">Marvin Froeder</a>
- */
-public class ForkModeTestNGIT
- extends ForkModeIT
-{
- @Override
- protected String getProject()
- {
- return "fork-mode-testng";
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
deleted file mode 100644
index a6c539c..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
+++ /dev/null
@@ -1,95 +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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * Test include/exclude from files.
- * <br>
- * Based on {@link IncludesExcludesIT}.
- */
-public class IncludesExcludesFromFileIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private SurefireLauncher unpack()
- {
- return unpack( "/includes-excludes-from-file" );
- }
-
- @Test
- public void testSimple()
- {
- testWithProfile( "simple" );
- }
-
- @Test
- public void testSimpleMixed()
- {
- testWithProfile( "simple-mixed" );
- }
-
- @Test
- public void testRegex()
- {
- testWithProfile( "regex" );
- }
-
- @Test
- public void testPath()
- {
- testWithProfile( "path" );
- }
-
- @Test
- public void testMissingExcludes()
- {
- expectBuildFailure("missing-excludes-file", "Failed to load list from file", "no-such-excludes-file");
- }
-
- @Test
- public void testMissingIncludes()
- {
- expectBuildFailure( "missing-includes-file", "Failed to load list from file", "no-such-includes-file" );
- }
-
- private void testWithProfile( String profile )
- {
- final OutputValidator outputValidator = unpack().
- activateProfile( profile ).executeTest().verifyErrorFree( 2 );
-
- outputValidator.getTargetFile( "testTouchFile.txt" ).assertFileExists();
- outputValidator.getTargetFile( "defaultTestTouchFile.txt" ).assertFileExists();
- }
-
- private void expectBuildFailure( final String profile, final String... messages )
- {
- final OutputValidator outputValidator = unpack().activateProfile( profile )
- .maven().withFailure().executeTest();
-
- for ( String message : messages )
- {
- outputValidator.verifyTextInLog( message );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
deleted file mode 100644
index 46bdeb6..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
+++ /dev/null
@@ -1,68 +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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * Test include/exclude patterns.
- *
- * @author Benjamin Bentmann
- */
-public class IncludesExcludesIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private SurefireLauncher unpack()
- {
- return unpack( "/includes-excludes" );
- }
-
- /**
- * Test surefire inclusions/exclusions
- */
- @Test
- public void testIncludesExcludes()
- {
- testWithProfile( "simple" );
- }
-
- @Test
- public void testRegexIncludesExcludes()
- {
- testWithProfile( "regex" );
- }
-
- @Test
- public void testPathBasedIncludesExcludes()
- {
- testWithProfile( "path" );
- }
-
- private void testWithProfile( String profile )
- {
- final OutputValidator outputValidator = unpack().
- activateProfile( profile ).executeTest().verifyErrorFree( 2 );
- outputValidator.getTargetFile( "testTouchFile.txt" ).assertFileExists();
- outputValidator.getTargetFile( "defaultTestTouchFile.txt" ).assertFileExists();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
deleted file mode 100644
index 7bf90f0..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
+++ /dev/null
@@ -1,38 +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;
-
-/**
- * Test project using JUnit4.4 (including Hamcrest extensions)
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class JUnit44HamcrestIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testJUnit44Hamcrest()
- {
- executeErrorFreeTest( "junit44-hamcrest", 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/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 57007a7..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( "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
[03/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
new file mode 100644
index 0000000..10a40c4
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
@@ -0,0 +1,51 @@
+<!--
+ ~ 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-test-provider</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test provider</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-api</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources/META-INF</directory>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java
new file mode 100644
index 0000000..79b2ceb
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java
@@ -0,0 +1,75 @@
+package org.apache.maven.surefire.testprovider;
+
+/*
+ * 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.providerapi.AbstractProvider;
+import org.apache.maven.surefire.providerapi.ProviderParameters;
+import org.apache.maven.surefire.report.ReporterException;
+import org.apache.maven.surefire.suite.RunResult;
+import org.apache.maven.surefire.testset.TestSetFailedException;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class TestProvider
+ extends AbstractProvider
+{
+
+ public TestProvider( ProviderParameters booterParameters )
+ {
+ invokeRuntimeExceptionIfSet( System.getProperty( "constructorCrash" ) );
+ }
+
+ public Iterable<Class<?>> getSuites()
+ {
+ invokeRuntimeExceptionIfSet( System.getProperty( "getSuitesCrash" ) );
+ return null;
+ }
+
+ public RunResult invoke( Object forkTestSet )
+ throws TestSetFailedException, ReporterException
+ {
+ throwIfSet( System.getProperty( "invokeCrash" ) );
+ return new RunResult( 1, 0, 0, 2 );
+ }
+
+ private void throwIfSet( String throwError )
+ throws TestSetFailedException, ReporterException
+ {
+ if ( "testSetFailed".equals( throwError ) )
+ {
+ throw new TestSetFailedException( "Let's fail" );
+ }
+ if ( "reporterException".equals( throwError ) )
+ {
+ throw new ReporterException( "Let's fail with a reporterexception", new RuntimeException() );
+ }
+
+ invokeRuntimeExceptionIfSet( throwError );
+ }
+
+ private void invokeRuntimeExceptionIfSet( String throwError )
+ {
+ if ( "runtimeException".equals( throwError ) )
+ {
+ throw new RuntimeException( "Let's fail with a runtimeException" );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
new file mode 100644
index 0000000..d52f21c
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
@@ -0,0 +1 @@
+org.apache.maven.surefire.testprovider.TestProvider
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-141-pluggableproviders/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-141-pluggableproviders/pom.xml b/surefire-its/src/test/resources/surefire-141-pluggableproviders/pom.xml
new file mode 100644
index 0000000..1a92a0c
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-141-pluggableproviders/pom.xml
@@ -0,0 +1,68 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire141-test</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>surefire-141-pluggableproviders</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <surefire.version>2.12.4</surefire.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit3</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-test-provider</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/BasicTest.java b/surefire-its/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/BasicTest.java
new file mode 100644
index 0000000..acf8bb3
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/BasicTest.java
@@ -0,0 +1,87 @@
+package surefire141;
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public BasicTest( String name )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ Test test = new BasicTest( "testSetUp" );
+ suite.addTest( test );
+ TestSetup setup = new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+
+ return setup;
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/TestTwo.java b/surefire-its/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/TestTwo.java
new file mode 100644
index 0000000..1768daf
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/TestTwo.java
@@ -0,0 +1,29 @@
+package surefire141;
+
+/*
+ * 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 junit.framework.TestCase;
+
+
+public class TestTwo
+ extends TestCase
+{
+ public void testTwo() {}
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml b/surefire-its/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
new file mode 100644
index 0000000..671a654
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
@@ -0,0 +1,58 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>forkPerTestNoSetup</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for SUREFIRE-146 (forkMode=pertest fails to call setUp)</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java b/surefire-its/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java
new file mode 100644
index 0000000..5810572
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java
@@ -0,0 +1,86 @@
+package forkPerTestNoSetup;
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class TestSurefire2
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public TestSurefire2( String name, String extraName )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ Test test = new TestSurefire2( "testSetUp", "dummy" );
+ suite.addTest( test );
+
+ return new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-162-charsetProvider/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-162-charsetProvider/pom.xml b/surefire-its/src/test/resources/surefire-162-charsetProvider/pom.xml
new file mode 100644
index 0000000..3eb6175
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-162-charsetProvider/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.surefire.its</groupId>
+ <artifactId>surefire-162-charsetProvider</artifactId>
+ <name>Test alternate CharsetProvider</name>
+ <version>1.0-SNAPSHOT</version>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jcharset</groupId>
+ <artifactId>jcharset</artifactId>
+ <version>1.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar
new file mode 100644
index 0000000..e9864bb
Binary files /dev/null and b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar differ
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.md5
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.md5 b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.md5
new file mode 100644
index 0000000..c9c4d19
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.md5
@@ -0,0 +1 @@
+c4b966f51890d6f093f9695073eddd17
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.sha1
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.sha1 b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.sha1
new file mode 100644
index 0000000..d59a609
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.sha1
@@ -0,0 +1 @@
+3cd17d7cc1cca87607df77a9fe1b8f66bdfadcbb
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom
new file mode 100644
index 0000000..4b235e0
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>jcharset</groupId>
+ <artifactId>jcharset</artifactId>
+ <version>1.2.1</version>
+ <distributionManagement>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.md5
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.md5 b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.md5
new file mode 100644
index 0000000..75aa95b
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.md5
@@ -0,0 +1 @@
+5e621bbe805a5a50e7d06bc1f6978e65
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.sha1
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.sha1 b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.sha1
new file mode 100644
index 0000000..3903b9d
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.sha1
@@ -0,0 +1 @@
+1d048854e95e548527550e11ef3ba1615cd0c3ec
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml
new file mode 100644
index 0000000..94ee601
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>jcharset</groupId>
+ <artifactId>jcharset</artifactId>
+ <version>1.2.1</version>
+ <versioning>
+ <versions>
+ <version>1.2.1</version>
+ </versions>
+ <lastUpdated>20071219170211</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.md5
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.md5 b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.md5
new file mode 100644
index 0000000..3e1a8c3
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.md5
@@ -0,0 +1 @@
+6b6e65bd49d8b6f5fa035b7f842217d5
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.sha1
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.sha1 b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.sha1
new file mode 100644
index 0000000..ee1dae6
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+31af2f983559347ed4cdc42e882fdc1ccf9cfc24
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-162-charsetProvider/src/test/java/charsetProvider/MSUREFIRE77TestCase.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-162-charsetProvider/src/test/java/charsetProvider/MSUREFIRE77TestCase.java b/surefire-its/src/test/resources/surefire-162-charsetProvider/src/test/java/charsetProvider/MSUREFIRE77TestCase.java
new file mode 100644
index 0000000..ef492dc
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-162-charsetProvider/src/test/java/charsetProvider/MSUREFIRE77TestCase.java
@@ -0,0 +1,40 @@
+package charsetProvider;
+
+/*
+ * 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.io.UnsupportedEncodingException;
+
+import junit.framework.TestCase;
+
+public class MSUREFIRE77TestCase
+ extends TestCase
+{
+ public void testThatICanUseCharsets()
+ throws UnsupportedEncodingException
+ {
+ System.out.println( new String( "foo".getBytes(), "GSM_0338" ) );
+ }
+
+ public static void main( String[] args )
+ throws Exception
+ {
+ new MSUREFIRE77TestCase().testThatICanUseCharsets();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml b/surefire-its/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
new file mode 100644
index 0000000..74217ef
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
@@ -0,0 +1,58 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>wellFormedXmlFailures</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for MSUREFIRE-54 (well-formed XML failures)</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-224-wellFormedXmlFailures/src/test/java/wellFormedXmlFailures/TestSurefire3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-224-wellFormedXmlFailures/src/test/java/wellFormedXmlFailures/TestSurefire3.java b/surefire-its/src/test/resources/surefire-224-wellFormedXmlFailures/src/test/java/wellFormedXmlFailures/TestSurefire3.java
new file mode 100644
index 0000000..7bb1afe
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-224-wellFormedXmlFailures/src/test/java/wellFormedXmlFailures/TestSurefire3.java
@@ -0,0 +1,62 @@
+package wellFormedXmlFailures;
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class TestSurefire3
+ extends TestCase
+{
+
+ public TestSurefire3( )
+ {
+ super( );
+ }
+
+ public TestSurefire3( String name )
+ {
+ super( name );
+ }
+
+
+ public void testQuote()
+ {
+ fail( "\"" );
+ }
+
+ public void testLower()
+ {
+ fail( "<" );
+ }
+
+ public void testGreater()
+ {
+ fail( ">" );
+ }
+
+ public void testU0000()
+ {
+ fail( "\u0000" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-257-rerunningTests/module1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-257-rerunningTests/module1/pom.xml b/surefire-its/src/test/resources/surefire-257-rerunningTests/module1/pom.xml
new file mode 100644
index 0000000..90ca5c6
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-257-rerunningTests/module1/pom.xml
@@ -0,0 +1,23 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire-257-rerunningTests</groupId>
+ <artifactId>surefire-257-rerunningTests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.maven.surefire-257-rerunningTests.module1</groupId>
+ <artifactId>module1</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-257-rerunningTests/module1/src/main/java/surefire257/MyModule1Class.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-257-rerunningTests/module1/src/main/java/surefire257/MyModule1Class.java b/surefire-its/src/test/resources/surefire-257-rerunningTests/module1/src/main/java/surefire257/MyModule1Class.java
new file mode 100644
index 0000000..861bd34
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-257-rerunningTests/module1/src/main/java/surefire257/MyModule1Class.java
@@ -0,0 +1,26 @@
+package surefire257;
+
+/*
+ * 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.
+ */
+
+public class MyModule1Class {
+ public int getFoo() {
+ return 42;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-257-rerunningTests/module1/src/test/java/surefire257/MyModule1ClassTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-257-rerunningTests/module1/src/test/java/surefire257/MyModule1ClassTest.java b/surefire-its/src/test/resources/surefire-257-rerunningTests/module1/src/test/java/surefire257/MyModule1ClassTest.java
new file mode 100644
index 0000000..0b3260f
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-257-rerunningTests/module1/src/test/java/surefire257/MyModule1ClassTest.java
@@ -0,0 +1,33 @@
+package surefire257;
+
+/*
+ * 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 junit.framework.Assert;
+import junit.framework.TestCase;
+import surefire257.MyModule1Class;
+
+public class MyModule1ClassTest extends TestCase {
+
+ public void testGetFooOK() {
+ MyModule1Class mc = new MyModule1Class();
+ Assert.assertEquals(42, mc.getFoo());
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-257-rerunningTests/module2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-257-rerunningTests/module2/pom.xml b/surefire-its/src/test/resources/surefire-257-rerunningTests/module2/pom.xml
new file mode 100644
index 0000000..2685c13
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-257-rerunningTests/module2/pom.xml
@@ -0,0 +1,23 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire-257-rerunningTests</groupId>
+ <artifactId>surefire-257-rerunningTests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.maven.surefire-257-rerunningTests.module2</groupId>
+ <artifactId>module2</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-257-rerunningTests/module2/src/main/java/surefire257/MyModule2Class.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-257-rerunningTests/module2/src/main/java/surefire257/MyModule2Class.java b/surefire-its/src/test/resources/surefire-257-rerunningTests/module2/src/main/java/surefire257/MyModule2Class.java
new file mode 100644
index 0000000..9b284e3
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-257-rerunningTests/module2/src/main/java/surefire257/MyModule2Class.java
@@ -0,0 +1,6 @@
+package surefire257;
+public class MyModule2Class {
+ public int getFoo() {
+ return 42;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-257-rerunningTests/module2/src/test/java/surefire257/MyModule2ClassTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-257-rerunningTests/module2/src/test/java/surefire257/MyModule2ClassTest.java b/surefire-its/src/test/resources/surefire-257-rerunningTests/module2/src/test/java/surefire257/MyModule2ClassTest.java
new file mode 100644
index 0000000..f573a86
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-257-rerunningTests/module2/src/test/java/surefire257/MyModule2ClassTest.java
@@ -0,0 +1,13 @@
+package surefire257;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+import surefire257.MyModule2Class;
+
+public class MyModule2ClassTest extends TestCase {
+
+ public void testGetFooOK() {
+ MyModule2Class mc = new MyModule2Class();
+ Assert.assertEquals(42, mc.getFoo());
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-257-rerunningTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-257-rerunningTests/pom.xml b/surefire-its/src/test/resources/surefire-257-rerunningTests/pom.xml
new file mode 100644
index 0000000..c3e6738
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-257-rerunningTests/pom.xml
@@ -0,0 +1,43 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.surefire-257-rerunningTests</groupId>
+ <artifactId>surefire-257-rerunningTests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <inherited>true</inherited>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <modules>
+ <module>module1</module>
+ <module>module2</module>
+ </modules>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
new file mode 100644
index 0000000..16035fe
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
@@ -0,0 +1,64 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-260-testsWithIdenticalNames</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>surefire-260-testsWithIdenticalNames</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <dependencies>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <dependencies>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestA.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestA.java b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestA.java
new file mode 100644
index 0000000..3b52a44
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestA.java
@@ -0,0 +1,35 @@
+package surefire260;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class TestA
+ extends TestCase
+{
+ public void testOne()
+ {
+ }
+
+ public void testDup()
+ {
+ fail( "This is what we want" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestB.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestB.java b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestB.java
new file mode 100644
index 0000000..d06b7b2
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestB.java
@@ -0,0 +1,31 @@
+package surefire260;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class TestB
+ extends TestCase
+{
+ public void testDup()
+ {
+ fail( "This is what we want" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestC.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestC.java b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestC.java
new file mode 100644
index 0000000..a5050fb
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestC.java
@@ -0,0 +1,31 @@
+package surefire260;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class TestC
+ extends TestCase
+{
+ public void testDup()
+ {
+ fail( "This is what we want" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-34-securityManager-success/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-34-securityManager-success/pom.xml b/surefire-its/src/test/resources/surefire-34-securityManager-success/pom.xml
new file mode 100644
index 0000000..541f499
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-34-securityManager-success/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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire34</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Surefire-34-SecurityManager</name>
+
+ <properties>
+ <junitVersion>3.8.1</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <systemPropertyVariables>
+ <surefire.security.manager>java.lang.SecurityManager</surefire.security.manager>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java b/surefire-its/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java
new file mode 100644
index 0000000..3448502
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java
@@ -0,0 +1,56 @@
+package junit4;
+
+/*
+ * 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 junit.framework.TestCase;
+
+
+public class SecurityManagerTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public void testNotMuch()
+ {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-34-securityManager/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-34-securityManager/pom.xml b/surefire-its/src/test/resources/surefire-34-securityManager/pom.xml
new file mode 100644
index 0000000..541f499
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-34-securityManager/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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire34</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Surefire-34-SecurityManager</name>
+
+ <properties>
+ <junitVersion>3.8.1</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <systemPropertyVariables>
+ <surefire.security.manager>java.lang.SecurityManager</surefire.security.manager>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-34-securityManager/src/test/java/junit4/SecurityManagerTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-34-securityManager/src/test/java/junit4/SecurityManagerTest.java b/surefire-its/src/test/resources/surefire-34-securityManager/src/test/java/junit4/SecurityManagerTest.java
new file mode 100644
index 0000000..6fb992f
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-34-securityManager/src/test/java/junit4/SecurityManagerTest.java
@@ -0,0 +1,60 @@
+package junit4;
+
+/*
+ * 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.io.File;
+
+import junit.framework.TestCase;
+
+
+public class SecurityManagerTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public void testWillFailWhenAccessingCurrentDirectory()
+ {
+ File file = new File( "." );
+ file.isDirectory();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-408-manual-provider-selection/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-408-manual-provider-selection/pom.xml b/surefire-its/src/test/resources/surefire-408-manual-provider-selection/pom.xml
new file mode 100644
index 0000000..ac94779
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-408-manual-provider-selection/pom.xml
@@ -0,0 +1,77 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit-twoTestCases</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for two test cases</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit3</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ <!-- dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit3</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-testng</artifactId>
+ <version>${surefire.version}</version>
+ </dependency -->
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java b/surefire-its/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java
new file mode 100644
index 0000000..2efc5ed
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java
@@ -0,0 +1,86 @@
+package junit.twoTestCases;
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public BasicTest( String name )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ Test test = new BasicTest( "testSetUp" );
+ suite.addTest( test );
+
+ return new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/TestTwo.java b/surefire-its/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/TestTwo.java
new file mode 100644
index 0000000..9af4558
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/TestTwo.java
@@ -0,0 +1,29 @@
+package junit.twoTestCases;
+
+/*
+ * 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 junit.framework.TestCase;
+
+
+public class TestTwo
+ extends TestCase
+{
+ public void testTwo() {}
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-500-puzzling-error/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-500-puzzling-error/pom.xml b/surefire-its/src/test/resources/surefire-500-puzzling-error/pom.xml
new file mode 100644
index 0000000..ce01272
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-500-puzzling-error/pom.xml
@@ -0,0 +1,37 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example</groupId>
+ <artifactId>surefire-500</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>surefire-500-puzzling-error</name>
+ <url>http://maven.apache.org</url>
+ <properties>
+ <junit.version>4.4</junit.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <reportFormat>brief</reportFormat>
+ <useFile>true</useFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java b/surefire-its/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java
new file mode 100644
index 0000000..88164bf
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java
@@ -0,0 +1,49 @@
+package surefire500;
+
+/*
+ * 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.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class ExplodingTest
+{
+
+ static
+ {
+ // noinspection ConstantIfStatement
+ if ( true )
+ {
+ throw new java.lang.NoClassDefFoundError( "whoops!" );
+ }
+ }
+
+ @Test
+ public void testPass()
+ {
+ assertTrue( true );
+ }
+
+ public void testFail()
+ {
+ fail( "fail" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java b/surefire-its/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java
new file mode 100644
index 0000000..65355f1
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java
@@ -0,0 +1,53 @@
+package surefire500;
+
+/*
+ * 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.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class PassingTest {
+
+ @Test
+ public void testOne()
+ {
+ assertTrue(true);
+ }
+
+ @Test
+ public void testTwo()
+ {
+ assertTrue(true);
+ }
+
+ @Test
+ public void testThree()
+ {
+ assertTrue(true);
+ }
+
+ @Test
+ public void testFour()
+ {
+ assertTrue(true);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java b/surefire-its/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java
new file mode 100644
index 0000000..566173e
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java
@@ -0,0 +1,30 @@
+package surefire500;
+
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(org.junit.runners.Suite.class)
+@SuiteClasses(value={ExplodingTest.class, PassingTest.class})
+public class Suite {
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-510-testClassPath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-510-testClassPath/pom.xml b/surefire-its/src/test/resources/surefire-510-testClassPath/pom.xml
new file mode 100644
index 0000000..5cb7b92
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-510-testClassPath/pom.xml
@@ -0,0 +1,57 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>Surefire-510-systemprops</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Surefire-510-systemprops</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-510-testClassPath/src/test/java/surefire510/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-510-testClassPath/src/test/java/surefire510/Test1.java b/surefire-its/src/test/resources/surefire-510-testClassPath/src/test/java/surefire510/Test1.java
new file mode 100644
index 0000000..012b1fb
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-510-testClassPath/src/test/java/surefire510/Test1.java
@@ -0,0 +1,40 @@
+package surefire510;
+
+/*
+ * 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 junit.framework.TestCase;
+
+import java.io.IOException;
+
+public class Test1
+ extends TestCase
+{
+
+ public void test1()
+ throws IOException
+ {
+ String tcp = System.getProperty( "surefire.test.class.path" );
+ if ( tcp != null )
+ {
+ System.out.println( "tcp is set" );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
new file mode 100644
index 0000000..d173770
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
@@ -0,0 +1,50 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-569-RunTestFromDependencyJars</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <groupId>org.apache.maven.plugins.surefire.dependency-jar</groupId>
+ <artifactId>module1</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.plugins.surefire.dependency-jar</groupId>
+ <artifactId>testjar</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*A*.java</include>
+ </includes>
+ <dependenciesToScan>
+ <dependency>org.apache.maven.plugins.surefire.dependency-jar:testjar</dependency>
+ </dependenciesToScan>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
new file mode 100644
index 0000000..e69ac9d
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
@@ -0,0 +1,17 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+ <artifactId>surefire-569-RunTestFromDependencyJars</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>testjar</module>
+ <module>module1</module>
+ </modules>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
new file mode 100644
index 0000000..7778331
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
@@ -0,0 +1,47 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-569-RunTestFromDependencyJars</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
+
+ <groupId>org.apache.maven.plugins.surefire.dependency-jar</groupId>
+ <artifactId>testjar</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
[35/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java b/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
deleted file mode 100644
index c367ef5..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/src/test/java/junit4/SmartStackTraceTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package junit4;
-
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-
-
-public class SmartStackTraceTest
-{
-
- @Test(expected = RuntimeException.class)
- public void shouldFailInMethodButDoesnt()
- {
- }
-
- @Test(expected = IOException.class)
- public void incorrectExceptionThrown()
- {
- throw new RuntimeException("We fail here");
- }
-
- @Test(expected = IOException.class)
- public void shortName()
- {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/large-test-results/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/large-test-results/pom.xml b/surefire-integration-tests/src/test/resources/large-test-results/pom.xml
deleted file mode 100644
index 36caa01..0000000
--- a/surefire-integration-tests/src/test/resources/large-test-results/pom.xml
+++ /dev/null
@@ -1,55 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>large-test-results</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for large test results</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <systemProperties>
- <property><name>numTests</name><value>${numTests}</value></property>
- </systemProperties>
- <argLine>-Xmx1024m</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java b/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
deleted file mode 100644
index bdeeb04..0000000
--- a/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package largeTestResults;
-
-/*
- * 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 junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- private final int number;
-
- public BasicTest( String name, int number )
- {
- super( name );
- this.number = number;
- }
-
- public static Test suite()
- {
- int tests = Integer.parseInt( System.getProperty( "numTests", "20" ) );
- TestSuite suite = new TestSuite();
- for ( int i = 0; i < tests; i++ )
- {
- if ( i % 4 == 0 )
- {
- suite.addTest( new BasicTest( "testPass", i ) );
- }
- else
- {
- suite.addTest( new BasicTest( "testFail", i ) );
- }
- }
- return suite;
- }
-
- public void testFail()
- {
- fail( "failure " + number );
- }
-
- public void testPass()
- {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/long-windows-path/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/long-windows-path/pom.xml b/surefire-integration-tests/src/test/resources/long-windows-path/pom.xml
deleted file mode 100644
index c65948c..0000000
--- a/surefire-integration-tests/src/test/resources/long-windows-path/pom.xml
+++ /dev/null
@@ -1,57 +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/xsd/maven-4.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>long-windows-path</artifactId>
- <version>1.0</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/long-windows-path/src/test/java/longwindowspath/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/long-windows-path/src/test/java/longwindowspath/BasicTest.java b/surefire-integration-tests/src/test/resources/long-windows-path/src/test/java/longwindowspath/BasicTest.java
deleted file mode 100644
index bd9cf36..0000000
--- a/surefire-integration-tests/src/test/resources/long-windows-path/src/test/java/longwindowspath/BasicTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package longwindowspath;
-
-/*
- * 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.Test;
-
-public class BasicTest
-{
- @Test
- public void test()
- {
- System.out.println( "SUREFIRE-1400 user.dir="
- + System.getProperty( "user.dir" ) );
-
- System.out.println( "SUREFIRE-1400 surefire.real.class.path="
- + System.getProperty( "surefire.real.class.path" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/modulepath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/modulepath/pom.xml b/surefire-integration-tests/src/test/resources/modulepath/pom.xml
deleted file mode 100644
index e4a7783..0000000
--- a/surefire-integration-tests/src/test/resources/modulepath/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<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>
-
- <groupId>foo</groupId>
- <artifactId>app</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <name>app</name>
-
- <properties>
- <maven.compiler.release>9</maven.compiler.release>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.9.9</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/modulepath/src/main/java/com/app/Main.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/modulepath/src/main/java/com/app/Main.java b/surefire-integration-tests/src/test/resources/modulepath/src/main/java/com/app/Main.java
deleted file mode 100644
index 6a44492..0000000
--- a/surefire-integration-tests/src/test/resources/modulepath/src/main/java/com/app/Main.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.app;
-
-/*
- * 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.joda.time.DateTime;
-
-public class Main
-{
- public static void main( String... args )
- {
- System.out.println( "module path => " + System.getProperty( "jdk.module.path" ) );
- System.out.println( " class path => " + System.getProperty( "java.class.path" ) );
-
- DateTime dt = new DateTime();
- System.out.println( dt );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/modulepath/src/main/java/module-info.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/modulepath/src/main/java/module-info.java b/surefire-integration-tests/src/test/resources/modulepath/src/main/java/module-info.java
deleted file mode 100644
index 5f3eed4..0000000
--- a/surefire-integration-tests/src/test/resources/modulepath/src/main/java/module-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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.
- */
-module com.app {
- requires joda.time;
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/modulepath/src/test/java/com/app/AppTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/modulepath/src/test/java/com/app/AppTest.java b/surefire-integration-tests/src/test/resources/modulepath/src/test/java/com/app/AppTest.java
deleted file mode 100644
index aa836a4..0000000
--- a/surefire-integration-tests/src/test/resources/modulepath/src/test/java/com/app/AppTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.app;
-
-/*
- * 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.testng.annotations.Test;
-
-@Test
-public class AppTest
-{
- public void testNoop()
- throws Exception
- {
- }
-
- public void testMain()
- {
- Main.main();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml b/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml
deleted file mode 100644
index dd1a3cc..0000000
--- a/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml
+++ /dev/null
@@ -1,58 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>norunnabletests</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test JUnit classes with inner classes</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <failIfNoTests>true</failIfNoTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/norunnableTests/src/test/java/junit/norunnabletests/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/norunnableTests/src/test/java/junit/norunnabletests/BasicTest.java b/surefire-integration-tests/src/test/resources/norunnableTests/src/test/java/junit/norunnabletests/BasicTest.java
deleted file mode 100644
index 30acd3e..0000000
--- a/surefire-integration-tests/src/test/resources/norunnableTests/src/test/java/junit/norunnabletests/BasicTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package junit.norunnabletests;
-
-
-/*
- * 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 junit.framework.TestCase;
-
-
-public class BasicTest extends TestCase
-{
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml b/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml
deleted file mode 100644
index f39f949..0000000
--- a/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>parallel-runtime</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>parallel-runtime</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- </dependency>
- </dependencies>
-
- <properties>
- <parallel>classes</parallel>
- <threadCount>3</threadCount>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <threadCount>${threadCount}</threadCount>
- <perCoreThreadCount>false</perCoreThreadCount>
- <parallel>${parallel}</parallel>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test1.java b/surefire-integration-tests/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test1.java
deleted file mode 100755
index 3b6abf3..0000000
--- a/surefire-integration-tests/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test1.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package runorder.parallel;
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Test1
-{
-
- public static final int ms = 5000;
-
- static void sleep( int ms )
- {
- long target = System.currentTimeMillis() + ms;
- try
- {
- do
- {
- Thread.sleep( ms );
- } while ( System.currentTimeMillis() < target);
- }
- catch ( InterruptedException e )
- {
- throw new RuntimeException( e );
- }
- }
-
- @Test
- public void testSleep1()
- {
- Test1.sleep( ms );
- }
-
- @Test
- public void testSleep2()
- {
- Test1.sleep( ms );
- }
-
- @Test
- public void testSleep3()
- {
- Test1.sleep( ms );
- }
-
- @Test
- public void testSleep4()
- {
- Test1.sleep( ms );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test2.java b/surefire-integration-tests/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test2.java
deleted file mode 100644
index f72c499..0000000
--- a/surefire-integration-tests/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test2.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package runorder.parallel;
-
-/*
- * 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.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Test2
-{
-
- @Test
- public void testSleep1()
- {
- Test1.sleep( Test1.ms );
- }
-
- @Test
- public void testSleep2()
- {
- Test1.sleep( Test1.ms );
- }
-
- @Test
- public void testSleep3()
- {
- Test1.sleep( Test1.ms );
- }
-
- @Test
- public void testSleep4()
- {
- Test1.sleep( Test1.ms );
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test3.java b/surefire-integration-tests/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test3.java
deleted file mode 100644
index 3557667..0000000
--- a/surefire-integration-tests/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test3.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package runorder.parallel;
-
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Test3
-{
- @Test
- public void testSleep1()
- {
- Test1.sleep( Test1.ms );
- }
-
- @Test
- public void testSleep2()
- {
- Test1.sleep( Test1.ms );
- }
-
- @Test
- public void testSleep3()
- {
- Test1.sleep( Test1.ms );
- }
-
- @Test
- public void testSleep4()
- {
- Test1.sleep( Test1.ms );
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml b/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
deleted file mode 100644
index 72bd38c..0000000
--- a/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
+++ /dev/null
@@ -1,57 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>plain-old-java-classpath</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for useManifestOnlyJar=false</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <useManifestOnlyJar>false</useManifestOnlyJar>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java b/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
deleted file mode 100644
index e458631..0000000
--- a/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package plainOldJavaClasspath;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public BasicTest( String name, String extraName )
- {
- super( name );
- }
-
- public static Test suite()
- {
- System.out.println( "suite" );
- TestSuite suite = new TestSuite();
- Test test = new BasicTest( "testSetUp", "dummy" );
- suite.addTest( test );
-
- return new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml b/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml
deleted file mode 100644
index 338904a..0000000
--- a/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml
+++ /dev/null
@@ -1,59 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>plexus-conflict</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for plexus conflict</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java b/surefire-integration-tests/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java
deleted file mode 100644
index 98f2615..0000000
--- a/surefire-integration-tests/src/test/resources/plexus-conflict/src/main/java/plexusConflict/CommandlineExtender.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package plexusConflict;
-
-/*
- * 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.codehaus.plexus.util.cli.Commandline;
-
-/**
- * Conflict with latest version of plexus by using modified protected class.
- */
-public class CommandlineExtender
- extends Commandline
-{
- public CommandlineExtender()
- {
- // In 1.0.4, Commandline.envVars was a Vector; in 1.4.x, it's a Map.
- super.envVars.add( "" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java b/surefire-integration-tests/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java
deleted file mode 100644
index 96f1bba..0000000
--- a/surefire-integration-tests/src/test/resources/plexus-conflict/src/test/java/plexusConflict/BasicTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package plexusConflict;
-
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- public void testPlexusConflict()
- {
- CommandlineExtender ce = new CommandlineExtender();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml b/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml
deleted file mode 100644
index 45986ac..0000000
--- a/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml
+++ /dev/null
@@ -1,50 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>pojo-simple</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Pojo simple test</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <!-- NOTE: This has no dependencies on JUnit or TestNG, just nothing -->
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/pojo-simple/src/test/java/PojoTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/pojo-simple/src/test/java/PojoTest.java b/surefire-integration-tests/src/test/resources/pojo-simple/src/test/java/PojoTest.java
deleted file mode 100644
index 8e13ecb..0000000
--- a/surefire-integration-tests/src/test/resources/pojo-simple/src/test/java/PojoTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-public class PojoTest
-{
-
- public void testSuccess()
- {
- assert true;
- }
-
- public void testFailure()
- {
- assert false;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/pom.xml b/surefire-integration-tests/src/test/resources/pom.xml
deleted file mode 100644
index e01ed4c..0000000
--- a/surefire-integration-tests/src/test/resources/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <packaging>pom</packaging>
-
- <version>1.0</version>
- <name>It parent</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>never</forkMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>never</forkMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/reporters/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/reporters/pom.xml b/surefire-integration-tests/src/test/resources/reporters/pom.xml
deleted file mode 100644
index 2152525..0000000
--- a/surefire-integration-tests/src/test/resources/reporters/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>reporters</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>reporters</name>
- <url>http://maven.apache.org</url>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.8</version>
- <scope>test</scope>
- <classifier>jdk15</classifier>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <disableXmlReport>false</disableXmlReport>
- <forkMode>${forkMode}</forkMode>
- <printSummary>${printSummary}</printSummary>
- <useFile>true</useFile>
- <redirectTestOutputToFile>${redirect.to.file}</redirectTestOutputToFile>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
- <properties>
- <junit.version>4.8.1</junit.version>
- <redirect.to.file>true</redirect.to.file>
- <forkMode>once</forkMode>
- <printSummary>true</printSummary>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/reporters/src/test/java/reporters/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/reporters/src/test/java/reporters/Test1.java b/surefire-integration-tests/src/test/resources/reporters/src/test/java/reporters/Test1.java
deleted file mode 100644
index e783db5..0000000
--- a/surefire-integration-tests/src/test/resources/reporters/src/test/java/reporters/Test1.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package reporters;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class Test1 extends TestCase
-{
- public void test6281() {
- System.out.println( "Test1 on" + Thread.currentThread().getName());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/reporters/src/test/java/reporters/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/reporters/src/test/java/reporters/Test2.java b/surefire-integration-tests/src/test/resources/reporters/src/test/java/reporters/Test2.java
deleted file mode 100644
index e5622d2..0000000
--- a/surefire-integration-tests/src/test/resources/reporters/src/test/java/reporters/Test2.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package reporters;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class Test2 extends TestCase
-{
- public void test6281() {
- System.out.println( "Test2 on" + Thread.currentThread().getName());
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/result-counting/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/result-counting/pom.xml b/surefire-integration-tests/src/test/resources/result-counting/pom.xml
deleted file mode 100644
index fcb7372..0000000
--- a/surefire-integration-tests/src/test/resources/result-counting/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>mag</groupId>
- <artifactId>junit4-test</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>junit4-test</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <includes>
- <include>**/Test*.java</include>
- <include>**/MySuiteTest1.java</include>
- <include>**/MySuiteTest2.java</include>
- <include>**/MySuiteTest3.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <junit.version>4.8.1</junit.version>
- <forkMode>once</forkMode>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java
deleted file mode 100644
index 137fdee..0000000
--- a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package resultcounting;
-
-/*
- * 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 junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class MySuiteTest1 extends TestCase {
-
- public static Test suite () {
- TestSuite suite = new TestSuite();
-
- suite.addTest (new MySuiteTest1("testMe" ));
-
- return suite;
- }
-
- public MySuiteTest1( String name ) {
- super (name);
- }
-
- public void testMe() {
- assertTrue (true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java
deleted file mode 100644
index 9188290..0000000
--- a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package resultcounting;
-
-/*
- * 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 junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class MySuiteTest2 extends TestCase {
-
- public static Test suite () {
- TestSuite suite = new TestSuite();
-
- suite.addTest (new MySuiteTest2("testMe" ));
- suite.addTest (new MySuiteTest2("testMe" ));
-
- return suite;
- }
-
- public MySuiteTest2( String name ) {
- super (name);
- }
-
- public void testMe() {
- assertTrue (true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java
deleted file mode 100644
index 35c6e5b..0000000
--- a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package resultcounting;
-
-/*
- * 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 junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class MySuiteTest3 extends TestCase {
-
- public static Test suite () {
- TestSuite suite = new TestSuite();
-
- suite.addTest (new MySuiteTest3("testMe" ));
- suite.addTest (new MySuiteTest3("testMe" ));
- suite.addTest (new MySuiteTest3("testMe" ));
-
- return suite;
- }
-
- public MySuiteTest3( String name ) {
- super (name);
- }
-
- public void testMe() {
- assertTrue (true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java
deleted file mode 100644
index c3283d2..0000000
--- a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test1.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package resultcounting;
-/*
- * 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.Test;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assume.*;
-import junit.framework.TestCase;
-
-public class Test1 extends TestCase
-{
- public void testWithFailingAssumption1() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption2() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption3() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption4() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption5() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption6() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption7() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption8() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption9() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption10() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption11() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption12() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption13() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption14() {
- assumeThat( 2, is(3));
- }
- public void testWithFailingAssumption15() {
- assumeThat( 2, is(3));
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test2.java b/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test2.java
deleted file mode 100644
index e5d5f53..0000000
--- a/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/Test2.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package resultcounting;
-
-/*
- * 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.Ignore;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assume.*;
-import static junit.framework.Assert.fail;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Test2
-{
- @Test
- public void testAllok()
- {
- System.out.println( "testAllok to stdout" );
- System.err.println( "testAllok to stderr" );
- }
-
- @Ignore
- @Test
- public void testWithIgnore1()
- {
- }
-
- @Ignore
- @Test
- public void testWithIgnore2()
- {
- }
-
- @Test
- public void testiWithFail1()
- {
- fail( "We excpect this" );
- }
-
- @Test
- public void testiWithFail2()
- {
- fail( "We excpect this" );
- }
-
- @Test
- public void testiWithFail3()
- {
- fail( "We excpect this" );
- }
-
- @Test
- public void testiWithFail4()
- {
- fail( "We excpect this" );
- }
-
- @Test
- public void testWithException1()
- {
- System.out.println( "testWithException1 to stdout" );
- System.err.println( "testWithException1 to stderr" );
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException2()
- {
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException3()
- {
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException4()
- {
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException5()
- {
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException6()
- {
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException7()
- {
- throw new RuntimeException( "We expect this" );
- }
-
- @Test
- public void testWithException8()
- {
- throw new RuntimeException( "We expect this" );
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/runOrder/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runOrder/pom.xml b/surefire-integration-tests/src/test/resources/runOrder/pom.xml
deleted file mode 100644
index 84abb53..0000000
--- a/surefire-integration-tests/src/test/resources/runOrder/pom.xml
+++ /dev/null
@@ -1,60 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>runOrder</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for runOrder</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>once</forkMode>
- </configuration>
- <dependencies>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/runOrder/src/test/java/junit/runOrder/TestA.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runOrder/src/test/java/junit/runOrder/TestA.java b/surefire-integration-tests/src/test/resources/runOrder/src/test/java/junit/runOrder/TestA.java
deleted file mode 100644
index cbf15e0..0000000
--- a/surefire-integration-tests/src/test/resources/runOrder/src/test/java/junit/runOrder/TestA.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package junit.runOrder;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class TestA
- extends TestCase
-{
- public void testTwo()
- {
- System.out.println( "TA" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/runOrder/src/test/java/junit/runOrder/TestB.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runOrder/src/test/java/junit/runOrder/TestB.java b/surefire-integration-tests/src/test/resources/runOrder/src/test/java/junit/runOrder/TestB.java
deleted file mode 100644
index 96da722..0000000
--- a/surefire-integration-tests/src/test/resources/runOrder/src/test/java/junit/runOrder/TestB.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package junit.runOrder;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class TestB
- extends TestCase
-{
- public void testTwo()
- {
- System.out.println( "TB" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/runOrder/src/test/java/junit/runOrder/TestC.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runOrder/src/test/java/junit/runOrder/TestC.java b/surefire-integration-tests/src/test/resources/runOrder/src/test/java/junit/runOrder/TestC.java
deleted file mode 100644
index 4ac63c2..0000000
--- a/surefire-integration-tests/src/test/resources/runOrder/src/test/java/junit/runOrder/TestC.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package junit.runOrder;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class TestC
- extends TestCase
-{
- public void testTwo()
- {
- System.out.println( "TC" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml b/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
deleted file mode 100644
index 1dee7d8..0000000
--- a/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>runorder-parallel</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>runorder-parallel</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- </dependency>
- </dependencies>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <runOrder>balanced</runOrder>
- <parallel>classesAndMethods</parallel>
- <threadCountClasses>2</threadCountClasses>
- <threadCountMethods>6</threadCountMethods>
- <perCoreThreadCount>false</perCoreThreadCount>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java b/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
deleted file mode 100755
index d11f48a..0000000
--- a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package runorder.parallel;
-
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Test1
-{
-
- public Test1()
- {
- System.out.println( Thread.currentThread().getName() + " Constructor" );
- }
-
- static void sleep( int ms )
- {
- long target = System.currentTimeMillis() + ms;
- try
- {
- do
- {
- Thread.sleep( 1L );
- }
- while ( System.currentTimeMillis() < target );
- }
- catch ( InterruptedException e )
- {
- throw new RuntimeException( e );
- }
- }
-
- @Test
- public void testSleep2000()
- {
- System.out.println(
- Thread.currentThread().getName() + " Test1.sleep2000 started @ " + System.currentTimeMillis() );
- sleep( 2000 );
- }
-
- @Test
- public void testSleep4000()
- {
- System.out.println(
- Thread.currentThread().getName() + " Test1.sleep4000 started @ " + System.currentTimeMillis() );
- sleep( 4000 );
- }
-
- @Test
- public void testSleep6000()
- {
- System.out.println(
- Thread.currentThread().getName() + " Test1.sleep6000 started @ " + System.currentTimeMillis() );
- sleep( 6000 );
- }
-
- @BeforeClass
- public static void setUpBeforeClass()
- throws Exception
- {
- System.out.println( Thread.currentThread().getName() + " beforeClass sleep 175 " + System.currentTimeMillis() );
- Thread.sleep( 175 );
- }
-
- @AfterClass
- public static void tearDownAfterClass()
- throws Exception
- {
- System.out.println( Thread.currentThread().getName() + " afterClass sleep 175 " + System.currentTimeMillis() );
- Thread.sleep( 175 );
- }
-
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java b/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java
deleted file mode 100644
index dfa4f4f..0000000
--- a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package runorder.parallel;
-
-/*
- * 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.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Test2
-{
-
- @Test
- public void testSleep1000()
- {
- System.out.println( "Test2.sleep1000 started @ " + System.currentTimeMillis() );
- Test1.sleep( 1000 );
- }
-
- @Test
- public void testSleep3000()
- {
- System.out.println( "Test2.sleep3000 started @ " + System.currentTimeMillis() );
- Test1.sleep( 3000 );
- }
-
- @Test
- public void testSleep5000()
- {
- System.out.println( "Test2.sleep5000 started @ " + System.currentTimeMillis() );
- Test1.sleep( 5000 );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java b/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
deleted file mode 100644
index 0dbc57e..0000000
--- a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package runorder.parallel;
-
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Test3
-{
-
- private void sleep( int ms )
- {
- try
- {
- Thread.sleep( ms );
- }
- catch ( InterruptedException e )
- {
- throw new RuntimeException( e );
- }
- }
-
- @Test
- public void testSleep100()
- {
- System.out.println( "Test3.sleep100 started @ " + System.currentTimeMillis() );
- Test1.sleep( 100 );
- }
-
- @Test
- public void testSleep300()
- {
- System.out.println( "Test3.sleep300 started @ " + System.currentTimeMillis() );
- Test1.sleep( 300 );
- }
-
- @Test
- public void testSleep500()
- {
- System.out.println( "Test3.sleep500 started @ " + System.currentTimeMillis() );
- Test1.sleep( 500 );
- }
-
- @BeforeClass
- public static void setUpBeforeClass()
- throws Exception
- {
- System.out.println(
- Thread.currentThread().getName() + " Test3 beforeClass sleep 175 " + System.currentTimeMillis() );
- Thread.sleep( 175 );
- }
-
- @AfterClass
- public static void tearDownAfterClass()
- throws Exception
- {
- System.out.println(
- Thread.currentThread().getName() + " Test3 afterClass sleep 175 " + System.currentTimeMillis() );
- Thread.sleep( 175 );
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/settings.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/settings.xml b/surefire-integration-tests/src/test/resources/settings.xml
deleted file mode 100644
index 991a3e3..0000000
--- a/surefire-integration-tests/src/test/resources/settings.xml
+++ /dev/null
@@ -1,53 +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.
- -->
-<settings>
- <profiles>
- <profile>
- <id>it-repo</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>local.central</id>
- <url>${localRepositoryUrl}</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>local.central</id>
- <url>${localRepositoryUrl}</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-</settings>
[33/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
deleted file mode 100644
index 8a39f12..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
+++ /dev/null
@@ -1,70 +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/xsd/maven-4.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>jiras-surefire-1095</artifactId>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/SomeTest.java</include>
- </includes>
- <properties>
- <property>
- <name>listener</name>
- <value>jiras.surefire1095.Listener</value>
- </property>
- </properties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java b/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
deleted file mode 100644
index f16c04a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/Listener.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package jiras.surefire1095;
-
-/*
- * 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.runner.Description;
-import org.junit.runner.notification.RunListener;
-
-public class Listener
- extends RunListener
-{
- @Override
- public void testRunStarted( Description description )
- throws Exception
- {
- String described = description.getDisplayName();
- System.out.println( "testRunStarted " +
- ( described == null || described.equals( "null" )
- ? description.getChildren()
- : description ) );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java b/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
deleted file mode 100644
index 923917a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/src/test/java/jiras/surefire1095/SomeTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package jiras.surefire1095;
-
-/*
- * 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 junit.runner.Version;
-import org.junit.Test;
-
-public class SomeTest {
- @Test
- public void test()
- {
- System.out.println( "Running JUnit " + Version.id() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml
deleted file mode 100644
index 75f1c8e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/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/xsd/maven-4.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>jiras-surefire-1098</artifactId>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <runOrder>balanced</runOrder>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/ATest.java b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/ATest.java
deleted file mode 100644
index 34bb895..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/ATest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package jiras.surefire1098;
-
-/*
- * 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.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public final class ATest {
-
- @Test
- public void someMethod() throws InterruptedException {
- System.out.println(getClass() + " " + Thread.currentThread().getName());
- TimeUnit.MILLISECONDS.sleep(100);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/BTest.java b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/BTest.java
deleted file mode 100644
index a9a52b8..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/BTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package jiras.surefire1098;
-
-/*
- * 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.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public final class BTest {
-
- @Test
- public void someMethod() throws InterruptedException {
- System.out.println(getClass() + " " + Thread.currentThread().getName());
- TimeUnit.SECONDS.sleep(2);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/CTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/CTest.java b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/CTest.java
deleted file mode 100644
index 63e4e0f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/CTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package jiras.surefire1098;
-
-/*
- * 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.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public final class CTest {
-
- @Test
- public void someMethod() throws InterruptedException {
- System.out.println(getClass() + " " + Thread.currentThread().getName());
- TimeUnit.SECONDS.sleep(4);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/DTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/DTest.java b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/DTest.java
deleted file mode 100644
index a97640e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/src/test/java/jiras/surefire1098/DTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package jiras.surefire1098;
-
-/*
- * 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.Test;
-
-import java.util.concurrent.TimeUnit;
-
-public final class DTest {
-
- @Test
- public void someMethod() throws InterruptedException {
- System.out.println(getClass() + " " + Thread.currentThread().getName());
- TimeUnit.SECONDS.sleep(8);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
deleted file mode 100644
index 0efc935..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
+++ /dev/null
@@ -1,78 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-1122</artifactId>
- <version>1.0</version>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <rerunFailingTestsCount>2</rerunFailingTestsCount>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>parallel</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <useUnlimitedThreads>true</useUnlimitedThreads>
- <forkCount>0</forkCount>
- <parallel>classes</parallel>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/src/test/java/test/FlakyTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/src/test/java/test/FlakyTest.java b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/src/test/java/test/FlakyTest.java
deleted file mode 100644
index fc7b443..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/src/test/java/test/FlakyTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package test;
-
-/*
- * 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.Test;
-
-public class FlakyTest
-{
- private static int x = 1;
-
- @Test
- public void failsOnFirstExecution()
- {
- if ( x++ < 2 )
- {
- org.junit.Assert.fail( "First execution always fails. Try again." );
- }
- }
-
- @Test
- public void alwaysPasses()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
deleted file mode 100644
index daecfc0..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
+++ /dev/null
@@ -1,79 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-1135-improve-ignore-message-for-testng</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Surefire 1135</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <test>SkipExceptionReportTest</test>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/src/test/java/testng/SkipExceptionReportTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/src/test/java/testng/SkipExceptionReportTest.java b/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/src/test/java/testng/SkipExceptionReportTest.java
deleted file mode 100644
index abb555f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/src/test/java/testng/SkipExceptionReportTest.java
+++ /dev/null
@@ -1 +0,0 @@
-/*
* 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.
*/
package testng;
import org.testng.annotations.Test;
import org.testng.SkipException;
public class SkipExceptionReportTest
{
@Test
public void testSkipException()
{
throw new SkipException("Skip test");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
deleted file mode 100644
index d8c5a01..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--
- ~ 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/xsd/maven-4.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>cwd</groupId>
- <artifactId>cwd</artifactId>
- <version>1.0</version>
- <packaging>jar</packaging>
-
- <name>cwd</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- To override fork mode from parrent pom.xml -->
- <forkMode>once</forkMode>
- <forkCount>1</forkCount>
- <!-- To ensure proper variables expansion for both standard maven and surefire specific variables -->
- <workingDirectory>${project.name}_${surefire.forkNumber}</workingDirectory>
- <systemPropertyVariables>
- <maven.project.base.directory>${basedir}</maven.project.base.directory>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java b/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
deleted file mode 100644
index 6a82ee3..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1136-cwd-propagation-in-forked-mode/src/test/java/cwd/CurrentWorkingDirectoryInForkedModeTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cwd;
-
-/*
- * 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.Test;
-
-import java.io.File;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-public class CurrentWorkingDirectoryInForkedModeTest
-{
-
- @Test
- public void testCurrentWorkingDirectoryPropagation()
- throws Exception
- {
-
- File projectDirectory = new File( System.getProperty( "maven.project.base.directory" ) );
- File forkDirectory = new File( projectDirectory, "cwd_1" );
- forkDirectory.deleteOnExit();
-
- // user.dir and current working directory must be aligned, base directory is not affected
- assertEquals( projectDirectory.getCanonicalPath(), System.getProperty( "basedir" ) );
- assertEquals( forkDirectory.getCanonicalPath(), System.getProperty( "user.dir" ) );
- assertEquals( forkDirectory.getCanonicalPath(), new File( "." ).getCanonicalPath() );
-
- // original working directory (before variable expansion) should not be created
- assertFalse( new File( "cwd_${surefire.forkNumber}" ).exists() );
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml
deleted file mode 100644
index b183414..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml
+++ /dev/null
@@ -1,50 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire1144-xml-runtime</artifactId>
- <version>1.0</version>
-
- <url>http://maven.apache.org</url>
-
- <contributors>
- <contributor>
- <name>lamyaa (Lamyaa Eloussi)</name>
- <email>eloussi2@illinois.edu</email>
- </contributor>
- </contributors>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/src/test/java/surefire1144/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/src/test/java/surefire1144/Test1.java b/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/src/test/java/surefire1144/Test1.java
deleted file mode 100644
index 047a741..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/src/test/java/surefire1144/Test1.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package surefire1144;
-
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Test1
-{
- static void sleep( int ms )
- {
- long target = System.currentTimeMillis() + ms;
- try
- {
- do
- {
- Thread.sleep( 1L );
- }
- while ( System.currentTimeMillis() < target );
- }
- catch ( InterruptedException e )
- {
- throw new RuntimeException( e );
- }
- }
-
- static void printTimeAndSleep( String msg, int ms )
- {
- System.out.println( msg + " started @ " + System.currentTimeMillis() );
- sleep( ms );
- }
-
- @Test
- public void testSleep100()
- {
- printTimeAndSleep( "Test1.sleep100", 100 );
- }
-
- @Test
- public void testSleep200()
- {
- printTimeAndSleep( "Test1.sleep200", 200 );
- }
-
- @Test
- public void testSleep300()
- {
- printTimeAndSleep( "Test1.sleep300", 300 );
- }
-
- @BeforeClass
- public static void setUpBeforeClass()
- throws Exception
- {
- printTimeAndSleep( "beforeClass sleep 500", 500 );
- }
-
- @AfterClass
- public static void tearDownAfterClass()
- throws Exception
- {
- printTimeAndSleep( "afterClass sleep 500", 500 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
deleted file mode 100644
index 77e10e7..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/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/xsd/maven-4.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>jiras-surefire-1146</artifactId>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <rerunFailingTestsCount>2</rerunFailingTestsCount>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionParameterizedTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionParameterizedTest.java b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionParameterizedTest.java
deleted file mode 100644
index ffdfa87..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionParameterizedTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package jiras.surefire1146;
-
-/*
- * 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.ArrayList;
-import java.util.List;
-
-import junit.runner.Version;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import static org.junit.Assert.*;
-
-@RunWith( Parameterized.class )
-public class CustomDescriptionParameterizedTest
-{
-
- private static boolean success;
-
- public CustomDescriptionParameterizedTest( String test1, String test2, String test3 )
- {
-
- }
-
- @Parameters( name = "{index}: ({0}); {1}; {2};" )
- public static List getParameters()
- {
- List parameters = new ArrayList();
- parameters.add( new String[]{ "Test11", "Test12", "Test13" } );
- parameters.add( new String[]{ "Test21", "Test22", "Test23" } );
- return parameters;
- }
-
- @Test
- public void flakyTest()
- {
- System.out.println( "Running JUnit " + Version.id() );
- boolean current = success;
- success = !success;
- assertTrue( current );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionWithCommaParameterizedTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionWithCommaParameterizedTest.java b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionWithCommaParameterizedTest.java
deleted file mode 100644
index 39563df..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/CustomDescriptionWithCommaParameterizedTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package jiras.surefire1146;
-
-/*
- * 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.ArrayList;
-import java.util.List;
-
-import junit.runner.Version;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import static org.junit.Assert.*;
-
-@RunWith( Parameterized.class )
-public class CustomDescriptionWithCommaParameterizedTest
-{
-
- private static boolean success;
-
- public CustomDescriptionWithCommaParameterizedTest( String test1, String test2, String test3 )
- {
-
- }
-
- @Parameters( name = "{index}: ({0}), {1}, {2};" )
- public static List getParameters()
- {
- List parameters = new ArrayList();
- parameters.add( new String[]{ "Test11", "Test12", "Test13" } );
- parameters.add( new String[]{ "Test21", "Test22", "Test23" } );
- parameters.add( new String[]{ "Test31", "Test32", "Test33" } );
- return parameters;
- }
-
- @Test
- public void flakyTest()
- {
- System.out.println( "Running JUnit " + Version.id() );
- boolean current = success;
- success = !success;
- assertTrue( current );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/SimpleParameterizedTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/SimpleParameterizedTest.java b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/SimpleParameterizedTest.java
deleted file mode 100644
index f278c34..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/SimpleParameterizedTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package jiras.surefire1146;
-
-/*
- * 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.ArrayList;
-import java.util.List;
-
-import junit.runner.Version;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import static org.junit.Assert.*;
-
-@RunWith( Parameterized.class )
-public class SimpleParameterizedTest
-{
-
- private static boolean success;
-
- public SimpleParameterizedTest( String test )
- {
-
- }
-
- @Parameters
- public static List getParameters()
- {
- List parameters = new ArrayList();
- parameters.add( new String[]{ "Test1" } );
- parameters.add( new String[]{ "Test2" } );
- return parameters;
- }
-
- @Test
- public void flakyTest()
- {
- System.out.println( "Running JUnit " + Version.id() );
- boolean current = success;
- success = !success;
- assertTrue( current );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/StandardTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/StandardTest.java b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/StandardTest.java
deleted file mode 100644
index f96cdd8..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/src/test/java/jiras/surefire1146/StandardTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package jiras.surefire1146;
-
-/*
- * 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 junit.runner.Version;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class StandardTest
-{
- private static boolean success;
-
- @Test
- public void flakyTest()
- {
- System.out.println( "Running JUnit " + Version.id() );
- boolean current = success;
- success = !success;
- assertTrue( current );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml
deleted file mode 100644
index bdba56b..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/pom.xml
+++ /dev/null
@@ -1,143 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-1152</artifactId>
-
- <version>1.0</version>
-
- <properties>
- <failIfNoTests>true</failIfNoTests>
- <failsafe.rerunFailingTestsCount>2</failsafe.rerunFailingTestsCount>
- <surefire.rerunFailingTestsCount>2</surefire.rerunFailingTestsCount>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>FlakyTestSuite</include>
- </includes>
- <!--<skip>true</skip>-->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>FlakyITSuite</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>surefire-junit47</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>surefire-junit4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java
deleted file mode 100644
index 27d5b5f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyIT.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package jiras.surefire1152;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class FlakyIT
-{
- private static int n;
-
- @Test
- public void testFlaky()
- {
- if ( n++ == 0 )
- {
- fail( "deliberately flaky test (should pass the next time)" );
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java
deleted file mode 100644
index 0ebd03c..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyITSuite.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package jiras.surefire1152;
-
-/*
- * 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.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith( Suite.class )
-@Suite.SuiteClasses( { FlakyIT.class } )
-public class FlakyITSuite
-{
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java
deleted file mode 100644
index 86a08db..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package jiras.surefire1152;
-
-/*
- * 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.Test;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.junit.Assert.fail;
-
-public class FlakyParent
-{
- // set of test classes which have previously invoked testFlakyParent
- private static final Set<Class<?>> previouslyRun = new HashSet<Class<?>>();
-
- @Test
- public void testFlakyParent()
- {
- Class<?> clazz = getClass();
- if ( !previouslyRun.contains( clazz ) )
- {
- previouslyRun.add( clazz );
- fail( "deliberately flaky test (should pass the next time)" );
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java
deleted file mode 100644
index ee20f9e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package jiras.surefire1152;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class FlakyTest extends FlakyParent
-{
- private static int n;
-
- @Test
- public void testFlaky()
- {
- if ( n++ == 0 )
- {
- fail( "deliberately flaky test (should pass the next time)" );
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java b/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java
deleted file mode 100644
index f4a7d67..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyTestSuite.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package jiras.surefire1152;
-
-/*
- * 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.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith( Suite.class )
-@Suite.SuiteClasses( { FlakyTest.class, FlakyParent.class } )
-public class FlakyTestSuite
-{
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
deleted file mode 100644
index 13ae6b6..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
+++ /dev/null
@@ -1,60 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-1153</artifactId>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*UT.java</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/IncludedUT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/IncludedUT.java b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/IncludedUT.java
deleted file mode 100644
index 042cf37..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/IncludedUT.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package jiras.surefire1153;
-
-/*
- * 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.Test;
-
-public class IncludedUT
-{
- @Test
- public void testIncluded()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/NotIncludedTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/NotIncludedTest.java b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/NotIncludedTest.java
deleted file mode 100644
index b03d0af..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/NotIncludedTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package jiras.surefire1153;
-
-/*
- * 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.Test;
-
-public class NotIncludedTest
-{
- @Test
- public void testNotIncluded()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml
deleted file mode 100644
index 37e65bf..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml
+++ /dev/null
@@ -1,69 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-1158</artifactId>
- <version>1.0</version>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.7</version>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>always</forkMode>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>${provider}</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/JUnitTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/JUnitTest.java b/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/JUnitTest.java
deleted file mode 100644
index 5bfb834..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/JUnitTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package jira1158;
-
-/*
- * 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.Test;
-
-public class JUnitTest {
-
- @Test
- public void doNothing()
- {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/TestNGSuiteTest.java b/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/TestNGSuiteTest.java
deleted file mode 100644
index 65cc8c4..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/src/test/java/jira1158/TestNGSuiteTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package jira1158;
-
-/*
- * 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.testng.annotations.Test;
-
-
-public class TestNGSuiteTest {
-
- @Test
- public void doNothing()
- {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml
deleted file mode 100644
index e61abeb..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/pom.xml
+++ /dev/null
@@ -1,73 +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/xsd/maven-4.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>surefire-1179-testng-parallel-dataprovider</artifactId>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.10</version>
- <classifier>jdk15</classifier>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <properties>
- <property>
- <name>parallel</name>
- <value>methods</value>
- </property>
- <property>
- <name>dataproviderthreadcount</name>
- <value>30</value>
- </property>
- </properties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/src/test/java/debug/ParallelTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/src/test/java/debug/ParallelTest.java b/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/src/test/java/debug/ParallelTest.java
deleted file mode 100644
index 6863f62..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1179-testng-parallel-dataprovider/src/test/java/debug/ParallelTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package debug;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-public class ParallelTest
-{
- private static final AtomicInteger concurrency = new AtomicInteger();
-
- private static final AtomicInteger counter = new AtomicInteger();
-
- @DataProvider( parallel = true, name = "dataProvider" )
- public Iterator<Object[]> dataProvider()
- {
- List<Object[]> data = new ArrayList<Object[]>();
- for ( int i = 0; i < 5000; i++ )
- {
- data.add( new Object[]{ "ID_" + i } );
- }
- return data.iterator();
- }
-
- @Test( dataProvider = "dataProvider" )
- public void testParallelDataProvider( String iterId )
- throws Exception
- {
- int methodCount = counter.incrementAndGet();
- int currentlyParallelCalls = concurrency.incrementAndGet();
- if ( methodCount % 100 == 0 )
- {
- System.out.println( iterId + ": CONCURRENCY=" + currentlyParallelCalls + "." );
- }
- TimeUnit.MILLISECONDS.sleep( 20 );
- concurrency.decrementAndGet();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml
deleted file mode 100644
index ca15310..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml
+++ /dev/null
@@ -1,66 +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/xsd/maven-4.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>jiras-surefire-1185</artifactId>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>PMC</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-</project>
[43/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
deleted file mode 100644
index 3175196..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-697 Asserts proper truncation of long exception messages Some say testing this is a bit over the top.
- *
- * @author Kristian Rosenvold
- */
-public class Surefire697NiceSummaryIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testBuildFailingWhenErrors()
- {
- unpack( "/surefire-697-niceSummary" ).failNever().executeTest().verifyTextInLog(
- "junit.surefire697.BasicTest#testShortMultiline RuntimeException A very short m" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
deleted file mode 100644
index e1a258a..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * Test
- *
- * @author Kristian Rosenvold
- */
-public class Surefire705ParallelForkTimeoutIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testTimeoutForked()
- {
- unpack( "/fork-timeout" ).setJUnitVersion( "4.8.1" ).addGoal( "-Djunit.version=4.8.1" ).addGoal(
- "-Djunit.parallel=classes" ).addGoal( "-DtimeOut=1" ).maven().withFailure().executeTest()
- .verifyTextInLog( "There was a timeout or other error in the fork" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java
deleted file mode 100644
index aabb05d..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Surefire733AllOverrridesCapturedIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testLogOutput()
- {
- unpack( "surefire-733-allOverridesCaptured" ).executeTest().verifyTextInLog( "abc" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
deleted file mode 100644
index 34504c1..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import static org.fest.assertions.Assertions.assertThat;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Surefire735ForkFailWithRedirectConsoleOutputIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void vmStartFail()
- throws Exception
- {
- OutputValidator outputValidator = unpack().failNever().executeTest();
- assertJvmCrashed( outputValidator );
- }
-
- @Test
- public void vmStartFailShouldFailBuildk()
- throws Exception
- {
- OutputValidator outputValidator = unpack().maven().withFailure().executeTest();
- assertJvmCrashed( outputValidator );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "fork-fail" );
- }
-
- private static void assertJvmCrashed( OutputValidator outputValidator )
- {
- File reportDir = outputValidator.getSurefireReportsDirectory();
- String[] dumpFiles = reportDir.list( new FilenameFilter()
- {
- @Override
- public boolean accept( File dir, String name )
- {
- return name.endsWith( ".dumpstream" );
- }
- }
- );
- assertThat( dumpFiles ).isNotEmpty();
- for ( String dump : dumpFiles )
- {
- outputValidator.getSurefireReportsFile( dump )
- .assertContainsText( "Invalid maximum heap size: -Xmxxxx712743m" );
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
deleted file mode 100644
index e05cee7..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.apache.maven.surefire.its.fixture.TestFile;
-import org.junit.Test;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test Surefire-740 Truncated comma with non us locale
- *
- * @author Kristian Rosenvold
- */
-public class Surefire740TruncatedCommaIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testRussianLocaleReport()
- {
- OutputValidator validator = unpack( "/surefire-740-comma-truncated" ).setMavenOpts(
- "-Duser.language=ru -Duser.country=RU" ).failNever().addSurefireReportGoal().executeCurrentGoals();
-
- TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
- assertTrue( "Expecting file", siteFile.exists() );
- siteFile.assertContainsText( "027" ); // Avoid asserting with the "," or "." ;)
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
deleted file mode 100644
index c5dbc84..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.text.Format;
-import java.text.NumberFormat;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
-
-import static java.lang.String.format;
-import static java.math.RoundingMode.DOWN;
-import static java.util.Locale.ROOT;
-import static org.hamcrest.CoreMatchers.anyOf;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.endsWith;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Surefire747MethodParallelWithSuiteCountIT
- extends SurefireJUnit4IntegrationTestCase
-{
- // if you want to change his constant, change it in SuiteTest1.java and SuiteTest2.java as well
- private static final int PERFORMANCE_TEST_MULTIPLICATION_FACTOR = 4;
-
- private Format lowerScaleFormatter, noFractionalDigitsFormatter;
-
- private static Set<String> printTestLines( OutputValidator validator, String pattern )
- throws VerificationException
- {
- Set<String> log = new TreeSet<String>( validator.loadLogLines() );
- for ( Iterator<String> it = log.iterator(); it.hasNext(); )
- {
- String line = it.next();
- if ( !line.contains( pattern ) )
- {
- it.remove();
- }
- }
- return log;
- }
-
- private static long duration( String logLine )
- {
- return Integer.decode( logLine.split( "=" )[1] );
- }
-
- @Before
- public void init()
- {
- NumberFormat lowScaleFormatter = NumberFormat.getInstance( ROOT );
- lowScaleFormatter.setRoundingMode( DOWN );
- lowScaleFormatter.setMinimumFractionDigits( 1 );
- lowScaleFormatter.setMaximumFractionDigits( 1 );
- this.lowerScaleFormatter = lowScaleFormatter;
-
- NumberFormat noFractionalDigitsFormatter = NumberFormat.getInstance( ROOT );
- noFractionalDigitsFormatter.setRoundingMode( DOWN );
- noFractionalDigitsFormatter.setMinimumFractionDigits( 0 );
- noFractionalDigitsFormatter.setMaximumFractionDigits( 0 );
- this.noFractionalDigitsFormatter = noFractionalDigitsFormatter;
- }
-
- @Test
- public void testMethodsParallelWithSuite()
- throws VerificationException
- {
- OutputValidator validator = unpack().executeTest().verifyErrorFree( 6 );
- Set<String> testLines = printTestLines( validator, "test finished after duration=" );
- assertThat( testLines.size(), is( 2 ) );
- for ( String testLine : testLines )
- {
- long duration = duration( testLine );
- long min = 250 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
- long max = 750 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
- assertTrue( format( "duration %d should be between %d and %d ms", duration, min, max ),
- duration > min && duration < max
- );
- }
- Set<String> suiteLines = printTestLines( validator, "suite finished after duration=" );
- assertThat( suiteLines.size(), is( 1 ) );
- long duration = duration( suiteLines.iterator().next() );
- long min = 750 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
- long max = 1250 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
- assertTrue( format( "duration %d should be between %d and %d ms", duration, min, max ),
- duration > min && duration < max
- );
-
- String delayMin = lowerScaleFormatter.format( 0.98 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR * 0.5 );
- String delayMax = noFractionalDigitsFormatter.format( PERFORMANCE_TEST_MULTIPLICATION_FACTOR * 0.5 ) + ".";
-
- for ( String line : validator.loadLogLines() )
- {
- if ( line.startsWith( "Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:" ) )
- {
- assertThat( line, anyOf( // 1.9xx to 2.xxx can vary depending on CI jobs
- containsString( "Time elapsed: " + delayMin ),
- containsString( "Time elapsed: " + delayMax )
- )
- );
- assertThat( line, anyOf(
- endsWith( " s - in surefire747.SuiteTest1" ),
- endsWith( " s - in surefire747.SuiteTest2" )
- )
- );
- }
- }
- }
-
- @Test
- public void testClassesParallelWithSuite()
- throws VerificationException
- {
- OutputValidator validator = unpack().parallelClasses().executeTest().verifyErrorFree( 6 );
- Set<String> testLines = printTestLines( validator, "test finished after duration=" );
- assertThat( testLines.size(), is( 2 ) );
- for ( String testLine : testLines )
- {
- long duration = duration( testLine );
- long min = 1450 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
- long max = 1750 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
- assertTrue( format( "duration %d should be between %d and %d ms", duration, min, max ),
- duration > min && duration < max
- );
- }
- Set<String> suiteLines = printTestLines( validator, "suite finished after duration=" );
- assertThat( suiteLines.size(), is( 1 ) );
- long duration = duration( suiteLines.iterator().next() );
- long min = 1450 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
- long max = 1750 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR;
- assertTrue( format( "duration %d should be between %d and %d ms", duration, min, max ),
- duration > min && duration < max
- );
- }
-
- public SurefireLauncher unpack()
- {
- return unpack( "junit47-parallel-with-suite" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
deleted file mode 100644
index 96d31c1..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.*;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test Surefire-740 Truncated comma with non us locale
- *
- * @author Kristian Rosenvold
- */
-public class Surefire772BothReportsIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- public SurefireLauncher unpack()
- {
- SurefireLauncher unpack = unpack( "/surefire-772-both-reports" );
- unpack.maven().deleteSiteDir().skipClean().failNever();
- return unpack;
- }
-
- @Test
- public void testReportGeneration()
- throws Exception
- {
- OutputValidator outputValidator =
- unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
-
- TestFile siteFile = outputValidator.getSiteFile( "surefire-report.html" );
- assertTrue( "Expecting surefire report file", siteFile.isFile() );
-
- siteFile = outputValidator.getSiteFile( "failsafe-report.html" );
- assertTrue( "Expecting failsafe report file", siteFile.isFile() );
- }
-
- @Test
- public void testSkippedFailsafeReportGeneration()
- throws Exception
- {
- OutputValidator validator = unpack().
- activateProfile(
- "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
-
- TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
- assertTrue( "Expecting surefire report file", siteFile.isFile() );
-
- siteFile = validator.getSiteFile( "failsafe-report.html" );
- assertFalse( "Expecting no failsafe report file", siteFile.isFile() );
- }
-
- @Test
- public void testSkippedSurefireReportGeneration()
- throws Exception
- {
- OutputValidator validator = unpack().failNever().
- activateProfile(
- "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
-
- TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
- assertFalse( "Expecting no surefire report file", siteFile.isFile() );
-
- siteFile = validator.getSiteFile( "failsafe-report.html" );
- assertTrue( "Expecting failsafe report file", siteFile.isFile() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
deleted file mode 100644
index af18336..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.io.IOException;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.*;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test Surefire-740 Truncated comma with non us locale
- *
- * @author Kristian Rosenvold
- */
-public class Surefire772NoFailsafeReportsIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void testReportGeneration()
- throws Exception
- {
- final OutputValidator site =
- unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
-
- assertSurefireReportPresent( site );
- assertNoFailsefeReport( site );
- }
-
- @Test
- public void testSkippedFailsafeReportGeneration()
- throws Exception
- {
- final OutputValidator validator = unpack().activateProfile(
- "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- assertSurefireReportPresent( validator );
- assertNoFailsefeReport( validator );
-
- }
-
- @Test
- public void testForcedFailsafeReportGeneration()
- throws Exception
- {
- final OutputValidator validator = unpack().activateProfile(
- "forceFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- assertSurefireReportPresent( validator );
- assertFailsafeReport( validator );
- }
-
- @Test
- public void testSkipForcedFailsafeReportGeneration()
- throws Exception
- {
- final OutputValidator validator = unpack().activateProfile( "forceFailsafe" ).activateProfile(
- "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
-
- assertSurefireReportPresent( validator );
- assertNoFailsefeReport( validator );
- }
-
- private void assertNoFailsefeReport( OutputValidator site )
- {
- TestFile siteFile = site.getSiteFile( "failsafe-report.html" );
- assertFalse( "Expecting no failsafe report file", siteFile.isFile() );
- }
-
- private void assertFailsafeReport( OutputValidator site )
- {
- TestFile siteFile = site.getSiteFile( "failsafe-report.html" );
- assertTrue( "Expecting no failsafe report file", siteFile.isFile() );
- }
-
- private void assertSurefireReportPresent( OutputValidator site )
- {
- TestFile siteFile = site.getSiteFile( "surefire-report.html" );
- assertTrue( "Expecting surefire report file", siteFile.isFile() );
- }
-
- private SurefireLauncher unpack()
- throws VerificationException, IOException
- {
- final SurefireLauncher unpack = unpack( "surefire-772-no-failsafe-reports" );
- unpack.maven().deleteSiteDir().skipClean().failNever().assertNotPresent( "site" );
- return unpack;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
deleted file mode 100644
index 6b59ba2..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.TestFile;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test Surefire-740 Truncated comma with non us locale
- *
- * @author Kristian Rosenvold
- */
-public class Surefire772NoSurefireReportsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testReportGeneration()
- {
- OutputValidator validator =
- unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
-
- TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
- assertTrue( "Expecting surefire report file", siteFile.isFile() );
-
- siteFile = validator.getSiteFile( "failsafe-report.html" );
- assertTrue( "Expecting failsafe report file", siteFile.isFile() );
- }
-
- @Test
- public void testSkippedSurefireReportGeneration()
- {
- OutputValidator validator = unpack().activateProfile(
- "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
-
- TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
- assertFalse( "Expecting no surefire report file", siteFile.isFile() );
-
- siteFile = validator.getSiteFile( "failsafe-report.html" );
- assertTrue( "Expecting failsafe report file", siteFile.isFile() );
- }
-
- @Test
- public void testOptionalSurefireReportGeneration()
- {
- OutputValidator validator = unpack().activateProfile(
- "optionalSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
-
- TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
- assertFalse( "Expecting no surefire report file", siteFile.isFile() );
-
- siteFile = validator.getSiteFile( "failsafe-report.html" );
- assertTrue( "Expecting failsafe report file", siteFile.isFile() );
- }
-
- @Test
- public void testSkipOptionalSurefireReportGeneration()
- {
- OutputValidator validator = unpack().activateProfile( "optionalSurefire" ).activateProfile(
- "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
-
- TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
- assertFalse( "Expecting no surefire report file", siteFile.isFile() );
-
- siteFile = validator.getSiteFile( "failsafe-report.html" );
- assertTrue( "Expecting failsafe report file", siteFile.isFile() );
- }
-
- public SurefireLauncher unpack()
- {
- SurefireLauncher unpack = unpack( "/surefire-772-no-surefire-reports" );
- unpack.maven().failNever().deleteSiteDir().skipClean( );
- return unpack;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
deleted file mode 100644
index a709f7d..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.*;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test Surefire-740 Truncated comma with non us locale
- *
- * @author Kristian Rosenvold
- */
-public class Surefire772SpecifiedReportsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testReportGeneration()
- {
- OutputValidator validator =
- unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
-
- TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
- assertTrue( "Expecting surefire report file", siteFile.isFile() );
-
- siteFile = validator.getSiteFile( "failsafe-report.html" );
- assertTrue( "Expecting failsafe report file", siteFile.isFile() );
- }
-
- @Test
- public void testSkippedFailsafeReportGeneration()
- {
- OutputValidator validator = unpack().activateProfile(
- "skipFailsafe" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
-
- TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
- assertTrue( "Expecting surefire report file", siteFile.isFile() );
-
- siteFile = validator.getSiteFile( "failsafe-report.html" );
- assertFalse( "Expecting no failsafe report file", siteFile.isFile() );
- }
-
- @Test
- public void testSkippedSurefireReportGeneration()
- {
- OutputValidator validator = unpack().activateProfile(
- "skipSurefire" ).addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
-
- TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
- assertFalse( "Expecting no surefire report file", siteFile.isFile() );
-
- siteFile = validator.getSiteFile( "failsafe-report.html" );
- assertTrue( "Expecting failsafe report file", siteFile.isFile() );
- }
-
- public SurefireLauncher unpack()
- {
- SurefireLauncher unpack = unpack( "/surefire-772-specified-reports" );
- unpack.maven().deleteSiteDir().skipClean().failNever();
- return unpack;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java
deleted file mode 100644
index 910cfc5..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * Test
- *
- * @author Kristian Rosenvold
- */
-public class Surefire801ForkModeNoneClassLoaderIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testSHouldBeOkWithForkNever()
- {
- unpack( "fork-mode-resource-loading" ).forkNever().executeTest();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java
deleted file mode 100644
index 658befd..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-/*
- * 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;
-
-public class Surefire803MultiFailsafeExecsIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void testSecondExecutionRunsAfterFirstExecutionFails()
- {
- unpack(
- "/surefire-803-multiFailsafeExec-failureInFirst" ).maven().withFailure().executeVerify().assertIntegrationTestSuiteResults(
- 4, 0, 2, 0 );
- }
-
- @Test
- public void testOneExecutionRunInTwoBuilds()
- {
- SurefireLauncher launcher = unpack( "/surefire-803-multiFailsafeExec-rebuildOverwrites" );
- launcher.sysProp( "success", "false" ).maven().withFailure().executeVerify().assertIntegrationTestSuiteResults(
- 1, 0, 1, 0 );
- launcher.reset();
- launcher.sysProp( "success", "true" ).executeVerify().assertIntegrationTestSuiteResults( 1, 0, 0, 0 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
deleted file mode 100644
index aedb82b..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-/*
- * 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.Ignore;
-import org.junit.Test;
-
-public class Surefire806SpecifiedTestControlsIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- @Ignore( "since SUREFIRE-1153 the includes/excludes are overridden by -Dtest or it.test for whatever execution" )
- public void singleTestInOneExecutionOfMultiExecutionProject()
- {
- unpack( "/surefire-806-specifiedTests-multi" ).setTestToRun( "FirstTest" ).failIfNoSpecifiedTests(
- false ).executeTest().verifyErrorFree( 1 );
- }
-
- @Test
- @Ignore( "since SUREFIRE-1153 the includes/excludes are overridden by -Dtest or it.test for whatever execution" )
- public void twoSpecifiedTestExecutionsInCorrectExecutionBlocks()
- {
- unpack( "/surefire-806-specifiedTests-multi" ).setTestToRun(
- "FirstTest,SecondTest" ).executeTest().verifyErrorFree( 2 );
- }
-
- @Test
- public void singleTestInSingleExecutionProject()
- {
- unpack( "/surefire-806-specifiedTests-single" ).setTestToRun( "ThirdTest" ).failIfNoSpecifiedTests(
- false ).executeTest().verifyErrorFree( 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
deleted file mode 100755
index 5ab103b..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire809GroupExpressionsIT.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-/*
- * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
-
-import org.junit.Test;
-
-public class Surefire809GroupExpressionsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void categoryAB()
- {
- OutputValidator validator = unpackJUnit().groups( "junit4.CategoryA AND junit4.CategoryB" ).executeTest();
- validator.verifyErrorFreeLog();
- validator.assertTestSuiteResults( 2, 0, 0, 0 );
- validator.verifyTextInLog( "catA: 1" );
- validator.verifyTextInLog( "catB: 1" );
- validator.verifyTextInLog( "catC: 0" );
- validator.verifyTextInLog( "catNone: 0" );
- validator.verifyTextInLog( "mA: 1" );
- validator.verifyTextInLog( "mB: 1" );
- validator.verifyTextInLog( "mC: 0" );
- }
-
- @Test
- public void incorrectJUnitVersions()
- {
- unpackJUnit().setJUnitVersion( "4.5" ).groups(
- "junit4.CategoryA AND junit4.CategoryB" ).maven().withFailure().executeTest();
- }
-
- @Test
- public void testJUnitRunCategoryNotC()
- {
- OutputValidator validator = unpackJUnit().groups( "!junit4.CategoryC" ).executeTest();
- validator.verifyErrorFreeLog();
- validator.assertTestSuiteResults( 5, 0, 0, 0 );
- validator.verifyTextInLog( "catA: 2" );
- validator.verifyTextInLog( "catB: 2" );
- validator.verifyTextInLog( "catC: 0" );
- validator.verifyTextInLog( "catNone: 1" );
- validator.verifyTextInLog( "NoCategoryTest.CatNone: 1" );
- }
-
- @Test
- public void testExcludedGroups()
- {
- OutputValidator validator = unpackJUnit().setExcludedGroups( "junit4.CategoryC" ).executeTest();
- validator.verifyErrorFreeLog();
- validator.assertTestSuiteResults( 5, 0, 0, 0 );
- validator.verifyTextInLog( "catA: 2" );
- validator.verifyTextInLog( "catB: 2" );
- validator.verifyTextInLog( "catC: 0" );
- validator.verifyTextInLog( "catNone: 1" );
- validator.verifyTextInLog( "NoCategoryTest.CatNone: 1" );
- }
-
- @Test
- public void testNGRunCategoryAB()
- {
- OutputValidator validator = unpackTestNG().groups( "CategoryA AND CategoryB" ).debugLogging().executeTest();
- validator.verifyErrorFreeLog();
- validator.assertTestSuiteResults( 2, 0, 0, 0 );
- validator.verifyTextInLog( "BasicTest.testInCategoriesAB()" );
- validator.verifyTextInLog( "CategoryCTest.testInCategoriesAB()" );
- }
-
- @Test
- public void testNGRunCategoryNotC()
- {
- OutputValidator validator = unpackTestNG().groups( "!CategoryC" ).debugLogging().executeTest();
- validator.verifyErrorFreeLog();
- validator.assertTestSuiteResults( 8, 0, 0, 0 );
- validator.verifyTextInLog( "catA: 2" );
- validator.verifyTextInLog( "catB: 2" );
- validator.verifyTextInLog( "catC: 0" );
- validator.verifyTextInLog( "catNone: 1" );
- validator.verifyTextInLog( "mA: 2" );
- validator.verifyTextInLog( "mB: 2" );
- validator.verifyTextInLog( "mC: 0" );
- validator.verifyTextInLog( "NoCategoryTest.CatNone: 1" );
- }
-
- private SurefireLauncher unpackJUnit()
- {
- return unpack( "surefire-809-groupExpr-junit48" );
- }
-
- private SurefireLauncher unpackTestNG()
- {
- return unpack( "surefire-809-groupExpr-testng" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
deleted file mode 100644
index 065ec19..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire812Log4JClassLoaderIT.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Surefire812Log4JClassLoaderIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testJunit3ParallelBuildResultCount()
- {
- executeErrorFreeTest( "surefire-812-log4j-classloader", 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java
deleted file mode 100644
index 215bd5d..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-817">SUREFIRE-817</a>
- * @since 2.18
- */
-public class Surefire817SystemExitIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void systemExit1()
- throws VerificationException
- {
- unpack().maven().withFailure().executeTest().verifyTextInLog( "class jiras.surefire817.Test main" );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-817-system-exit" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
deleted file mode 100644
index 1bf4c8d..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-818
- *
- * @author Kristian Rosenvold
- */
-public class Surefire818NpeIgnoresTestsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testBuildFailingWhenErrors()
- {
- unpack( "surefire-818-ignored-tests-on-npe" ).maven().withFailure().executeTest().assertTestSuiteResults( 2, 0,
- 1, 0 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
deleted file mode 100644
index b59bc6a..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire828EmptyGroupExprIT.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-/*
- * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-public class Surefire828EmptyGroupExprIT
- extends SurefireJUnit4IntegrationTestCase
-{
- // !CategoryC
- @Test
- public void testJUnitRunEmptyGroups()
- {
- OutputValidator validator = unpackJUnit().sysProp( "profile", "emptyGroups" ).executeTest();
- validator.verifyErrorFreeLog();
- validator.assertTestSuiteResults( 5, 0, 0, 0 );
- validator.verifyTextInLog( "catA: 2" );
- validator.verifyTextInLog( "catB: 2" );
- validator.verifyTextInLog( "catC: 0" );
- validator.verifyTextInLog( "catNone: 1" );
- validator.verifyTextInLog( "NoCategoryTest.CatNone: 1" );
- }
-
- // CategoryA && CategoryB
- @Test
- public void testJUnitRunEmptyExcludeGroups()
- {
- OutputValidator validator = unpackJUnit().sysProp( "profile", "emptyExcludedGroups" ).executeTest();
- validator.verifyErrorFreeLog();
- validator.assertTestSuiteResults( 2, 0, 0, 0 );
- validator.verifyTextInLog( "catA: 1" );
- validator.verifyTextInLog( "catB: 1" );
- validator.verifyTextInLog( "catC: 0" );
- validator.verifyTextInLog( "catNone: 0" );
- validator.verifyTextInLog( "mA: 1" );
- validator.verifyTextInLog( "mB: 1" );
- validator.verifyTextInLog( "mC: 0" );
- }
-
- // CategoryA && CategoryB
- @Test
- public void testTestNGRunEmptyExcludeGroups()
- {
- OutputValidator validator = unpackTestNG().sysProp( "profile", "emptyExcludedGroups" ).executeTest();
- validator.verifyErrorFreeLog();
- validator.assertTestSuiteResults( 2, 0, 0, 0 );
- validator.verifyTextInLog( "BasicTest.testInCategoriesAB()" );
- validator.verifyTextInLog( "CategoryCTest.testInCategoriesAB()" );
- }
-
- // !CategoryC
- @Test
- public void testTestNGRunEmptyGroups()
- {
- OutputValidator validator = unpackTestNG().sysProp( "profile", "emptyGroups" ).executeTest();
- validator.verifyErrorFreeLog();
- validator.assertTestSuiteResults( 8, 0, 0, 0 );
- validator.verifyTextInLog( "catA: 2" );
- validator.verifyTextInLog( "catB: 2" );
- validator.verifyTextInLog( "catC: 0" );
- validator.verifyTextInLog( "catNone: 1" );
- validator.verifyTextInLog( "mA: 2" );
- validator.verifyTextInLog( "mB: 2" );
- validator.verifyTextInLog( "mC: 0" );
- validator.verifyTextInLog( "NoCategoryTest.CatNone: 1" );
- }
-
- private SurefireLauncher unpackJUnit()
- {
- return unpack( "surefire-828-emptyGroupExpr-junit48" );
- }
-
- private SurefireLauncher unpackTestNG()
- {
- return unpack( "surefire-828-emptyGroupExpr-testng" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java
deleted file mode 100755
index c694a3d..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire832ProviderSelectionIT.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-/*
- * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-public class Surefire832ProviderSelectionIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testJUnitRunCategoryAB()
- {
- OutputValidator validator = unpackJUnit().groups( "junit4.CategoryA AND junit4.CategoryB" ).executeTest();
- validator.verifyErrorFreeLog();
- validator.assertTestSuiteResults( 2, 0, 0, 0 );
- validator.verifyTextInLog( "catA: 1" );
- validator.verifyTextInLog( "catB: 1" );
- validator.verifyTextInLog( "catC: 0" );
- validator.verifyTextInLog( "catNone: 0" );
- validator.verifyTextInLog( "mA: 1" );
- validator.verifyTextInLog( "mB: 1" );
- validator.verifyTextInLog( "mC: 0" );
- }
-
- private SurefireLauncher unpackJUnit()
- {
- return unpack( "surefire-832-provider-selection" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire839TestWithoutCategoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire839TestWithoutCategoriesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire839TestWithoutCategoriesIT.java
deleted file mode 100755
index 0babe66..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire839TestWithoutCategoriesIT.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-/*
- * 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 Surefire839TestWithoutCategoriesIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void classWithoutCategory()
- {
- unpack( "junit48-categories" ).setJUnitVersion( "4.11" ).executeTest().verifyErrorFree( 3 );
- }
-
- @Test
- public void classWithoutCategoryForked()
- {
- unpack( "junit48-categories" )
- .setJUnitVersion( "4.11" )
- .forkPerThread()
- .reuseForks( true )
- .threadCount( 2 )
- .executeTest()
- .verifyErrorFree( 3 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java
deleted file mode 100755
index eaecc90..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-/*
- * 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 Surefire847AdditionalFailureIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testJUnitRunCategoryAB()
- {
- unpack( "surefire-847-testngfail" ).setTestToRun(
- "org/codehaus/SomePassedTest" ).executeTest().verifyErrorFreeLog();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
deleted file mode 100644
index 1263ab3..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-855">SUREFIRE-855</a>
- * @since 2.19
- */
-public class Surefire855AllowFailsafeUseArtifactFileIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void warShouldUseClasses()
- {
- unpack( "surefire-855-failsafe-use-war" ).maven().executeVerify().verifyErrorFree( 2 );
- }
-
- @Test
- public void jarShouldUseFile()
- {
- unpack( "surefire-855-failsafe-use-jar" )
- .maven().sysProp( "forkMode", "once" ).executeVerify().assertIntegrationTestSuiteResults( 3, 0, 0, 1 );
- }
-
- @Test
- public void jarNotForkingShouldUseFile()
- {
- unpack( "surefire-855-failsafe-use-jar" )
- .maven().sysProp( "forkMode", "never" ).executeVerify().assertIntegrationTestSuiteResults( 3, 0, 0, 1 );
- }
-
- @Test
- public void osgiBundleShouldUseFile()
- {
- unpack( "surefire-855-failsafe-use-bundle" ).maven().executeVerify().verifyErrorFree( 2 );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
deleted file mode 100644
index 14e278e..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire901MIssingResultfileWhenNoTestsIT.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * Failsafe should work with early return when no tests
- * s
- */
-public class Surefire901MIssingResultfileWhenNoTestsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void failsafeWithNoTests()
- {
- unpack( "failsafe-notests" ).executeVerify();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
deleted file mode 100755
index 8317c52..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire907PerThreadWithoutThreadCountIT.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-/*
- * 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;
-
-public class Surefire907PerThreadWithoutThreadCountIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void categoryAB()
- {
- OutputValidator validator = unpack( "fork-mode" )
- .forkPerThread()
- .reuseForks( false )
- .maven()
- .withFailure()
- .executeTest();
-
- validator.verifyTextInLog( "Fork mode perthread requires a thread count" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire920TestFailureIgnoreWithTimeoutIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire920TestFailureIgnoreWithTimeoutIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire920TestFailureIgnoreWithTimeoutIT.java
deleted file mode 100755
index 4f60895..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire920TestFailureIgnoreWithTimeoutIT.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-/*
- * 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;
-
-public class Surefire920TestFailureIgnoreWithTimeoutIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void timeoutInForkWithBuildFail()
- {
- OutputValidator validator =
- unpack( "fork-timeout" ).sysProp( "junit.parallel", "none" ).maven().withFailure().executeTest();
- validator.verifyTextInLog( "There was a timeout or other error in the fork" );
- }
-
- @Test
- public void timeoutInForkWithNoBuildFail()
- {
- OutputValidator validator =
- unpack( "fork-timeout" ).sysProp( "junit.parallel", "none" ).mavenTestFailureIgnore( true ).executeTest();
- validator.verifyTextInLog( "[ERROR] There was a timeout or other error in the fork" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
deleted file mode 100644
index e6f9dc6..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire926FailureWith2ProvidersIT.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Surefire926FailureWith2ProvidersIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testBuildFailingWhenErrors()
- {
- unpack( "surefire-926-2-provider-failure" ).maven().withFailure().executeTest();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire930TestNgSuiteXmlIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire930TestNgSuiteXmlIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire930TestNgSuiteXmlIT.java
deleted file mode 100644
index 5963662..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire930TestNgSuiteXmlIT.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-/*
- * 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 Surefire930TestNgSuiteXmlIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void suiteXmlRun()
- {
- unpack(
- "surefire-930-failsafe-runtests" ).maven().withFailure().executeVerify().assertIntegrationTestSuiteResults(
- 1, 0, 1, 0 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
deleted file mode 100644
index 59d2170..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire943ReportContentIT.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.io.FileNotFoundException;
-
-import org.apache.maven.shared.utils.xml.Xpp3Dom;
-import org.apache.maven.shared.utils.xml.Xpp3DomBuilder;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class Surefire943ReportContentIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void test_noParallel()
- throws Exception
- {
- doTest( "none" );
- }
-
- @Test
- public void test_parallelBoth()
- throws Exception
- {
- doTest( "both" );
- }
-
- private void doTest( String parallelMode )
- throws Exception
- {
- OutputValidator validator =
- unpack( "surefire-943-report-content" ).maven()
- .sysProp( "parallel", parallelMode )
- .sysProp( "threadCount", 4 )
- .withFailure().executeTest();
-
- validator.assertTestSuiteResults( 10, 1, 3, 3 );
-
- validate( validator, "org.sample.module.My1Test", 1 );
- validate( validator, "org.sample.module.My2Test", 1 );
- validate( validator, "org.sample.module.My3Test", 0 );
- validateSkipped( validator, "org.sample.module.My4Test" );
- validateFailInBeforeClass( validator, "org.sample.module.My5Test" );
- }
-
- private void validateFailInBeforeClass( OutputValidator validator, String className )
- throws FileNotFoundException
- {
- Xpp3Dom[] children = readTests( validator, className );
-
- Assert.assertEquals( 1, children.length );
-
- Xpp3Dom child = children[0];
-
- Assert.assertEquals( className, child.getAttribute( "classname" ) );
- Assert.assertEquals( className, child.getAttribute( "name" ) );
-
- Assert.assertEquals( "Expected error tag for failed BeforeClass method for " + className, 1,
- child.getChildren( "error" ).length );
-
- Assert.assertTrue( "time for test failure in BeforeClass is expected to be positive",
- Double.compare( Double.parseDouble( child.getAttribute( "time" ) ), 0.0d ) >= 0 );
-
- Assert.assertTrue( "time for test failure in BeforeClass is expected to be resonably low",
- Double.compare( Double.parseDouble( child.getAttribute( "time" ) ), 2.0d ) <= 0 );
-
- }
-
- private void validateSkipped( OutputValidator validator, String className )
- throws FileNotFoundException
- {
- Xpp3Dom[] children = readTests( validator, className );
-
- Assert.assertEquals( 1, children.length );
-
- Xpp3Dom child = children[0];
-
- Assert.assertEquals( className, child.getAttribute( "classname" ) );
- Assert.assertEquals( className, child.getAttribute( "name" ) );
-
- Assert.assertEquals( "Expected skipped tag for ignored method for " + className, 1,
- child.getChildren( "skipped" ).length );
-
- Assert.assertTrue( "time for ignored test is expected to be zero",
- Double.compare( Double.parseDouble( child.getAttribute( "time" ) ), 0.0d ) == 0 );
- }
-
- private void validate( OutputValidator validator, String className, int ignored )
- throws FileNotFoundException
- {
- Xpp3Dom[] children = readTests( validator, className );
-
- Assert.assertEquals( 2 + ignored, children.length );
-
- for ( Xpp3Dom child : children )
- {
- Assert.assertEquals( className, child.getAttribute( "classname" ) );
-
- if ( "alwaysSuccessful".equals( child.getAttribute( "name" ) ) )
- {
- Assert.assertEquals( "Expected no failures for method alwaysSuccessful for " + className, 0,
- child.getChildCount() );
-
- Assert.assertTrue( "time for successful test is expected to be positive",
- Double.compare( Double.parseDouble( child.getAttribute( "time" ) ), 0.0d ) > 0 );
- }
- else if ( child.getAttribute( "name" ).contains( "Ignored" ) )
- {
- Assert.assertEquals( "Expected skipped-tag for ignored method for " + className, 1,
- child.getChildren( "skipped" ).length );
-
- Assert.assertTrue( "time for ignored test is expected to be zero",
- Double.compare( Double.parseDouble( child.getAttribute( "time" ) ), 0.0d ) == 0 );
-
- }
- else
- {
- Assert.assertEquals( "Expected methods \"alwaysSuccessful\", \"*Ignored\" and \"fails\" in "
- + className, "fails", child.getAttribute( "name" ) );
- Assert.assertEquals( "Expected failure description for method \"fails\" in " + className, 1,
- child.getChildren( "failure" ).length );
- Assert.assertTrue( "time for failed test is expected to be positive",
- Double.compare( Double.parseDouble( child.getAttribute( "time" ) ), 0.0d ) > 0 );
- }
- }
- }
-
- private Xpp3Dom[] readTests( OutputValidator validator, String className )
- throws FileNotFoundException
- {
- Xpp3Dom testResult =
- Xpp3DomBuilder.build( validator.getSurefireReportsXmlFile( "TEST-" + className + ".xml" ).getFileInputStream(),
- "UTF-8" );
- Xpp3Dom[] children = testResult.getChildren( "testcase" );
- return children;
- }
-
-}
[28/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/target/surefire-reports/TEST-junit.twoTestCases.TestTwo.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/target/surefire-reports/TEST-junit.twoTestCases.TestTwo.xml b/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/target/surefire-reports/TEST-junit.twoTestCases.TestTwo.xml
deleted file mode 100644
index a7429aa..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/target/surefire-reports/TEST-junit.twoTestCases.TestTwo.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.007" errors="0" skipped="0" tests="1" name="junit.twoTestCases.TestTwo">
- <properties>
- <property name="surefire.version" value="2.8.1"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/>
- <property name="java.vm.version" value="19.1-b02"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="RU"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.runtime.version" value="1.6.0_24-b07"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
- <property name="os.version" value="2.6.32-29-generic"/>
- <property name="user.home" value="/home/kristian"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="user.name" value="kristian"/>
- <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="ru"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_24"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/kristian/fast/repo"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0" classname="junit.twoTestCases.TestTwo" name="testTwo"/>
-</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml b/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml
deleted file mode 100644
index ab99166..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml
+++ /dev/null
@@ -1,56 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-twoTestCases</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for two test cases</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml b/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml
deleted file mode 100644
index 1d8df09..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml
+++ /dev/null
@@ -1,91 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-twoTestCases</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for two test cases</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>skipSurefire</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <skipSurefireReport>true</skipSurefireReport>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>optionalSurefire</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <alwaysGenerateSurefireReport>false</alwaysGenerateSurefireReport>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/target/failsafe-reports/TEST-junit.twoTestCases.BasicTest.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/target/failsafe-reports/TEST-junit.twoTestCases.BasicTest.xml b/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/target/failsafe-reports/TEST-junit.twoTestCases.BasicTest.xml
deleted file mode 100644
index 4832590..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/target/failsafe-reports/TEST-junit.twoTestCases.BasicTest.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.02" errors="0" skipped="0" tests="1" name="junit.twoTestCases.BasicTest">
- <properties>
- <property name="surefire.version" value="2.8.1"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/>
- <property name="java.vm.version" value="19.1-b02"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="RU"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.runtime.version" value="1.6.0_24-b07"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
- <property name="os.version" value="2.6.32-29-generic"/>
- <property name="user.home" value="/home/kristian"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="user.name" value="kristian"/>
- <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="ru"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_24"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/kristian/fast/repo"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0.002" classname="junit.twoTestCases.BasicTest" name="testSetUp"/>
-</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/target/failsafe-reports/TEST-junit.twoTestCases.TestTwo.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/target/failsafe-reports/TEST-junit.twoTestCases.TestTwo.xml b/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/target/failsafe-reports/TEST-junit.twoTestCases.TestTwo.xml
deleted file mode 100644
index a7429aa..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/target/failsafe-reports/TEST-junit.twoTestCases.TestTwo.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.007" errors="0" skipped="0" tests="1" name="junit.twoTestCases.TestTwo">
- <properties>
- <property name="surefire.version" value="2.8.1"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/>
- <property name="java.vm.version" value="19.1-b02"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="RU"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.runtime.version" value="1.6.0_24-b07"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
- <property name="os.version" value="2.6.32-29-generic"/>
- <property name="user.home" value="/home/kristian"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="user.name" value="kristian"/>
- <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="ru"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_24"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/kristian/fast/repo"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0" classname="junit.twoTestCases.TestTwo" name="testTwo"/>
-</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml b/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml
deleted file mode 100644
index 4832590..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/persistent-reports/TEST-junit.twoTestCases.BasicTest.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.02" errors="0" skipped="0" tests="1" name="junit.twoTestCases.BasicTest">
- <properties>
- <property name="surefire.version" value="2.8.1"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/>
- <property name="java.vm.version" value="19.1-b02"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="RU"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.runtime.version" value="1.6.0_24-b07"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
- <property name="os.version" value="2.6.32-29-generic"/>
- <property name="user.home" value="/home/kristian"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="user.name" value="kristian"/>
- <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="ru"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_24"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/kristian/fast/repo"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0.002" classname="junit.twoTestCases.BasicTest" name="testSetUp"/>
-</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml b/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml
deleted file mode 100644
index a7429aa..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/persistent-reports/TEST-junit.twoTestCases.TestTwo.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.007" errors="0" skipped="0" tests="1" name="junit.twoTestCases.TestTwo">
- <properties>
- <property name="surefire.version" value="2.8.1"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64"/>
- <property name="java.vm.version" value="19.1-b02"/>
- <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
- <property name="java.vendor.url" value="http://java.sun.com/"/>
- <property name="path.separator" value=":"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.country" value="RU"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.runtime.version" value="1.6.0_24-b07"/>
- <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="basedir" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="surefire.real.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/surefire/surefirebooter1575043494622388453.jar"/>
- <property name="java.io.tmpdir" value="/tmp"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="os.name" value="Linux"/>
- <property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64/server:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/amd64:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/../lib/amd64:/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
- <property name="surefire.test.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="50.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
- <property name="os.version" value="2.6.32-29-generic"/>
- <property name="user.home" value="/home/kristian"/>
- <property name="user.timezone" value=""/>
- <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
- <property name="java.specification.version" value="1.6"/>
- <property name="file.encoding" value="UTF-8"/>
- <property name="user.name" value="kristian"/>
- <property name="java.class.path" value="/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/test-classes:/home/kristian/lsrc/maven-surefire/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/target/classes:/home/kristian/fast/repo/junit/junit/3.8.1/junit-3.8.1.jar:"/>
- <property name="java.vm.specification.version" value="1.0"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre"/>
- <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
- <property name="user.language" value="ru"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.6.0_24"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/ext:/usr/java/packages/lib/ext"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/lib/modules/jdk.boot.jar:/usr/lib/jvm/java-6-sun-1.6.0.24/jre/classes"/>
- <property name="java.vendor" value="Sun Microsystems Inc."/>
- <property name="localRepository" value="/home/kristian/fast/repo"/>
- <property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="gnome"/>
- <property name="sun.cpu.isalist" value=""/>
- </properties>
- <testcase time="0" classname="junit.twoTestCases.TestTwo" name="testTwo"/>
-</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/pom.xml b/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/pom.xml
deleted file mode 100644
index c44effd..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/pom.xml
+++ /dev/null
@@ -1,96 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-twoTestCases</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for two test cases</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <reportsDirectories>
- <reportsDirectory>${basedir}/persistent-reports</reportsDirectory>
- </reportsDirectories>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>skipFailsafe</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <skipFailsafeReport>true</skipFailsafeReport>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>skipSurefire</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- <configuration>
- <skipSurefireReport>true</skipSurefireReport>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml
deleted file mode 100644
index 9c039d4..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-803-multiFailsafeExec-failureInFirst</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>surefire-803-failure-prevents-subsequent-executions</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.version}</version>
- <executions>
- <execution>
- <id>failing</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/FailingTest.java</include>
- </includes>
- <excludes>
- <exclude>**/SucceedingTest.java</exclude>
- </excludes>
- </configuration>
- </execution>
- <execution>
- <id>succeed</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/SucceedingTest.java</include>
- </includes>
- <excludes>
- <exclude>**/FailingTest.java</exclude>
- </excludes>
- </configuration>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/src/main/java/org/apache/maven/surefire/test/App.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/src/main/java/org/apache/maven/surefire/test/App.java b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/src/main/java/org/apache/maven/surefire/test/App.java
deleted file mode 100644
index 22cfc74..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/src/main/java/org/apache/maven/surefire/test/App.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.maven.surefire.test;
-
-/*
- * 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.
- */
-
-public class App
-{
-
- private String test = "value";
-
- public String getTest()
- {
- return test;
- }
-
- public void setTest( final String test )
- {
- this.test = test;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/src/test/java/org/apache/maven/surefire/test/FailingTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/src/test/java/org/apache/maven/surefire/test/FailingTest.java b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/src/test/java/org/apache/maven/surefire/test/FailingTest.java
deleted file mode 100644
index a4d0cd3..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/src/test/java/org/apache/maven/surefire/test/FailingTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.apache.maven.surefire.test;
-
-/*
- * 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 static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class FailingTest
-{
- @Rule
- public TestName name = new TestName();
-
- @Test
- public void defaultTestValueIs_Value()
- {
- assertThat( new App().getTest(), equalTo( "wrong" ) );
- }
-
- @Test
- public void setTestAndRetrieveValue()
- {
- final App app = new App();
- final String val = "foo";
-
- app.setTest( val );
-
- assertThat( app.getTest(), equalTo( "bar" ) );
- }
-
- @After
- public void writeFile()
- throws IOException
- {
- final File f = new File( "target/tests-run", getClass().getName() + ".txt" );
- f.getParentFile().mkdirs();
-
- FileWriter w = null;
-
- try
- {
- w = new FileWriter( f, true );
- w.write( name.getMethodName() );
- }
- finally
- {
- if ( w != null )
- {
- try
- {
- w.close();
- }
- catch ( final IOException e )
- {
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/src/test/java/org/apache/maven/surefire/test/SucceedingTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/src/test/java/org/apache/maven/surefire/test/SucceedingTest.java b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/src/test/java/org/apache/maven/surefire/test/SucceedingTest.java
deleted file mode 100644
index c9167c1..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-failureInFirst/src/test/java/org/apache/maven/surefire/test/SucceedingTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.apache.maven.surefire.test;
-
-/*
- * 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 static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class SucceedingTest
-{
- @Rule
- public TestName name = new TestName();
-
- @Test
- public void defaultTestValueIs_Value()
- {
- assertThat( new App().getTest(), equalTo( "value" ) );
- }
-
- @Test
- public void setTestAndRetrieveValue()
- {
- final App app = new App();
- final String val = "foo";
-
- app.setTest( val );
-
- assertThat( app.getTest(), equalTo( val ) );
- }
-
- @After
- public void writeFile()
- throws IOException
- {
- final File f = new File( "target/tests-run", getClass().getName() + ".txt" );
- f.getParentFile().mkdirs();
-
- FileWriter w = null;
-
- try
- {
- w = new FileWriter( f, true );
- w.write( name.getMethodName() );
- }
- finally
- {
- if ( w != null )
- {
- try
- {
- w.close();
- }
- catch ( final IOException e )
- {
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml
deleted file mode 100644
index ae8ad78..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-803-multiFailsafeExec-rebuildOverwrites</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>surefire-803-failure-prevents-subsequent-executions</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.version}</version>
- <executions>
- <execution>
- <id>its</id>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/TheTest.java</include>
- </includes>
- <systemPropertyVariables>
- <success>${success}</success>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/src/main/java/org/apache/maven/surefire/test/App.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/src/main/java/org/apache/maven/surefire/test/App.java b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/src/main/java/org/apache/maven/surefire/test/App.java
deleted file mode 100644
index 22cfc74..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/src/main/java/org/apache/maven/surefire/test/App.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.maven.surefire.test;
-
-/*
- * 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.
- */
-
-public class App
-{
-
- private String test = "value";
-
- public String getTest()
- {
- return test;
- }
-
- public void setTest( final String test )
- {
- this.test = test;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/src/test/java/org/apache/maven/surefire/test/TheTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/src/test/java/org/apache/maven/surefire/test/TheTest.java b/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/src/test/java/org/apache/maven/surefire/test/TheTest.java
deleted file mode 100644
index 79c5b51..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-803-multiFailsafeExec-rebuildOverwrites/src/test/java/org/apache/maven/surefire/test/TheTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.apache.maven.surefire.test;
-
-/*
- * 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 static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class TheTest
-{
- @Test
- public void checkSuccessCLIParam()
- {
- assertThat( Boolean.getBoolean( "success" ), equalTo( true ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
deleted file mode 100644
index 296ded6..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
+++ /dev/null
@@ -1,86 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>default-configuration-multi-exec</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for single test in one of multiple executions</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <executions>
- <execution>
- <id>default-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/FirstTest.java</include>
- <include>**/ThirdTest.java</include>
- </includes>
- <systemPropertyVariables>
- <phaseName>first</phaseName>
- </systemPropertyVariables>
- </configuration>
- </execution>
- <execution>
- <id>second</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/SecondTest.java</include>
- <include>**/FourthTest.java</include>
- </includes>
- <systemPropertyVariables>
- <phaseName>second</phaseName>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/FirstTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/FirstTest.java b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/FirstTest.java
deleted file mode 100644
index 56aeb83..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/FirstTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package defaultConfiguration;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class FirstTest
- extends TestCase
-{
-
- public void testSetUp()
- {
- assertEquals( "first", System.getProperty( "phaseName" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/FourthTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/FourthTest.java b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/FourthTest.java
deleted file mode 100644
index 880a5b2..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/FourthTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package defaultConfiguration;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class FourthTest
- extends TestCase
-{
-
- public void testSetUp()
- {
- assertEquals( "second", System.getProperty( "phaseName" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/SecondTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/SecondTest.java b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/SecondTest.java
deleted file mode 100644
index 4ff022c..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/SecondTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package defaultConfiguration;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class SecondTest
- extends TestCase
-{
-
- public void testSetUp()
- {
- assertEquals( "second", System.getProperty( "phaseName" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/ThirdTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/ThirdTest.java b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/ThirdTest.java
deleted file mode 100644
index ff25a9b..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/src/test/java/defaultConfiguration/ThirdTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package defaultConfiguration;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class ThirdTest
- extends TestCase
-{
-
- public void testSetUp()
- {
- assertEquals( "first", System.getProperty( "phaseName" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml
deleted file mode 100644
index 74e261a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml
+++ /dev/null
@@ -1,70 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>default-configuration-multi-exec</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for single test in one of multiple executions</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <executions>
- <execution>
- <id>default-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/FirstTest.java</include>
- </includes>
- <systemPropertyVariables>
- <phaseName>first</phaseName>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/FirstTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/FirstTest.java b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/FirstTest.java
deleted file mode 100644
index 3c7264f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/FirstTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package defaultConfiguration;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class FirstTest
- extends TestCase
-{
-
- public void testSetUp()
- {
- assertEquals( "FAIL", System.getProperty( "phaseName" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/FourthTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/FourthTest.java b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/FourthTest.java
deleted file mode 100644
index 880a5b2..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/FourthTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package defaultConfiguration;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class FourthTest
- extends TestCase
-{
-
- public void testSetUp()
- {
- assertEquals( "second", System.getProperty( "phaseName" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/SecondTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/SecondTest.java b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/SecondTest.java
deleted file mode 100644
index 4ff022c..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/SecondTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package defaultConfiguration;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class SecondTest
- extends TestCase
-{
-
- public void testSetUp()
- {
- assertEquals( "second", System.getProperty( "phaseName" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/ThirdTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/ThirdTest.java b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/ThirdTest.java
deleted file mode 100644
index ff25a9b..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/src/test/java/defaultConfiguration/ThirdTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package defaultConfiguration;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class ThirdTest
- extends TestCase
-{
-
- public void testSetUp()
- {
- assertEquals( "first", System.getProperty( "phaseName" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
deleted file mode 100644
index 30f1708..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
+++ /dev/null
@@ -1,57 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit 4.8.1</name>
-
-
- <properties>
- <junit.version>4.8.1</junit.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index ecfec31..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package junit4;
-/*
- * 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.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-
-public class BasicTest
-{
- static int catACount = 0;
- static int catBCount = 0;
- static int catCCount = 0;
- static int catNoneCount = 0;
-
- @Rule
- public TestName testName = new TestName();
-
- @Before
- public void testName()
- {
- System.out.println( "Running " + getClass().getName() + "." + testName.getMethodName() );
- }
-
- @Test
- @Category(CategoryA.class)
- public void testInCategoryA()
- {
- catACount++;
- }
-
- @Test
- @Category(CategoryB.class)
- public void testInCategoryB()
- {
- catBCount++;
- }
-
- @Test
- @Category({CategoryA.class, CategoryB.class})
- public void testInCategoryAB()
- {
- catACount++;
- catBCount++;
- }
-
- @Test
- @Category(CategoryC.class)
- public void testInCategoryC()
- {
- catCCount++;
- }
-
- @Test
- public void testInNoCategory()
- {
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("catA: " + catACount + "\n" +
- "catB: " + catBCount + "\n" +
- "catC: " + catCCount + "\n" +
- "catNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryA.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryA.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryA.java
deleted file mode 100644
index 9b8b855..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryA.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryA {}
[48/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
deleted file mode 100644
index 5aee1a8..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
+++ /dev/null
@@ -1,540 +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;
-
-/**
- * Testing JUnitCoreWrapper with ParallelComputerBuilder.
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.16
- */
-public class JUnit47ParallelIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void unknownThreadCountSuites()
- {
- unpack().parallelSuites().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
- "Use threadCount or threadCountSuites > 0 or useUnlimitedThreads=true for parallel='suites'" );
- }
-
- @Test
- public void unknownThreadCountClasses()
- {
- unpack().parallelClasses().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
- "Use threadCount or threadCountClasses > 0 or useUnlimitedThreads=true for parallel='classes'" );
- }
-
- @Test
- public void unknownThreadCountMethods()
- {
- unpack().parallelMethods().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
- "Use threadCount or threadCountMethods > 0 or useUnlimitedThreads=true for parallel='methods'" );
-
- }
-
- @Test
- public void unknownThreadCountBoth()
- {
- unpack().parallelBoth().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
- "Use useUnlimitedThreads=true, " +
- "or only threadCount > 0, " +
- "or (threadCountClasses > 0 and threadCountMethods > 0), " +
- "or (threadCount > 0 and threadCountClasses > 0 and threadCountMethods > 0), " +
- "or (threadCount > 0 and threadCountClasses > 0 and threadCount > threadCountClasses) " +
- "for parallel='both' or parallel='classesAndMethods'" );
- }
-
- @Test
- public void unknownThreadCountAll()
- {
- unpack().parallelAll().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
- "Use useUnlimitedThreads=true, " +
- "or only threadCount > 0, " +
- "or (threadCountSuites > 0 and threadCountClasses > 0 and threadCountMethods > 0), " +
- "or every thread-count is specified, " +
- "or (threadCount > 0 and threadCountSuites > 0 and threadCountClasses > 0 " +
- "and threadCount > threadCountSuites + threadCountClasses) " +
- "for parallel='all'" );
- }
-
- @Test
- public void unknownThreadCountSuitesAndClasses()
- {
- unpack().parallelSuitesAndClasses().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
- "Use useUnlimitedThreads=true, " +
- "or only threadCount > 0, " +
- "or (threadCountSuites > 0 and threadCountClasses > 0), " +
- "or (threadCount > 0 and threadCountSuites > 0 and threadCountClasses > 0) " +
- "or (threadCount > 0 and threadCountSuites > 0 and threadCount > threadCountSuites) " +
- "for parallel='suitesAndClasses' or 'both'" );
- }
-
- @Test
- public void unknownThreadCountSuitesAndMethods()
- {
- unpack().parallelSuitesAndMethods().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
- "Use useUnlimitedThreads=true, " +
- "or only threadCount > 0, " +
- "or (threadCountSuites > 0 and threadCountMethods > 0), " +
- "or (threadCount > 0 and threadCountSuites > 0 and threadCountMethods > 0), " +
- "or (threadCount > 0 and threadCountSuites > 0 and threadCount > threadCountSuites) " +
- "for parallel='suitesAndMethods'" );
- }
-
- @Test
- public void unknownThreadCountClassesAndMethods()
- {
- unpack().parallelClassesAndMethods().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
- "Use useUnlimitedThreads=true, " +
- "or only threadCount > 0, " +
- "or (threadCountClasses > 0 and threadCountMethods > 0), " +
- "or (threadCount > 0 and threadCountClasses > 0 and threadCountMethods > 0), " +
- "or (threadCount > 0 and threadCountClasses > 0 and threadCount > threadCountClasses) " +
- "for parallel='both' or parallel='classesAndMethods'" );
- }
-
- @Test
- public void serial()
- {
- // takes 7.2 sec
- unpack().setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void unlimitedThreadsSuites1()
- {
- // takes 3.6 sec
- unpack().parallelSuites().useUnlimitedThreads().setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
- 24 );
- }
-
- @Test
- public void unlimitedThreadsSuites2()
- {
- // takes 3.6 sec
- unpack().parallelSuites().useUnlimitedThreads().threadCountSuites( 5 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void unlimitedThreadsClasses1()
- {
- // takes 1.8 sec
- unpack().parallelClasses().useUnlimitedThreads().setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
- 24 );
- }
-
- @Test
- public void unlimitedThreadsClasses2()
- {
- // takes 1.8 sec
- unpack().parallelClasses().useUnlimitedThreads().threadCountClasses( 5 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void unlimitedThreadsMethods1()
- {
- // takes 2.4 sec
- unpack().parallelMethods().useUnlimitedThreads().setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
- 24 );
- }
-
- @Test
- public void unlimitedThreadsMethods2()
- {
- // takes 2.4 sec
- unpack().parallelMethods().useUnlimitedThreads().threadCountMethods( 5 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void unlimitedThreadsSuitesAndClasses1()
- {
- // takes 0.9 sec
- unpack().parallelSuitesAndClasses().useUnlimitedThreads().setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void unlimitedThreadsSuitesAndClasses2()
- {
- // takes 0.9 sec
- // 1.8 sec with 4 parallel classes
- unpack().parallelSuitesAndClasses().useUnlimitedThreads().threadCountSuites( 5 ).threadCountClasses(
- 15 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void unlimitedThreadsSuitesAndMethods1()
- {
- // takes 1.2 sec
- unpack().parallelSuitesAndMethods().useUnlimitedThreads().setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void unlimitedThreadsSuitesAndMethods2()
- {
- // takes 1.2 sec
- unpack().parallelSuitesAndMethods().useUnlimitedThreads().threadCountSuites( 5 ).threadCountMethods(
- 15 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void unlimitedThreadsClassesAndMethods1()
- {
- // takes 0.6 sec
- unpack().parallelClassesAndMethods().useUnlimitedThreads().setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void unlimitedThreadsClassesAndMethods2()
- {
- // takes 0.6 sec
- unpack().parallelClassesAndMethods().useUnlimitedThreads().threadCountClasses( 5 ).threadCountMethods(
- 15 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void unlimitedThreadsAll1()
- {
- // takes 0.3 sec
- unpack().parallelAll().useUnlimitedThreads().setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void unlimitedThreadsAll2()
- {
- // takes 0.3 sec
- unpack().parallelAll().useUnlimitedThreads().threadCountSuites( 5 ).threadCountClasses( 15 ).threadCountMethods(
- 30 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void threadCountSuites()
- {
- // takes 3.6 sec
- unpack().parallelSuites().threadCount( 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void threadCountClasses()
- {
- // takes 3.6 sec for single core
- // takes 1.8 sec for double core
- unpack().parallelClasses().threadCount( 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void threadCountMethods()
- {
- // takes 2.4 sec
- unpack().parallelMethods().threadCount( 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void threadCountClassesAndMethodsOneCore()
- {
- // takes 4.8 sec
- unpack().disablePerCoreThreadCount().disableParallelOptimization().parallelClassesAndMethods().threadCount(
- 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void threadCountClassesAndMethodsOneCoreOptimized()
- {
- // the number of reused threads in leafs depends on the number of runners and CPU
- unpack().disablePerCoreThreadCount().parallelClassesAndMethods().threadCount( 3 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void threadCountClassesAndMethods()
- {
- // takes 2.4 sec for double core CPU
- unpack().disableParallelOptimization().parallelClassesAndMethods().threadCount( 3 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void threadCountClassesAndMethodsOptimized()
- {
- // the number of reused threads in leafs depends on the number of runners and CPU
- unpack().parallelClassesAndMethods().threadCount( 3 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void threadCountSuitesAndMethods()
- {
- // usually 24 times 0.3 sec = 7.2 sec with one core CPU
- // takes 1.8 sec for double core CPU
- unpack().disableParallelOptimization().parallelSuitesAndMethods().threadCount( 3 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void threadCountSuitesAndMethodsOptimized()
- {
- // the number of reused threads in leafs depends on the number of runners and CPU
- unpack().parallelSuitesAndMethods().threadCount( 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
- 24 );
- }
-
- @Test
- public void threadCountSuitesAndClasses()
- {
- unpack().disableParallelOptimization().parallelSuitesAndClasses().threadCount( 3 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void threadCountSuitesAndClassesOptimized()
- {
- // the number of reused threads in leafs depends on the number of runners and CPU
- unpack().parallelSuitesAndClasses().threadCount( 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
- 24 );
- }
-
- @Test
- public void threadCountAll()
- {
- unpack().disableParallelOptimization().parallelAll().threadCount( 3 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void threadCountAllOptimized()
- {
- // the number of reused threads in leafs depends on the number of runners and CPU
- unpack().parallelAll().threadCount( 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void everyThreadCountSuitesAndClasses()
- {
- // takes 1.8 sec for double core CPU
- unpack().parallelSuitesAndClasses().threadCount( 3 ).threadCountSuites( 34 ).threadCountClasses(
- 66 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void everyThreadCountSuitesAndMethods()
- {
- // takes 1.8 sec for double core CPU
- unpack().parallelSuitesAndMethods().threadCount( 3 ).threadCountSuites( 34 ).threadCountMethods(
- 66 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void everyThreadCountClassesAndMethods()
- {
- // takes 1.8 sec for double core CPU
- unpack().parallelClassesAndMethods().threadCount( 3 ).threadCountClasses( 34 ).threadCountMethods(
- 66 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void everyThreadCountAll()
- {
- // takes 2.4 sec for double core CPU
- unpack().parallelAll().threadCount( 3 ).threadCountSuites( 17 ).threadCountClasses( 34 ).threadCountMethods(
- 49 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void reusableThreadCountSuitesAndClasses()
- {
- // 4 * cpu to 5 * cpu threads to run test classes
- // takes cca 1.8 sec
- unpack().disableParallelOptimization().parallelSuitesAndClasses().disablePerCoreThreadCount().threadCount(
- 6 ).threadCountSuites( 2 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void reusableThreadCountSuitesAndClassesOptimized()
- {
- // the number of reused threads in leafs depends on the number of runners and CPU
- unpack().parallelSuitesAndClasses().disablePerCoreThreadCount().threadCount( 6 ).threadCountSuites(
- 2 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void reusableThreadCountSuitesAndMethods()
- {
- // 4 * cpu to 5 * cpu threads to run test methods
- // takes cca 1.8 sec
- unpack().disableParallelOptimization().parallelSuitesAndMethods().disablePerCoreThreadCount().threadCount(
- 6 ).threadCountSuites( 2 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void reusableThreadCountSuitesAndMethodsOptimized()
- {
- // the number of reused threads in leafs depends on the number of runners and CPU
- unpack().parallelSuitesAndMethods().disablePerCoreThreadCount().threadCount( 6 ).threadCountSuites(
- 2 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void reusableThreadCountClassesAndMethods()
- {
- // 4 * cpu to 5 * cpu threads to run test methods
- // takes cca 1.8 sec
- unpack().disableParallelOptimization().parallelClassesAndMethods().disablePerCoreThreadCount().threadCount(
- 6 ).threadCountClasses( 2 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void reusableThreadCountClassesAndMethodsOptimized()
- {
- // the number of reused threads in leafs depends on the number of runners and CPU
- unpack().parallelClassesAndMethods().disablePerCoreThreadCount().threadCount( 6 ).threadCountClasses(
- 2 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void reusableThreadCountAll()
- {
- // 8 * cpu to 13 * cpu threads to run test methods
- // takes 0.9 sec
- unpack().disableParallelOptimization().parallelAll().disablePerCoreThreadCount().threadCount(
- 14 ).threadCountSuites( 2 ).threadCountClasses( 4 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void reusableThreadCountAllOptimized()
- {
- // the number of reused threads in leafs depends on the number of runners and CPU
- unpack().parallelAll().disablePerCoreThreadCount().threadCount( 14 ).threadCountSuites( 2 ).threadCountClasses(
- 4 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void suites()
- {
- // takes 3.6 sec
- unpack().parallelSuites().threadCountSuites( 5 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
- 24 );
- }
-
- @Test
- public void classes()
- {
- // takes 1.8 sec on any CPU because the suites are running in a sequence
- unpack().parallelClasses().threadCountClasses( 5 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
- 24 );
- }
-
- @Test
- public void methods()
- {
- // takes 2.4 sec on any CPU because every class has only three methods
- // and the suites and classes are running in a sequence
- unpack().parallelMethods().threadCountMethods( 5 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
- 24 );
- }
-
- @Test
- public void suitesAndClasses()
- {
- // takes 0.9 sec
- unpack().parallelSuitesAndClasses().threadCountSuites( 5 ).threadCountClasses( 15 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void suitesAndMethods()
- {
- // takes 1.2 sec on any CPU
- unpack().parallelSuitesAndMethods().threadCountSuites( 5 ).threadCountMethods( 15 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void classesAndMethods()
- {
- // takes 0.6 sec on any CPU
- unpack().parallelClassesAndMethods().threadCountClasses( 5 ).threadCountMethods( 15 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void all()
- {
- // takes 0.3 sec on any CPU
- unpack().parallelAll().threadCountSuites( 5 ).threadCountClasses( 15 ).threadCountMethods( 30 ).setTestToRun(
- "Suite*Test" ).executeTest().verifyErrorFree( 24 );
- }
-
- @Test
- public void shutdown()
- {
- // executes for 2.5 sec until timeout has elapsed
- unpack().parallelMethods().threadCountMethods( 2 ).parallelTestsTimeoutInSeconds( 2.5d ).setTestToRun(
- "TestClass" ).failNever().executeTest().verifyTextInLog(
- "The test run has finished abruptly after timeout of 2.5 seconds." );
- }
-
- @Test
- public void forcedShutdown()
- {
- // executes for 2.5 sec until timeout has elapsed
- unpack().parallelMethods().threadCountMethods( 2 ).parallelTestsTimeoutForcedInSeconds( 2.5d ).setTestToRun(
- "TestClass" ).failNever().executeTest().verifyTextInLog(
- "The test run has finished abruptly after timeout of 2.5 seconds." );
- }
-
- @Test
- public void timeoutAndForcedShutdown()
- {
- // executes for one sec until timeout has elapsed
- unpack().parallelMethods().threadCountMethods( 2 ).parallelTestsTimeoutInSeconds(
- 1 ).parallelTestsTimeoutForcedInSeconds( 2.5d ).setTestToRun(
- "TestClass" ).failNever().executeTest().verifyTextInLog(
- "The test run has finished abruptly after timeout of 1.0 seconds." );
- }
-
- @Test
- public void forcedShutdownVerifyingLogs()
- {
- // executes for 2.5 sec until timeout has elapsed
- unpack().parallelMethods().threadCountMethods( 3 ).disablePerCoreThreadCount()
- .parallelTestsTimeoutForcedInSeconds( 1.05d ).setTestToRun( "Waiting*Test" ).failNever().executeTest()
- .verifyTextInLog( "The test run has finished abruptly after timeout of 1.05 seconds." )
- .verifyTextInLog( "These tests were executed in prior to the shutdown operation:" )
- .verifyTextInLog( "These tests are incomplete:" );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "junit47-parallel" )
- .showErrorStackTraces();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java
deleted file mode 100644
index bf393ca..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.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;
-
-/**
- * Testing {@code @net.jcip.annotations.NotThreadSafe} with ParallelComputerBuilder.
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19
- */
-public class JUnit47ParallelNotThreadSafeIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- private SurefireLauncher unpack()
- {
- return unpack( "junit47-parallel-nts" );
- }
-
- @Test
- public void test()
- {
- unpack()
- .parallelAll()
- .useUnlimitedThreads()
- .executeTest()
- .verifyErrorFree( 2 )
- .verifyTextInLog( "xxx-maven-surefire-plugin@NotThreadSafe" )
- .verifyTextInLog( "expected-thread" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
deleted file mode 100644
index aa38dac..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.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.commons.lang.StringUtils;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import java.io.IOException;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-public class JUnit47RedirectOutputIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testPrintSummaryTrueWithRedirect()
- throws Exception
- {
- final OutputValidator clean = unpack().redirectToFile( true ).addGoal( "clean" ).executeTest();
- checkReports( clean );
- }
-
- @Test
- public void testClassesParallel()
- throws Exception
- {
- final OutputValidator clean =
- unpack().redirectToFile( true ).parallelClasses().addGoal( "clean" ).executeTest();
- checkReports( clean );
- }
-
- private void checkReports( OutputValidator validator )
- throws IOException
- {
- String report = StringUtils.trimToNull(
- validator.getSurefireReportsFile( "junit47ConsoleOutput.Test1-output.txt" ).readFileToString() );
- assertNotNull( report );
- String report2 = StringUtils.trimToNull(
- validator.getSurefireReportsFile( "junit47ConsoleOutput.Test2-output.txt" ).readFileToString() );
- assertNotNull( report2 );
- assertFalse( validator.getSurefireReportsFile( "junit47ConsoleOutput.Test3-output.txt" ).exists() );
- }
-
-
- private SurefireLauncher unpack()
- {
- return unpack( "/junit47-redirect-output" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
deleted file mode 100644
index 9fe1775..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
+++ /dev/null
@@ -1,80 +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 static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
-
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests using the JUnit 47 provider to rerun failing tests with the cucumber runner. The main
- * problem that the junit4 provider has with the cucumber runner is that the junit Description
- * instance created by the runner has a null test class attribute. This requires that tests are
- * rerun based on their description.
- *
- * @author mpkorstanje
- */
-public class JUnit47RerunFailingTestWithCucumberIT
- extends SurefireJUnit4IntegrationTestCase {
-
- @Before
- public void assumeJdk17() {
- assumeJavaVersion(1.7d);
- }
-
-
- private SurefireLauncher unpack() {
- return unpack("junit47-rerun-failing-tests-with-cucumber")
- .setJUnitVersion("4.12");
- }
-
- @Test
- public void testRerunFailingErrorTestsFalse() {
- unpack()
- .maven()
- .addGoal("-Dsurefire.rerunFailingTestsCount=" + 0)
- .withFailure()
- .executeTest()
- .assertTestSuiteResults(1, 0, 1, 0, 0);
- }
-
- @Test
- public void testRerunFailingErrorTestsWithOneRetry() {
- unpack()
- .maven()
- .addGoal("-Dsurefire.rerunFailingTestsCount=" + 1)
- .withFailure()
- .executeTest()
- .assertTestSuiteResults(1, 0, 1, 0, 0);
- }
-
- @Test
- public void testRerunFailingErrorTestsTwoRetry() {
- unpack()
- .maven()
- .addGoal("-Dsurefire.rerunFailingTestsCount=" + 2)
- .executeTest()
- .assertTestSuiteResults(1, 0, 0, 0, 2);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/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 e50e6d7..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/4d00932a/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 38c2eae..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java
+++ /dev/null
@@ -1,70 +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.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( 1.6d );
- }
-
- @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/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
deleted file mode 100644
index fdb56f7..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
+++ /dev/null
@@ -1,145 +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 project using "groups" support
- *
- * @author <a href="mailto:todd@apache.org">Todd Lipcon</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class JUnit48TestCategoriesIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testCategoriesAB()
- {
- runAB( unpacked() );
- }
-
- @Test
- public void testCategoriesABForkAlways()
- {
- runAB( unpacked().forkAlways() );
- }
-
- @Test
- public void testCategoriesACFullyQualifiedClassName()
- {
- runACFullyQualifiedClassName( unpacked() );
- }
-
- @Test
- public void testCategoriesACFullyQualifiedClassNameForkAlways()
- {
- runACFullyQualifiedClassName( unpacked().forkAlways() );
- }
-
- @Test
- public void testCategoriesACClassNameSuffix()
- {
- runACClassNameSuffix( unpacked() );
- }
-
- @Test
- public void testCategoriesACClassNameSuffixForkAlways()
- {
- runACClassNameSuffix( unpacked().forkAlways() );
- }
-
- @Test
- public void testCategoriesBadCategory()
- {
- runBadCategory( unpacked() );
- }
-
- @Test
- public void testBadCategoryForkAlways()
- {
- runBadCategory( unpacked().forkAlways() );
- }
-
- private static void runAB( SurefireLauncher unpacked )
- {
- unpacked.executeTest()
- .verifyErrorFreeLog()
- .assertTestSuiteResults( 3, 0, 0, 0 )
- .verifyTextInLog( "catA: 1" )
- .verifyTextInLog( "catB: 1" )
- .verifyTextInLog( "catC: 0" )
- .verifyTextInLog( "catNone: 0" );
- }
-
- private static void runACClassNameSuffix( SurefireLauncher unpacked )
- {
- unpacked.groups( "CategoryA,CategoryC" )
- .executeTest()
- .verifyErrorFreeLog()
- .assertTestSuiteResults( 6, 0, 0, 0 )
- .verifyTextInLog( "catA: 1" )
- .verifyTextInLog( "catB: 0" )
- .verifyTextInLog( "catC: 1" )
- .verifyTextInLog( "catNone: 0" )
- .verifyTextInLog( "mA: 1" )
-
- // This seems questionable !? The class is annotated with category C and method with B
- .verifyTextInLog( "mB: 1" )
-
- .verifyTextInLog( "mC: 1" )
- .verifyTextInLog( "CatNone: 1" );
- }
-
- private static void runACFullyQualifiedClassName( SurefireLauncher unpacked )
- {
- unpacked.groups( "junit4.CategoryA,junit4.CategoryC" )
- .executeTest()
- .verifyErrorFreeLog()
- .assertTestSuiteResults( 6, 0, 0, 0 )
- .verifyTextInLog( "catA: 1" )
- .verifyTextInLog( "catB: 0" )
- .verifyTextInLog( "catC: 1" )
- .verifyTextInLog( "catNone: 0" )
- .verifyTextInLog( "mA: 1" )
-
- // This seems questionable !? The class is annotated with category C and method with B
- .verifyTextInLog( "mB: 1" )
-
- .verifyTextInLog( "mC: 1" )
- .verifyTextInLog( "CatNone: 1" );
- }
-
- private static void runBadCategory( SurefireLauncher unpacked )
- {
- unpacked.failIfNoTests( false )
- .groups( "BadCategory" )
- .executeTest()
- .verifyErrorFreeLog();
- }
-
- private SurefireLauncher unpacked()
- {
- return unpack( "/junit48-categories" );
- // .debugSurefireFork();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
deleted file mode 100644
index 19b937d..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
+++ /dev/null
@@ -1,38 +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;
-
-/**
- * Test JUnit 4 tests marked with "Ignore" attribute
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class JUnit4ForkAlwaysStaticInitPollutionIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testJunit4Ignore()
- {
- executeErrorFreeTest( "junit4-forkAlways-staticInit", 2 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/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 71ec3d8..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:dfabulich@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/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
deleted file mode 100644
index 7d6f560..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
+++ /dev/null
@@ -1,278 +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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * JUnit4 RunListener Integration Test.
- *
- * @author <a href="mailto:qingzhouluo@google.com">Qingzhou Luo</a>
- */
-public class JUnit4RerunFailingTestsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private SurefireLauncher unpack()
- {
- return unpack( "/junit4-rerun-failing-tests" );
- }
-
- @Test
- public void testRerunFailingErrorTestsWithOneRetry()
- throws Exception
- {
- OutputValidator outputValidator =
- unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=1" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0,
- 0 );
- verifyFailuresOneRetryAllClasses( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=1" ).addGoal(
- "-DforkCount=2" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
- verifyFailuresOneRetryAllClasses( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=methods" ).addGoal(
- "-DuseUnlimitedThreads=true" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
- verifyFailuresOneRetryAllClasses( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=classes" ).addGoal(
- "-DuseUnlimitedThreads=true" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
- verifyFailuresOneRetryAllClasses( outputValidator );
- }
-
- @Test
- public void testRerunFailingErrorTestsTwoRetry()
- throws Exception
- {
- // Four flakes, both tests have been re-run twice
- OutputValidator outputValidator =
- unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=2" ).executeTest().assertTestSuiteResults( 5, 0, 0, 0, 4 );
-
- verifyFailuresTwoRetryAllClasses( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=2" ).addGoal( "-DforkCount=3" ).executeTest()
- .assertTestSuiteResults( 5, 0, 0, 0, 4 );
-
- verifyFailuresTwoRetryAllClasses( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=2" ).addGoal( "-Dparallel=methods" ).addGoal(
- "-DuseUnlimitedThreads=true" ).executeTest().assertTestSuiteResults( 5, 0, 0, 0, 4 );
-
- verifyFailuresTwoRetryAllClasses( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=2" ).addGoal( "-Dparallel=classes" ).addGoal(
- "-DuseUnlimitedThreads=true" ).executeTest().assertTestSuiteResults( 5, 0, 0, 0, 4 );
-
- verifyFailuresTwoRetryAllClasses( outputValidator );
- }
-
- @Test
- public void testRerunFailingErrorTestsFalse()
- throws Exception
- {
- OutputValidator outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion(
- "4.12" ).maven().withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
-
- verifyFailuresNoRetryAllClasses( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-DforkCount=3" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
-
- verifyFailuresNoRetryAllClasses( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dparallel=methods" ).addGoal(
- "-DuseUnlimitedThreads=true" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
-
- verifyFailuresNoRetryAllClasses( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dparallel=classes" ).addGoal(
- "-DuseUnlimitedThreads=true" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
-
- verifyFailuresNoRetryAllClasses( outputValidator );
- }
-
- @Test
- public void testRerunOneTestClass()
- throws Exception
- {
- OutputValidator outputValidator =
- unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=1" ).addGoal(
- "-Dtest=FlakyFirstTimeTest" ).withFailure().executeTest().assertTestSuiteResults( 3, 1, 1, 0, 0 );
-
- verifyFailuresOneRetryOneClass( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-DforkCount=3" ).addGoal(
- "-Dtest=FlakyFirstTimeTest" ).withFailure().executeTest().assertTestSuiteResults( 3, 1, 1, 0, 0 );
-
- verifyFailuresOneRetryOneClass( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=methods" ).addGoal(
- "-DuseUnlimitedThreads=true" ).addGoal(
- "-Dtest=FlakyFirstTimeTest" ).withFailure().executeTest().assertTestSuiteResults( 3, 1, 1, 0, 0 );
-
- verifyFailuresOneRetryOneClass( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=classes" ).addGoal(
- "-DuseUnlimitedThreads=true" ).addGoal(
- "-Dtest=FlakyFirstTimeTest" ).withFailure().executeTest().assertTestSuiteResults( 3, 1, 1, 0, 0 );
-
- verifyFailuresOneRetryOneClass( outputValidator );
- }
-
- @Test
- public void testRerunOneTestMethod()
- throws Exception
- {
- OutputValidator outputValidator =
- unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=1" ).addGoal(
- "-Dtest=FlakyFirstTimeTest#testFailing*" ).withFailure().executeTest().assertTestSuiteResults( 1, 0, 1,
- 0, 0 );
-
- verifyFailuresOneRetryOneMethod( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-DforkCount=3" ).addGoal(
- "-Dtest=FlakyFirstTimeTest#testFailing*" ).withFailure().executeTest().assertTestSuiteResults( 1, 0, 1, 0,
- 0 );
-
- verifyFailuresOneRetryOneMethod( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=methods" ).addGoal(
- "-DuseUnlimitedThreads=true" ).addGoal(
- "-Dtest=FlakyFirstTimeTest#testFailing*" ).withFailure().executeTest().assertTestSuiteResults( 1, 0, 1, 0,
- 0 );
-
- verifyFailuresOneRetryOneMethod( outputValidator );
-
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
- "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=classes" ).addGoal(
- "-DuseUnlimitedThreads=true" ).addGoal(
- "-Dtest=FlakyFirstTimeTest#testFailing*" ).withFailure().executeTest().assertTestSuiteResults( 1, 0, 1, 0,
- 0 );
-
- verifyFailuresOneRetryOneMethod( outputValidator );
- }
-
- private void verifyFailuresOneRetryAllClasses( OutputValidator outputValidator )
- {
- verifyFailuresOneRetry( outputValidator, 5, 1, 1, 0 );
- }
-
- private void verifyFailuresTwoRetryAllClasses( OutputValidator outputValidator )
- {
- verifyFailuresTwoRetry( outputValidator, 5, 0, 0, 2 );
- }
-
- private void verifyFailuresNoRetryAllClasses( OutputValidator outputValidator )
- {
- verifyFailuresNoRetry( outputValidator, 5, 1, 1, 0 );
- }
-
- private void verifyFailuresOneRetryOneClass( OutputValidator outputValidator )
- {
- verifyFailuresOneRetry( outputValidator, 3, 1, 1, 0 );
- }
-
- private void verifyFailuresOneRetryOneMethod( OutputValidator outputValidator )
- {
- verifyOnlyFailuresOneRetry( outputValidator, 1, 1, 0, 0 );
- }
-
- private void verifyFailuresOneRetry( OutputValidator outputValidator, int run, int failures, int errors,
- int flakes )
- {
- outputValidator.verifyTextInLog( "Failures:" );
- outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testFailingTestOne" );
- outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testFailingTestOne" );
-
- outputValidator.verifyTextInLog( "Errors:" );
- outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testErrorTestOne" );
- outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testErrorTestOne" );
-
- verifyStatistics( outputValidator, run, failures, errors, flakes );
- }
-
- private void verifyOnlyFailuresOneRetry( OutputValidator outputValidator, int run, int failures, int errors,
- int flakes )
- {
- outputValidator.verifyTextInLog( "Failures:" );
- outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testFailingTestOne" );
- outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testFailingTestOne" );
-
- verifyStatistics( outputValidator, run, failures, errors, flakes );
- }
-
- private void verifyFailuresTwoRetry( OutputValidator outputValidator, int run, int failures, int errors,
- int flakes )
- {
- outputValidator.verifyTextInLog( "Flakes:" );
- outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testFailingTestOne" );
- outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testFailingTestOne" );
- outputValidator.verifyTextInLog( "Run 3: PASS" );
-
- outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testErrorTestOne" );
- outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testErrorTestOne" );
-
- verifyStatistics( outputValidator, run, failures, errors, flakes );
- }
-
- private void verifyFailuresNoRetry( OutputValidator outputValidator, int run, int failures, int errors, int flakes )
- {
- outputValidator.verifyTextInLog( "Failures:" );
- outputValidator.verifyTextInLog( "testFailingTestOne(junit4.FlakyFirstTimeTest)" );
- outputValidator.verifyTextInLog( "ERROR" );
- outputValidator.verifyTextInLog( "testErrorTestOne(junit4.FlakyFirstTimeTest)" );
-
- verifyStatistics( outputValidator, run, failures, errors, flakes );
- }
-
- private void verifyStatistics( OutputValidator outputValidator, int run, int failures, int errors, int flakes )
- {
- if ( flakes > 0 )
- {
- outputValidator.verifyTextInLog(
- "Tests run: " + run + ", Failures: " + failures + ", Errors: " + errors + ", Skipped: 0, Flakes: "
- + flakes );
- }
- else
- {
- outputValidator.verifyTextInLog(
- "Tests run: " + run + ", Failures: " + failures + ", Errors: " + errors + ", Skipped: 0" );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
deleted file mode 100644
index 433863e..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
+++ /dev/null
@@ -1,73 +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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * JUnit4 RunListener Integration Test.
- *
- * @author <a href="mailto:matthew.gilliard@gmail.com">Matthew Gilliard</a>
- */
-public class JUnit4RunListenerIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private SurefireLauncher unpack()
- {
- return unpack( "/junit4-runlistener" );
- }
-
- @Test
- public void testJUnit4RunListener()
- throws Exception
- {
- final OutputValidator outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion(
- "4.4" ).executeTest().verifyErrorFreeLog();
- assertResults( outputValidator );
- outputValidator.verifyTextInLog( "testRunStarted null" );
- outputValidator.verifyTextInLog( "testFinished simpleTest" );
- outputValidator.verifyTextInLog( "testRunFinished org.junit.runner.Result" );
- }
-
- @Test
- public void testRunlistenerJunitCoreProvider()
- throws Exception
- {
- final OutputValidator outputValidator =
- unpack().addGoal( "-Dprovider=surefire-junit47" ).setJUnitVersion( "4.8.1" ).addGoal(
- "-DjunitVersion=4.8.1" ).executeTest().verifyErrorFreeLog(); // Todo: Fix junitVesion
- assertResults( outputValidator );
- outputValidator.verifyTextInLog( "testRunStarted null" );
- outputValidator.verifyTextInLog( "testFinished simpleTest" );
- outputValidator.verifyTextInLog( "testRunFinished org.junit.runner.Result" );
- }
-
- private void assertResults( OutputValidator outputValidator )
- {
- outputValidator.assertTestSuiteResults( 1, 0, 0, 0 );
- outputValidator.getTargetFile( "runlistener-output-1.txt" ).assertFileExists();
- outputValidator.getTargetFile( "runlistener-output-2.txt" ).assertFileExists();
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/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 8dd8f0c..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:dfabulich@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", version );
- }
-
- @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/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
deleted file mode 100644
index 0757a17..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
+++ /dev/null
@@ -1,70 +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 project using JUnit4.4 -dep. junit-dep includes only junit.* classes, and depends explicitly on hamcrest-core
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class JUnitDepIT
- extends SurefireJUnit4IntegrationTestCase
-{
- public SurefireLauncher unpack()
- {
- return unpack( "/junit44-dep" );
- }
-
- @Test
- public void testJUnit44Dep()
- throws Exception
- {
- unpack().debugLogging().sysProp( "junit-dep.version", "4.4" ).executeTest().verifyErrorFree( 1 ).verifyTextInLog(
- "surefire-junit4" ); // Ahem. Will match on the 4.7 provider too
- }
-
- @Test
- public void testJUnit44DepWithSneaky381()
- throws Exception
- {
- unpack().debugLogging().sysProp( "junit-dep.version", "4.4" ).activateProfile(
- "provided381" ).executeTest().verifyErrorFree( 1 );
- }
-
- @Test
- public void testJUnit47Dep()
- throws Exception
- {
- unpack().debugLogging().sysProp( "junit-dep.version", "4.7" ).executeTest().verifyErrorFree( 1 ).verifyTextInLog(
- "surefire-junit47" );
- }
-
- @Test
- public void testJUnit48Dep()
- throws Exception
- {
- unpack().debugLogging().sysProp( "junit-dep.version", "4.8" ).executeTest().verifyErrorFree( 1 ).verifyTextInLog(
- "surefire-junit47" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
deleted file mode 100644
index 165d745..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
+++ /dev/null
@@ -1,109 +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.junit.Test;
-
-import java.io.File;
-
-import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME;
-import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME_KEY;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.hamcrest.Matchers.is;
-
-/**
- * Running Surefire on the top of JDK 9 and should be able to load
- * classes of multiple different Jigsaw modules without error.
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.20.1
- */
-public class Java9FullApiIT
- extends AbstractJigsawIT
-{
-
- @Test
- public void shouldLoadMultipleJavaModules_JavaHome() throws Exception
- {
- OutputValidator validator = assumeJigsaw()
- .setForkJvm()
- .debugLogging()
- .execute( "verify" )
- .verifyErrorFree( 1 );
-
- validator.verifyTextInLog( "loaded class java.sql.SQLException" )
- .verifyTextInLog( "loaded class javax.xml.ws.Holder" )
- .verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
- .verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
- .verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
- .assertThatLogLine( anyOf( is( "java.specification.version=9" ),
- is( "java.specification.version=10" ) ),
- greaterThanOrEqualTo( 1 ) );
- }
-
- @Test
- public void shouldLoadMultipleJavaModules_JvmParameter() throws Exception
- {
- OutputValidator validator = assumeJava9Property()
- .setForkJvm()
- .debugLogging()
- .sysProp( EXT_JDK_HOME_KEY, new File( EXT_JDK_HOME ).getCanonicalPath() )
- .execute( "verify" )
- .verifyErrorFree( 1 );
-
- validator.verifyTextInLog( "loaded class java.sql.SQLException" )
- .verifyTextInLog( "loaded class javax.xml.ws.Holder" )
- .verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
- .verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
- .verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
- .assertThatLogLine( anyOf( is( "java.specification.version=9" ),
- is( "java.specification.version=10" ) ),
- greaterThanOrEqualTo( 1 ) );
- }
-
- @Test
- public void shouldLoadMultipleJavaModules_ToolchainsXML() throws Exception
- {
- OutputValidator validator = assumeJava9Property()
- .setForkJvm()
- .activateProfile( "use-toolchains" )
- .addGoal( "--toolchains" )
- .addGoal( System.getProperty( "maven.toolchains.file" ) )
- .execute( "verify" )
- .verifyErrorFree( 1 );
-
- validator.verifyTextInLog( "loaded class java.sql.SQLException" )
- .verifyTextInLog( "loaded class javax.xml.ws.Holder" )
- .verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
- .verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
- .verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
- .assertThatLogLine( anyOf( is( "java.specification.version=9" ),
- is( "java.specification.version=10" ) ),
- greaterThanOrEqualTo( 1 ) );
- }
-
- @Override
- protected String getProjectDirectoryName()
- {
- return "java9-full-api";
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/LongWindowsPathIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/LongWindowsPathIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/LongWindowsPathIT.java
deleted file mode 100644
index 6280835..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/LongWindowsPathIT.java
+++ /dev/null
@@ -1,88 +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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-
-import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS;
-import static org.fest.assertions.Assertions.assertThat;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assume.assumeTrue;
-
-/**
- * Testing long path of base.dir where Windows CLI crashes.
- * <br>
- * Integration test for <a href="https://issues.apache.org/jira/browse/SUREFIRE-1400">SUREFIRE-1400</a>.
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.20.1
- */
-public class LongWindowsPathIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private static final String PROJECT_DIR = "long-windows-path";
- private static final String LONG_PATH = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-
- // the IT engine crashes using long path
- private static final String LONG_DIR = LONG_PATH + LONG_PATH + LONG_PATH;
-
- @Test
- public void shouldRunInSystemTmp() throws Exception
- {
- assumeTrue( IS_OS_WINDOWS );
-
- OutputValidator validator = unpack().setForkJvm()
- .showErrorStackTraces()
- .executeTest()
- .verifyErrorFreeLog();
-
- validator.assertThatLogLine( containsString( "SUREFIRE-1400 user.dir=" ), is( 1 ) )
- .assertThatLogLine( containsString( "SUREFIRE-1400 surefire.real.class.path=" ), is( 1 ) );
-
- for ( String line : validator.loadLogLines() )
- {
- if ( line.contains( "SUREFIRE-1400 user.dir=" ) )
- {
- File buildDir = new File( System.getProperty( "user.dir" ), "target" );
- File itBaseDir = new File( buildDir, "LongWindowsPathIT_shouldRunInSystemTmp" );
-
- assertThat( line )
- .contains( itBaseDir.getAbsolutePath() );
- }
- else if ( line.contains( "SUREFIRE-1400 surefire.real.class.path=" ) )
- {
- assertThat( line )
- .contains( System.getProperty( "java.io.tmpdir" ) );
- }
- }
- }
-
- private SurefireLauncher unpack() throws IOException
- {
- return unpack( PROJECT_DIR/*, "_" + LONG_DIR*/ );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ModulePathIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ModulePathIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ModulePathIT.java
deleted file mode 100644
index 3c3d2c6..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ModulePathIT.java
+++ /dev/null
@@ -1,45 +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.junit.Test;
-
-import java.io.IOException;
-
-public class ModulePathIT
- extends AbstractJigsawIT
-{
- @Test
- public void testModulePath()
- throws IOException
- {
- assumeJigsaw()
- .debugLogging()
- .executeTest()
- .verifyErrorFreeLog()
- .assertTestSuiteResults( 2 );
- }
-
- @Override
- protected String getProjectDirectoryName()
- {
- return "modulepath";
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
deleted file mode 100644
index 1be88b7..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
+++ /dev/null
@@ -1,39 +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;
-
-/**
- * SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
- *
- * @author Kristian Rosenvold
- */
-public class NoRunnableTestsInClassIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testJunit3ParallelBuildResultCount()
- {
- unpack( "norunnableTests" ).failNever().executeTest().verifyTextInLog(
- "No tests found in junit.norunnabletests.BasicTest" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
deleted file mode 100644
index 71bccd6..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
+++ /dev/null
@@ -1,38 +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;
-
-/**
- * Test useManifestOnlyJar option
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class PlainOldJavaClasspathIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testPlainOldJavaClasspath()
- {
- executeErrorFreeTest( "plain-old-java-classpath", 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
deleted file mode 100644
index bec3e99..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
+++ /dev/null
@@ -1,50 +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 library using a conflicting version of plexus-utils
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class PlexusConflictIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testPlexusConflict()
- {
- unpack().executeTest().verifyErrorFree( 1 );
- }
-
- @Test
- public void testPlexusConflictIsolatedClassLoader()
- {
- unpack().useSystemClassLoader(false).executeTest().verifyErrorFree( 1 );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "/plexus-conflict" );
- }
-}
\ No newline at end of file
[40/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-notests/src/test/java/AClass.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-notests/src/test/java/AClass.java b/surefire-integration-tests/src/test/resources/failsafe-notests/src/test/java/AClass.java
deleted file mode 100644
index 268eec5..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-notests/src/test/java/AClass.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-
-public class AClass extends TestCase {
- public void testSomething() {
- assertTrue(false);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-regular/invoker.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-regular/invoker.properties b/surefire-integration-tests/src/test/resources/failsafe-regular/invoker.properties
deleted file mode 100644
index ab6608f..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-regular/invoker.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
-invoker.buildResult=failure
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-regular/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-regular/pom.xml b/surefire-integration-tests/src/test/resources/failsafe-regular/pom.xml
deleted file mode 100644
index 4755cb4..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-regular/pom.xml
+++ /dev/null
@@ -1,83 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>localhost</groupId>
- <artifactId>working-directory-test</artifactId>
- <version>1.0</version>
- <name>Run tests multiple times</name>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.version}</version>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <summaryFile>${project.build.directory}/failsafe-reports/Xfailsafe-summary-1.xml</summaryFile>
- </configuration>
- </execution>
- <execution>
- <id>acceptance-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/AT*.java</include>
- <include>**/*AT.java</include>
- <include>**/*ATCase.java</include>
- </includes>
- <summaryFile>${project.build.directory}/failsafe-reports/Xfailsafe-summary-2.xml</summaryFile>
- </configuration>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- <configuration>
- <summaryFiles>
- <summaryFile>${project.build.directory}/failsafe-reports/Xfailsafe-summary-1.xml</summaryFile>
- <summaryFile>${project.build.directory}/failsafe-reports/Xfailsafe-summary-2.xml</summaryFile>
- </summaryFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-regular/src/test/java/MyAT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-regular/src/test/java/MyAT.java b/surefire-integration-tests/src/test/resources/failsafe-regular/src/test/java/MyAT.java
deleted file mode 100644
index 615ee76..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-regular/src/test/java/MyAT.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-
-public class MyAT extends TestCase {
- public void testSomething() {
- assertTrue(true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failsafe-regular/src/test/java/MyIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failsafe-regular/src/test/java/MyIT.java b/surefire-integration-tests/src/test/resources/failsafe-regular/src/test/java/MyIT.java
deleted file mode 100644
index c74feb1..0000000
--- a/surefire-integration-tests/src/test/resources/failsafe-regular/src/test/java/MyIT.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-
-public class MyIT extends TestCase {
- public void testSomething() {
- assertTrue(true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml b/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml
deleted file mode 100644
index 7d79f29..0000000
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>maven-surefire</groupId>
- <artifactId>small-result-counting</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>failure-result-counting</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <includes>
- <include>**/*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <junit.version>4.10</junit.version>
- <forkMode>once</forkMode>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java
deleted file mode 100644
index 0e80332..0000000
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package failureresultcounting;
-/*
- * 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.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class BeforeClassError
-{
-
- @BeforeClass
- public static void beforeClassError()
- {
- throw new RuntimeException( "Exception in beforeclass" );
- }
-
- @Test
- public void ok()
- {
- System.out.println( "beforeClassError run !!" );
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java
deleted file mode 100644
index 62d51ac..0000000
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package failureresultcounting;
-/*
- * 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 junit.framework.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class BeforeClassFailure
-{
-
- @BeforeClass
- public static void failInBeforeClass()
- {
- Assert.fail( "Failing in @BeforeClass" );
- }
-
- @Test
- public void ok()
- {
- System.out.println( "failInBeforeClass run !!");
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java
deleted file mode 100644
index 0798c80..0000000
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package failureresultcounting;
-/*
- * 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.Before;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class BeforeError
-{
-
- @Before
- public void exceptionInBefore()
- {
- throw new RuntimeException( "Exception in @before" );
- }
-
- @Test
- public void ok()
- {
- System.out.println( "exceptionInBefore run!!");
- }
-
- /*@Test
- public void ok2()
- {
- System.out.println( "exceptionInBefore2 run!!");
- } */
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java
deleted file mode 100644
index 174a448..0000000
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package failureresultcounting;
-/*
- * 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 junit.framework.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class BeforeFailure
-{
-
- @Before
- public void failInBEfore()
- {
- Assert.fail( "Failing in @before" );
- }
-
- @Test
- public void ok()
- {
- System.out.println( "failInBEfore run !!");
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java
deleted file mode 100644
index 245c9a6..0000000
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package failureresultcounting;
-/*
- * 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.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class NoErrors
-{
-
- @Test
- @Ignore
- public void allOk1()
- {
- }
-
- @Test
- @Ignore
- public void allOk2()
- {
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java
deleted file mode 100644
index 7e6387a..0000000
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package failureresultcounting;
-/*
- * 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.Assert;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class OrdinaryError
-{
-
- @Test
- public void ordinaryEror()
- {
- throw new RuntimeException( "Exception in @before" );
- }
-
- @Test
- public void ordinaryFailure()
- {
- Assert.fail();
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/RunTests.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/RunTests.java b/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/RunTests.java
deleted file mode 100644
index 6dc2f4c..0000000
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/RunTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package failureresultcounting;
-
-/*
- * 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.
- */
-
-public class RunTests
-{
- public static void main(String args[]) {
- org.junit.runner.JUnitCore.main(BeforeClassError.class.getName(),
- BeforeClassFailure.class.getName(),
- BeforeError.class.getName(),
- BeforeFailure.class.getName(),
- OrdinaryError.class.getName(),
- NoErrors.class.getName()
- );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failureOutput/pom.xml b/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
deleted file mode 100644
index 85c10ee..0000000
--- a/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>failureOutput</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>failureOutput</name>
- <url>http://maven.apache.org</url>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <printSummary>${printSummary}</printSummary>
- <useFile>${userFile}</useFile>
- <reportFormat>${reportFormat}</reportFormat>
- <redirectTestOutputToFile>${redirect.to.file}</redirectTestOutputToFile>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
- <properties>
- <junit.version>4.8.1</junit.version>
- <redirect.to.file>true</redirect.to.file>
- <forkMode>once</forkMode>
- <printSummary>true</printSummary>
- <useFile>true</useFile>
- <reportFormat>brief</reportFormat>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java b/surefire-integration-tests/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java
deleted file mode 100644
index af92952..0000000
--- a/surefire-integration-tests/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package forkConsoleOutput;
-
-/*
- * 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.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.io.File;
-
-public class Test1
-{
- @Test
- public void test6281() {
- System.out.println( "Test1 on" + Thread.currentThread().getName());
- }
-
- @Test
- public void nullPointerInLibrary() {
- new File((String)null);
- }
-
- @Test
- public void failInMethod() {
- innerFailure();
- }
-
- @Test
- public void failInLibInMethod() {
- new File((String)null);
- }
-
-
- @Test
- public void failInNestedLibInMethod() {
- nestedLibFailure();
- }
-
- @Test
- public void assertion1() {
- Assert.assertEquals("Bending maths", "123", "312");
- }
-
- @Test
- public void assertion2() {
- Assert.assertFalse("True is false", true);
- }
-
- private void innerFailure(){
- throw new NullPointerException("Fail here");
- }
-
- private void nestedLibFailure(){
- new File((String) null);
- }
-
- @BeforeClass
- public static void testWithFailingAssumption2() {
- System.out.println( "BeforeTest1 on" + Thread.currentThread().getName());
- }
-
- @AfterClass
- public static void testWithFailingAssumption3() {
- System.out.println( "AfterTest1 on" + Thread.currentThread().getName());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test2.java b/surefire-integration-tests/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test2.java
deleted file mode 100644
index f5c825e..0000000
--- a/surefire-integration-tests/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test2.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package forkConsoleOutput;
-
-/*
- * 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.Test;
-
-public class Test2
-{
- @Test
- public void test6281()
- {
- System.out.println( "sout: I am talking to you" );
- System.out.println( "sout: Will Fail soon" );
- System.err.println( "serr: And you too" );
- System.err.println( "serr: Will Fail now" );
- throw new RuntimeException( "FailHere" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/failureOutput/test
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failureOutput/test b/surefire-integration-tests/src/test/resources/failureOutput/test
deleted file mode 100644
index 873a7bf..0000000
--- a/surefire-integration-tests/src/test/resources/failureOutput/test
+++ /dev/null
@@ -1,15 +0,0 @@
-[INFO] Scanning for projects...
-[WARNING]
-[WARNING] Some problems were encountered while building the effective model for org.apache.maven.plugins.surefire:failureOutput:jar:1.0-SNAPSHOT
-[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-compiler-plugin is missing. @ line 20, column 17
-[WARNING]
-[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
-[WARNING]
-[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
-[WARNING]
-[INFO]
-[INFO] ------------------------------------------------------------------------
-[INFO] Building failureOutput 1.0-SNAPSHOT
-[INFO] ------------------------------------------------------------------------
-[INFO]
-[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ failureOutput ---
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fixture/testsuitexmlparser/TEST-org.apache.maven.surefire.test.SucceedingTest.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fixture/testsuitexmlparser/TEST-org.apache.maven.surefire.test.SucceedingTest.xml b/surefire-integration-tests/src/test/resources/fixture/testsuitexmlparser/TEST-org.apache.maven.surefire.test.SucceedingTest.xml
deleted file mode 100644
index 2801bf6..0000000
--- a/surefire-integration-tests/src/test/resources/fixture/testsuitexmlparser/TEST-org.apache.maven.surefire.test.SucceedingTest.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.008" errors="0" skipped="0" tests="2" name="org.apache.maven.surefire.test.SucceedingTest">
- <properties>
- <property name="surefire.version" value="2.13-SNAPSHOT"/>
- <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
- <property name="sun.boot.library.path" value="c:\java\jdk1.7.0_09\jre\bin"/>
- <property name="java.vm.version" value="23.5-b02"/>
- <property name="user.country.format" value="NO"/>
- <property name="java.vm.vendor" value="Oracle Corporation"/>
- <property name="java.vendor.url" value="http://java.oracle.com/"/>
- <property name="path.separator" value=";"/>
- <property name="guice.disable.misplaced.annotation.check" value="true"/>
- <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
- <property name="user.script" value=""/>
- <property name="user.country" value="US"/>
- <property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="Service Pack 1"/>
- <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
- <property name="user.dir" value="c:\workspace\maven-surefire\surefire-integration-tests\src\test\resources\surefire-803-multiFailsafeExec-failureInFirst"/>
- <property name="java.runtime.version" value="1.7.0_09-b05"/>
- <property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/>
- <property name="java.endorsed.dirs" value="c:\java\jdk1.7.0_09\jre\lib\endorsed"/>
- <property name="os.arch" value="amd64"/>
- <property name="java.io.tmpdir" value="C:\Users\krose\AppData\Local\Temp\"/>
- <property name="line.separator" value="
-"/>
- <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
- <property name="user.variant" value=""/>
- <property name="os.name" value="Windows 7"/>
- <property name="classworlds.conf" value="c:/java/apache-maven-3.0.4/bin/m2.conf"/>
- <property name="sun.jnu.encoding" value="Cp1252"/>
- <property name="java.library.path" value="c:\java\jdk1.7.0_09\bin;C:\Windows\Sun\Java\bin;C:\Windows\system32;C:\Windows;x:\bin;.;C:\java\Git\local\bin;C:\java\Git\mingw\bin;C:\java\Git\bin;c:\java\jdk1.7.0_09\bin;c:\java\Subversion;c:\Program Files\Common Files\Microsoft Shared\Microsoft Online Services;c:\Program Files (x86)\Common Files\Microsoft Shared\Microsoft Online Services;c:\Windows\system32;c:\Windows;c:\Windows\System32\Wbem;c:\Windows\System32\WindowsPowerShell\v1.0\;c:\java\jdk1.7.0_09\bin;c:\java\Subversion;c:\Program Files\Common Files\Microsoft Shared\Microsoft Online Services;c:\Program Files (x86)\Common Files\Microsoft Shared\Microsoft Online Services;c:\Windows\system32;c:\Windows;c:\Windows\System32\Wbem;c:\Windows\System32\WindowsPowerShell\v1.0\;c:\java\bin;."/>
- <property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="51.0"/>
- <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
- <property name="os.version" value="6.1"/>
- <property name="user.home" value="C:\Users\krose"/>
- <property name="user.timezone" value="Europe/Paris"/>
- <property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/>
- <property name="java.specification.version" value="1.7"/>
- <property name="file.encoding" value="Cp1252"/>
- <property name="user.name" value="krose"/>
- <property name="java.class.path" value="c:/java/apache-maven-3.0.4/boot/plexus-classworlds-2.4.jar"/>
- <property name="java.vm.specification.version" value="1.7"/>
- <property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="c:\java\jdk1.7.0_09\jre"/>
- <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher -Dsurefire.version=2.13-SNAPSHOT clean verify"/>
- <property name="java.specification.vendor" value="Oracle Corporation"/>
- <property name="user.language" value="en"/>
- <property name="user.language.format" value="no"/>
- <property name="awt.toolkit" value="sun.awt.windows.WToolkit"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.7.0_09"/>
- <property name="java.ext.dirs" value="c:\java\jdk1.7.0_09\jre\lib\ext;C:\Windows\Sun\Java\lib\ext"/>
- <property name="sun.boot.class.path" value="c:\java\jdk1.7.0_09\jre\lib\resources.jar;c:\java\jdk1.7.0_09\jre\lib\rt.jar;c:\java\jdk1.7.0_09\jre\lib\sunrsasign.jar;c:\java\jdk1.7.0_09\jre\lib\jsse.jar;c:\java\jdk1.7.0_09\jre\lib\jce.jar;c:\java\jdk1.7.0_09\jre\lib\charsets.jar;c:\java\jdk1.7.0_09\jre\lib\jfr.jar;c:\java\jdk1.7.0_09\jre\classes"/>
- <property name="java.vendor" value="Oracle Corporation"/>
- <property name="maven.home" value="c:\java\apache-maven-3.0.4"/>
- <property name="file.separator" value="\"/>
- <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
- <property name="sun.cpu.endian" value="little"/>
- <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
- <property name="sun.desktop" value="windows"/>
- <property name="sun.cpu.isalist" value="amd64"/>
- </properties>
- <testcase time="0.007" classname="org.apache.maven.surefire.test.SucceedingTest" name="defaultTestValueIs_Value"/>
- <testcase time="0.001" classname="org.apache.maven.surefire.test.SucceedingTest" name="setTestAndRetrieveValue"/>
-</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.FailingTest.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.FailingTest.txt b/surefire-integration-tests/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.FailingTest.txt
deleted file mode 100644
index 38abc1f..0000000
--- a/surefire-integration-tests/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.FailingTest.txt
+++ /dev/null
@@ -1,84 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.apache.maven.surefire.test.FailingTest
--------------------------------------------------------------------------------
-Tests run: 2, Failures: 2, Errors: 0, Skipped: 0, Time elapsed: 0.046 sec <<< FAILURE!
-defaultTestValueIs_Value(org.apache.maven.surefire.test.FailingTest) Time elapsed: 0.013 sec <<< FAILURE!
-java.lang.AssertionError:
-Expected: "wrong"
- got: "value"
-
- at org.junit.Assert.assertThat(Assert.java:778)
- at org.junit.Assert.assertThat(Assert.java:736)
- at org.apache.maven.surefire.test.FailingTest.defaultTestValueIs_Value(FailingTest.java:23)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:601)
- at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
- at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
- at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
- at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
- at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
- at org.junit.rules.TestWatchman$1.evaluate(TestWatchman.java:48)
- at org.junit.runners.BlockJUnit4ClassRunner.runNotIgnored(BlockJUnit4ClassRunner.java:79)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:71)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:49)
- at org.junit.runners.ParentRunner$3.run(ParentRunner.java:193)
- at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:52)
- at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:191)
- at org.junit.runners.ParentRunner.access$000(ParentRunner.java:42)
- at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:184)
- at org.junit.runners.ParentRunner.run(ParentRunner.java:236)
- at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:262)
- at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:151)
- at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:122)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:601)
- at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
- at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
- at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
- at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:128)
- at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:88)
-
-setTestAndRetrieveValue(org.apache.maven.surefire.test.FailingTest) Time elapsed: 0.001 sec <<< FAILURE!
-java.lang.AssertionError:
-Expected: "bar"
- got: "foo"
-
- at org.junit.Assert.assertThat(Assert.java:778)
- at org.junit.Assert.assertThat(Assert.java:736)
- at org.apache.maven.surefire.test.FailingTest.setTestAndRetrieveValue(FailingTest.java:34)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:601)
- at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
- at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
- at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
- at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
- at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
- at org.junit.rules.TestWatchman$1.evaluate(TestWatchman.java:48)
- at org.junit.runners.BlockJUnit4ClassRunner.runNotIgnored(BlockJUnit4ClassRunner.java:79)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:71)
- at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:49)
- at org.junit.runners.ParentRunner$3.run(ParentRunner.java:193)
- at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:52)
- at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:191)
- at org.junit.runners.ParentRunner.access$000(ParentRunner.java:42)
- at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:184)
- at org.junit.runners.ParentRunner.run(ParentRunner.java:236)
- at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:262)
- at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:151)
- at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:122)
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
- at java.lang.reflect.Method.invoke(Method.java:601)
- at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
- at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
- at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
- at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:128)
- at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:88)
-
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.SucceedingTest.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.SucceedingTest.txt b/surefire-integration-tests/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.SucceedingTest.txt
deleted file mode 100644
index 9433827..0000000
--- a/surefire-integration-tests/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.SucceedingTest.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.apache.maven.surefire.test.SucceedingTest
--------------------------------------------------------------------------------
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.044 sec
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml b/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
deleted file mode 100644
index 407d86b..0000000
--- a/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-consoleOutput</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>fork-consoleOutput</name>
- <url>http://maven.apache.org</url>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <printSummary>${printSummary}</printSummary>
- <useFile>true</useFile>
- <reportFormat>${reportFormat}</reportFormat>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
- <properties>
- <junit.version>4.8.1</junit.version>
- <forkMode>once</forkMode>
- <printSummary>true</printSummary>
- <reportFormat>brief</reportFormat>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java b/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java
deleted file mode 100644
index ad18954..0000000
--- a/surefire-integration-tests/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package forkConsoleOutput;
-
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Test1
-{
- @Test
- public void test6281() {
- System.out.println( "Test1 on" + Thread.currentThread().getName());
- }
-
- @BeforeClass
- public static void testWithFailingAssumption2() {
- System.out.println( "BeforeTest1 on" + Thread.currentThread().getName());
- }
-
- @AfterClass
- public static void testWithFailingAssumption3() {
- System.out.println( "AfterTest1 on" + Thread.currentThread().getName());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml b/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml
deleted file mode 100644
index 9aa5e1b..0000000
--- a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-consoleOutput</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>fork-consoleOutput</name>
- <url>http://maven.apache.org</url>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <printSummary>${printSummary}</printSummary>
- <useFile>${userFile}</useFile>
- <reportFormat>${reportFormat}</reportFormat>
- <redirectTestOutputToFile>${redirect.to.file}</redirectTestOutputToFile>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
- <properties>
- <junit.version>4.8.1</junit.version>
- <redirect.to.file>true</redirect.to.file>
- <forkMode>once</forkMode>
- <printSummary>true</printSummary>
- <useFile>true</useFile>
- <reportFormat>brief</reportFormat>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test1.java b/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test1.java
deleted file mode 100644
index ad18954..0000000
--- a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test1.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package forkConsoleOutput;
-
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Test1
-{
- @Test
- public void test6281() {
- System.out.println( "Test1 on" + Thread.currentThread().getName());
- }
-
- @BeforeClass
- public static void testWithFailingAssumption2() {
- System.out.println( "BeforeTest1 on" + Thread.currentThread().getName());
- }
-
- @AfterClass
- public static void testWithFailingAssumption3() {
- System.out.println( "AfterTest1 on" + Thread.currentThread().getName());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test2.java b/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test2.java
deleted file mode 100644
index f5c825e..0000000
--- a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test2.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package forkConsoleOutput;
-
-/*
- * 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.Test;
-
-public class Test2
-{
- @Test
- public void test6281()
- {
- System.out.println( "sout: I am talking to you" );
- System.out.println( "sout: Will Fail soon" );
- System.err.println( "serr: And you too" );
- System.err.println( "serr: Will Fail now" );
- throw new RuntimeException( "FailHere" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-fail/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-fail/pom.xml b/surefire-integration-tests/src/test/resources/fork-fail/pom.xml
deleted file mode 100644
index 9db6d72..0000000
--- a/surefire-integration-tests/src/test/resources/fork-fail/pom.xml
+++ /dev/null
@@ -1,60 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-fail</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for failing fork</name>
-
- <properties>
- <argLine>-Xmxxxx712743m</argLine>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>once</forkMode>
- <argLine>${argLine}</argLine>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-fail/src/test/java/forkMode/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-fail/src/test/java/forkMode/Test1.java b/surefire-integration-tests/src/test/resources/fork-fail/src/test/java/forkMode/Test1.java
deleted file mode 100644
index 8c09af6..0000000
--- a/surefire-integration-tests/src/test/resources/fork-fail/src/test/java/forkMode/Test1.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-
-import junit.framework.TestCase;
-
-public class Test1
- extends TestCase
-{
-
- public void test1()
- throws IOException
- {
- dumpPidFile( this );
- }
-
- public static void dumpPidFile( TestCase test )
- throws IOException
- {
- String fileName = test.getName() + "-pid";
- File target = new File( "target" );
- if ( !( target.exists() && target.isDirectory() ) )
- {
- target = new File( "." );
- }
- File pidFile = new File( target, fileName );
- FileWriter fw = new FileWriter( pidFile );
- // DGF little known trick... this is guaranteed to be unique to the PID
- // In fact, it usually contains the pid and the local host name!
- String pid = ManagementFactory.getRuntimeMXBean().getName();
- fw.write( pid );
- fw.flush();
- fw.close();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-fail/src/test/java/forkMode/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-fail/src/test/java/forkMode/Test2.java b/surefire-integration-tests/src/test/resources/fork-fail/src/test/java/forkMode/Test2.java
deleted file mode 100644
index 33d3cf1..0000000
--- a/surefire-integration-tests/src/test/resources/fork-fail/src/test/java/forkMode/Test2.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.IOException;
-
-import junit.framework.TestCase;
-
-public class Test2
- extends TestCase
-{
-
- public void test2() throws IOException {
- Test1.dumpPidFile(this);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-fail/src/test/java/forkMode/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-fail/src/test/java/forkMode/Test3.java b/surefire-integration-tests/src/test/resources/fork-fail/src/test/java/forkMode/Test3.java
deleted file mode 100644
index c8eef74..0000000
--- a/surefire-integration-tests/src/test/resources/fork-fail/src/test/java/forkMode/Test3.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.IOException;
-
-import junit.framework.TestCase;
-
-public class Test3
- extends TestCase
-{
-
- public void test3() throws IOException {
- Test1.dumpPidFile(this);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/pom.xml
deleted file mode 100644
index 9de3941..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/pom.xml
+++ /dev/null
@@ -1,36 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-mode-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-mode-multimodule.module-a</artifactId>
- <name>Test for forkMode Module A</name>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test1.java b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test1.java
deleted file mode 100644
index 7497816..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test1.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-public class Test1
- extends TestCase
-{
-
- private static final Random RANDOM = new Random();
-
- public void test1()
- throws IOException, InterruptedException
- {
- int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "1500" ));
- Thread.sleep(sleepLength);
- dumpPidFile( this );
- }
-
- public static void dumpPidFile( TestCase test )
- throws IOException
- {
- String fileName = test.getName() + "-pid";
- File target = new File( "target" ).getCanonicalFile(); // getCanonicalFile required for embedded mode
- if ( !( target.exists() && target.isDirectory() ) )
- {
- target = new File( "." );
- }
- File pidFile = new File( target, fileName );
- FileWriter fw = new FileWriter( pidFile );
- // DGF little known trick... this is guaranteed to be unique to the PID
- // In fact, it usually contains the pid and the local host name!
- String pid = ManagementFactory.getRuntimeMXBean().getName();
- fw.write( pid );
- fw.write( " " );
- fw.write( System.getProperty( "testProperty", String.valueOf( RANDOM.nextLong() ) ) );
- fw.flush();
- fw.close();
- System.out.println( "Done Writing pid file" + pidFile.getAbsolutePath() );
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test2.java b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test2.java
deleted file mode 100644
index e9d0652..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test2.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.IOException;
-
-import junit.framework.TestCase;
-
-public class Test2
- extends TestCase
-{
-
- public void test2() throws IOException, InterruptedException {
- int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "1500" ));
- Thread.sleep(sleepLength);
- Test1.dumpPidFile(this);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test3.java b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test3.java
deleted file mode 100644
index c8eef74..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test3.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.IOException;
-
-import junit.framework.TestCase;
-
-public class Test3
- extends TestCase
-{
-
- public void test3() throws IOException {
- Test1.dumpPidFile(this);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/pom.xml
deleted file mode 100644
index 61fd8a0..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/pom.xml
+++ /dev/null
@@ -1,36 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-mode-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-mode-multimodule.module-b</artifactId>
- <name>Test for forkMode Module B</name>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test1.java b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test1.java
deleted file mode 100644
index 7497816..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test1.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-public class Test1
- extends TestCase
-{
-
- private static final Random RANDOM = new Random();
-
- public void test1()
- throws IOException, InterruptedException
- {
- int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "1500" ));
- Thread.sleep(sleepLength);
- dumpPidFile( this );
- }
-
- public static void dumpPidFile( TestCase test )
- throws IOException
- {
- String fileName = test.getName() + "-pid";
- File target = new File( "target" ).getCanonicalFile(); // getCanonicalFile required for embedded mode
- if ( !( target.exists() && target.isDirectory() ) )
- {
- target = new File( "." );
- }
- File pidFile = new File( target, fileName );
- FileWriter fw = new FileWriter( pidFile );
- // DGF little known trick... this is guaranteed to be unique to the PID
- // In fact, it usually contains the pid and the local host name!
- String pid = ManagementFactory.getRuntimeMXBean().getName();
- fw.write( pid );
- fw.write( " " );
- fw.write( System.getProperty( "testProperty", String.valueOf( RANDOM.nextLong() ) ) );
- fw.flush();
- fw.close();
- System.out.println( "Done Writing pid file" + pidFile.getAbsolutePath() );
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test2.java b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test2.java
deleted file mode 100644
index e9d0652..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test2.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.IOException;
-
-import junit.framework.TestCase;
-
-public class Test2
- extends TestCase
-{
-
- public void test2() throws IOException, InterruptedException {
- int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "1500" ));
- Thread.sleep(sleepLength);
- Test1.dumpPidFile(this);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test3.java b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test3.java
deleted file mode 100644
index c8eef74..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/src/test/java/forkMode/Test3.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package forkMode;
-
-/*
- * 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.io.IOException;
-
-import junit.framework.TestCase;
-
-public class Test3
- extends TestCase
-{
-
- public void test3() throws IOException {
- Test1.dumpPidFile(this);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml
deleted file mode 100644
index e0786b1..0000000
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml
+++ /dev/null
@@ -1,66 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-mode-multimodule</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for forkMode Multimodule</name>
-
- <packaging>pom</packaging>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <modules>
- <module>module-a</module>
- <module>module-b</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <threadCount>${threadCount}</threadCount>
- <runOrder>alphabetical</runOrder>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
[02/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestA.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestA.java b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestA.java
new file mode 100644
index 0000000..404377a
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestA.java
@@ -0,0 +1,29 @@
+package org.test;
+
+/*
+ * 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.Test;
+
+public class TestA {
+
+ @Test
+ public void shouldRun() {
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestB.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestB.java b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestB.java
new file mode 100644
index 0000000..1295e97
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/src/test/java/org/test/TestB.java
@@ -0,0 +1,29 @@
+package org.test;
+
+/*
+ * 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.Test;
+
+public class TestB {
+
+ @Test
+ public void shouldRun() {
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
new file mode 100644
index 0000000..5b8fd7c
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
@@ -0,0 +1,23 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire-report</groupId>
+ <artifactId>surefire-570-multipleReportDirectories</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.maven.surefire-report.module1</groupId>
+ <artifactId>module1</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java
new file mode 100644
index 0000000..830d0f0
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java
@@ -0,0 +1,26 @@
+package org.apache.maven.surefire570;
+
+/*
+ * 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.
+ */
+
+public class MyModule1Class {
+ public int getFoo() {
+ return 42;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java
new file mode 100644
index 0000000..521fb6c
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java
@@ -0,0 +1,38 @@
+package org.apache.maven.surefire570;
+
+/*
+ * 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 junit.framework.Assert;
+import junit.framework.TestCase;
+import org.apache.maven.surefire570.MyModule1Class;
+
+public class MyModule1ClassTest extends TestCase {
+
+ public void testGetFooKO() {
+ MyModule1Class mc = new MyModule1Class();
+ Assert.assertEquals(18, mc.getFoo());
+ }
+
+ public void testGetFooOK() {
+ MyModule1Class mc = new MyModule1Class();
+ Assert.assertEquals(42, mc.getFoo());
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
new file mode 100644
index 0000000..6f7c3c5
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="1" time="0.04" errors="0" skipped="0" tests="2" name="org.apache.maven.surefireReport.surefireReportTest.MyClassTest">
+ <properties>
+ <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+ <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386"/>
+ <property name="java.vm.version" value="14.0-b16"/>
+ <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
+ <property name="java.vendor.url" value="http://java.sun.com/"/>
+ <property name="path.separator" value=":"/>
+ <property name="java.vm.name" value="Java HotSpot(TM) Server VM"/>
+ <property name="file.encoding.pkg" value="sun.io"/>
+ <property name="user.country" value="FR"/>
+ <property name="sun.java.launcher" value="SUN_STANDARD"/>
+ <property name="sun.os.patch.level" value="unknown"/>
+ <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+ <property name="user.dir" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test"/>
+ <property name="java.runtime.version" value="1.6.0_14-b08"/>
+ <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
+ <property name="basedir" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test"/>
+ <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/endorsed"/>
+ <property name="os.arch" value="i386"/>
+ <property name="surefire.real.class.path" value="/tmp/surefirebooter5998945456175966466.jar"/>
+ <property name="java.io.tmpdir" value="/tmp"/>
+ <property name="line.separator" value="
+"/>
+ <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
+ <property name="os.name" value="Linux"/>
+ <property name="sun.jnu.encoding" value="UTF-8"/>
+ <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386/server:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib"/>
+ <property name="surefire.test.class.path" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/test-classes:/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/classes:/home/tsauzedde/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar:"/>
+ <property name="java.specification.name" value="Java Platform API Specification"/>
+ <property name="java.class.version" value="50.0"/>
+ <property name="sun.management.compiler" value="HotSpot Tiered Compilers"/>
+ <property name="os.version" value="2.6.28-15-generic"/>
+ <property name="user.home" value="/home/tsauzedde"/>
+ <property name="user.timezone" value=""/>
+ <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
+ <property name="file.encoding" value="UTF-8"/>
+ <property name="java.specification.version" value="1.6"/>
+ <property name="user.name" value="tsauzedde"/>
+ <property name="java.class.path" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/test-classes:/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/classes:/home/tsauzedde/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar:"/>
+ <property name="java.vm.specification.version" value="1.0"/>
+ <property name="sun.arch.data.model" value="32"/>
+ <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre"/>
+ <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
+ <property name="user.language" value="fr"/>
+ <property name="java.vm.info" value="mixed mode"/>
+ <property name="java.version" value="1.6.0_14"/>
+ <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/ext:/usr/java/packages/lib/ext"/>
+ <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/classes"/>
+ <property name="java.vendor" value="Sun Microsystems Inc."/>
+ <property name="localRepository" value="/home/tsauzedde/.m2/repository"/>
+ <property name="file.separator" value="/"/>
+ <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
+ <property name="sun.cpu.endian" value="little"/>
+ <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+ <property name="sun.desktop" value="gnome"/>
+ <property name="sun.cpu.isalist" value=""/>
+ </properties>
+ <testcase time="0.005" classname="org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassM1Test" name="testGetFooKO">
+ <failure message="expected:<18> but was:<42>" type="junit.framework.AssertionFailedError">junit.framework.AssertionFailedError: expected:<18> but was:<42>
+ at junit.framework.Assert.fail(Assert.java:47)
+ at junit.framework.Assert.failNotEquals(Assert.java:280)
+ at junit.framework.Assert.assertEquals(Assert.java:64)
+ at junit.framework.Assert.assertEquals(Assert.java:198)
+ at junit.framework.Assert.assertEquals(Assert.java:204)
+ at org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest.testGetFooKO(MyClassTest.java:10)
+</failure>
+ </testcase>
+ <testcase time="0" classname="org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassM1Test" name="testGetFooOK"/>
+</testsuite>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
new file mode 100644
index 0000000..9964f13
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
@@ -0,0 +1,13 @@
+-------------------------------------------------------------------------------
+Test set: org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest
+-------------------------------------------------------------------------------
+Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.049 sec <<< FAILURE!
+testGetFooKO(org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest) Time elapsed: 0.01 sec <<< FAILURE!
+junit.framework.AssertionFailedError: expected:<18> but was:<42>
+ at junit.framework.Assert.fail(Assert.java:47)
+ at junit.framework.Assert.failNotEquals(Assert.java:280)
+ at junit.framework.Assert.assertEquals(Assert.java:64)
+ at junit.framework.Assert.assertEquals(Assert.java:198)
+ at junit.framework.Assert.assertEquals(Assert.java:204)
+ at org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest.testGetFooKO(MyClassTest.java:10)
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml
new file mode 100644
index 0000000..9972a51
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml
@@ -0,0 +1,23 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire-report</groupId>
+ <artifactId>surefire-570-multipleReportDirectories</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.maven.surefire-report.module2</groupId>
+ <artifactId>module2</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java
new file mode 100644
index 0000000..54a1fe3
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java
@@ -0,0 +1,6 @@
+package org.apache.maven.surefire570.module2;
+public class MyModule2Class {
+ public int getFoo() {
+ return 42;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java
new file mode 100644
index 0000000..4f0194a
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java
@@ -0,0 +1,18 @@
+package org.apache.maven.surefire570.module2;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+import org.apache.maven.surefire570.module2.MyModule2Class;
+
+public class MyModule2ClassTest extends TestCase {
+
+ public void testGetFooKO() {
+ MyModule2Class mc = new MyModule2Class();
+ Assert.assertEquals(18, mc.getFoo());
+ }
+
+ public void testGetFooOK() {
+ MyModule2Class mc = new MyModule2Class();
+ Assert.assertEquals(42, mc.getFoo());
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
new file mode 100644
index 0000000..2c9cbed
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="1" time="0.04" errors="0" skipped="0" tests="2" name="org.apache.maven.surefireReport.surefireReportTest.MyClassTest">
+ <properties>
+ <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+ <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386"/>
+ <property name="java.vm.version" value="14.0-b16"/>
+ <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
+ <property name="java.vendor.url" value="http://java.sun.com/"/>
+ <property name="path.separator" value=":"/>
+ <property name="java.vm.name" value="Java HotSpot(TM) Server VM"/>
+ <property name="file.encoding.pkg" value="sun.io"/>
+ <property name="user.country" value="FR"/>
+ <property name="sun.java.launcher" value="SUN_STANDARD"/>
+ <property name="sun.os.patch.level" value="unknown"/>
+ <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+ <property name="user.dir" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test"/>
+ <property name="java.runtime.version" value="1.6.0_14-b08"/>
+ <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
+ <property name="basedir" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test"/>
+ <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/endorsed"/>
+ <property name="os.arch" value="i386"/>
+ <property name="surefire.real.class.path" value="/tmp/surefirebooter5998945456175966466.jar"/>
+ <property name="java.io.tmpdir" value="/tmp"/>
+ <property name="line.separator" value="
+"/>
+ <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
+ <property name="os.name" value="Linux"/>
+ <property name="sun.jnu.encoding" value="UTF-8"/>
+ <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386/server:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib"/>
+ <property name="surefire.test.class.path" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/test-classes:/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/classes:/home/tsauzedde/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar:"/>
+ <property name="java.specification.name" value="Java Platform API Specification"/>
+ <property name="java.class.version" value="50.0"/>
+ <property name="sun.management.compiler" value="HotSpot Tiered Compilers"/>
+ <property name="os.version" value="2.6.28-15-generic"/>
+ <property name="user.home" value="/home/tsauzedde"/>
+ <property name="user.timezone" value=""/>
+ <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
+ <property name="file.encoding" value="UTF-8"/>
+ <property name="java.specification.version" value="1.6"/>
+ <property name="user.name" value="tsauzedde"/>
+ <property name="java.class.path" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/test-classes:/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/classes:/home/tsauzedde/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar:"/>
+ <property name="java.vm.specification.version" value="1.0"/>
+ <property name="sun.arch.data.model" value="32"/>
+ <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre"/>
+ <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
+ <property name="user.language" value="fr"/>
+ <property name="java.vm.info" value="mixed mode"/>
+ <property name="java.version" value="1.6.0_14"/>
+ <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/ext:/usr/java/packages/lib/ext"/>
+ <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/classes"/>
+ <property name="java.vendor" value="Sun Microsystems Inc."/>
+ <property name="localRepository" value="/home/tsauzedde/.m2/repository"/>
+ <property name="file.separator" value="/"/>
+ <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
+ <property name="sun.cpu.endian" value="little"/>
+ <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+ <property name="sun.desktop" value="gnome"/>
+ <property name="sun.cpu.isalist" value=""/>
+ </properties>
+ <testcase time="0.005" classname="org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassM2Test" name="testGetFooKO">
+ <failure message="expected:<18> but was:<42>" type="junit.framework.AssertionFailedError">junit.framework.AssertionFailedError: expected:<18> but was:<42>
+ at junit.framework.Assert.fail(Assert.java:47)
+ at junit.framework.Assert.failNotEquals(Assert.java:280)
+ at junit.framework.Assert.assertEquals(Assert.java:64)
+ at junit.framework.Assert.assertEquals(<Assert class="ja"></Assert>va:198)
+ at junit.framework.Assert.assertEquals(Assert.java:204)
+ at org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest.testGetFooKO(MyClassTest.java:10)
+</failure>
+ </testcase>
+ <testcase time="0" classname="org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassM2Test" name="testGetFooOK"/>
+</testsuite>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
new file mode 100644
index 0000000..9964f13
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
@@ -0,0 +1,13 @@
+-------------------------------------------------------------------------------
+Test set: org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest
+-------------------------------------------------------------------------------
+Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.049 sec <<< FAILURE!
+testGetFooKO(org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest) Time elapsed: 0.01 sec <<< FAILURE!
+junit.framework.AssertionFailedError: expected:<18> but was:<42>
+ at junit.framework.Assert.fail(Assert.java:47)
+ at junit.framework.Assert.failNotEquals(Assert.java:280)
+ at junit.framework.Assert.assertEquals(Assert.java:64)
+ at junit.framework.Assert.assertEquals(Assert.java:198)
+ at junit.framework.Assert.assertEquals(Assert.java:204)
+ at org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest.testGetFooKO(MyClassTest.java:10)
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/pom.xml b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
new file mode 100644
index 0000000..b3238ea
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
@@ -0,0 +1,117 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.surefire-report</groupId>
+ <artifactId>surefire-570-multipleReportDirectories</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>maven-3</id>
+ <activation>
+ <file>
+ <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
+ <exists>${basedir}</exists>
+ </file>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <inherited>true</inherited>
+ <configuration>
+ <reportsDirectories>
+ <reportsDirectory>${basedir}/target/surefire-reports</reportsDirectory>
+ <reportsDirectory>${basedir}/src/test/resources/surefire-reports</reportsDirectory>
+ </reportsDirectories>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <inherited>true</inherited>
+ <configuration>
+ <reportsDirectories>
+ <reportsDirectory>${basedir}/target/surefire-reports</reportsDirectory>
+ <reportsDirectory>${basedir}/src/test/resources/surefire-reports</reportsDirectory>
+ </reportsDirectories>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>report-only</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <modules>
+ <module>module1</module>
+ <module>module2</module>
+ </modules>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/pom.xml b/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
new file mode 100644
index 0000000..8175d3f
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
@@ -0,0 +1,38 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4-test</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>junit4-test</name>
+ <url>http://maven.apache.org</url>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ <parallel>methods</parallel>
+ <threadCount>10</threadCount>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test1.java b/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test1.java
new file mode 100644
index 0000000..6256635
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test1.java
@@ -0,0 +1,90 @@
+package surefire613;
+
+/*
+ * 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.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assume.*;
+public class Test1
+{
+ @Test
+ public void testWithFailingAssumption1() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption2() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption3() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption4() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption5() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption6() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption7() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption8() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption9() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption10() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption11() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption12() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption13() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption14() {
+ assumeThat( 2, is(3));
+ }
+ @Test
+ public void testWithFailingAssumption15() {
+ assumeThat( 2, is(3));
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test2.java b/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test2.java
new file mode 100644
index 0000000..c6d5840
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-613-testCount-in-parallel/src/test/java/surefire163/Test2.java
@@ -0,0 +1,127 @@
+package surefire613;
+
+/*
+ * 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.Ignore;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assume.*;
+import static junit.framework.Assert.fail;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class Test2
+{
+ @Test
+ public void testAllok()
+ {
+ System.out.println( "testAllok to stdout" );
+ System.err.println( "testAllok to stderr" );
+ }
+
+ @Ignore
+ @Test
+ public void testWithIgnore1()
+ {
+ }
+
+ @Ignore("Ignorance is bliss2")
+ @Test
+ public void testWithIgnore2()
+ {
+ }
+
+ @Test
+ public void testiWithFail1()
+ {
+ fail( "We excpect this" );
+ }
+
+ @Test
+ public void testiWithFail2()
+ {
+ fail( "We excpect this" );
+ }
+
+ @Test
+ public void testiWithFail3()
+ {
+ fail( "We excpect this" );
+ }
+
+ @Test
+ public void testiWithFail4()
+ {
+ fail( "We excpect this" );
+ }
+
+ @Test
+ public void testWithException1()
+ {
+ System.out.println( "testWithException1 to stdout" );
+ System.err.println( "testWithException1 to stderr" );
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException2()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException3()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException4()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException5()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException6()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException7()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+ @Test
+ public void testWithException8()
+ {
+ throw new RuntimeException( "We expect this" );
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml b/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
new file mode 100644
index 0000000..412035d
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
@@ -0,0 +1,217 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-test</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>junit-test</name>
+ <url>http://maven.apache.org</url>
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testSourceDirectory>src/it/java</testSourceDirectory>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>all-parallel-junit3-testcases</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <skip>true</skip>
+ <parallel>all</parallel>
+ <threadCount>10</threadCount>
+ <perCoreThreadCount>false</perCoreThreadCount>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>**/MySuiteTest1.java</include>
+ <include>**/MySuiteTest2.java</include>
+ <include>**/MySuiteTest3.java</include>
+ </includes>
+ <forkMode>once</forkMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>parallel-junit3-testcases</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <skip>true</skip>
+ <parallel>classes</parallel>
+ <threadCount>10</threadCount>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>**/MySuiteTest1.java</include>
+ <include>**/MySuiteTest2.java</include>
+ <include>**/MySuiteTest3.java</include>
+ </includes>
+ <forkMode>once</forkMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>junit3-testcases</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>**/MySuiteTest1.java</include>
+ <include>**/MySuiteTest2.java</include>
+ <include>**/MySuiteTest3.java</include>
+ </includes>
+ <forkMode>once</forkMode>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>parallel-junit3-testsuite</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <skip>true</skip>
+ <parallel>all</parallel>
+ <threadCount>10</threadCount>
+ <perCoreThreadCount>false</perCoreThreadCount>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>JUnit4AdapterSuiteTest</include>
+ </includes>
+ <forkMode>once</forkMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>junit3-testsuite</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>JUnit4AdapterSuiteTest</include>
+ </includes>
+ <forkMode>once</forkMode>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/JUnit4AdapterSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/JUnit4AdapterSuiteTest.java b/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/JUnit4AdapterSuiteTest.java
new file mode 100644
index 0000000..47c2d75
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/JUnit4AdapterSuiteTest.java
@@ -0,0 +1,39 @@
+package mho;
+
+/*
+ * 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 junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@Suite.SuiteClasses( {
+ MySuiteTest1.class,
+ MySuiteTest2.class,
+ MySuiteTest3.class
+} )
+@RunWith( Suite.class )
+public class JUnit4AdapterSuiteTest
+{
+ public static Test suite()
+ {
+ return new JUnit4TestAdapter( JUnit4AdapterSuiteTest.class );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java b/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
new file mode 100644
index 0000000..edd5781
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
@@ -0,0 +1,48 @@
+package mho;
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+
+public class MySuiteTest1 extends TestCase {
+
+ public static Test suite () {
+ TestSuite suite = new TestSuite();
+
+ suite.addTest (new MySuiteTest1("testMe", 1));
+
+ return suite;
+ }
+
+ private final int number;
+
+ public MySuiteTest1(String name, int number) {
+ super (name);
+ this.number = number;
+ }
+
+ public void testMe() {
+ System.out.println ("### "+ this.getClass().getName()+":"+this.getName()+" - number "+number);
+ assertTrue (true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java b/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
new file mode 100644
index 0000000..6ef92f6
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
@@ -0,0 +1,49 @@
+package mho;
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+
+public class MySuiteTest2 extends TestCase {
+
+ public static Test suite () {
+ TestSuite suite = new TestSuite();
+
+ suite.addTest (new MySuiteTest2("testMe", 1));
+ suite.addTest (new MySuiteTest2("testMe", 2));
+
+ return suite;
+ }
+
+ private final int number;
+
+ public MySuiteTest2(String name, int number) {
+ super (name);
+ this.number = number;
+ }
+
+ public void testMe() {
+ System.out.println ("### "+ this.getClass().getName()+":"+this.getName()+" - number "+number);
+ assertTrue (true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java b/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java
new file mode 100644
index 0000000..6618566
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java
@@ -0,0 +1,49 @@
+package mho;
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class MySuiteTest3 extends TestCase {
+
+ public static Test suite () {
+ TestSuite suite = new TestSuite();
+
+ suite.addTest (new MySuiteTest3("testMe", 1));
+ suite.addTest (new MySuiteTest3("testMe", 2));
+ suite.addTest (new MySuiteTest3("testMe", 3));
+
+ return suite;
+ }
+
+ private final int number;
+
+ public MySuiteTest3(String name, int number) {
+ super (name);
+ this.number = number;
+ }
+
+ public void testMe() {
+ System.out.println ("### "+ this.getClass().getName()+":"+this.getName()+" - number "+number);
+ assertTrue (true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml b/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
new file mode 100644
index 0000000..9c975a8
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
@@ -0,0 +1,39 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4-test</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>junit4-test</name>
+ <url>http://maven.apache.org</url>
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <parallel>methods</parallel>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ <threadCount>5</threadCount>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test1.java b/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test1.java
new file mode 100644
index 0000000..91d1201
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test1.java
@@ -0,0 +1,48 @@
+package surefire628;
+
+/*
+ * 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.Test;
+import org.junit.BeforeClass;
+import org.junit.AfterClass;
+
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assume.*;
+public class Test1
+{
+ @Test
+ public void test6281() {
+ System.out.println( "628Test1 on" + Thread.currentThread().getName());
+ }
+
+ @BeforeClass
+ public static void testWithFailingAssumption2() {
+ System.out.println( "Before628Test1 on" + Thread.currentThread().getName());
+ }
+
+ @AfterClass
+ public static void testWithFailingAssumption3() {
+ System.out.println( "After628Test1 on" + Thread.currentThread().getName());
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test2.java b/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test2.java
new file mode 100644
index 0000000..5be3fa3
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/src/test/java/surefire628/Test2.java
@@ -0,0 +1,42 @@
+package surefire628;
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+public class Test2
+{
+ @Test
+ public void test6281() {
+ System.out.println( "628Test2 on" + Thread.currentThread().getName());
+ }
+
+ @BeforeClass
+ public static void testWithFailingAssumption2() {
+ System.out.println( "BeforeClass628Test2 on" + Thread.currentThread().getName());
+ }
+
+ @AfterClass
+ public static void testWithFailingAssumption3() {
+ System.out.println( "AfterClass628Test2 on" + Thread.currentThread().getName());
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml b/surefire-its/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
new file mode 100644
index 0000000..211a99d
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-634-systemPropertiesWarning/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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>surefire-634-propertiesWarning</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for warning about system properties that cannot be set</name>
+
+ <properties>
+ <junitVersion>4.4</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <systemPropertyVariables>
+ <java.library.path>${basedir}/src/main</java.library.path>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-634-systemPropertiesWarning/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-634-systemPropertiesWarning/src/test/java/junit4/BasicTest.java b/surefire-its/src/test/resources/surefire-634-systemPropertiesWarning/src/test/java/junit4/BasicTest.java
new file mode 100644
index 0000000..2d43f8f
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-634-systemPropertiesWarning/src/test/java/junit4/BasicTest.java
@@ -0,0 +1,64 @@
+package junit4;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-649-systemProperties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-649-systemProperties/pom.xml b/surefire-its/src/test/resources/surefire-649-systemProperties/pom.xml
new file mode 100644
index 0000000..985d8df
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-649-systemProperties/pom.xml
@@ -0,0 +1,67 @@
+<?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/xsd/maven-4.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>jiras-surefire-649-sys-props</artifactId>
+ <version>1.0</version>
+ <url>http://maven.apache.org</url>
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>emptyProperty</name>
+ <value/>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-649-systemProperties/src/test/java/jiras/surefire649/SystemPropertiesTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-649-systemProperties/src/test/java/jiras/surefire649/SystemPropertiesTest.java b/surefire-its/src/test/resources/surefire-649-systemProperties/src/test/java/jiras/surefire649/SystemPropertiesTest.java
new file mode 100644
index 0000000..27512df
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-649-systemProperties/src/test/java/jiras/surefire649/SystemPropertiesTest.java
@@ -0,0 +1,32 @@
+package jiras.surefire649;
+
+/*
+ * 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.Test;
+
+public final class SystemPropertiesTest {
+
+ @Test
+ public void someMethod() throws InterruptedException {
+ String prop = System.getProperty( "emptyProperty" );
+ System.out.println( "emptyProperty=" + ( prop == null ? null : "'" + prop + "'" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-649-systemPropertyVariables/pom.xml b/surefire-its/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
new file mode 100644
index 0000000..e7a7fad
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
@@ -0,0 +1,64 @@
+<?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/xsd/maven-4.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>jiras-surefire-649-sys-prop-vars</artifactId>
+ <version>1.0</version>
+ <url>http://maven.apache.org</url>
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <emptyProperty/>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-649-systemPropertyVariables/src/test/java/jiras/surefire649/SystemPropertyVariablesTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-649-systemPropertyVariables/src/test/java/jiras/surefire649/SystemPropertyVariablesTest.java b/surefire-its/src/test/resources/surefire-649-systemPropertyVariables/src/test/java/jiras/surefire649/SystemPropertyVariablesTest.java
new file mode 100644
index 0000000..e235b46
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-649-systemPropertyVariables/src/test/java/jiras/surefire649/SystemPropertyVariablesTest.java
@@ -0,0 +1,32 @@
+package jiras.surefire649;
+
+/*
+ * 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.Test;
+
+public final class SystemPropertyVariablesTest {
+
+ @Test
+ public void someMethod() throws InterruptedException {
+ String prop = System.getProperty( "emptyProperty" );
+ System.out.println( "emptyProperty=" + ( prop == null ? null : "'" + prop + "'" ) );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-673-mockito/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-673-mockito/pom.xml b/surefire-its/src/test/resources/surefire-673-mockito/pom.xml
new file mode 100644
index 0000000..0b03c13
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-673-mockito/pom.xml
@@ -0,0 +1,37 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>MockitoTest</artifactId>
+ <name>surefire-673-mockito</name>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.8.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-673-mockito/src/test/java/surefire673/TestMockito.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-673-mockito/src/test/java/surefire673/TestMockito.java b/surefire-its/src/test/resources/surefire-673-mockito/src/test/java/surefire673/TestMockito.java
new file mode 100644
index 0000000..12c16bd
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-673-mockito/src/test/java/surefire673/TestMockito.java
@@ -0,0 +1,36 @@
+package surefire673;
+
+/*
+ * 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.Test;
+import org.mockito.Mockito;
+
+public class TestMockito
+{
+ @Test
+ public void canMockPrivateStaticClass()
+ {
+ Mockito.mock(PrivateClass.class);
+ }
+
+ private static class PrivateClass
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml b/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
new file mode 100644
index 0000000..398a225
--- /dev/null
+++ b/surefire-its/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
@@ -0,0 +1,41 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>buildFailingWhenErrors</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>buildFailingWhenErrors</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <includes>
+ <include>**/Test*.java</include>
+ <include>**/MySuiteTest1.java</include>
+ <include>**/MySuiteTest2.java</include>
+ <include>**/MySuiteTest3.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <forkMode>once</forkMode>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+</project>
[23/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
deleted file mode 100644
index 41768cd..0000000
--- a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
+++ /dev/null
@@ -1,79 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for Testng</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <test>BasicTest#testSuccess*</test>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/src/test/java/testng/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/src/test/java/testng/BasicTest.java b/surefire-integration-tests/src/test/resources/testng-method-pattern-before/src/test/java/testng/BasicTest.java
deleted file mode 100644
index 468e425..0000000
--- a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/src/test/java/testng/BasicTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package testng;
-
-/*
- * 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.testng.annotations.*;
-import org.testng.Assert;
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- private Integer foo;
-
- @BeforeTest
- public void intialize()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- foo = Integer.valueOf( 1 );
- }
-
- @AfterTest
- public void shutdown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( setUpCalled );
- Assert.assertNotNull( foo );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- Assert.assertNotNull( foo );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- Assert.assertNotNull( foo );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
deleted file mode 100644
index 50b08bf..0000000
--- a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
+++ /dev/null
@@ -1,80 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for Testng</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <test>BasicTest#testSuccess*</test>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-method-pattern/src/test/java/testng/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern/src/test/java/testng/BasicTest.java b/surefire-integration-tests/src/test/resources/testng-method-pattern/src/test/java/testng/BasicTest.java
deleted file mode 100644
index 381016c..0000000
--- a/surefire-integration-tests/src/test/resources/testng-method-pattern/src/test/java/testng/BasicTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package testng;
-
-/*
- * 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.testng.annotations.*;
-import org.testng.Assert;
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @BeforeTest
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @AfterTest
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml
deleted file mode 100644
index eef5f57..0000000
--- a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml
+++ /dev/null
@@ -1,108 +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/xsd/maven-4.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>jiras-surefire-745-testng</artifactId>
- <version>1.0</version>
-
- <properties>
- <included/>
- <excluded/>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.7</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>testng-test</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>testng-includes</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>${included}</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>testng-includes-excludes</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>${included}</include>
- </includes>
- <excludes>
- <exclude>${excluded}</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/BasicTest.java b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/BasicTest.java
deleted file mode 100644
index 3e2728e..0000000
--- a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/BasicTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package jiras.surefire745;
-
-
-/*
- * 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.testng.annotations.*;
-import static org.testng.Assert.*;
-
-public class BasicTest
-{
-
- @Test
- public void testSuccessOne()
- {
- System.out.println( getClass() + "#testSuccessOne" );
- }
-
- @Test
- public void testSuccessTwo()
- {
- System.out.println( getClass() + "#testSuccessTwo" );
- }
-
- @Test
- public void testFailure()
- {
- System.out.println( getClass() + "#testFailure" );
- fail( );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestFive.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestFive.java b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestFive.java
deleted file mode 100644
index d11ef5d..0000000
--- a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestFive.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package jiras.surefire745;
-
-/*
- * 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.testng.annotations.*;
-
-public class TestFive
-{
-
- @Test
- public void testSuccessOne()
- {
- System.out.println( getClass() + "#testSuccessOne" );
- }
-
- @Test
- public void testSuccessTwo()
- {
- System.out.println( getClass() + "#testSuccessTwo" );
- }
-
- @Test
- public void testSuccessThree()
- {
- System.out.println( getClass() + "#testSuccessThree" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestFour.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestFour.java b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestFour.java
deleted file mode 100644
index 0b1b6c6..0000000
--- a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestFour.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package jiras.surefire745;
-
-/*
- * 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.testng.annotations.*;
-
-public class TestFour
-{
-
- @Test
- public void testSuccessOne()
- {
- System.out.println( getClass() + "#testSuccessOne" );
- }
-
- @Test
- public void testSuccessTwo()
- {
- System.out.println( getClass() + "#testSuccessTwo" );
- }
-
- @Test
- public void testSuccessThree()
- {
- System.out.println( getClass() + "#testSuccessThree" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestThree.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestThree.java b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestThree.java
deleted file mode 100644
index 0d290dc..0000000
--- a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestThree.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package jiras.surefire745;
-
-/*
- * 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.testng.annotations.*;
-import static org.testng.Assert.*;
-
-public class TestThree
-{
-
- @Test
- public void testSuccessOne()
- {
- System.out.println( getClass() + "#testSuccessOne" );
- }
-
- @Test
- public void testSuccessTwo()
- {
- System.out.println( getClass() + "#testSuccessTwo" );
- }
-
- @Test
- public void testFailOne()
- {
- System.out.println( getClass() + "#testFailOne" );
- fail();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestTwo.java b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestTwo.java
deleted file mode 100644
index 4e1b56d..0000000
--- a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/src/test/java/jiras/surefire745/TestTwo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package jiras.surefire745;
-
-/*
- * 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.testng.annotations.*;
-
-public class TestTwo
-{
-
- @Test
- public void testSuccessOne()
- {
- System.out.println( getClass() + "#testSuccessOne" );
- }
-
- @Test
- public void testSuccessTwo()
- {
- System.out.println( getClass() + "#testSuccessTwo" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml b/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml
deleted file mode 100644
index ee76f09..0000000
--- a/surefire-integration-tests/src/test/resources/testng-objectFactory/pom.xml
+++ /dev/null
@@ -1,66 +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/xsd/maven-4.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>testng-testobjectfactory</artifactId>
- <version>1.0</version>
- <name>TestNG using custom object factory.</name>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.7</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <properties>
- <property>
- <name>objectfactory</name>
- <value>testng.objectfactory.TestNGCustomObjectFactory</value>
- </property>
- </properties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/FileHelper.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/FileHelper.java b/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/FileHelper.java
deleted file mode 100644
index 4db30b6..0000000
--- a/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/FileHelper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package testng.objectfactory;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class FileHelper
-{
- public static void writeFile( String fileName, String content )
- {
- try
- {
- File target = new File( System.getProperty("user.dir"), "target" ).getCanonicalFile();
- File listenerOutput = new File( target, fileName );
- FileWriter out = new FileWriter( listenerOutput, true );
- out.write( content );
- out.flush();
- out.close();
- }
- catch ( IOException exception )
- {
- throw new RuntimeException( exception );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/TestNGCustomObjectFactory.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/TestNGCustomObjectFactory.java b/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/TestNGCustomObjectFactory.java
deleted file mode 100644
index 74feb33..0000000
--- a/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/TestNGCustomObjectFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package testng.objectfactory;
-
-import java.lang.reflect.Constructor;
-import org.testng.IObjectFactory;
-
-public class TestNGCustomObjectFactory implements IObjectFactory
-{
- public Object newInstance( Constructor constructor, Object... params )
- {
- String testClassName = constructor.getDeclaringClass().getName();
- FileHelper.writeFile( "objectFactory-output.txt", "Instantiated Test: " + testClassName + "\n" );
- try
- {
- return constructor.newInstance( params );
- }
- catch ( Exception exception )
- {
- throw new RuntimeException( exception );
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/TestNGSuiteTest.java b/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/TestNGSuiteTest.java
deleted file mode 100644
index 1dcc7ed..0000000
--- a/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/TestNGSuiteTest.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package testng.objectfactory;
-
-import org.testng.annotations.Test;
-
-public class TestNGSuiteTest
-{
- @Test
- public void doNothing()
- {
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml
deleted file mode 100644
index e3e347b..0000000
--- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml
+++ /dev/null
@@ -1,81 +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/xsd/maven-4.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>testng-parallel-suites</artifactId>
- <version>1.0</version>
-
- <url>http://maven.apache.org</url>
-
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.9.8</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <file>src/test/resources/testng1.xml</file>
- <file>src/test/resources/testng2.xml</file>
- </suiteXmlFiles>
- <properties>
- <property>
- <name>suitethreadpoolsize</name>
- <value>2</value>
- </property>
- </properties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/java/testng/suiteXml/ShouldNotRunTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/java/testng/suiteXml/ShouldNotRunTest.java b/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/java/testng/suiteXml/ShouldNotRunTest.java
deleted file mode 100644
index d2eb9ca..0000000
--- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/java/testng/suiteXml/ShouldNotRunTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package testng.suiteXml;
-
-/*
- * 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.testng.annotations.Test;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19
- */
-public class ShouldNotRunTest {
-
- @Test
- public void shouldNotRun()
- {
- System.out.println( getClass().getSimpleName() + "#shouldNotRun()" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/java/testng/suiteXml/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/java/testng/suiteXml/TestNGSuiteTest.java b/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/java/testng/suiteXml/TestNGSuiteTest.java
deleted file mode 100644
index b20e81e..0000000
--- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/java/testng/suiteXml/TestNGSuiteTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package testng.suiteXml;
-
-/*
- * 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.testng.annotations.Test;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19
- */
-public class TestNGSuiteTest {
- private static final AtomicInteger counter = new AtomicInteger();
-
- @Test
- public void shouldRunAndPrintItself()
- throws Exception
- {
- System.out.println( getClass().getSimpleName() + "#shouldRunAndPrintItself() "
- + counter.incrementAndGet() + ".");
-
- TimeUnit.SECONDS.sleep( 2 );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng1.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng1.xml b/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng1.xml
deleted file mode 100644
index ac62eca..0000000
--- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng1.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ 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.
- -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="Suite 1 Test" verbose="4">
-
- <test name="Sample Test 1">
- <classes>
- <class name="testng.suiteXml.TestNGSuiteTest"/>
- </classes>
- </test>
-
-</suite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng2.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng2.xml b/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng2.xml
deleted file mode 100644
index 4036c21..0000000
--- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng2.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ 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.
- -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="Suite 2 Test" verbose="4">
-
- <test name="Sample Test 2">
- <classes>
- <class name="testng.suiteXml.TestNGSuiteTest"/>
- </classes>
- </test>
-
-</suite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml
deleted file mode 100644
index 9464c84..0000000
--- a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml
+++ /dev/null
@@ -1,42 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-group-thread-parallel</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG group/parallel thread tests, with parallel settings set by @Test(threadPoolSize)</name>
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.8</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/src/test/java/testng/paralellwithannotations/TestNGParallelTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/src/test/java/testng/paralellwithannotations/TestNGParallelTest.java b/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/src/test/java/testng/paralellwithannotations/TestNGParallelTest.java
deleted file mode 100644
index e6904e9..0000000
--- a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/src/test/java/testng/paralellwithannotations/TestNGParallelTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package testng.paralellwithannotations;
-
-/*
- * 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 static org.testng.Assert.*;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Test;
-import java.util.Date;
-
-/**
- * Test that parallel tests actually run and complete within the expected time.
- */
-public class TestNGParallelTest
-{
-
- static int testCount = 0;
-
- static long startTime;
-
- @BeforeSuite( alwaysRun = true )
- public void startClock()
- {
- startTime = new Date().getTime();
- }
-
- @AfterSuite( alwaysRun = true )
- public void checkTestResults()
- {
- long runtime = new Date().getTime() - startTime;
- System.out.println( "Runtime was: " + runtime );
- assertTrue( testCount == 3, "Expected test to be run 3 times, but was " + testCount );
- // Note, this can be < 1000 on Windows.
- assertTrue( runtime < 1400, "Runtime was " + runtime + ". It should be a little over 1000ms" );
- }
-
- @Test( threadPoolSize = 2, invocationCount = 3 )
- public void incrementTestCountAndSleepForOneSecond()
- throws InterruptedException
- {
- incrementTestCount();
- Thread.sleep( 500 );
- System.out.println( "Ran test" );
- }
-
- private synchronized void incrementTestCount()
- {
- testCount++;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml b/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml
deleted file mode 100644
index 3f1138a..0000000
--- a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml
+++ /dev/null
@@ -1,76 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-path-with-spaces</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG test in a path with spaces</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-path with spaces/src/test/java/testng/pathWithSpaces/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-path with spaces/src/test/java/testng/pathWithSpaces/TestNGSuiteTest.java b/surefire-integration-tests/src/test/resources/testng-path with spaces/src/test/java/testng/pathWithSpaces/TestNGSuiteTest.java
deleted file mode 100644
index 92549a3..0000000
--- a/surefire-integration-tests/src/test/resources/testng-path with spaces/src/test/java/testng/pathWithSpaces/TestNGSuiteTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package testng.pathWithSpaces;
-
-/*
- * 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.io.File;
-import java.net.URISyntaxException;
-
-import org.testng.annotations.Test;
-
-
-public class TestNGSuiteTest {
-
- @Test
- public void loadTestResourceWithSpaces() throws URISyntaxException
- {
- new File( getClass().getResource( "/test.txt" ).toURI() );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-path with spaces/src/test/resources/test.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-path with spaces/src/test/resources/test.txt b/surefire-integration-tests/src/test/resources/testng-path with spaces/src/test/resources/test.txt
deleted file mode 100644
index 6769dd6..0000000
--- a/surefire-integration-tests/src/test/resources/testng-path with spaces/src/test/resources/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-simple/pom.xml b/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
deleted file mode 100644
index d361ddc..0000000
--- a/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
+++ /dev/null
@@ -1,103 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-simple</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG simple test</name>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- <exclusions>
- <exclusion>
- <!-- NOTE: Deliberaty excluding junit to enforce TestNG only tests, cf. SUREFIRE-642 -->
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <exclusions>
- <exclusion>
- <!-- NOTE: Deliberaty excluding junit to enforce TestNG only tests, cf. SUREFIRE-642 -->
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <properties>
- <surefire.testng.verbose>0</surefire.testng.verbose>
- <argLine/>
- <jacoco.agent/>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <argLine>${argLine} ${jacoco.agent}</argLine>
- <runOrder>reversealphabetical</runOrder>
- <properties>
- <property>
- <name>surefire.testng.verbose</name>
- <value>${surefire.testng.verbose}</value>
- </property>
- </properties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-simple/src/test/java/testng/simple/TestNGSuiteTestA.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-simple/src/test/java/testng/simple/TestNGSuiteTestA.java b/surefire-integration-tests/src/test/resources/testng-simple/src/test/java/testng/simple/TestNGSuiteTestA.java
deleted file mode 100644
index 6f97d09..0000000
--- a/surefire-integration-tests/src/test/resources/testng-simple/src/test/java/testng/simple/TestNGSuiteTestA.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package testng.simple;
-
-/*
- * 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.testng.annotations.Test;
-
-
-public class TestNGSuiteTestA {
-
- @Test
- public void doNothing()
- {
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-simple/src/test/java/testng/simple/TestNGSuiteTestB.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-simple/src/test/java/testng/simple/TestNGSuiteTestB.java b/surefire-integration-tests/src/test/resources/testng-simple/src/test/java/testng/simple/TestNGSuiteTestB.java
deleted file mode 100644
index e8d856d..0000000
--- a/surefire-integration-tests/src/test/resources/testng-simple/src/test/java/testng/simple/TestNGSuiteTestB.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package testng.simple;
-
-/*
- * 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.testng.annotations.Test;
-
-
-public class TestNGSuiteTestB {
-
- @Test
- public void doNothing()
- {
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-simple/src/test/java/testng/simple/TestNGSuiteTestC.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-simple/src/test/java/testng/simple/TestNGSuiteTestC.java b/surefire-integration-tests/src/test/resources/testng-simple/src/test/java/testng/simple/TestNGSuiteTestC.java
deleted file mode 100644
index 751feff..0000000
--- a/surefire-integration-tests/src/test/resources/testng-simple/src/test/java/testng/simple/TestNGSuiteTestC.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package testng.simple;
-
-/*
- * 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.testng.annotations.Test;
-
-
-public class TestNGSuiteTestC {
-
- @Test
- public void doNothing()
- {
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml b/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
deleted file mode 100644
index a10bd0f..0000000
--- a/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
+++ /dev/null
@@ -1,57 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for Testng</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.14.9</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <test>BasicTest#testSuccessOne</test>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/src/test/java/testng/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/src/test/java/testng/BasicTest.java b/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/src/test/java/testng/BasicTest.java
deleted file mode 100644
index 381016c..0000000
--- a/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/src/test/java/testng/BasicTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package testng;
-
-/*
- * 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.testng.annotations.*;
-import org.testng.Assert;
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @BeforeTest
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @AfterTest
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml b/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
deleted file mode 100644
index 32ebfaf..0000000
--- a/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
+++ /dev/null
@@ -1,80 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for Testng</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <test>BasicTest#testSuccessOne</test>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-single-method/src/test/java/testng/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-single-method/src/test/java/testng/BasicTest.java b/surefire-integration-tests/src/test/resources/testng-single-method/src/test/java/testng/BasicTest.java
deleted file mode 100644
index 381016c..0000000
--- a/surefire-integration-tests/src/test/resources/testng-single-method/src/test/java/testng/BasicTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package testng;
-
-/*
- * 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.testng.annotations.*;
-import org.testng.Assert;
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @BeforeTest
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @AfterTest
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-succes-percentage/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-succes-percentage/pom.xml b/surefire-integration-tests/src/test/resources/testng-succes-percentage/pom.xml
deleted file mode 100644
index 4e74bd8..0000000
--- a/surefire-integration-tests/src/test/resources/testng-succes-percentage/pom.xml
+++ /dev/null
@@ -1,65 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>testng-success-percentage</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for Testng</name>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-succes-percentage/src/test/java/testng/TestNGSuccessPercentFailingTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-succes-percentage/src/test/java/testng/TestNGSuccessPercentFailingTest.java b/surefire-integration-tests/src/test/resources/testng-succes-percentage/src/test/java/testng/TestNGSuccessPercentFailingTest.java
deleted file mode 100644
index 791869c..0000000
--- a/surefire-integration-tests/src/test/resources/testng-succes-percentage/src/test/java/testng/TestNGSuccessPercentFailingTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package testng;
-
-/*
- * 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.testng.annotations.*;
-import static org.testng.Assert.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class TestNGSuccessPercentFailingTest
-{
-
- private static final AtomicInteger counter = new AtomicInteger( 0 );
-
- // Pass 2 of 4 tests, expect this test to fail when 60% success is required
- @Test( invocationCount = 4, successPercentage = 60 )
- public void testFailure()
- {
- int value = counter.addAndGet( 1 );
- assertTrue( isOdd( value ), "is odd: " + value );
- }
-
- private boolean isOdd( int number )
- {
- return number % 2 == 0;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-succes-percentage/src/test/java/testng/TestNGSuccessPercentPassingTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-succes-percentage/src/test/java/testng/TestNGSuccessPercentPassingTest.java b/surefire-integration-tests/src/test/resources/testng-succes-percentage/src/test/java/testng/TestNGSuccessPercentPassingTest.java
deleted file mode 100644
index 35a1be4..0000000
--- a/surefire-integration-tests/src/test/resources/testng-succes-percentage/src/test/java/testng/TestNGSuccessPercentPassingTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package testng;
-
-/*
- * 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.testng.annotations.*;
-import static org.testng.Assert.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class TestNGSuccessPercentPassingTest
-{
-
- private static final AtomicInteger counter = new AtomicInteger( 0 );
-
- // Pass 2 of 4 tests, expect this test to pass when 50% success is required
- @Test( invocationCount = 4, successPercentage = 50 )
- public void testSuccess()
- {
- int value = counter.addAndGet( 1 );
- assertTrue( isOdd( value ), "is odd: " + value );
- }
-
- private boolean isOdd( int number )
- {
- return number % 2 == 0;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml b/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
deleted file mode 100644
index ec02455..0000000
--- a/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
+++ /dev/null
@@ -1,84 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>suiteXml</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG Suite XML File</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <suiteXmlFiles>
- <file>src/test-data/testng1.xml</file>
- <file>src/test-data/testng2.xml</file>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng1.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng1.xml b/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng1.xml
deleted file mode 100644
index ac62eca..0000000
--- a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng1.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ 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.
- -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="Suite 1 Test" verbose="4">
-
- <test name="Sample Test 1">
- <classes>
- <class name="testng.suiteXml.TestNGSuiteTest"/>
- </classes>
- </test>
-
-</suite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng2.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng2.xml b/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng2.xml
deleted file mode 100644
index 4036c21..0000000
--- a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng2.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ 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.
- -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="Suite 2 Test" verbose="4">
-
- <test name="Sample Test 2">
- <classes>
- <class name="testng.suiteXml.TestNGSuiteTest"/>
- </classes>
- </test>
-
-</suite>
\ No newline at end of file
[36/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml b/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
deleted file mode 100644
index 38ec727..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>fork-consoleOutput</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>fork-consoleOutput</name>
- <url>http://maven.apache.org</url>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <printSummary>${printSummary}</printSummary>
- <useFile>true</useFile>
- <redirectTestOutputToFile>${redirect.to.file}</redirectTestOutputToFile>
- <threadCount>2</threadCount>
- <parallel>${parallel}</parallel>
- <runOrder>alphabetical</runOrder>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
- <properties>
- <junit.version>4.8.1</junit.version>
- <redirect.to.file>true</redirect.to.file>
- <forkMode>once</forkMode>
- <printSummary>true</printSummary>
- <parallel>none</parallel>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test0.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test0.java b/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test0.java
deleted file mode 100644
index 102faaa..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test0.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package junit47ConsoleOutput;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Test0 {
-
- public Test0(){
- System.out.println("Constructor");
- }
-
- @Test
- public void testT0() throws Exception {
- System.out.println("testT0");
- }
-
- @Test
- public void testT1() throws Exception {
- System.out.println("testT1");
- }
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- System.out.println("setUpBeforeClass");
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- System.out.println("tearDownAfterClass");
- }
-
- @Before
- public void setUp() throws Exception {
- System.out.println("setUp");
- }
-
- @After
- public void tearDown() throws Exception {
- System.out.println("tearDown");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test1.java b/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test1.java
deleted file mode 100644
index 40e084e..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test1.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package junit47ConsoleOutput;
-
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Test1
-{
- @Test
- public void test6281() {
- System.out.println( "Test1 on" + Thread.currentThread().getName());
- }
-
- @BeforeClass
- public static void testWithFailingAssumption2() {
- System.out.println( "BeforeTest1 on" + Thread.currentThread().getName());
- }
-
- @AfterClass
- public static void testWithFailingAssumption3() {
- System.out.println( "AfterTest1 on" + Thread.currentThread().getName());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test2.java b/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test2.java
deleted file mode 100644
index 1a14fc7..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test2.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package junit47ConsoleOutput;
-
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Test2
-{
- @Test
- public void test6281() {
- System.out.println( "Test2 on" + Thread.currentThread().getName());
- }
-
- @BeforeClass
- public static void testWithFailingAssumption2() {
- System.out.println( "BeforeTest2 on" + Thread.currentThread().getName());
- }
-
- @AfterClass
- public static void testWithFailingAssumption3() {
- System.out.println( "AfterTest2 on" + Thread.currentThread().getName());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test3.java b/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test3.java
deleted file mode 100644
index 35b0032..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test3.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package junit47ConsoleOutput;
-
-/*
- * 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.Test;
-
-public class Test3
-{
- @Test
- public void test3() {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml b/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml
deleted file mode 100644
index 24ee294..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml
+++ /dev/null
@@ -1,77 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>junit47-rerun-failing-tests-with-cucumber</artifactId>
- <name>Test for rerun failing cucumber tests in JUnit 47</name>
-
- <properties>
- <cucumber.version>2.0.0</cucumber.version>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-java</artifactId>
- <version>${cucumber.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-junit</artifactId>
- <version>${cucumber.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/FlakeCucumberTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/FlakeCucumberTest.java b/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/FlakeCucumberTest.java
deleted file mode 100644
index ecda87b..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/FlakeCucumberTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-
-package org.sample.cucumber;
-
-import cucumber.api.junit.Cucumber;
-import org.junit.runner.RunWith;
-
-@RunWith( Cucumber.class )
-public class FlakeCucumberTest
-{
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/StepDefs.java b/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
deleted file mode 100644
index d253222..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.
- */
-
-package org.sample.cucumber;
-
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-
-import static org.junit.Assert.fail;
-
-public class StepDefs
-{
- private static int testFailures = 0;
-
- @Given( "^I have some code$" )
- public void I_have_some_code()
- throws Throwable
- {
- // do nothing
- }
-
- @When( "^I run test$" )
- public void I_run_test()
- throws Throwable
- {
- // do nothing
- }
-
- @Then( "^I get a flake$" )
- public void I_get_a_flake()
- throws Throwable
- {
- // This test will error out with only one retry, but will pass with two
- if( testFailures < 2 ) {
- testFailures++;
- fail( "failing the test on purpose." );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/resources/org/sample/cucumber/Sample.feature
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/resources/org/sample/cucumber/Sample.feature b/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/resources/org/sample/cucumber/Sample.feature
deleted file mode 100644
index d5b5dac..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/resources/org/sample/cucumber/Sample.feature
+++ /dev/null
@@ -1,10 +0,0 @@
-Feature: Sample
-
- In order to use Maven
- As a user
- I want to do tests.
-
- Scenario: Do a flake test
- Given I have some code
- When I run test
- Then I get a flake
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml b/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml
deleted file mode 100644
index 81f26c2..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4-test</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>junit47-static-inner-class-tests</name>
- <url>http://maven.apache.org</url>
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>never</forkMode>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index f11de6d..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package junit4;
-
-/*
- * 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.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-
-@RunWith(Enclosed.class)
-public class BasicTest {
- public static class InnerTest {
- @Test
- public void testSomething() {
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelAbstractClassTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelAbstractClassTest.java b/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelAbstractClassTest.java
deleted file mode 100644
index b47e755..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelAbstractClassTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package junit4;
-
-/*
- * 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.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-
-@RunWith(Enclosed.class)
-public abstract class TopLevelAbstractClassTest {
- public static class InnerTest {
- @Test
- public void testSomething() {
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelInterfaceTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelInterfaceTest.java b/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelInterfaceTest.java
deleted file mode 100644
index eaa6756..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelInterfaceTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package junit4;
-
-/*
- * 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.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-
-@RunWith(Enclosed.class)
-public interface TopLevelInterfaceTest {
- public static class InnerTest {
- @Test
- public void testSomething() {
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml b/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml
deleted file mode 100644
index a83b687..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml
+++ /dev/null
@@ -1,70 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit 4.8.1</name>
-
-
- <properties>
- <junit.version>4.8.1</junit.version>
- <groups>junit4.CategoryA,junit4.CategoryB</groups>
- <excludedGroups></excludedGroups>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <groups>${groups}</groups>
- <excludedGroups>${excludedGroups}</excludedGroups>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index 3108e1a..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package junit4;
-/*
- * 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.AfterClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-
-public class BasicTest
-{
- static int catACount = 0;
- static int catBCount = 0;
- static int catCCount = 0;
- static int catNoneCount = 0;
-
- @Test
- @Category(CategoryA.class)
- public void testInCategoryA()
- {
- System.out.println( "Ran testInCategoryA" );
- catACount++;
- }
-
- @Test
- @Category(CategoryB.class)
- public void testInCategoryB()
- {
- System.out.println( "Ran testInCategoryB" );
- catBCount++;
- }
-
- @Test
- @Category(CategoryC.class)
- public void testInCategoryC()
- {
- System.out.println( "Ran testInCategoryC" );
- catCCount++;
- }
-
- @Test
- public void testInNoCategory()
- {
- System.out.println( "Ran testInNoCategory" );
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("catA: " + catACount + "\n" +
- "catB: " + catBCount + "\n" +
- "catC: " + catCCount + "\n" +
- "catNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryA.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryA.java b/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryA.java
deleted file mode 100644
index 9b8b855..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryA.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryA {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryB.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryB.java b/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryB.java
deleted file mode 100644
index f10f3b1..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryB.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryB {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryC.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryC.java b/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryC.java
deleted file mode 100644
index 3e9e854..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryC.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryC {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryCTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryCTest.java b/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryCTest.java
deleted file mode 100644
index af88bc8..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/CategoryCTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package junit4;
-/*
- * 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.AfterClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-
-@Category(CategoryC.class)
-public class CategoryCTest
-{
- static int catACount = 0;
- static int catBCount = 0;
- static int catCCount = 0;
- static int catNoneCount = 0;
-
- @Test
- public void testInCategoryA()
- {
- catACount++;
- }
-
- @Test
- @Category(CategoryB.class)
- public void testInCategoryB()
- {
- catBCount++;
- }
-
- @Test
- @Category(CategoryC.class)
- public void testInCategoryC()
- {
- catCCount++;
- }
-
- @Test
- public void testInNoCategory()
- {
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("mA: " + catACount + "\n" +
- "mB: " + catBCount + "\n" +
- "mC: " + catCCount + "\n" +
- "CatNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/NoCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/NoCategoryTest.java b/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/NoCategoryTest.java
deleted file mode 100644
index f08f40f..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-categories/src/test/java/junit4/NoCategoryTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package junit4;
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class NoCategoryTest {
- static int catNoneCount = 0;
-
- @Test
- public void testInNoCategory()
- {
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("NoCategoryTest.CatNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
deleted file mode 100644
index 8689549..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
+++ /dev/null
@@ -1,103 +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/xsd/maven-4.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>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit 4.8.1</name>
-
- <properties>
- <junitVersion>4.8.1</junitVersion>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <test>BasicTest#testSuccess*</test>
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>surefire-junit47</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>surefire-junit4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index 218488c..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package junit4;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- @Category(SampleCategory.class)
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/SampleCategory.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/SampleCategory.java b/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/SampleCategory.java
deleted file mode 100644
index db057af..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/SampleCategory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package junit4;
-
-/*
- * 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.
- */
-
-public interface SampleCategory
-{
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml b/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml
deleted file mode 100644
index f307687..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml
+++ /dev/null
@@ -1,195 +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/xsd/maven-4.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>jiras-surefire-745-junit</artifactId>
- <version>1.0</version>
-
- <properties>
- <included/>
- <excluded/>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>junit4-test</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>junit47-test</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>junit4-includes</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>${included}</include>
- </includes>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>junit47-includes</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>${included}</include>
- </includes>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>junit4-includes-excludes</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>${included}</include>
- </includes>
- <excludes>
- <exclude>${excluded}</exclude>
- </excludes>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>junit47-includes-excludes</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>${included}</include>
- </includes>
- <excludes>
- <exclude>${excluded}</exclude>
- </excludes>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/BasicTest.java b/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/BasicTest.java
deleted file mode 100644
index 44d5978..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/BasicTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package jiras.surefire745;
-
-
-/*
- * 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.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-import static org.junit.Assert.*;
-
-
-public class BasicTest
-{
- @Rule
- public final TestName testName = new TestName();
-
- @Test
- public void testSuccessOne()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- }
-
- @Test
- public void testSuccessTwo()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- }
-
- @Test
- public void testFailure()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- fail( );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFive.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFive.java b/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFive.java
deleted file mode 100644
index 7d88f70..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFive.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package jiras.surefire745;
-
-/*
- * 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.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-
-public class TestFive
-{
- @Rule
- public final TestName testName = new TestName();
-
- @Test
- public void testSuccessOne()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- }
-
- @Test
- public void testSuccessTwo()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- }
-
- @Test
- public void testSuccessThree()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFour.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFour.java b/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFour.java
deleted file mode 100644
index 824b0d5..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFour.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package jiras.surefire745;
-
-/*
- * 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.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-
-public class TestFour
-{
- @Rule
- public final TestName testName = new TestName();
-
- @Test
- public void testSuccessOne()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- }
-
- @Test
- public void testSuccessTwo()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- }
-
- @Test
- public void testSuccessThree()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestThree.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestThree.java b/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestThree.java
deleted file mode 100644
index a868e7c..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestThree.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package jiras.surefire745;
-
-/*
- * 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.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-import static org.junit.Assert.*;
-
-public class TestThree
-{
- @Rule
- public final TestName testName = new TestName();
-
- @Test
- public void testSuccessOne()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- }
-
- @Test
- public void testSuccessTwo()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- }
-
- @Test
- public void testFailOne()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- fail();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestTwo.java b/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestTwo.java
deleted file mode 100644
index 5f1182d..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestTwo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package jiras.surefire745;
-
-/*
- * 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.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-public class TestTwo
-{
- @Rule
- public final TestName testName = new TestName();
-
- @Test
- public void testSuccessOne()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- }
-
- @Test
- public void testSuccessTwo()
- {
- System.out.println( getClass() + "#" + testName.getMethodName() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml b/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml
deleted file mode 100644
index 09ef51e..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml
+++ /dev/null
@@ -1,103 +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/xsd/maven-4.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>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit 4.8.1</name>
-
- <properties>
- <junitVersion>4.8.1</junitVersion>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <test>junit4/BasicTest#testSuccessOne+testFailOne,junit4/TestThree#testSuccessTwo</test>
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>surefire-junit47</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>surefire-junit4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/junit48-multiple-methods/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index de387d3..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package junit4;
-
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testFailOne()
- {
- Assert.assertFalse( false );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestThree.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestThree.java b/surefire-integration-tests/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestThree.java
deleted file mode 100644
index 16bc283..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestThree.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package junit4;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class TestThree
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestTwo.java b/surefire-integration-tests/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestTwo.java
deleted file mode 100644
index 137bf8b..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestTwo.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package junit4;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class TestTwo
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml b/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
deleted file mode 100644
index 96061ce..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
+++ /dev/null
@@ -1,103 +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/xsd/maven-4.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>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit 4.8.1</name>
-
- <properties>
- <junitVersion>4.8.1</junitVersion>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <test>BasicTest#testSuccessOne</test>
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>surefire-junit47</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>surefire-junit4</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index d983259..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package junit4;
-
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml b/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml
deleted file mode 100644
index fe104a4..0000000
--- a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml
+++ /dev/null
@@ -1,57 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4-smartstacktrace</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for smart stack trace parser</name>
-
-
- <properties>
- <junitVersion>4.8.1</junitVersion>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
[42/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire946KillMainProcessInReusableForkIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire946KillMainProcessInReusableForkIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire946KillMainProcessInReusableForkIT.java
deleted file mode 100644
index ea663ab..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire946KillMainProcessInReusableForkIT.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.BeforeClass;
-import org.junit.Test;
-
-public class Surefire946KillMainProcessInReusableForkIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- // there are 10 test classes that each would wait 2 seconds.
- private static final int TEST_SLEEP_TIME = 2000;
-
- @BeforeClass
- public static void installSelfdestructPlugin()
- throws Exception
- {
- unpack( Surefire946KillMainProcessInReusableForkIT.class, "surefire-946-self-destruct-plugin", "plugin" ).executeInstall();
- }
-
- @Test( timeout = 30000 )
- public void testHalt()
- throws Exception
- {
- doTest( "halt" );
- }
-
- @Test( timeout = 30000 )
- public void testExit()
- throws Exception
- {
- doTest( "exit" );
- }
-
- @Test( timeout = 30000 )
- public void testInterrupt()
- throws Exception
- {
- doTest( "interrupt" );
- }
-
- private void doTest( String method )
- {
- unpack( "surefire-946-killMainProcessInReusableFork" )
- .sysProp( "selfdestruct.timeoutInMillis", "5000" )
- .sysProp( "selfdestruct.method", method )
- .sysProp( "testSleepTime", String.valueOf( TEST_SLEEP_TIME ) )
- .addGoal( "org.apache.maven.plugins.surefire:maven-selfdestruct-plugin:selfdestruct" )
- .setForkJvm()
- .forkPerThread().threadCount( 1 ).reuseForks( true ).maven().withFailure().executeTest();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire972BizarreNoClassDefIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire972BizarreNoClassDefIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire972BizarreNoClassDefIT.java
deleted file mode 100644
index 94db9f8..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire972BizarreNoClassDefIT.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-
-/*
- * 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.
- */
-public class Surefire972BizarreNoClassDefIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testJunit3ParallelBuildResultCount()
- {
- unpack( "surefire-972-bizarre-noclassdef" ).maven().withFailure().executeVerify();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java
deleted file mode 100644
index 0f30dbc..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire975DefaultVMEncodingIT.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-public class Surefire975DefaultVMEncodingIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void runWithRussian1251()
- throws Exception
- {
- OutputValidator outputValidator =
- unpack( "surefire-975-wrong-encoding" ).setMavenOpts( "-Dfile.encoding=windows-1251" ).executeTest();
- outputValidator.getSurefireReportsXmlFile( "TEST-EncodingInReportTest.xml" ).assertContainsText(
- "\u043A\u0438\u0440\u0438\u043B\u043B\u0438\u0446\u0435" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire979WrongClassLoaderIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire979WrongClassLoaderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire979WrongClassLoaderIT.java
deleted file mode 100644
index d648576..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire979WrongClassLoaderIT.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-public class Surefire979WrongClassLoaderIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void wrongClassloaderUSedInSmartStacktraceparser()
- throws Exception
- {
- OutputValidator outputValidator =
- unpack( "surefire-979-smartStackTrace-wrongClassloader" ).failNever().executeTest();
- outputValidator.verifyTextInLog( "java.lang.NoClassDefFoundError: org/apache/commons/io/input/AutoCloseInputStream" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire985ParameterizedRunnerAndCategoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire985ParameterizedRunnerAndCategoriesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire985ParameterizedRunnerAndCategoriesIT.java
deleted file mode 100644
index b86b291..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire985ParameterizedRunnerAndCategoriesIT.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.io.FileNotFoundException;
-
-import org.apache.maven.shared.utils.xml.Xpp3Dom;
-import org.apache.maven.shared.utils.xml.Xpp3DomBuilder;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.TestFile;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class Surefire985ParameterizedRunnerAndCategoriesIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void test()
- throws Exception
- {
- OutputValidator validator = unpack( "surefire-985-parameterized-and-categories" ).maven().executeTest();
- validator.assertTestSuiteResults( 12, 0, 0, 0 );
-
- assertFalse( validator.getSurefireReportsXmlFile( "TEST-sample.parameterized.Parameterized01Test.xml" ).exists() );
-
- TestFile reportFile2 =
- validator.getSurefireReportsXmlFile( "TEST-sample.parameterized.Parameterized02Test.xml" );
- assertTestCount( reportFile2, 4 );
-
- TestFile reportFile3 =
- validator.getSurefireReportsXmlFile( "TEST-sample.parameterized.Parameterized03Test.xml" );
- assertTestCount( reportFile3, 8 );
-
- }
-
- private void assertTestCount( TestFile reportFile, int tests )
- throws FileNotFoundException
- {
- assertTrue( reportFile.exists() );
-
- Xpp3Dom testResult = Xpp3DomBuilder.build( reportFile.getFileInputStream(), "UTF-8" );
- Xpp3Dom[] children = testResult.getChildren( "testcase" );
- assertEquals( tests, children.length );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
deleted file mode 100644
index d776724..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-995">SUREFIRE-995</a>
- * @since 2.18.1
- */
-public class Surefire995CategoryInheritanceIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void negativeTestShouldRunAllCategories()
- {
- unpack()
- .setTestToRun( "Special*Test" )
- .executeTest()
- .verifyErrorFree( 3 );
- }
-
- @Test
- public void junit411ShouldRunExplicitCategory()
- {
- unpack()
- .addGoal( "-Ppositive-tests" )
- .sysProp( "version.junit", "4.11" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyTextInLog( "CategorizedTest#a" );
- }
-
- @Test
- public void junit411ShouldExcludeExplicitCategory()
- {
- unpack()
- .addGoal( "-Ppositive-tests-excluded-categories" )
- .sysProp( "version.junit", "4.11" )
- .executeTest()
- .verifyErrorFree( 2 );
- }
-
- @Test
- public void junit412ShouldRunInheritedCategory()
- {
- unpack()
- .setTestToRun( "Special*Test" )
- .addGoal( "-Ppositive-tests" )
- .executeTest()
- .verifyErrorFree( 2 );
- }
-
- @Test
- public void junit412ShouldExcludeInheritedCategory()
- {
- unpack()
- .setTestToRun( "Special*Test" )
- .addGoal( "-Ppositive-tests-excluded-categories" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyTextInLog( "SpecialNonCategoryTest#test" );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-995-categoryInheritance" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml b/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml
deleted file mode 100644
index 2d066eb..0000000
--- a/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-<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/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>SurefireToolchains</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Test :: SurefireToolchains</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <prerequisites>
- <maven>2.2.1</maven>
- </prerequisites>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <jdk>
- <version>1.5</version>
- <vendor>sun</vendor>
- </jdk>
- </toolchains>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/SurefireToolchains/src/main/java/test/surefiretoolchains/App.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/SurefireToolchains/src/main/java/test/surefiretoolchains/App.java b/surefire-integration-tests/src/test/resources/SurefireToolchains/src/main/java/test/surefiretoolchains/App.java
deleted file mode 100644
index 0a56a54..0000000
--- a/surefire-integration-tests/src/test/resources/SurefireToolchains/src/main/java/test/surefiretoolchains/App.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package test.surefiretoolchains;
-
-/*
- * 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.
- */
-
-public final class App
-{
-
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/SurefireToolchains/src/test/java/test/surefiretoolchains/AppTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/SurefireToolchains/src/test/java/test/surefiretoolchains/AppTest.java b/surefire-integration-tests/src/test/resources/SurefireToolchains/src/test/java/test/surefiretoolchains/AppTest.java
deleted file mode 100644
index 1c061d0..0000000
--- a/surefire-integration-tests/src/test/resources/SurefireToolchains/src/test/java/test/surefiretoolchains/AppTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package test.surefiretoolchains;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.*;
-
-public class AppTest
-{
-
- @Test
- public void testApp()
- {
- // 1.5.0_19-b02
- assertEquals( "1.5.0_19", System.getProperty( "java.version" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/additional-classpath/extraResource/test.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/additional-classpath/extraResource/test.txt b/surefire-integration-tests/src/test/resources/additional-classpath/extraResource/test.txt
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/additional-classpath/extraResource2/test2.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/additional-classpath/extraResource2/test2.txt b/surefire-integration-tests/src/test/resources/additional-classpath/extraResource2/test2.txt
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml b/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
deleted file mode 100644
index 01ce10c..0000000
--- a/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
+++ /dev/null
@@ -1,65 +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/xsd/maven-4.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>additional-classpath</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for additionalClasspathElements</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <additionalClasspathElements>
- <additionalClasspathElement>${basedir}/extraResource</additionalClasspathElement>
- <additionalClasspathElement>${abc}, ${basedir}/extraResource2</additionalClasspathElement>
- <!-- SUREFIRE-694 -->
- <additionalClasspathElement></additionalClasspathElement>
- <!-- SUREFIRE-694 -->
- </additionalClasspathElements>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/additional-classpath/src/test/java/additionalClasspath/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/additional-classpath/src/test/java/additionalClasspath/BasicTest.java b/surefire-integration-tests/src/test/resources/additional-classpath/src/test/java/additionalClasspath/BasicTest.java
deleted file mode 100644
index 43826b8..0000000
--- a/surefire-integration-tests/src/test/resources/additional-classpath/src/test/java/additionalClasspath/BasicTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package additionalClasspath;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class BasicTest
- extends TestCase
-{
-
- public void testExtraResource()
- {
- assertNotNull( BasicTest.class.getResourceAsStream( "/test.txt" ) );
- assertNotNull( BasicTest.class.getResourceAsStream( "/test2.txt" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
deleted file mode 100644
index 9897a25..0000000
--- a/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
+++ /dev/null
@@ -1,52 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>aggregate-report</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>aggregate-child1</artifactId>
- <name>child1 for aggregate-reports</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/aggregate-report/child1/src/test/java/aggregateReport/FailingTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/child1/src/test/java/aggregateReport/FailingTest.java b/surefire-integration-tests/src/test/resources/aggregate-report/child1/src/test/java/aggregateReport/FailingTest.java
deleted file mode 100644
index 440ade7..0000000
--- a/surefire-integration-tests/src/test/resources/aggregate-report/child1/src/test/java/aggregateReport/FailingTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package aggregateReport;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class FailingTest
- extends TestCase
-{
-
- public void testFailure()
- {
- fail( "This test is supposed to fail" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
deleted file mode 100644
index b67c49a..0000000
--- a/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
+++ /dev/null
@@ -1,52 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>aggregate-report</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>aggregate-child2</artifactId>
- <name>child2 for aggregate-reports</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java b/surefire-integration-tests/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java
deleted file mode 100644
index 529e7ca..0000000
--- a/surefire-integration-tests/src/test/resources/aggregate-report/child2/src/test/java/aggregateReport/BasicTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package aggregateReport;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public BasicTest( String name, String extraName )
- {
- super( name );
- }
-
- public static Test suite()
- {
- System.out.println( "suite" );
- TestSuite suite = new TestSuite();
- Test test = new BasicTest( "testSetUp", "dummy" );
- suite.addTest( test );
-
- return new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
deleted file mode 100644
index 42f0f32..0000000
--- a/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
+++ /dev/null
@@ -1,67 +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/xsd/maven-4.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>aggregate-report</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for aggregate-report</name>
- <packaging>pom</packaging>
- <modules>
- <module>child1</module>
- <module>child2</module>
- </modules>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore b/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore
deleted file mode 100644
index 2d7276b..0000000
--- a/surefire-integration-tests/src/test/resources/ant-ignore/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.jar
-TEST*
-
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/ant-ignore/build.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/build.xml b/surefire-integration-tests/src/test/resources/ant-ignore/build.xml
deleted file mode 100644
index 69795d0..0000000
--- a/surefire-integration-tests/src/test/resources/ant-ignore/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<project name="MyProject" xmlns:ivy="antlib:org.apache.ivy.ant" default="dist" basedir=".">
- <description>
- simple example build file
- </description>
- <!-- set global properties for this build -->
- <property name="src" location="src/test"/>
- <property name="build" location="build"/>
- <property name="dist" location="dist"/>
-
-
- <target name="resolve" description="--> retrieve dependencies with ivy">
- <ivy:retrieve />
- </target>
-
- <target name="init">
- <!-- Create the time stamp -->
- <tstamp/>
- <!-- Create the build directory structure used by compile -->
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="init, resolve"
- description="compile the source " >
- <javac srcdir="${src}" destdir="${build}" includeantruntime="true" classpath="lib/junit-4.8.1.jar" />
- </target>
-
- <target name="dist" depends="compile"
- description="generate the distribution" >
- <!-- Create the distribution directory -->
- <mkdir dir="${dist}/lib"/>
-
- <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
- <jar jarfile="${dist}/lib/MyProject-${DSTAMP}.jar" basedir="${build}"/>
- </target>
-
- <target name="test" depends="compile">
- <junit>
- <classpath path="build:lib/junit-4.8.1.jar"/>
- <formatter type="brief" usefile="true" />
- <formatter type="xml" usefile="true" />
- <test name="antignore.BasicTest" />
- </junit>
-</target>
-
- <target name="clean"
- description="clean up" >
- <!-- Delete the ${build} and ${dist} directory trees -->
- <delete dir="${build}"/>
- <delete dir="${dist}"/>
- </target>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml b/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml
deleted file mode 100644
index 64df19c..0000000
--- a/surefire-integration-tests/src/test/resources/ant-ignore/ivy.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ivy-module version="2.0">
- <info organisation="org.apache" module="hello-ivy"/>
- <dependencies>
- <dependency org="junit" name="junit" rev="4.8.1"/>
- </dependencies>
-</ivy-module>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml b/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
deleted file mode 100644
index 6360bed..0000000
--- a/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
+++ /dev/null
@@ -1,47 +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/xsd/maven-4.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>ant-ignore</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test of @Ignore annotation, can be used side-by-side with maven and ant </name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml b/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml
deleted file mode 100644
index 64df19c..0000000
--- a/surefire-integration-tests/src/test/resources/ant-ignore/src/ivy.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ivy-module version="2.0">
- <info organisation="org.apache" module="hello-ivy"/>
- <dependencies>
- <dependency org="junit" name="junit" rev="4.8.1"/>
- </dependencies>
-</ivy-module>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java b/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
deleted file mode 100644
index 750bd60..0000000
--- a/surefire-integration-tests/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package antignore;
-
-/*
- * 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.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class BasicTest
-{
-
- @Test
- @Ignore
- public void testIgnorable()
- {
- Assert.fail( "you should have ignored me!" );
- }
-
- @Test
- public void testSomethingElse()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml b/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml
deleted file mode 100644
index 0cce4c9..0000000
--- a/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml
+++ /dev/null
@@ -1,61 +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/xsd/maven-4.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>testArgLine</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for argLine configuration</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <argLine>-Dfoo.property="foo foo/foo/bar/1.0" -Dbar.property="bar bar/foo/bar/2.0"</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/argLine-parameter/src/test/java/argLine/TestSurefireArgLine.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/argLine-parameter/src/test/java/argLine/TestSurefireArgLine.java b/surefire-integration-tests/src/test/resources/argLine-parameter/src/test/java/argLine/TestSurefireArgLine.java
deleted file mode 100644
index 1765c84..0000000
--- a/surefire-integration-tests/src/test/resources/argLine-parameter/src/test/java/argLine/TestSurefireArgLine.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package argLine;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class TestSurefireArgLine
- extends TestCase
-{
-
- public void testArgLine()
- {
- String fooProperty = System.getProperty( "foo.property" );
- assertEquals( "incorrect foo.property; " +
- "Surefire should have passed this in correctly",
- "foo foo/foo/bar/1.0", fooProperty );
- String barProperty = System.getProperty( "bar.property" );
- assertEquals( "incorrect bar.property; " +
- "Surefire should have passed this in correctly",
- "bar bar/foo/bar/2.0", barProperty );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml b/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml
deleted file mode 100644
index 2a6d6c2..0000000
--- a/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml
+++ /dev/null
@@ -1,84 +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/xsd/maven-4.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>testArgProperties</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for late replacement argLine properties.</name>
-
- <properties>
- <from.prop>from-prop-value</from.prop>
- <override.prop>not-override-prop-value</override.prop>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <executions>
- <execution>
- <id>default</id>
- <phase>validate</phase>
- <goals>
- <goal>read-project-properties</goal>
- </goals>
- <configuration>
- <files>
- <file>${project.basedir}/src/test/resources/it.properties</file>
- </files>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <argLine>-Dp1=@{from.prop} -Dp2=@{override.prop} -Dp3=@{undefined.prop} -Dp4=@{generated.prop}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/argLine-properties/src/test/java/argLine-properties/TestSurefireArgLineProperties.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/argLine-properties/src/test/java/argLine-properties/TestSurefireArgLineProperties.java b/surefire-integration-tests/src/test/resources/argLine-properties/src/test/java/argLine-properties/TestSurefireArgLineProperties.java
deleted file mode 100644
index a16fceb..0000000
--- a/surefire-integration-tests/src/test/resources/argLine-properties/src/test/java/argLine-properties/TestSurefireArgLineProperties.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package argLine;
-
-/*
- * 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.Assert;
-import org.junit.Test;
-
-public class TestSurefireArgLineProperties
-{
- @Test
- public void testFromProp()
- {
- String fromProp = System.getProperty("p1");
- Assert.assertNotNull(fromProp, "incorrect arg line, no p1 present?");
- Assert.assertEquals("from-prop-value", fromProp);
- }
-
- @Test
- public void testOverrideProp()
- {
- String overrideProp = System.getProperty("p2");
- Assert.assertNotNull(overrideProp, "incorrect arg line, no p2 present?");
- Assert.assertEquals("override-prop-value", overrideProp);
- }
-
- @Test
- public void testUndefinedProp()
- {
- String undefinedProp = System.getProperty("p3");
- Assert.assertNotNull(undefinedProp, "incorrect arg line, no p3 present?");
- Assert.assertEquals("@{undefined.prop}", undefinedProp);
- }
-
- @Test
- public void testGeneratedProp()
- {
- String generatedProp = System.getProperty("p4");
- Assert.assertNotNull(generatedProp, "incorrect arg line, no p4 present?");
- Assert.assertEquals("generated-prop-value", generatedProp);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/argLine-properties/src/test/resources/it.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/argLine-properties/src/test/resources/it.properties b/surefire-integration-tests/src/test/resources/argLine-properties/src/test/resources/it.properties
deleted file mode 100644
index dd889a2..0000000
--- a/surefire-integration-tests/src/test/resources/argLine-properties/src/test/resources/it.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.
-
-override.prop=override-prop-value
-generated.prop=generated-prop-value
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml b/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml
deleted file mode 100644
index 8530eca..0000000
--- a/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml
+++ /dev/null
@@ -1,63 +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/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>assumpationFailure</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>assumpationFailureReportTest</name>
- <url>http://maven.apache.org</url>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/assumpationFailureReport/src/test/java/assumpationFailure/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/assumpationFailureReport/src/test/java/assumpationFailure/Test1.java b/surefire-integration-tests/src/test/resources/assumpationFailureReport/src/test/java/assumpationFailure/Test1.java
deleted file mode 100644
index 3653ce6..0000000
--- a/surefire-integration-tests/src/test/resources/assumpationFailureReport/src/test/java/assumpationFailure/Test1.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package assumptionFailure;
-
-/*
- * 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.Test;
-import org.junit.Assume;
-
-import static org.junit.Assert.fail;
-
-public class Test1
-{
- @Test
- public void testAssumptionFailureReport()
- {
- Assume.assumeTrue( "The test is skipped if it is false" , false );
- fail( "This is not expected to test" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml b/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml
deleted file mode 100644
index 49c4e34..0000000
--- a/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml
+++ /dev/null
@@ -1,65 +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/xsd/maven-4.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>classpath-dependency-filter</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for filtering classpath dependencies</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <classpathDependencyExcludes>
- <exclude>org.apache.commons:*</exclude>
- </classpathDependencyExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/classpath-filtering/src/test/java/classpathFiltering/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-filtering/src/test/java/classpathFiltering/BasicTest.java b/surefire-integration-tests/src/test/resources/classpath-filtering/src/test/java/classpathFiltering/BasicTest.java
deleted file mode 100644
index 5f8b23a..0000000
--- a/surefire-integration-tests/src/test/resources/classpath-filtering/src/test/java/classpathFiltering/BasicTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package classpathFiltering;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class BasicTest
- extends TestCase
-{
-
- public void testDependencyFilter() {
-
- Class testClass = null;
- String testClassName = "org.apache.commons.mail.Email";
- try
- {
- testClass = Class.forName( testClassName );
- System.out.println( "Able to load class " + testClass );
- }
- catch ( ClassNotFoundException e )
- {
- System.out.println( "Couldn't load " + testClassName );
- }
- assertNull( testClass );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/classpath-order/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-order/pom.xml b/surefire-integration-tests/src/test/resources/classpath-order/pom.xml
deleted file mode 100644
index b49fda7..0000000
--- a/surefire-integration-tests/src/test/resources/classpath-order/pom.xml
+++ /dev/null
@@ -1,64 +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/xsd/maven-4.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>classpath-order</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test proper order of class path elements: test-classes, classes, dependencies</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/classpath-order/src/main/resources/surefire-classpath-order.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-order/src/main/resources/surefire-classpath-order.properties b/surefire-integration-tests/src/test/resources/classpath-order/src/main/resources/surefire-classpath-order.properties
deleted file mode 100644
index 10493b4..0000000
--- a/surefire-integration-tests/src/test/resources/classpath-order/src/main/resources/surefire-classpath-order.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file collides with the equally named file from the project's test resources
-Surefire: classes
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/classpath-order/src/main/resources/surefire-report.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-order/src/main/resources/surefire-report.properties b/surefire-integration-tests/src/test/resources/classpath-order/src/main/resources/surefire-report.properties
deleted file mode 100644
index 585dd8b..0000000
--- a/surefire-integration-tests/src/test/resources/classpath-order/src/main/resources/surefire-report.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file collides with the equally named i18n bundle in the Surefire Report Plugin
-Surefire: classes
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/classpath-order/src/test/java/it/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-order/src/test/java/it/BasicTest.java b/surefire-integration-tests/src/test/resources/classpath-order/src/test/java/it/BasicTest.java
deleted file mode 100644
index 739e134..0000000
--- a/surefire-integration-tests/src/test/resources/classpath-order/src/test/java/it/BasicTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package it;
-
-/*
- * 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.io.InputStream;
-import java.io.IOException;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-public class BasicTest
- extends TestCase
-{
-
- public void testTestClassesBeforeMainClasses()
- {
- Properties props = getProperties( "/surefire-classpath-order.properties" );
- assertEquals( "test-classes", props.getProperty( "Surefire" ) );
- }
-
- public void testMainClassesBeforeDependencies()
- {
- Properties props = getProperties( "/surefire-report.properties" );
- assertEquals( "classes", props.getProperty( "Surefire" ) );
- }
-
- private Properties getProperties(String resource)
- {
- InputStream in = getClass().getResourceAsStream( resource );
- assertNotNull( in );
- try
- {
- Properties props = new Properties();
- props.load( in );
- return props;
- }
- catch (IOException e)
- {
- fail(e.toString());
- return null;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/classpath-order/src/test/resources/surefire-classpath-order.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-order/src/test/resources/surefire-classpath-order.properties b/surefire-integration-tests/src/test/resources/classpath-order/src/test/resources/surefire-classpath-order.properties
deleted file mode 100644
index 246cf2c..0000000
--- a/surefire-integration-tests/src/test/resources/classpath-order/src/test/resources/surefire-classpath-order.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file collides with the equally named file from the project's main resources
-Surefire: test-classes
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml b/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml
deleted file mode 100644
index 7dcdfa2..0000000
--- a/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml
+++ /dev/null
@@ -1,63 +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/xsd/maven-4.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>classpath-scope-filter</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for classpath scope filter</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <classpathDependencyScopeExclude>compile</classpathDependencyScopeExclude>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/classpath-scope-filtering/src/test/java/classpathFiltering/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-scope-filtering/src/test/java/classpathFiltering/BasicTest.java b/surefire-integration-tests/src/test/resources/classpath-scope-filtering/src/test/java/classpathFiltering/BasicTest.java
deleted file mode 100644
index 5f8b23a..0000000
--- a/surefire-integration-tests/src/test/resources/classpath-scope-filtering/src/test/java/classpathFiltering/BasicTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package classpathFiltering;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class BasicTest
- extends TestCase
-{
-
- public void testDependencyFilter() {
-
- Class testClass = null;
- String testClassName = "org.apache.commons.mail.Email";
- try
- {
- testClass = Class.forName( testClassName );
- System.out.println( "Able to load class " + testClass );
- }
- catch ( ClassNotFoundException e )
- {
- System.out.println( "Couldn't load " + testClassName );
- }
- assertNull( testClass );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml b/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml
deleted file mode 100644
index 407f909..0000000
--- a/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>consoleOutputTest</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>consoleOutputTest</name>
- <url>http://maven.apache.org</url>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <testFailureIgnore>true</testFailureIgnore>
- <forkMode>${forkMode}</forkMode>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/consoleOutput/src/test/java/consoleOutput/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleOutput/src/test/java/consoleOutput/Test1.java b/surefire-integration-tests/src/test/resources/consoleOutput/src/test/java/consoleOutput/Test1.java
deleted file mode 100644
index 8994251..0000000
--- a/surefire-integration-tests/src/test/resources/consoleOutput/src/test/java/consoleOutput/Test1.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package consoleOutput;
-
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.fail;
-
-public class Test1
-{
- static
- {
- System.out.println("Printline in static block");
- Runtime.getRuntime().addShutdownHook( new Thread( ){
- @Override
- public void run()
- {
- System.out.println( "Printline in shutdown hook" );
- }
- });
- }
-
- @Override
- protected void finalize()
- throws Throwable
- {
- System.out.println( "Printline in finalizer" );
- }
-
- public Test1(){
- System.out.println("In constructor");
- }
-
- @Test
- public void testStdOut()
- {
- char c = 'C';
- System.out.print( "Sout" );
- System.out.print( "Again" );
- System.out.print( "\n" );
- System.out.print( c );
- System.out.println( "SoutLine" );
- System.out.println( "äöüß" );
- System.out.println( "" );
- System.out.println( "==END==" );
-
- fail( "failing with ü" );
- }
-
- @Test
- public void testStdErr()
- {
- char e = 'E';
- System.err.print( "Serr" );
- System.err.print( "\n" );
- System.err.print( e );
- System.err.println( "SerrLine" );
- System.err.println( "äöüß" );
- System.err.println( "" );
- System.err.println( "==END==" );
- }
-}
[31/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
deleted file mode 100644
index be5cf97..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/pom.xml
+++ /dev/null
@@ -1,82 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>pluggableproviders-classpath</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>pluggableproviders-classpath-test</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-test-classpath-provider</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-test-classpath-provider</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyIT.java b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyIT.java
deleted file mode 100644
index f7e2a7f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyIT.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package pluggableproviders;
-
-/*
- * 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.
- */
-
-
-public class EmptyIT
-{
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyTest.java b/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyTest.java
deleted file mode 100644
index 4ac75c7..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1396-pluggableproviders-classpath/src/test/java/pluggableproviders/EmptyTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package pluggableproviders;
-
-/*
- * 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.
- */
-
-
-public class EmptyTest
-{
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
deleted file mode 100644
index 10a40c4..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
- ~ 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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-test-provider</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test provider</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-api</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources/META-INF</directory>
- <targetPath>META-INF</targetPath>
- </resource>
- </resources>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java
deleted file mode 100644
index 79b2ceb..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.apache.maven.surefire.testprovider;
-
-/*
- * 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.providerapi.AbstractProvider;
-import org.apache.maven.surefire.providerapi.ProviderParameters;
-import org.apache.maven.surefire.report.ReporterException;
-import org.apache.maven.surefire.suite.RunResult;
-import org.apache.maven.surefire.testset.TestSetFailedException;
-
-/**
- * @author Kristian Rosenvold
- */
-public class TestProvider
- extends AbstractProvider
-{
-
- public TestProvider( ProviderParameters booterParameters )
- {
- invokeRuntimeExceptionIfSet( System.getProperty( "constructorCrash" ) );
- }
-
- public Iterable<Class<?>> getSuites()
- {
- invokeRuntimeExceptionIfSet( System.getProperty( "getSuitesCrash" ) );
- return null;
- }
-
- public RunResult invoke( Object forkTestSet )
- throws TestSetFailedException, ReporterException
- {
- throwIfSet( System.getProperty( "invokeCrash" ) );
- return new RunResult( 1, 0, 0, 2 );
- }
-
- private void throwIfSet( String throwError )
- throws TestSetFailedException, ReporterException
- {
- if ( "testSetFailed".equals( throwError ) )
- {
- throw new TestSetFailedException( "Let's fail" );
- }
- if ( "reporterException".equals( throwError ) )
- {
- throw new ReporterException( "Let's fail with a reporterexception", new RuntimeException() );
- }
-
- invokeRuntimeExceptionIfSet( throwError );
- }
-
- private void invokeRuntimeExceptionIfSet( String throwError )
- {
- if ( "runtimeException".equals( throwError ) )
- {
- throw new RuntimeException( "Let's fail with a runtimeException" );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
deleted file mode 100644
index d52f21c..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders-provider/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.maven.surefire.testprovider.TestProvider
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml
deleted file mode 100644
index 1a92a0c..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml
+++ /dev/null
@@ -1,68 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire141-test</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>surefire-141-pluggableproviders</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <surefire.version>2.12.4</surefire.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit3</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-test-provider</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/BasicTest.java
deleted file mode 100644
index acf8bb3..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/BasicTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package surefire141;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public BasicTest( String name )
- {
- super( name );
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite();
- Test test = new BasicTest( "testSetUp" );
- suite.addTest( test );
- TestSetup setup = new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
-
- return setup;
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/TestTwo.java b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/TestTwo.java
deleted file mode 100644
index 1768daf..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/src/test/java/surefire141/TestTwo.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package surefire141;
-
-/*
- * 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 junit.framework.TestCase;
-
-
-public class TestTwo
- extends TestCase
-{
- public void testTwo() {}
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml b/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
deleted file mode 100644
index 671a654..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
+++ /dev/null
@@ -1,58 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>forkPerTestNoSetup</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for SUREFIRE-146 (forkMode=pertest fails to call setUp)</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>pertest</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java b/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java
deleted file mode 100644
index 5810572..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package forkPerTestNoSetup;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class TestSurefire2
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public TestSurefire2( String name, String extraName )
- {
- super( name );
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite();
- Test test = new TestSurefire2( "testSetUp", "dummy" );
- suite.addTest( test );
-
- return new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
deleted file mode 100644
index 3eb6175..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.surefire.its</groupId>
- <artifactId>surefire-162-charsetProvider</artifactId>
- <name>Test alternate CharsetProvider</name>
- <version>1.0-SNAPSHOT</version>
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>once</forkMode>
- <useSystemClassLoader>true</useSystemClassLoader>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jcharset</groupId>
- <artifactId>jcharset</artifactId>
- <version>1.2.1</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar
deleted file mode 100644
index e9864bb..0000000
Binary files a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.md5
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.md5 b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.md5
deleted file mode 100644
index c9c4d19..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-c4b966f51890d6f093f9695073eddd17
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.sha1
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.sha1 b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.sha1
deleted file mode 100644
index d59a609..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3cd17d7cc1cca87607df77a9fe1b8f66bdfadcbb
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom
deleted file mode 100644
index 4b235e0..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>jcharset</groupId>
- <artifactId>jcharset</artifactId>
- <version>1.2.1</version>
- <distributionManagement>
- <status>deployed</status>
- </distributionManagement>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.md5
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.md5 b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.md5
deleted file mode 100644
index 75aa95b..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-5e621bbe805a5a50e7d06bc1f6978e65
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.sha1
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.sha1 b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.sha1
deleted file mode 100644
index 3903b9d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1d048854e95e548527550e11ef3ba1615cd0c3ec
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml
deleted file mode 100644
index 94ee601..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
- <groupId>jcharset</groupId>
- <artifactId>jcharset</artifactId>
- <version>1.2.1</version>
- <versioning>
- <versions>
- <version>1.2.1</version>
- </versions>
- <lastUpdated>20071219170211</lastUpdated>
- </versioning>
-</metadata>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.md5
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.md5 b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.md5
deleted file mode 100644
index 3e1a8c3..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.md5
+++ /dev/null
@@ -1 +0,0 @@
-6b6e65bd49d8b6f5fa035b7f842217d5
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.sha1
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.sha1 b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.sha1
deleted file mode 100644
index ee1dae6..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/repo/jcharset/jcharset/maven-metadata.xml.sha1
+++ /dev/null
@@ -1 +0,0 @@
-31af2f983559347ed4cdc42e882fdc1ccf9cfc24
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/src/test/java/charsetProvider/MSUREFIRE77TestCase.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/src/test/java/charsetProvider/MSUREFIRE77TestCase.java b/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/src/test/java/charsetProvider/MSUREFIRE77TestCase.java
deleted file mode 100644
index ef492dc..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/src/test/java/charsetProvider/MSUREFIRE77TestCase.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package charsetProvider;
-
-/*
- * 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.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-public class MSUREFIRE77TestCase
- extends TestCase
-{
- public void testThatICanUseCharsets()
- throws UnsupportedEncodingException
- {
- System.out.println( new String( "foo".getBytes(), "GSM_0338" ) );
- }
-
- public static void main( String[] args )
- throws Exception
- {
- new MSUREFIRE77TestCase().testThatICanUseCharsets();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml b/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
deleted file mode 100644
index 74217ef..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
+++ /dev/null
@@ -1,58 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>wellFormedXmlFailures</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for MSUREFIRE-54 (well-formed XML failures)</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/src/test/java/wellFormedXmlFailures/TestSurefire3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/src/test/java/wellFormedXmlFailures/TestSurefire3.java b/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/src/test/java/wellFormedXmlFailures/TestSurefire3.java
deleted file mode 100644
index 7bb1afe..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/src/test/java/wellFormedXmlFailures/TestSurefire3.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package wellFormedXmlFailures;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class TestSurefire3
- extends TestCase
-{
-
- public TestSurefire3( )
- {
- super( );
- }
-
- public TestSurefire3( String name )
- {
- super( name );
- }
-
-
- public void testQuote()
- {
- fail( "\"" );
- }
-
- public void testLower()
- {
- fail( "<" );
- }
-
- public void testGreater()
- {
- fail( ">" );
- }
-
- public void testU0000()
- {
- fail( "\u0000" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/pom.xml b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/pom.xml
deleted file mode 100644
index 90ca5c6..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire-257-rerunningTests</groupId>
- <artifactId>surefire-257-rerunningTests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.maven.surefire-257-rerunningTests.module1</groupId>
- <artifactId>module1</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/src/main/java/surefire257/MyModule1Class.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/src/main/java/surefire257/MyModule1Class.java b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/src/main/java/surefire257/MyModule1Class.java
deleted file mode 100644
index 861bd34..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/src/main/java/surefire257/MyModule1Class.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package surefire257;
-
-/*
- * 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.
- */
-
-public class MyModule1Class {
- public int getFoo() {
- return 42;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/src/test/java/surefire257/MyModule1ClassTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/src/test/java/surefire257/MyModule1ClassTest.java b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/src/test/java/surefire257/MyModule1ClassTest.java
deleted file mode 100644
index 0b3260f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/src/test/java/surefire257/MyModule1ClassTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package surefire257;
-
-/*
- * 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 junit.framework.Assert;
-import junit.framework.TestCase;
-import surefire257.MyModule1Class;
-
-public class MyModule1ClassTest extends TestCase {
-
- public void testGetFooOK() {
- MyModule1Class mc = new MyModule1Class();
- Assert.assertEquals(42, mc.getFoo());
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/pom.xml b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/pom.xml
deleted file mode 100644
index 2685c13..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire-257-rerunningTests</groupId>
- <artifactId>surefire-257-rerunningTests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.maven.surefire-257-rerunningTests.module2</groupId>
- <artifactId>module2</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/src/main/java/surefire257/MyModule2Class.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/src/main/java/surefire257/MyModule2Class.java b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/src/main/java/surefire257/MyModule2Class.java
deleted file mode 100644
index 9b284e3..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/src/main/java/surefire257/MyModule2Class.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package surefire257;
-public class MyModule2Class {
- public int getFoo() {
- return 42;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/src/test/java/surefire257/MyModule2ClassTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/src/test/java/surefire257/MyModule2ClassTest.java b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/src/test/java/surefire257/MyModule2ClassTest.java
deleted file mode 100644
index f573a86..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/src/test/java/surefire257/MyModule2ClassTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package surefire257;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-import surefire257.MyModule2Class;
-
-public class MyModule2ClassTest extends TestCase {
-
- public void testGetFooOK() {
- MyModule2Class mc = new MyModule2Class();
- Assert.assertEquals(42, mc.getFoo());
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
deleted file mode 100644
index c3e6738..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.surefire-257-rerunningTests</groupId>
- <artifactId>surefire-257-rerunningTests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <inherited>true</inherited>
- </plugin>
- </plugins>
- </reporting>
-
- <modules>
- <module>module1</module>
- <module>module2</module>
- </modules>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml b/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
deleted file mode 100644
index 16035fe..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
+++ /dev/null
@@ -1,64 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-260-testsWithIdenticalNames</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>surefire-260-testsWithIdenticalNames</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <dependencies>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- <dependencies>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestA.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestA.java b/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestA.java
deleted file mode 100644
index 3b52a44..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestA.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package surefire260;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class TestA
- extends TestCase
-{
- public void testOne()
- {
- }
-
- public void testDup()
- {
- fail( "This is what we want" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestB.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestB.java b/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestB.java
deleted file mode 100644
index d06b7b2..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestB.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package surefire260;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class TestB
- extends TestCase
-{
- public void testDup()
- {
- fail( "This is what we want" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestC.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestC.java b/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestC.java
deleted file mode 100644
index a5050fb..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/src/test/java/surefire260/TestC.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package surefire260;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class TestC
- extends TestCase
-{
- public void testDup()
- {
- fail( "This is what we want" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml b/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
deleted file mode 100644
index 541f499..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
+++ /dev/null
@@ -1,61 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire34</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Surefire-34-SecurityManager</name>
-
- <properties>
- <junitVersion>3.8.1</junitVersion>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <systemPropertyVariables>
- <surefire.security.manager>java.lang.SecurityManager</surefire.security.manager>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java b/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java
deleted file mode 100644
index 3448502..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/src/test/java/junit4/SecurityManagerTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package junit4;
-
-/*
- * 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 junit.framework.TestCase;
-
-
-public class SecurityManagerTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public void testNotMuch()
- {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml b/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml
deleted file mode 100644
index 541f499..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml
+++ /dev/null
@@ -1,61 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire34</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Surefire-34-SecurityManager</name>
-
- <properties>
- <junitVersion>3.8.1</junitVersion>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <systemPropertyVariables>
- <surefire.security.manager>java.lang.SecurityManager</surefire.security.manager>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-34-securityManager/src/test/java/junit4/SecurityManagerTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-34-securityManager/src/test/java/junit4/SecurityManagerTest.java b/surefire-integration-tests/src/test/resources/surefire-34-securityManager/src/test/java/junit4/SecurityManagerTest.java
deleted file mode 100644
index 6fb992f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-34-securityManager/src/test/java/junit4/SecurityManagerTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package junit4;
-
-/*
- * 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.io.File;
-
-import junit.framework.TestCase;
-
-
-public class SecurityManagerTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public void testWillFailWhenAccessingCurrentDirectory()
- {
- File file = new File( "." );
- file.isDirectory();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml b/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml
deleted file mode 100644
index ac94779..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml
+++ /dev/null
@@ -1,77 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-twoTestCases</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for two test cases</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit3</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- <!-- dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit4</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit3</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-testng</artifactId>
- <version>${surefire.version}</version>
- </dependency -->
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java
deleted file mode 100644
index 2efc5ed..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package junit.twoTestCases;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public BasicTest( String name )
- {
- super( name );
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite();
- Test test = new BasicTest( "testSetUp" );
- suite.addTest( test );
-
- return new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/TestTwo.java b/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/TestTwo.java
deleted file mode 100644
index 9af4558..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/TestTwo.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package junit.twoTestCases;
-
-/*
- * 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 junit.framework.TestCase;
-
-
-public class TestTwo
- extends TestCase
-{
- public void testTwo() {}
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml
deleted file mode 100644
index ce01272..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.example</groupId>
- <artifactId>surefire-500</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>surefire-500-puzzling-error</name>
- <url>http://maven.apache.org</url>
- <properties>
- <junit.version>4.4</junit.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <reportFormat>brief</reportFormat>
- <useFile>true</useFile>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java
deleted file mode 100644
index 88164bf..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package surefire500;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-public class ExplodingTest
-{
-
- static
- {
- // noinspection ConstantIfStatement
- if ( true )
- {
- throw new java.lang.NoClassDefFoundError( "whoops!" );
- }
- }
-
- @Test
- public void testPass()
- {
- assertTrue( true );
- }
-
- public void testFail()
- {
- fail( "fail" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java
deleted file mode 100644
index 65355f1..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package surefire500;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.assertTrue;
-
-public class PassingTest {
-
- @Test
- public void testOne()
- {
- assertTrue(true);
- }
-
- @Test
- public void testTwo()
- {
- assertTrue(true);
- }
-
- @Test
- public void testThree()
- {
- assertTrue(true);
- }
-
- @Test
- public void testFour()
- {
- assertTrue(true);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java
deleted file mode 100644
index 566173e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/Suite.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package surefire500;
-
-/*
- * 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.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(org.junit.runners.Suite.class)
-@SuiteClasses(value={ExplodingTest.class, PassingTest.class})
-public class Suite {
-
-}
[27/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryB.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryB.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryB.java
deleted file mode 100644
index f10f3b1..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryB.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryB {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryC.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryC.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryC.java
deleted file mode 100644
index 3e9e854..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryC.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryC {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryCTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryCTest.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryCTest.java
deleted file mode 100644
index 7fc323d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/CategoryCTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package junit4;
-/*
- * 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.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-
-@Category(CategoryC.class)
-public class CategoryCTest
-{
- static int catACount = 0;
- static int catBCount = 0;
- static int catCCount = 0;
-
- @Rule
- public TestName testName = new TestName();
-
- @Before
- public void testName()
- {
- System.out.println( "Running " + getClass().getName() + "." + testName.getMethodName() );
- }
-
- @Test
- @Category( CategoryA.class )
- public void testInCategoryA()
- {
- catACount++;
- }
-
- @Test
- @Category(CategoryB.class)
- public void testInCategoryB()
- {
- catBCount++;
- }
-
- @Test
- @Category({CategoryA.class, CategoryB.class})
- public void testInCategoriesAB()
- {
- catACount++;
- catBCount++;
- }
-
- @Test
- public void testInCategoryC()
- {
- catCCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("mA: " + catACount + "\n" +
- "mB: " + catBCount + "\n" +
- "mC: " + catCCount );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/NoCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/NoCategoryTest.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/NoCategoryTest.java
deleted file mode 100644
index f08f40f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/src/test/java/junit4/NoCategoryTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package junit4;
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class NoCategoryTest {
- static int catNoneCount = 0;
-
- @Test
- public void testInNoCategory()
- {
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("NoCategoryTest.CatNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
deleted file mode 100644
index 983e5bb..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
+++ /dev/null
@@ -1,45 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-group-expressions</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG group expressions tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.8</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <groups>!CategoryC</groups>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/BasicTest.java
deleted file mode 100644
index c53875a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/BasicTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package testng;
-/*
- * 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.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-
-public class BasicTest
-{
- static int catACount = 0;
- static int catBCount = 0;
- static int catCCount = 0;
- static int catNoneCount = 0;
-
- @Test( groups = "CategoryA" )
- public void testInCategoryA()
- {
- catACount++;
- }
-
- @Test( groups = "CategoryB" )
- public void testInCategoryB()
- {
- catBCount++;
- }
-
- @Test( groups = { "CategoryA", "CategoryB" } )
- public void testInCategoryAB()
- {
- System.out.println( getClass().getSimpleName() + ".testInCategoriesAB()" );
- catACount++;
- catBCount++;
- }
-
- @Test( groups = "CategoryC" )
- public void testInCategoryC()
- {
- catCCount++;
- }
-
- @Test
- public void testInNoCategory()
- {
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("catA: " + catACount + "\n" +
- "catB: " + catBCount + "\n" +
- "catC: " + catCCount + "\n" +
- "catNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/CategoryCTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/CategoryCTest.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/CategoryCTest.java
deleted file mode 100644
index 66fafab..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/CategoryCTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package testng;
-/*
- * 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.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-public class CategoryCTest
-{
- static int catACount = 0;
- static int catBCount = 0;
- static int catCCount = 0;
-
- @Test( groups = "CategoryA" )
- public void testInCategoryA()
- {
- catACount++;
- }
-
- @Test( groups = "CategoryB" )
- public void testInCategoryB()
- {
- catBCount++;
- }
-
- @Test( groups = { "CategoryA", "CategoryB" } )
- public void testInCategoriesAB()
- {
- System.out.println( getClass().getSimpleName() + ".testInCategoriesAB()" );
- catACount++;
- catBCount++;
- }
-
- @Test( groups="CategoryC" )
- public void testInCategoryC()
- {
- catCCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("mA: " + catACount + "\n" +
- "mB: " + catBCount + "\n" +
- "mC: " + catCCount );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/NoCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/NoCategoryTest.java b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/NoCategoryTest.java
deleted file mode 100644
index 111f20d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/src/test/java/testng/NoCategoryTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package testng;
-/*
- * 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.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-public class NoCategoryTest {
- static int catNoneCount = 0;
-
- @Test
- public void testInNoCategory()
- {
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("NoCategoryTest.CatNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml b/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
deleted file mode 100644
index 61be350..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>log4jClassloader</artifactId>
- <name>surefire-812-log4j-classloader</name>
- <version>1.0.0-SNAPSHOT</version>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <useManifestOnlyJar>false</useManifestOnlyJar>
- <forkMode>always</forkMode>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <systemPropertyVariables>
- <java.awt.headless>true</java.awt.headless>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties b/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties
deleted file mode 100644
index 070ddc9..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-
-log4j.rootLogger=debug, stdout, xml, R
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-log4j.appender.xml=org.apache.log4j.FileAppender
-log4j.appender.xml.file=example_xml.log
-log4j.appender.xml.append=false
-log4j.appender.xml.layout=org.apache.log4j.xml.XMLLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
-
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=example.log
-
-
-log4j.appender.R.MaxFileSize=100KB
-# Keep one backup file
-log4j.appender.R.MaxBackupIndex=1
-
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/LoggingTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/LoggingTest.java b/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/LoggingTest.java
deleted file mode 100644
index 3cda524..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/src/test/java/surefire812/LoggingTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package surefire812;
-
-/*
- * 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.log4j.Logger;
-
-import junit.framework.TestCase;
-
-public class LoggingTest extends TestCase
-{
- //static {
-// Logger.getLogger( LoggingTest.class ).debug( "fud");
-// }
-
- public void testCanLogAMessage()
- {
- Logger.getLogger( LoggingTest.class ).warn( "hey you" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
deleted file mode 100644
index 8f48176..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
+++ /dev/null
@@ -1,69 +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/xsd/maven-4.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>jiras-surefire-817</artifactId>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>always</forkMode>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/src/test/java/jiras/surefire817/Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/src/test/java/jiras/surefire817/Test.java b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/src/test/java/jiras/surefire817/Test.java
deleted file mode 100644
index f56fd31..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/src/test/java/jiras/surefire817/Test.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package jiras.surefire817;
-
-/*
- * 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.
- */
-
-public class Test {
- @org.junit.Test
- public void test()
- {
- System.out.println( getClass() + " " + Thread.currentThread().getName() );
- System.exit( 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
deleted file mode 100644
index cef444e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>cyril</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>cyril</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/FirstTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/FirstTest.java b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/FirstTest.java
deleted file mode 100644
index 9246e85..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/FirstTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package cyril.test;
-
-/*
- * 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.jmock.Mock;
-import org.jmock.MockObjectTestCase;
-import org.junit.Test;
-
-
-public class FirstTest
- extends MockObjectTestCase
-{
-
- private Mock myServiceMock;
-
- @Override
- protected void setUp()
- throws Exception
- {
- myServiceMock = mock( MyService.class );
- }
-
-
- @Test
- public void test()
- {
-
- Message myMessage = new Message( "MyMessage" );
- // Expectations
- myServiceMock.expects( once() ).method( "writeMessage" ).with( eq( myMessage ) ).will(
- returnValue( myMessage ) );
-
- ( (MyService) myServiceMock.proxy() ).writeMessage( null );
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/IgnoredTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/IgnoredTest.java b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/IgnoredTest.java
deleted file mode 100644
index d66adc8..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/IgnoredTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cyril.test;
-
-/*
- * 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.Test;
-
-
-public class IgnoredTest
-{
-
-
- @Test
- public void test()
- {
- System.out.println( "My test is running fine" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/Message.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/Message.java b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/Message.java
deleted file mode 100644
index 9d37531..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/Message.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package cyril.test;
-
-/*
- * 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.
- */
-
-public class Message
-{
-
- private String content;
-
- public Message( String content )
- {
- this.content = content;
- }
-
- public int hashCode()
- {
- throw new NullPointerException();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyService.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyService.java b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyService.java
deleted file mode 100644
index cb84749..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cyril.test;
-
-/*
- * 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.
- */
-
-
-public interface MyService
-{
-
- public Message writeMessage( Message aMessage );
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyServiceImpl.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyServiceImpl.java b/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyServiceImpl.java
deleted file mode 100644
index f390ade..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/MyServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package cyril.test;
-
-public class MyServiceImpl
- implements MyService
-{
-
- public Message writeMessage( Message aMessage )
- {
- return aMessage;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/pom.xml b/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/pom.xml
deleted file mode 100644
index a06ab61..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>surefire-testcase</groupId>
- <artifactId>surefire-testcase</artifactId>
- <version>1.0</version>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>pl.pragmatists</groupId>
- <artifactId>JUnitParams</artifactId>
- <version>0.4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <parallel>both</parallel>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/JunitParamsTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/JunitParamsTest.java b/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/JunitParamsTest.java
deleted file mode 100644
index 3ccd814..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/JunitParamsTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package surefire.testcase;
-/*
- * 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 junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-/**
- * Surefire JunitParams test.
- */
-@RunWith( JUnitParamsRunner.class )
-public class JunitParamsTest
-{
-
- @Parameters( method = "parameters" )
- @Test
- public void testSum( int a, int b, int expected )
- {
- assertThat( a + b, equalTo( expected ) );
- }
-
- public Collection<Integer[]> parameters()
- {
- Integer[][] parameters = { { 1, 2, 3 }, { 2, 3, 5 }, { 3, 4, 7 }, };
- return Arrays.asList( parameters );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/NonJunitParamsTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/NonJunitParamsTest.java b/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/NonJunitParamsTest.java
deleted file mode 100644
index 6cffeeb..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/NonJunitParamsTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package surefire.testcase;
-/*
- * 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.Test;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-/**
- * Surefire non-JunitParams test.
- */
-public class NonJunitParamsTest
-{
-
- @Test
- public void testSum()
- {
- assertThat( 1 + 2, equalTo( 3 ) );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
deleted file mode 100644
index 2d005b6..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
+++ /dev/null
@@ -1,98 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit 4.8.1</name>
-
-
- <properties>
- <junitVersion>4.8.1</junitVersion>
- <groups>junit4.CategoryA,junit4.CategoryB</groups>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <groups>${groups}</groups>
- <excludedGroups>${excludedGroups}</excludedGroups>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>emptyGroups</id>
- <activation>
- <property>
- <name>profile</name>
- <value>emptyGroups</value>
- </property>
- </activation>
- <properties>
- <groups></groups>
- <excludedGroups>junit4.CategoryC</excludedGroups>
- </properties>
- </profile>
- <profile>
- <id>emptyExcludedGroups</id>
- <activation>
- <property>
- <name>profile</name>
- <value>emptyExcludedGroups</value>
- </property>
- </activation>
- <properties>
- <groups>junit4.CategoryA && junit4.CategoryB</groups>
- <excludedGroups></excludedGroups>
- </properties>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index ecfec31..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package junit4;
-/*
- * 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.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-
-public class BasicTest
-{
- static int catACount = 0;
- static int catBCount = 0;
- static int catCCount = 0;
- static int catNoneCount = 0;
-
- @Rule
- public TestName testName = new TestName();
-
- @Before
- public void testName()
- {
- System.out.println( "Running " + getClass().getName() + "." + testName.getMethodName() );
- }
-
- @Test
- @Category(CategoryA.class)
- public void testInCategoryA()
- {
- catACount++;
- }
-
- @Test
- @Category(CategoryB.class)
- public void testInCategoryB()
- {
- catBCount++;
- }
-
- @Test
- @Category({CategoryA.class, CategoryB.class})
- public void testInCategoryAB()
- {
- catACount++;
- catBCount++;
- }
-
- @Test
- @Category(CategoryC.class)
- public void testInCategoryC()
- {
- catCCount++;
- }
-
- @Test
- public void testInNoCategory()
- {
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("catA: " + catACount + "\n" +
- "catB: " + catBCount + "\n" +
- "catC: " + catCCount + "\n" +
- "catNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryA.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryA.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryA.java
deleted file mode 100644
index 9b8b855..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryA.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryA {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryB.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryB.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryB.java
deleted file mode 100644
index f10f3b1..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryB.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryB {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryC.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryC.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryC.java
deleted file mode 100644
index 3e9e854..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryC.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryC {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryCTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryCTest.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryCTest.java
deleted file mode 100644
index 7fc323d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/CategoryCTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package junit4;
-/*
- * 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.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-
-@Category(CategoryC.class)
-public class CategoryCTest
-{
- static int catACount = 0;
- static int catBCount = 0;
- static int catCCount = 0;
-
- @Rule
- public TestName testName = new TestName();
-
- @Before
- public void testName()
- {
- System.out.println( "Running " + getClass().getName() + "." + testName.getMethodName() );
- }
-
- @Test
- @Category( CategoryA.class )
- public void testInCategoryA()
- {
- catACount++;
- }
-
- @Test
- @Category(CategoryB.class)
- public void testInCategoryB()
- {
- catBCount++;
- }
-
- @Test
- @Category({CategoryA.class, CategoryB.class})
- public void testInCategoriesAB()
- {
- catACount++;
- catBCount++;
- }
-
- @Test
- public void testInCategoryC()
- {
- catCCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("mA: " + catACount + "\n" +
- "mB: " + catBCount + "\n" +
- "mC: " + catCCount );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/NoCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/NoCategoryTest.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/NoCategoryTest.java
deleted file mode 100644
index f08f40f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/src/test/java/junit4/NoCategoryTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package junit4;
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class NoCategoryTest {
- static int catNoneCount = 0;
-
- @Test
- public void testInNoCategory()
- {
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("NoCategoryTest.CatNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
deleted file mode 100644
index 989f8af..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
+++ /dev/null
@@ -1,78 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-group-expressions</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG group expressions tests</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.8</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <groups>${groups}</groups>
- <excludedGroups>${excludedGroups}</excludedGroups>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>emptyGroups</id>
- <activation>
- <property>
- <name>profile</name>
- <value>emptyGroups</value>
- </property>
- </activation>
- <properties>
- <groups></groups>
- <excludedGroups>CategoryC</excludedGroups>
- </properties>
- </profile>
- <profile>
- <id>emptyExcludedGroups</id>
- <activation>
- <property>
- <name>profile</name>
- <value>emptyExcludedGroups</value>
- </property>
- </activation>
- <properties>
- <groups>CategoryA && CategoryB</groups>
- <excludedGroups></excludedGroups>
- </properties>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/BasicTest.java
deleted file mode 100644
index c53875a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/BasicTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package testng;
-/*
- * 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.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-
-public class BasicTest
-{
- static int catACount = 0;
- static int catBCount = 0;
- static int catCCount = 0;
- static int catNoneCount = 0;
-
- @Test( groups = "CategoryA" )
- public void testInCategoryA()
- {
- catACount++;
- }
-
- @Test( groups = "CategoryB" )
- public void testInCategoryB()
- {
- catBCount++;
- }
-
- @Test( groups = { "CategoryA", "CategoryB" } )
- public void testInCategoryAB()
- {
- System.out.println( getClass().getSimpleName() + ".testInCategoriesAB()" );
- catACount++;
- catBCount++;
- }
-
- @Test( groups = "CategoryC" )
- public void testInCategoryC()
- {
- catCCount++;
- }
-
- @Test
- public void testInNoCategory()
- {
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("catA: " + catACount + "\n" +
- "catB: " + catBCount + "\n" +
- "catC: " + catCCount + "\n" +
- "catNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/CategoryCTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/CategoryCTest.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/CategoryCTest.java
deleted file mode 100644
index 66fafab..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/CategoryCTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package testng;
-/*
- * 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.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-public class CategoryCTest
-{
- static int catACount = 0;
- static int catBCount = 0;
- static int catCCount = 0;
-
- @Test( groups = "CategoryA" )
- public void testInCategoryA()
- {
- catACount++;
- }
-
- @Test( groups = "CategoryB" )
- public void testInCategoryB()
- {
- catBCount++;
- }
-
- @Test( groups = { "CategoryA", "CategoryB" } )
- public void testInCategoriesAB()
- {
- System.out.println( getClass().getSimpleName() + ".testInCategoriesAB()" );
- catACount++;
- catBCount++;
- }
-
- @Test( groups="CategoryC" )
- public void testInCategoryC()
- {
- catCCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("mA: " + catACount + "\n" +
- "mB: " + catBCount + "\n" +
- "mC: " + catCCount );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/NoCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/NoCategoryTest.java b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/NoCategoryTest.java
deleted file mode 100644
index 111f20d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/src/test/java/testng/NoCategoryTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package testng;
-/*
- * 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.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
-public class NoCategoryTest {
- static int catNoneCount = 0;
-
- @Test
- public void testInNoCategory()
- {
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("NoCategoryTest.CatNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
deleted file mode 100644
index 895dd91..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
+++ /dev/null
@@ -1,58 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>4.8.1 provider selection Test for JUnit Groups</name>
-
-
- <properties>
- <junitVersion>4.8.1</junitVersion>
- <groups>junit4.CategoryA,junit4.CategoryB</groups>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index ecfec31..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package junit4;
-/*
- * 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.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-
-public class BasicTest
-{
- static int catACount = 0;
- static int catBCount = 0;
- static int catCCount = 0;
- static int catNoneCount = 0;
-
- @Rule
- public TestName testName = new TestName();
-
- @Before
- public void testName()
- {
- System.out.println( "Running " + getClass().getName() + "." + testName.getMethodName() );
- }
-
- @Test
- @Category(CategoryA.class)
- public void testInCategoryA()
- {
- catACount++;
- }
-
- @Test
- @Category(CategoryB.class)
- public void testInCategoryB()
- {
- catBCount++;
- }
-
- @Test
- @Category({CategoryA.class, CategoryB.class})
- public void testInCategoryAB()
- {
- catACount++;
- catBCount++;
- }
-
- @Test
- @Category(CategoryC.class)
- public void testInCategoryC()
- {
- catCCount++;
- }
-
- @Test
- public void testInNoCategory()
- {
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("catA: " + catACount + "\n" +
- "catB: " + catBCount + "\n" +
- "catC: " + catCCount + "\n" +
- "catNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryA.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryA.java b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryA.java
deleted file mode 100644
index 9b8b855..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryA.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryA {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryB.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryB.java b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryB.java
deleted file mode 100644
index f10f3b1..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryB.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryB {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryC.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryC.java b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryC.java
deleted file mode 100644
index 3e9e854..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryC.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package junit4;
-/*
- * 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.
- */
-
-interface CategoryC {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryCTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryCTest.java b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryCTest.java
deleted file mode 100644
index 7fc323d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/CategoryCTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package junit4;
-/*
- * 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.AfterClass;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-
-@Category(CategoryC.class)
-public class CategoryCTest
-{
- static int catACount = 0;
- static int catBCount = 0;
- static int catCCount = 0;
-
- @Rule
- public TestName testName = new TestName();
-
- @Before
- public void testName()
- {
- System.out.println( "Running " + getClass().getName() + "." + testName.getMethodName() );
- }
-
- @Test
- @Category( CategoryA.class )
- public void testInCategoryA()
- {
- catACount++;
- }
-
- @Test
- @Category(CategoryB.class)
- public void testInCategoryB()
- {
- catBCount++;
- }
-
- @Test
- @Category({CategoryA.class, CategoryB.class})
- public void testInCategoriesAB()
- {
- catACount++;
- catBCount++;
- }
-
- @Test
- public void testInCategoryC()
- {
- catCCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("mA: " + catACount + "\n" +
- "mB: " + catBCount + "\n" +
- "mC: " + catCCount );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/NoCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/NoCategoryTest.java b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/NoCategoryTest.java
deleted file mode 100644
index f08f40f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/src/test/java/junit4/NoCategoryTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package junit4;
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class NoCategoryTest {
- static int catNoneCount = 0;
-
- @Test
- public void testInNoCategory()
- {
- catNoneCount++;
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- System.out.println("NoCategoryTest.CatNone: " + catNoneCount);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt
deleted file mode 100644
index a244b92..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-start project
-mvn clean test -Dtest=org.codehaus.SomeFailedTest
\ No newline at end of file
[51/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
[SUREFIRE-1471] Too long Windows path cause CI issues. Renamed surefire-intergation-tests to surefire-its.
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/4d00932a
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/4d00932a
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/4d00932a
Branch: refs/heads/master
Commit: 4d00932a06495deb27fb32187226cd7e40a89aee
Parents: b2d51ff
Author: Tibor17 <ti...@apache.org>
Authored: Mon Feb 5 23:06:52 2018 +0100
Committer: Tibor17 <ti...@apache.org>
Committed: Sun Feb 18 01:44:09 2018 +0100
----------------------------------------------------------------------
Jenkinsfile | 20 +-
pom.xml | 2 +-
surefire-integration-tests/pom.xml | 202 -------
.../maven/surefire/its/AbstractFailFastIT.java | 105 ----
.../maven/surefire/its/AbstractJigsawIT.java | 111 ----
.../maven/surefire/its/AbstractTestCaseIT.java | 41 --
.../its/AbstractTestMultipleMethodPatterns.java | 483 -----------------
.../surefire/its/AdditionalClasspathIT.java | 39 --
.../maven/surefire/its/AggregateReportIT.java | 57 --
.../apache/maven/surefire/its/ArgLineIT.java | 39 --
.../maven/surefire/its/ArgLinePropertiesIT.java | 39 --
.../surefire/its/AssumptionFailureReportIT.java | 34 --
.../maven/surefire/its/CheckSingleTestIT.java | 70 ---
.../its/CheckTestFailIfNoTestsForkModeIT.java | 81 ---
.../surefire/its/CheckTestFailIfNoTestsIT.java | 63 ---
.../its/CheckTestNgBeforeMethodFailureIT.java | 47 --
.../surefire/its/CheckTestNgBeforeMethodIT.java | 44 --
.../its/CheckTestNgCustomObjectFactoryIT.java | 58 --
.../CheckTestNgCustomTestRunnerFactoryIT.java | 59 --
.../surefire/its/CheckTestNgExecuteErrorIT.java | 69 ---
.../its/CheckTestNgGroupThreadParallelIT.java | 43 --
.../maven/surefire/its/CheckTestNgJdk14IT.java | 41 --
.../its/CheckTestNgListenerReporterIT.java | 105 ----
.../surefire/its/CheckTestNgListenersIT.java | 37 --
.../its/CheckTestNgPathWithSpacesIT.java | 42 --
.../surefire/its/CheckTestNgReportTestIT.java | 74 ---
.../surefire/its/CheckTestNgSuiteXmlIT.java | 60 ---
.../its/CheckTestNgSuiteXmlSingleIT.java | 44 --
.../surefire/its/CheckTestNgVersionsIT.java | 223 --------
.../maven/surefire/its/ClassPathOrderIT.java | 39 --
.../surefire/its/ClasspathFilteringIT.java | 39 --
.../surefire/its/ClasspathScopeFilteringIT.java | 39 --
.../maven/surefire/its/ConsoleOutputIT.java | 106 ----
.../maven/surefire/its/CrashDetectionIT.java | 61 ---
.../surefire/its/DefaultConfigurationIT.java | 38 --
.../surefire/its/EnvironmentVariableIT.java | 40 --
.../surefire/its/EnvironmentVariablesIT.java | 47 --
.../maven/surefire/its/FailFastJUnitIT.java | 77 ---
.../maven/surefire/its/FailFastTestNgIT.java | 69 ---
.../maven/surefire/its/ForkConsoleOutputIT.java | 87 ---
.../its/ForkConsoleOutputWithErrorsIT.java | 47 --
.../apache/maven/surefire/its/ForkModeIT.java | 241 ---------
.../surefire/its/ForkModeMultiModuleIT.java | 162 ------
.../maven/surefire/its/ForkModeTestNGIT.java | 35 --
.../its/IncludesExcludesFromFileIT.java | 95 ----
.../maven/surefire/its/IncludesExcludesIT.java | 68 ---
.../maven/surefire/its/JUnit44HamcrestIT.java | 38 --
.../surefire/its/JUnit47ConcurrencyIT.java | 58 --
.../maven/surefire/its/JUnit47ParallelIT.java | 540 -------------------
.../its/JUnit47ParallelNotThreadSafeIT.java | 52 --
.../surefire/its/JUnit47RedirectOutputIT.java | 71 ---
.../JUnit47RerunFailingTestWithCucumberIT.java | 80 ---
.../its/JUnit47StaticInnerClassTestsIT.java | 34 --
.../surefire/its/JUnit47WithCucumberIT.java | 70 ---
.../surefire/its/JUnit48TestCategoriesIT.java | 145 -----
.../JUnit4ForkAlwaysStaticInitPollutionIT.java | 38 --
.../maven/surefire/its/JUnit4IgnoreIT.java | 52 --
.../surefire/its/JUnit4RerunFailingTestsIT.java | 278 ----------
.../maven/surefire/its/JUnit4RunListenerIT.java | 73 ---
.../maven/surefire/its/JUnit4VersionsIT.java | 87 ---
.../apache/maven/surefire/its/JUnitDepIT.java | 70 ---
.../maven/surefire/its/Java9FullApiIT.java | 109 ----
.../maven/surefire/its/LongWindowsPathIT.java | 88 ---
.../apache/maven/surefire/its/ModulePathIT.java | 45 --
.../surefire/its/NoRunnableTestsInClassIT.java | 39 --
.../surefire/its/PlainOldJavaClasspathIT.java | 38 --
.../maven/surefire/its/PlexusConflictIT.java | 50 --
.../apache/maven/surefire/its/PojoSimpleIT.java | 38 --
.../apache/maven/surefire/its/ReporterTime.java | 26 -
.../apache/maven/surefire/its/ReportersIT.java | 45 --
.../maven/surefire/its/ResultCountingIT.java | 66 ---
.../apache/maven/surefire/its/RunOrderIT.java | 108 ----
.../surefire/its/RunOrderParallelForksIT.java | 31 --
.../maven/surefire/its/SiblingAggregatorIT.java | 47 --
.../maven/surefire/its/SmartStackTraceIT.java | 44 --
.../surefire/its/SystemPropertiesTestIT.java | 55 --
.../maven/surefire/its/TestMethodPatternIT.java | 115 ----
.../its/TestMultipleMethodPatternsIT.java | 67 ---
.../its/TestMultipleMethodPatternsTestNGIT.java | 64 ---
.../surefire/its/TestMultipleMethodsIT.java | 74 ---
.../maven/surefire/its/TestNgGroupsIT.java | 69 ---
.../its/TestNgParallelWithAnnotationsIT.java | 38 --
.../surefire/its/TestNgSuccessPercentageIT.java | 45 --
.../maven/surefire/its/TestSingleMethodIT.java | 141 -----
.../maven/surefire/its/TimeoutForkedTestIT.java | 43 --
.../maven/surefire/its/TwoTestCasesIT.java | 130 -----
.../apache/maven/surefire/its/UmlautDirIT.java | 64 ---
.../maven/surefire/its/UnicodeTestNamesIT.java | 75 ---
.../surefire/its/UseIsolatedClassLoaderIT.java | 38 --
.../maven/surefire/its/WorkingDirectoryIT.java | 134 -----
.../WorkingDirectoryIsInvalidPropertyIT.java | 39 --
.../surefire/its/WorkingDirectoryMissingIT.java | 39 --
.../surefire/its/XmlReporterRunTimeIT.java | 75 ---
.../surefire/its/fixture/Configuration.java | 29 -
.../its/fixture/FailsafeOutputValidator.java | 47 --
.../surefire/its/fixture/HelperAssertions.java | 174 ------
.../fixture/IntegrationTestSuiteResults.java | 91 ----
.../surefire/its/fixture/MavenLauncher.java | 504 -----------------
.../surefire/its/fixture/MavenLauncherTest.java | 47 --
.../surefire/its/fixture/OutputValidator.java | 230 --------
.../maven/surefire/its/fixture/Settings.java | 72 ---
.../SurefireJUnit4IntegrationTestCase.java | 60 ---
.../surefire/its/fixture/SurefireLauncher.java | 492 -----------------
.../its/fixture/SurefireLauncherTest.java | 43 --
.../its/fixture/SurefireVerifierException.java | 37 --
.../maven/surefire/its/fixture/TestFile.java | 155 ------
.../surefire/its/fixture/TestFramework.java | 29 -
.../Surefire1024VerifyFailsafeIfTestedIT.java | 48 --
.../jiras/Surefire1028UnableToRunSingleIT.java | 59 --
...onFilterableJUnitRunnerWithCategoriesIT.java | 71 ---
.../jiras/Surefire1041FailingJUnitRunnerIT.java | 38 --
.../jiras/Surefire1053SystemPropertiesIT.java | 72 ---
...urefire1055CorrectConcurrentTestCountIT.java | 41 --
.../Surefire1080ParallelForkDoubleTestIT.java | 54 --
...urefire1082ParallelJUnitParameterizedIT.java | 212 --------
.../its/jiras/Surefire1095NpeInRunListener.java | 94 ----
.../jiras/Surefire1098BalancedRunOrderIT.java | 119 ----
.../Surefire1122ParallelAndFlakyTestsIT.java | 48 --
...fire1135ImproveIgnoreMessageForTestNGIT.java | 152 ------
...urefire1136CwdPropagationInForkedModeIT.java | 43 --
.../its/jiras/Surefire1144XmlRunTimeIT.java | 58 --
...Surefire1146RerunFailedAndParameterized.java | 75 ---
.../Surefire1152RerunFailingTestsInSuiteIT.java | 64 ---
.../Surefire1153IncludesAndSpecifiedTestIT.java | 46 --
.../jiras/Surefire1158RemoveInfoLinesIT.java | 142 -----
.../Surefire1177TestngParallelSuitesIT.java | 59 --
.../surefire/its/jiras/Surefire1179IT.java | 43 --
.../jiras/Surefire1185DoNotSpawnTestsIT.java | 62 ---
.../its/jiras/Surefire1202RerunAndSkipIT.java | 58 --
.../jiras/Surefire1209RerunAndForkCountIT.java | 75 ---
.../its/jiras/Surefire1211JUnitTestNgIT.java | 62 ---
.../its/jiras/Surefire1260NewTestsPattern.java | 49 --
.../surefire/its/jiras/Surefire1264IT.java | 58 --
.../surefire/its/jiras/Surefire1265Java9IT.java | 57 --
.../jiras/Surefire1278GroupNameEndingIT.java | 44 --
...urefire1295AttributeJvmCrashesToTestsIT.java | 125 -----
.../jiras/Surefire1364SystemPropertiesIT.java | 203 -------
.../its/jiras/Surefire1367AssumptionLogsIT.java | 157 ------
.../Surefire1396CustomProviderClassPathIT.java | 52 --
.../jiras/Surefire141PluggableProvidersIT.java | 179 ------
.../jiras/Surefire146ForkPerTestNoSetupIT.java | 38 --
.../its/jiras/Surefire162CharsetProviderIT.java | 51 --
.../Surefire224WellFormedXmlFailuresIT.java | 78 ---
.../jiras/Surefire257NotRerunningTestsIT.java | 41 --
.../Surefire260TestWithIdenticalNamesIT.java | 72 ---
.../its/jiras/Surefire34SecurityManagerIT.java | 48 --
.../Surefire376TestNgAfterSuiteFailureIT.java | 44 --
.../Surefire377TestNgAndJUnitTogetherIT.java | 52 --
.../Surefire408ManualProviderSelectionIT.java | 42 --
.../jiras/Surefire42NotExtendingTestCaseIT.java | 38 --
.../its/jiras/Surefire44InnerClassTestIT.java | 38 --
.../its/jiras/Surefire500PuzzlingErrorIT.java | 42 --
.../Surefire510TestClassPathForkModesIT.java | 53 --
.../Surefire569RunTestFromDependencyJarsIT.java | 44 --
.../Surefire570MultipleReportDirectoriesIT.java | 68 ---
.../jiras/Surefire613TestCountInParallelIT.java | 45 --
...refire621TestCountingJunit3InParallelIT.java | 98 ----
...re628ConsoleOutputBeforeAndAfterClassIT.java | 48 --
...e634UnsettableSystemPropertiesWarningIT.java | 39 --
...urefire649EmptyStringSystemPropertiesIT.java | 84 ---
.../its/jiras/Surefire673MockitoIT.java | 38 --
.../Surefire674BuildFailingWhenErrorsIT.java | 39 --
...fire674BuildFailingWhenFailsafeErrorsIT.java | 38 --
.../Surefire685CommaSeparatedIncludesIT.java | 38 --
.../its/jiras/Surefire697NiceSummaryIT.java | 39 --
.../jiras/Surefire705ParallelForkTimeoutIT.java | 40 --
.../Surefire733AllOverrridesCapturedIT.java | 36 --
...e735ForkFailWithRedirectConsoleOutputIT.java | 80 ---
.../its/jiras/Surefire740TruncatedCommaIT.java | 48 --
...refire747MethodParallelWithSuiteCountIT.java | 168 ------
.../its/jiras/Surefire772BothReportsIT.java | 87 ---
.../jiras/Surefire772NoFailsafeReportsIT.java | 108 ----
.../jiras/Surefire772NoSurefireReportsIT.java | 98 ----
.../jiras/Surefire772SpecifiedReportsIT.java | 82 ---
.../Surefire801ForkModeNoneClassLoaderIT.java | 38 --
.../jiras/Surefire803MultiFailsafeExecsIT.java | 47 --
.../Surefire806SpecifiedTestControlsIT.java | 52 --
.../jiras/Surefire809GroupExpressionsIT.java | 114 ----
.../jiras/Surefire812Log4JClassLoaderIT.java | 36 --
.../its/jiras/Surefire817SystemExitIT.java | 47 --
.../its/jiras/Surefire818NpeIgnoresTestsIT.java | 39 --
.../its/jiras/Surefire828EmptyGroupExprIT.java | 97 ----
.../jiras/Surefire832ProviderSelectionIT.java | 49 --
.../Surefire839TestWithoutCategoriesIT.java | 45 --
.../jiras/Surefire847AdditionalFailureIT.java | 33 --
...refire855AllowFailsafeUseArtifactFileIT.java | 58 --
...refire901MIssingResultfileWhenNoTestsIT.java | 39 --
...urefire907PerThreadWithoutThreadCountIT.java | 42 --
...refire920TestFailureIgnoreWithTimeoutIT.java | 45 --
.../Surefire926FailureWith2ProvidersIT.java | 36 --
.../its/jiras/Surefire930TestNgSuiteXmlIT.java | 37 --
.../its/jiras/Surefire943ReportContentIT.java | 159 ------
...efire946KillMainProcessInReusableForkIT.java | 71 ---
.../jiras/Surefire972BizarreNoClassDefIT.java | 32 --
.../jiras/Surefire975DefaultVMEncodingIT.java | 40 --
.../jiras/Surefire979WrongClassLoaderIT.java | 39 --
...re985ParameterizedRunnerAndCategoriesIT.java | 68 ---
.../jiras/Surefire995CategoryInheritanceIT.java | 90 ----
.../test/resources/SurefireToolchains/pom.xml | 72 ---
.../main/java/test/surefiretoolchains/App.java | 29 -
.../java/test/surefiretoolchains/AppTest.java | 36 --
.../additional-classpath/extraResource/test.txt | 0
.../extraResource2/test2.txt | 0
.../test/resources/additional-classpath/pom.xml | 65 ---
.../java/additionalClasspath/BasicTest.java | 34 --
.../resources/aggregate-report/child1/pom.xml | 52 --
.../test/java/aggregateReport/FailingTest.java | 33 --
.../resources/aggregate-report/child2/pom.xml | 52 --
.../test/java/aggregateReport/BasicTest.java | 87 ---
.../src/test/resources/aggregate-report/pom.xml | 67 ---
.../src/test/resources/ant-ignore/.gitignore | 3 -
.../src/test/resources/ant-ignore/build.xml | 52 --
.../src/test/resources/ant-ignore/ivy.xml | 6 -
.../src/test/resources/ant-ignore/pom.xml | 47 --
.../src/test/resources/ant-ignore/src/ivy.xml | 6 -
.../src/test/java/antignore/BasicTest.java | 42 --
.../test/resources/argLine-parameter/pom.xml | 61 ---
.../test/java/argLine/TestSurefireArgLine.java | 40 --
.../test/resources/argLine-properties/pom.xml | 84 ---
.../TestSurefireArgLineProperties.java | 58 --
.../src/test/resources/it.properties | 19 -
.../resources/assumpationFailureReport/pom.xml | 63 ---
.../src/test/java/assumpationFailure/Test1.java | 35 --
.../test/resources/classpath-filtering/pom.xml | 65 ---
.../test/java/classpathFiltering/BasicTest.java | 44 --
.../src/test/resources/classpath-order/pom.xml | 64 ---
.../surefire-classpath-order.properties | 2 -
.../main/resources/surefire-report.properties | 2 -
.../src/test/java/it/BasicTest.java | 61 ---
.../surefire-classpath-order.properties | 2 -
.../resources/classpath-scope-filtering/pom.xml | 63 ---
.../test/java/classpathFiltering/BasicTest.java | 44 --
.../src/test/resources/consoleOutput/pom.xml | 46 --
.../src/test/java/consoleOutput/Test1.java | 81 ---
.../resources/consoleOutputEncoding/pom.xml | 71 ---
.../src/test/java/consoleOutput/Test1.java | 47 --
.../test/resources/consoleoutput-noisy/pom.xml | 63 ---
.../test/java/consoleoutput_noisy/Test1.java | 85 ---
.../test/java/consoleoutput_noisy/Test2.java | 53 --
.../src/test/resources/crash-detection/pom.xml | 58 --
.../java/junit44/environment/BasicTest.java | 46 --
.../test/resources/crash-during-test/pom.xml | 65 ---
.../java/junit44/environment/BasicTest.java | 52 --
.../java/junit44/environment/SomeOtherTest.java | 28 -
.../default-configuration-abstract/pom.xml | 47 --
.../AbstractConcreteBasicTest.java | 87 ---
.../abstractClasses/NonInstantiableTest.java | 28 -
.../pom.xml | 47 --
.../classWithNoTests/NoMethodsTestCase.java | 22 -
.../default-configuration-noTests/pom.xml | 72 ---
.../resources/default-configuration/pom.xml | 47 --
.../java/defaultConfiguration/BasicTest.java | 87 ---
.../resources/environment-variables/pom.xml | 64 ---
.../src/test/java/environment/BasicTest.java | 46 --
.../src/test/resources/fail-fast-junit/pom.xml | 104 ----
.../src/test/java/pkg/ATest.java | 20 -
.../src/test/java/pkg/BTest.java | 18 -
.../src/test/java/pkg/CTest.java | 17 -
.../src/test/java/pkg/DTest.java | 17 -
.../src/test/java/pkg/ETest.java | 12 -
.../src/test/resources/fail-fast-testng/pom.xml | 59 --
.../src/test/java/pkg/ATest.java | 19 -
.../src/test/java/pkg/BTest.java | 18 -
.../src/test/java/pkg/CTest.java | 17 -
.../src/test/java/pkg/DTest.java | 17 -
.../src/test/java/pkg/ETest.java | 12 -
.../src/test/resources/failingBuilds/pom.xml | 40 --
.../test/java/failingbuilds/ExceptionsTest.java | 38 --
.../failsafe-buildfail/invoker.properties | 19 -
.../test/resources/failsafe-buildfail/pom.xml | 83 ---
.../failsafe-buildfail/src/test/java/MyAT.java | 25 -
.../failsafe-buildfail/src/test/java/MyIT.java | 26 -
.../failsafe-nofail/invoker.properties | 19 -
.../src/test/resources/failsafe-nofail/pom.xml | 83 ---
.../failsafe-nofail/src/test/java/MyAT.java | 25 -
.../failsafe-nofail/src/test/java/MyIT.java | 26 -
.../src/test/resources/failsafe-notests/pom.xml | 61 ---
.../failsafe-notests/src/test/java/AClass.java | 25 -
.../failsafe-regular/invoker.properties | 19 -
.../src/test/resources/failsafe-regular/pom.xml | 83 ---
.../failsafe-regular/src/test/java/MyAT.java | 26 -
.../failsafe-regular/src/test/java/MyIT.java | 26 -
.../resources/failure-result-counting/pom.xml | 38 --
.../failureresultcounting/BeforeClassError.java | 43 --
.../BeforeClassFailure.java | 43 --
.../java/failureresultcounting/BeforeError.java | 48 --
.../failureresultcounting/BeforeFailure.java | 43 --
.../java/failureresultcounting/NoErrors.java | 43 --
.../failureresultcounting/OrdinaryError.java | 42 --
.../java/failureresultcounting/RunTests.java | 33 --
.../src/test/resources/failureOutput/pom.xml | 50 --
.../src/test/java/forkConsoleOutput/Test1.java | 85 ---
.../src/test/java/forkConsoleOutput/Test2.java | 35 --
.../src/test/resources/failureOutput/test | 15 -
...pache.maven.surefire.test.SucceedingTest.xml | 68 ---
...g.apache.maven.surefire.test.FailingTest.txt | 84 ---
...pache.maven.surefire.test.SucceedingTest.txt | 4 -
.../test/resources/fork-consoleOutput/pom.xml | 47 --
.../src/test/java/forkConsoleOutput/Test1.java | 43 --
.../fork-consoleOutputWithErrors/pom.xml | 50 --
.../src/test/java/forkConsoleOutput/Test1.java | 43 --
.../src/test/java/forkConsoleOutput/Test2.java | 35 --
.../src/test/resources/fork-fail/pom.xml | 60 ---
.../fork-fail/src/test/java/forkMode/Test1.java | 58 --
.../fork-fail/src/test/java/forkMode/Test2.java | 34 --
.../fork-fail/src/test/java/forkMode/Test3.java | 34 --
.../fork-mode-multimodule/module-a/pom.xml | 36 --
.../module-a/src/test/java/forkMode/Test1.java | 67 ---
.../module-a/src/test/java/forkMode/Test2.java | 36 --
.../module-a/src/test/java/forkMode/Test3.java | 34 --
.../fork-mode-multimodule/module-b/pom.xml | 36 --
.../module-b/src/test/java/forkMode/Test1.java | 67 ---
.../module-b/src/test/java/forkMode/Test2.java | 36 --
.../module-b/src/test/java/forkMode/Test3.java | 34 --
.../resources/fork-mode-multimodule/pom.xml | 66 ---
.../fork-mode-resource-loading/pom.xml | 54 --
.../test/java/forkMode/ResourceLoadTest.java | 46 --
.../src/test/resources/myFile.txt | 1 -
.../src/test/resources/fork-mode-testng/pom.xml | 50 --
.../src/test/java/forkMode/Test1.java | 65 ---
.../src/test/java/forkMode/Test2.java | 33 --
.../src/test/java/forkMode/Test3.java | 34 --
.../src/test/resources/fork-mode/pom.xml | 59 --
.../fork-mode/src/test/java/forkMode/Test1.java | 67 ---
.../fork-mode/src/test/java/forkMode/Test2.java | 34 --
.../fork-mode/src/test/java/forkMode/Test3.java | 34 --
.../src/test/resources/fork-timeout/pom.xml | 47 --
.../test/java/forktimeout/BaseForkTimeout.java | 53 --
.../src/test/java/forktimeout/Test1.java | 34 --
.../src/test/java/forktimeout/Test2.java | 30 --
.../src/test/java/forktimeout/Test3.java | 32 --
.../src/test/java/forktimeout/Test4.java | 32 --
.../src/test/java/forktimeout/Test5.java | 32 --
.../common-excludes.txt | 3 -
.../path-includes.txt | 3 -
.../includes-excludes-from-file/pom.xml | 153 ------
.../regex-includes.txt | 3 -
.../simple-includes.txt | 4 -
.../simple-mixed-includes.txt | 3 -
.../src/test/java/org/test/DefaultTest.java | 34 --
.../src/test/java/org/test/DontRunTest.java | 30 --
.../java/org/test/NotIncludedByDefault.java | 34 --
.../src/test/java/org/test/aTestXmlFile.xml | 24 -
.../test/resources/includes-excludes/pom.xml | 135 -----
.../src/test/java/org/test/DefaultTest.java | 34 --
.../src/test/java/org/test/DontRunTest.java | 30 --
.../java/org/test/NotIncludedByDefault.java | 34 --
.../src/test/java/org/test/aTestXmlFile.xml | 24 -
.../test/resources/isolated-classloader/pom.xml | 56 --
.../java/isolatedClassloader/BasicTest.java | 86 ---
.../src/test/resources/java9-full-api/pom.xml | 132 -----
.../java9-full-api/src/test/java/J9IT.java | 37 --
.../java9-full-api/src/test/java/J9Test.java | 36 --
.../resources/junit-fork-mode-always/pom.xml | 57 --
.../src/test/java/junit4/forkMode/Test1.java | 60 ---
.../src/test/java/junit4/forkMode/Test2.java | 36 --
.../src/test/java/junit4/forkMode/Test3.java | 36 --
.../src/test/resources/junit-ignore/pom.xml | 61 ---
.../ClassAndMethodIgnoreNothingToRunTest.java | 37 --
...sLevelIgnore1WithMethodThatIsNormalTest.java | 36 --
...sLevelIgnore2WithMethodThatIsNormalTest.java | 36 --
...IgnoredMethodsAnd1AssumptionFailureTest.java | 57 --
.../src/test/resources/junit-innerClass/pom.xml | 55 --
.../test/java/junit/innerClass/BasicTest.java | 39 --
.../junit-notExtendingTestCase/pom.xml | 55 --
.../junit/notExtendingTestCase/SuiteTest.java | 49 --
.../junit/notExtendingTestCase/TestHelper.java | 24 -
.../test/resources/junit-pathWithUmlaut/pom.xml | 55 --
.../src/test/java/umlautTest/BasicTest.java | 87 ---
.../resources/junit-twoTestCaseSuite/pom.xml | 59 --
.../java/junit/twoTestCaseSuite/BasicTest.java | 86 ---
.../java/junit/twoTestCaseSuite/TestTwo.java | 29 -
.../twoTestCaseSuite/WrapperTestSuite.java | 40 --
.../test/resources/junit-twoTestCases/pom.xml | 55 --
.../test/java/junit/twoTestCases/BasicTest.java | 86 ---
.../test/java/junit/twoTestCases/TestTwo.java | 29 -
.../junit4-forkAlways-staticInit/pom.xml | 38 --
.../src/test/java/junit4/App2Test.java | 50 --
.../src/test/java/junit4/AppTest.java | 50 --
.../junit4-rerun-failing-tests/pom.xml | 55 --
.../test/java/junit4/FlakyFirstTimeTest.java | 62 ---
.../src/test/java/junit4/PassingTest.java | 39 --
.../test/resources/junit4-runlistener/pom.xml | 71 ---
.../java/runListener/EchoingRunListener.java | 82 ---
.../src/test/java/runListener/FileHelper.java | 44 --
.../runListener/FileWritingRunListener1.java | 40 --
.../runListener/FileWritingRunListener2.java | 40 --
.../java/runListener/JUnit4RunListenerTest.java | 32 --
.../resources/junit4-twoTestCaseSuite/pom.xml | 62 ---
.../test/java/twoTestCaseSuite/BasicTest.java | 64 ---
.../java/twoTestCaseSuite/Junit4TestSuite.java | 33 --
.../java/twoTestCaseSuite/Junit4TestTwo.java | 27 -
.../src/test/resources/junit4/pom.xml | 55 --
.../junit4/src/test/java/junit4/BasicTest.java | 65 ---
.../src/test/resources/junit44-dep/pom.xml | 71 ---
.../src/test/java/junit44Dep/BasicTest.java | 67 ---
.../test/resources/junit44-environment/pom.xml | 59 --
.../java/junit44/environment/BasicTest.java | 40 --
.../src/test/resources/junit44-hamcrest/pom.xml | 54 --
.../test/java/junit44/hamcrest/BasicTest.java | 66 ---
.../resources/junit44-method-pattern/pom.xml | 60 ---
.../src/test/java/junit4/BasicTest.java | 77 ---
.../resources/junit44-multiple-methods/pom.xml | 68 ---
.../src/test/java/junit4/BasicTest.java | 83 ---
.../src/test/java/junit4/TestThree.java | 77 ---
.../src/test/java/junit4/TestTwo.java | 77 ---
.../resources/junit44-single-method/pom.xml | 60 ---
.../src/test/java/junit4/BasicTest.java | 71 ---
.../test/resources/junit47-concurrency/pom.xml | 61 ---
.../src/test/java/junit47/BasicTest.java | 71 ---
.../src/test/resources/junit47-cucumber/pom.xml | 81 ---
.../sample/cucumber/FailingCucumberTest.java | 31 --
.../test/java/org/sample/cucumber/StepDefs.java | 57 --
.../sample/cucumber/SuccessCucumberTest.java | 31 --
.../src/test/resources/failing/Sample.feature | 10 -
.../src/test/resources/success/Sample.feature | 10 -
.../test/resources/junit47-parallel-nts/pom.xml | 64 ---
.../java/surefireparallelnts/ParallelTest.java | 37 --
.../RunningInSequenceTest.java | 37 --
.../junit47-parallel-with-suite/pom.xml | 38 --
.../src/test/java/surefire747/SuiteTest1.java | 93 ----
.../src/test/java/surefire747/SuiteTest2.java | 93 ----
.../src/test/java/surefire747/TestSuite.java | 52 --
.../src/test/resources/junit47-parallel/pom.xml | 70 ---
.../test/java/surefireparallel/Suite1Test.java | 39 --
.../test/java/surefireparallel/Suite2Test.java | 39 --
.../test/java/surefireparallel/TestClass.java | 50 --
.../java/surefireparallel/Waiting1Test.java | 50 --
.../java/surefireparallel/Waiting2Test.java | 50 --
.../java/surefireparallel/Waiting3Test.java | 50 --
.../java/surefireparallel/Waiting4Test.java | 50 --
.../java/surefireparallel/Waiting5Test.java | 50 --
.../java/surefireparallel/Waiting6Test.java | 50 --
.../java/surefireparallel/Waiting7Test.java | 50 --
.../java/surefireparallel/Waiting8Test.java | 50 --
.../resources/junit47-redirect-output/pom.xml | 58 --
.../test/java/junit47ConsoleOutput/Test0.java | 63 ---
.../test/java/junit47ConsoleOutput/Test1.java | 43 --
.../test/java/junit47ConsoleOutput/Test2.java | 43 --
.../test/java/junit47ConsoleOutput/Test3.java | 30 --
.../pom.xml | 77 ---
.../org/sample/cucumber/FlakeCucumberTest.java | 29 -
.../test/java/org/sample/cucumber/StepDefs.java | 56 --
.../org/sample/cucumber/Sample.feature | 10 -
.../junit47-static-inner-class-tests/pom.xml | 40 --
.../src/test/java/junit4/BasicTest.java | 33 --
.../java/junit4/TopLevelAbstractClassTest.java | 33 --
.../test/java/junit4/TopLevelInterfaceTest.java | 33 --
.../test/resources/junit48-categories/pom.xml | 70 ---
.../src/test/java/junit4/BasicTest.java | 72 ---
.../src/test/java/junit4/CategoryA.java | 21 -
.../src/test/java/junit4/CategoryB.java | 21 -
.../src/test/java/junit4/CategoryC.java | 21 -
.../src/test/java/junit4/CategoryCTest.java | 68 ---
.../src/test/java/junit4/NoCategoryTest.java | 38 --
.../resources/junit48-method-pattern/pom.xml | 103 ----
.../src/test/java/junit4/BasicTest.java | 79 ---
.../src/test/java/junit4/SampleCategory.java | 25 -
.../junit48-multiple-method-patterns/pom.xml | 195 -------
.../test/java/jiras/surefire745/BasicTest.java | 53 --
.../test/java/jiras/surefire745/TestFive.java | 49 --
.../test/java/jiras/surefire745/TestFour.java | 49 --
.../test/java/jiras/surefire745/TestThree.java | 51 --
.../test/java/jiras/surefire745/TestTwo.java | 42 --
.../resources/junit48-multiple-methods/pom.xml | 103 ----
.../src/test/java/junit4/BasicTest.java | 83 ---
.../src/test/java/junit4/TestThree.java | 77 ---
.../src/test/java/junit4/TestTwo.java | 76 ---
.../resources/junit48-single-method/pom.xml | 103 ----
.../src/test/java/junit4/BasicTest.java | 71 ---
.../resources/junit48-smartStackTrace/pom.xml | 57 --
.../test/java/junit4/SmartStackTraceTest.java | 50 --
.../test/resources/large-test-results/pom.xml | 55 --
.../test/java/largeTestResults/BasicTest.java | 65 ---
.../test/resources/long-windows-path/pom.xml | 57 --
.../test/java/longwindowspath/BasicTest.java | 36 --
.../src/test/resources/modulepath/pom.xml | 45 --
.../modulepath/src/main/java/com/app/Main.java | 34 --
.../modulepath/src/main/java/module-info.java | 21 -
.../src/test/java/com/app/AppTest.java | 36 --
.../src/test/resources/norunnableTests/pom.xml | 58 --
.../java/junit/norunnabletests/BasicTest.java | 28 -
.../src/test/resources/parallel-runtime/pom.xml | 42 --
.../src/test/java/runorder/parallel/Test1.java | 69 ---
.../src/test/java/runorder/parallel/Test2.java | 54 --
.../src/test/java/runorder/parallel/Test3.java | 55 --
.../resources/plain-old-java-classpath/pom.xml | 57 --
.../java/plainOldJavaClasspath/BasicTest.java | 87 ---
.../src/test/resources/plexus-conflict/pom.xml | 59 --
.../plexusConflict/CommandlineExtender.java | 35 --
.../src/test/java/plexusConflict/BasicTest.java | 37 --
.../src/test/resources/pojo-simple/pom.xml | 50 --
.../pojo-simple/src/test/java/PojoTest.java | 33 --
.../src/test/resources/pom.xml | 40 --
.../src/test/resources/reporters/pom.xml | 49 --
.../src/test/java/reporters/Test1.java | 30 --
.../src/test/java/reporters/Test2.java | 30 --
.../src/test/resources/result-counting/pom.xml | 41 --
.../test/java/resultcounting/MySuiteTest1.java | 43 --
.../test/java/resultcounting/MySuiteTest2.java | 44 --
.../test/java/resultcounting/MySuiteTest3.java | 45 --
.../src/test/java/resultcounting/Test1.java | 76 ---
.../src/test/java/resultcounting/Test2.java | 127 -----
.../src/test/resources/runOrder/pom.xml | 60 ---
.../src/test/java/junit/runOrder/TestA.java | 31 --
.../src/test/java/junit/runOrder/TestB.java | 31 --
.../src/test/java/junit/runOrder/TestC.java | 31 --
.../test/resources/runorder-parallel/pom.xml | 42 --
.../src/test/java/runorder/parallel/Test1.java | 92 ----
.../src/test/java/runorder/parallel/Test2.java | 50 --
.../src/test/java/runorder/parallel/Test3.java | 83 ---
.../src/test/resources/settings.xml | 53 --
.../sibling-aggregator/aggregator/pom.xml | 51 --
.../resources/sibling-aggregator/child1/pom.xml | 44 --
.../main/java/siblingAggregator/FooHolder.java | 24 -
.../resources/sibling-aggregator/child2/pom.xml | 49 --
.../java/siblingAggregator/FooHolderTest.java | 27 -
.../resources/small-result-counting/pom.xml | 38 --
.../test/java/smallresultcounting/Test1.java | 66 ---
.../test/java/smallresultcounting/Test2.java | 107 ----
.../jiras-surefire-1024-it/pom.xml | 79 ---
.../jiras-surefire-1024-testjar/pom.xml | 47 --
.../src/main/java/jiras/surefire1024/A1IT.java | 12 -
.../src/test/resources/surefire-1024/pom.xml | 51 --
.../pom.xml | 53 --
.../test/java/jiras/surefire1028/SomeTest.java | 36 --
.../pom.xml | 69 ---
.../jiras/surefire1036/IntegrationTest.java | 24 -
.../jiras/surefire1036/TestSomeIntegration.java | 37 --
.../java/jiras/surefire1036/TestSomeUnit.java | 36 --
.../TestSomethingWithMockitoRunner.java | 52 --
.../pom.xml | 60 ---
.../src/test/java/test/AppTest.java | 38 --
.../src/test/java/test/BadRunner.java | 43 --
.../surefire-1053-system-properties/pom.xml | 65 ---
.../src/test/java/jiras/surefire1053/ATest.java | 32 --
.../surefire-1055-parallelTestCount/pom.xml | 66 ---
.../src/test/java/foo/Method1Test.java | 30 --
.../src/test/java/foo/Methods2Test.java | 36 --
.../src/test/java/foo/Methods3Test.java | 43 --
.../src/test/java/foo/Methods4Test.java | 48 --
.../src/test/java/foo/Methods5Test.java | 54 --
.../src/test/java/foo/Methods6Test.java | 42 --
.../src/test/java/foo/SleepUtil.java | 35 --
.../pom.xml | 74 ---
.../java/com/cal/HelloWorldFlakyCotTest.java | 35 --
.../java/com/cal/HelloWorldFlakyErrorTest.java | 35 --
.../src/test/java/com/cal/HelloWorldTest.java | 40 --
.../src/test/java/com/cal/SimpleTest.java | 46 --
.../pom.xml | 64 ---
.../java/jiras/surefire1082/Jira1082Test.java | 60 ---
.../java/jiras/surefire1082/Jira1264Test.java | 36 --
.../surefire-1095-npe-in-runlistener/pom.xml | 70 ---
.../test/java/jiras/surefire1095/Listener.java | 38 --
.../test/java/jiras/surefire1095/SomeTest.java | 31 --
.../surefire-1098-balanced-runorder/pom.xml | 62 ---
.../src/test/java/jiras/surefire1098/ATest.java | 34 --
.../src/test/java/jiras/surefire1098/BTest.java | 34 --
.../src/test/java/jiras/surefire1098/CTest.java | 34 --
.../src/test/java/jiras/surefire1098/DTest.java | 34 --
.../pom.xml | 78 ---
.../src/test/java/test/FlakyTest.java | 41 --
.../pom.xml | 79 ---
.../java/testng/SkipExceptionReportTest.java | 1 -
.../pom.xml | 69 ---
...CurrentWorkingDirectoryInForkedModeTest.java | 51 --
.../resources/surefire-1144-xml-runtime/pom.xml | 50 --
.../src/test/java/surefire1144/Test1.java | 82 ---
.../pom.xml | 62 ---
.../CustomDescriptionParameterizedTest.java | 62 ---
...omDescriptionWithCommaParameterizedTest.java | 63 ---
.../surefire1146/SimpleParameterizedTest.java | 62 ---
.../java/jiras/surefire1146/StandardTest.java | 40 --
.../pom.xml | 143 -----
.../test/java/jiras/surefire1152/FlakyIT.java | 39 --
.../java/jiras/surefire1152/FlakyITSuite.java | 29 -
.../java/jiras/surefire1152/FlakyParent.java | 45 --
.../test/java/jiras/surefire1152/FlakyTest.java | 39 --
.../java/jiras/surefire1152/FlakyTestSuite.java | 29 -
.../pom.xml | 60 ---
.../java/jiras/surefire1153/IncludedUT.java | 30 --
.../jiras/surefire1153/NotIncludedTest.java | 30 --
.../surefire-1158-remove-info-lines/pom.xml | 69 ---
.../src/test/java/jira1158/JUnitTest.java | 31 --
.../src/test/java/jira1158/TestNGSuiteTest.java | 32 --
.../pom.xml | 73 ---
.../src/test/java/debug/ParallelTest.java | 45 --
.../src/test/resources/surefire-1185/pom.xml | 66 ---
.../src/test/java/pkg/RunningTest.java | 29 -
.../src/test/java/pkg/UnlistedTest.java | 29 -
.../surefire-1202-rerun-and-failfast/pom.xml | 118 ----
.../src/test/java/pkg/ATest.java | 45 --
.../src/test/java/pkg/BTest.java | 42 --
.../src/test/java/pkg/CTest.java | 35 --
.../src/test/java/pkg/DTest.java | 35 --
.../src/test/java/pkg/ETest.java | 31 --
.../surefire-1209-rerun-and-forkcount/pom.xml | 115 ----
.../src/test/java/pkg/ATest.java | 45 --
.../src/test/java/pkg/BTest.java | 42 --
.../src/test/java/pkg/CTest.java | 35 --
.../src/test/java/pkg/DTest.java | 35 --
.../src/test/java/pkg/ETest.java | 31 --
.../src/test/resources/surefire-1211/pom.xml | 71 ---
.../src/test/java/jira1211/JUnitTest.java | 31 --
.../src/test/java/jira1211/TestNGSuiteTest.java | 32 --
.../surefire-1260-new-tests-pattern/pom.xml | 60 ---
.../src/test/java/pkg/JUnit3Tests.java | 34 --
.../src/test/java/pkg/JUnit4Tests.java | 42 --
.../src/test/resources/surefire-1264/pom.xml | 52 --
.../core/surefireJunitTests/ATest.java | 33 --
.../core/surefireJunitTests/BTest.java | 33 --
.../core/surefireJunitTests/BaseTest.java | 52 --
.../core/surefireJunitTests/CTest.java | 33 --
.../core/surefireJunitTests/DTest.java | 33 --
.../src/test/resources/surefire-1265/pom.xml | 49 --
.../surefire-1265/src/test/java/J9Test.java | 15 -
.../surefire-1278-group-name-ending/pom.xml | 58 --
.../src/test/java/pkg/ATest.java | 40 --
.../src/test/resources/surefire-1364/pom.xml | 155 ------
.../surefire-1364/src/test/java/FirstTest.java | 30 --
.../surefire-1364/src/test/java/SecondTest.java | 30 --
.../surefire-1364/src/test/java/ThirdTest.java | 30 --
.../src/test/resources/surefire-1367/pom.xml | 59 --
.../surefire-1367/src/test/java/ATest.java | 38 --
.../surefire-1367/src/test/java/BTest.java | 34 --
.../pom.xml | 52 --
.../testprovider/ClassPathTestProvider.java | 63 ---
....maven.surefire.providerapi.SurefireProvider | 1 -
.../pom.xml | 82 ---
.../test/java/pluggableproviders/EmptyIT.java | 26 -
.../test/java/pluggableproviders/EmptyTest.java | 26 -
.../pom.xml | 51 --
.../surefire/testprovider/TestProvider.java | 75 ---
....maven.surefire.providerapi.SurefireProvider | 1 -
.../surefire-141-pluggableproviders/pom.xml | 68 ---
.../src/test/java/surefire141/BasicTest.java | 87 ---
.../src/test/java/surefire141/TestTwo.java | 29 -
.../surefire-146-forkPerTestNoSetup/pom.xml | 58 --
.../java/forkPerTestNoSetup/TestSurefire2.java | 86 ---
.../surefire-162-charsetProvider/pom.xml | 38 --
.../jcharset/jcharset/1.2.1/jcharset-1.2.1.jar | Bin 22719 -> 0 bytes
.../jcharset/1.2.1/jcharset-1.2.1.jar.md5 | 1 -
.../jcharset/1.2.1/jcharset-1.2.1.jar.sha1 | 1 -
.../jcharset/jcharset/1.2.1/jcharset-1.2.1.pom | 9 -
.../jcharset/1.2.1/jcharset-1.2.1.pom.md5 | 1 -
.../jcharset/1.2.1/jcharset-1.2.1.pom.sha1 | 1 -
.../repo/jcharset/jcharset/maven-metadata.xml | 11 -
.../jcharset/jcharset/maven-metadata.xml.md5 | 1 -
.../jcharset/jcharset/maven-metadata.xml.sha1 | 1 -
.../charsetProvider/MSUREFIRE77TestCase.java | 40 --
.../surefire-224-wellFormedXmlFailures/pom.xml | 58 --
.../wellFormedXmlFailures/TestSurefire3.java | 62 ---
.../surefire-257-rerunningTests/module1/pom.xml | 23 -
.../main/java/surefire257/MyModule1Class.java | 26 -
.../java/surefire257/MyModule1ClassTest.java | 33 --
.../surefire-257-rerunningTests/module2/pom.xml | 23 -
.../main/java/surefire257/MyModule2Class.java | 6 -
.../java/surefire257/MyModule2ClassTest.java | 13 -
.../surefire-257-rerunningTests/pom.xml | 43 --
.../surefire-260-testWithIdenticalNames/pom.xml | 64 ---
.../src/test/java/surefire260/TestA.java | 35 --
.../src/test/java/surefire260/TestB.java | 31 --
.../src/test/java/surefire260/TestC.java | 31 --
.../surefire-34-securityManager-success/pom.xml | 61 ---
.../test/java/junit4/SecurityManagerTest.java | 56 --
.../surefire-34-securityManager/pom.xml | 61 ---
.../test/java/junit4/SecurityManagerTest.java | 60 ---
.../pom.xml | 77 ---
.../test/java/junit/twoTestCases/BasicTest.java | 86 ---
.../test/java/junit/twoTestCases/TestTwo.java | 29 -
.../surefire-500-puzzling-error/pom.xml | 37 --
.../test/java/surefire500/ExplodingTest.java | 49 --
.../src/test/java/surefire500/PassingTest.java | 53 --
.../src/test/java/surefire500/Suite.java | 30 --
.../surefire-510-testClassPath/pom.xml | 57 --
.../src/test/java/surefire510/Test1.java | 40 --
.../module1/pom.xml | 50 --
.../pom.xml | 17 -
.../testjar/pom.xml | 47 --
.../testjar/src/test/java/org/test/TestA.java | 29 -
.../testjar/src/test/java/org/test/TestB.java | 29 -
.../module1/pom.xml | 23 -
.../maven/surefire570/MyModule1Class.java | 26 -
.../maven/surefire570/MyModule1ClassTest.java | 38 --
...ireReport.surefireReportTest.MyClassTest.xml | 71 ---
...ireReport.surefireReportTest.MyClassTest.txt | 13 -
.../module2/pom.xml | 23 -
.../surefire570/module2/MyModule2Class.java | 6 -
.../surefire570/module2/MyModule2ClassTest.java | 18 -
...ireReport.surefireReportTest.MyClassTest.xml | 71 ---
...ireReport.surefireReportTest.MyClassTest.txt | 13 -
.../pom.xml | 117 ----
.../surefire-613-testCount-in-parallel/pom.xml | 38 --
.../src/test/java/surefire163/Test1.java | 90 ----
.../src/test/java/surefire163/Test2.java | 127 -----
.../pom.xml | 217 --------
.../src/it/java/mho/JUnit4AdapterSuiteTest.java | 39 --
.../src/it/java/mho/MySuiteTest1.java | 48 --
.../src/it/java/mho/MySuiteTest2.java | 49 --
.../src/it/java/mho/MySuiteTest3.java | 49 --
.../pom.xml | 39 --
.../src/test/java/surefire628/Test1.java | 48 --
.../src/test/java/surefire628/Test2.java | 42 --
.../pom.xml | 61 ---
.../src/test/java/junit4/BasicTest.java | 64 ---
.../surefire-649-systemProperties/pom.xml | 67 ---
.../jiras/surefire649/SystemPropertiesTest.java | 32 --
.../pom.xml | 64 ---
.../SystemPropertyVariablesTest.java | 32 --
.../test/resources/surefire-673-mockito/pom.xml | 37 --
.../src/test/java/surefire673/TestMockito.java | 36 --
.../surefire-674-buildFailingWhenErrors/pom.xml | 41 --
.../src/test/java/resultcounting/Test2.java | 36 --
.../surefire-685-commaseparatedIncludes/pom.xml | 63 ---
.../src/test/java/surefire685/TestA.java | 29 -
.../src/test/java/surefire685/TestB.java | 29 -
.../src/test/java/surefire685/TestC.java | 29 -
.../resources/surefire-697-niceSummary/pom.xml | 55 --
.../test/java/junit/surefire697/BasicTest.java | 65 ---
.../test/java/junit/surefire697/TestTwo.java | 31 --
.../surefire-733-allOverridesCaptured/pom.xml | 56 --
.../src/test/java/junit/surefire733/ATest.java | 46 --
.../TEST-junit.twoTestCases.BasicTest.xml | 62 ---
.../TEST-junit.twoTestCases.TestTwo.xml | 62 ---
.../surefire-740-comma-truncated/pom.xml | 61 ---
.../resources/surefire-772-both-reports/pom.xml | 91 ----
.../TEST-junit.twoTestCases.BasicTest.xml | 62 ---
.../TEST-junit.twoTestCases.TestTwo.xml | 62 ---
.../TEST-junit.twoTestCases.BasicTest.xml | 62 ---
.../TEST-junit.twoTestCases.TestTwo.xml | 62 ---
.../surefire-772-no-failsafe-reports/pom.xml | 91 ----
.../TEST-junit.twoTestCases.BasicTest.xml | 62 ---
.../TEST-junit.twoTestCases.TestTwo.xml | 62 ---
.../resources/surefire-772-no-reports/pom.xml | 56 --
.../surefire-772-no-surefire-reports/pom.xml | 91 ----
.../TEST-junit.twoTestCases.BasicTest.xml | 62 ---
.../TEST-junit.twoTestCases.TestTwo.xml | 62 ---
.../TEST-junit.twoTestCases.BasicTest.xml | 62 ---
.../TEST-junit.twoTestCases.TestTwo.xml | 62 ---
.../surefire-772-specified-reports/pom.xml | 96 ----
.../pom.xml | 80 ---
.../org/apache/maven/surefire/test/App.java | 37 --
.../apache/maven/surefire/test/FailingTest.java | 84 ---
.../maven/surefire/test/SucceedingTest.java | 84 ---
.../pom.xml | 61 ---
.../org/apache/maven/surefire/test/App.java | 37 --
.../org/apache/maven/surefire/test/TheTest.java | 42 --
.../surefire-806-specifiedTests-multi/pom.xml | 86 ---
.../java/defaultConfiguration/FirstTest.java | 36 --
.../java/defaultConfiguration/FourthTest.java | 36 --
.../java/defaultConfiguration/SecondTest.java | 36 --
.../java/defaultConfiguration/ThirdTest.java | 36 --
.../surefire-806-specifiedTests-single/pom.xml | 70 ---
.../java/defaultConfiguration/FirstTest.java | 36 --
.../java/defaultConfiguration/FourthTest.java | 36 --
.../java/defaultConfiguration/SecondTest.java | 36 --
.../java/defaultConfiguration/ThirdTest.java | 36 --
.../surefire-809-groupExpr-junit48/pom.xml | 57 --
.../src/test/java/junit4/BasicTest.java | 88 ---
.../src/test/java/junit4/CategoryA.java | 21 -
.../src/test/java/junit4/CategoryB.java | 21 -
.../src/test/java/junit4/CategoryC.java | 21 -
.../src/test/java/junit4/CategoryCTest.java | 80 ---
.../src/test/java/junit4/NoCategoryTest.java | 38 --
.../surefire-809-groupExpr-testng/pom.xml | 45 --
.../src/test/java/testng/BasicTest.java | 72 ---
.../src/test/java/testng/CategoryCTest.java | 63 ---
.../src/test/java/testng/NoCategoryTest.java | 38 --
.../surefire-812-log4j-classloader/pom.xml | 44 --
.../src/main/resources/log4j.properties | 24 -
.../src/test/java/surefire812/LoggingTest.java | 36 --
.../resources/surefire-817-system-exit/pom.xml | 69 ---
.../src/test/java/jiras/surefire817/Test.java | 29 -
.../surefire-818-ignored-tests-on-npe/pom.xml | 37 --
.../src/test/java/cyril/test/FirstTest.java | 55 --
.../src/test/java/cyril/test/IgnoredTest.java | 35 --
.../src/test/java/cyril/test/Message.java | 37 --
.../src/test/java/cyril/test/MyService.java | 28 -
.../src/test/java/cyril/test/MyServiceImpl.java | 12 -
.../pom.xml | 44 --
.../java/surefire/testcase/JunitParamsTest.java | 51 --
.../surefire/testcase/NonJunitParamsTest.java | 37 --
.../surefire-828-emptyGroupExpr-junit48/pom.xml | 98 ----
.../src/test/java/junit4/BasicTest.java | 88 ---
.../src/test/java/junit4/CategoryA.java | 21 -
.../src/test/java/junit4/CategoryB.java | 21 -
.../src/test/java/junit4/CategoryC.java | 21 -
.../src/test/java/junit4/CategoryCTest.java | 80 ---
.../src/test/java/junit4/NoCategoryTest.java | 38 --
.../surefire-828-emptyGroupExpr-testng/pom.xml | 78 ---
.../src/test/java/testng/BasicTest.java | 72 ---
.../src/test/java/testng/CategoryCTest.java | 63 ---
.../src/test/java/testng/NoCategoryTest.java | 38 --
.../surefire-832-provider-selection/pom.xml | 58 --
.../src/test/java/junit4/BasicTest.java | 88 ---
.../src/test/java/junit4/CategoryA.java | 21 -
.../src/test/java/junit4/CategoryB.java | 21 -
.../src/test/java/junit4/CategoryC.java | 21 -
.../src/test/java/junit4/CategoryCTest.java | 80 ---
.../src/test/java/junit4/NoCategoryTest.java | 38 --
.../surefire-847-testngfail/README.txt | 2 -
.../resources/surefire-847-testngfail/pom.xml | 60 ---
.../test/java/org/codehaus/SomeFailedTest.java | 32 --
.../test/java/org/codehaus/SomePassedTest.java | 34 --
.../src/test/resources/suite.xml | 8 -
.../surefire-855-failsafe-use-bundle/pom.xml | 127 -----
.../src/main/java/pkg/AClassInOSGiBundle.java | 24 -
.../main/resources/main/surefire855.properties | 1 -
.../java/jiras/surefre855/bundle/FooIT.java | 166 ------
.../bundle/properties/surefire855.properties | 1 -
.../surefire-855-failsafe-use-jar/pom.xml | 115 ----
.../src/main/java/pkg/ToRunJavadoc.java | 8 -
.../main/resources/main/surefire855.properties | 1 -
.../test/java/jiras/surefire855/jar/FooIT.java | 179 ------
.../jar/properties/surefire855.properties | 1 -
.../surefire-855-failsafe-use-war/pom.xml | 124 -----
.../main/java/pkg/ToCreateClassesDirectory.java | 24 -
.../main/resources/main/surefire855.properties | 1 -
.../test/java/jiras/surefire855/war/FooIT.java | 163 ------
.../war/properties/surefire855.properties | 1 -
.../surefire-926-2-provider-failure/pom.xml | 41 --
.../src/test/java/com/company/JUnitTest.java | 31 --
.../src/test/java/com/company/TestNGTest.java | 31 --
.../surefire-930-failsafe-runtests/pom.xml | 53 --
.../failsafe/ExampleIntegrationTest.java | 32 --
.../maven/plugins/failsafe/ExampleTest.java | 32 --
.../maven/plugins/failsafe/TestConstants.java | 33 --
.../test/resources/testng-integrationTest.xml | 18 -
.../src/test/resources/testng.xml | 17 -
.../surefire-931-provider-failure/pom.xml | 41 --
.../main/java/com/mycompany/testfailed/App.java | 32 --
.../java/com/mycompany/testfailed/AppTest.java | 37 --
.../resources/surefire-942-testngSuite/pom.xml | 37 --
.../src/test/java/org/BasicTest.java | 67 ---
.../src/test/resources/config.xml | 8 -
.../surefire-943-report-content/pom.xml | 44 --
.../test/java/org/sample/module/My1Test.java | 50 --
.../test/java/org/sample/module/My2Test.java | 49 --
.../test/java/org/sample/module/My3Test.java | 41 --
.../test/java/org/sample/module/My4Test.java | 41 --
.../test/java/org/sample/module/My5Test.java | 39 --
.../pom.xml | 61 ---
.../java/junit44/environment/Basic01Test.java | 45 --
.../java/junit44/environment/Basic02Test.java | 45 --
.../java/junit44/environment/Basic03Test.java | 45 --
.../java/junit44/environment/Basic04Test.java | 45 --
.../java/junit44/environment/Basic05Test.java | 45 --
.../java/junit44/environment/Basic06Test.java | 45 --
.../java/junit44/environment/Basic07Test.java | 45 --
.../java/junit44/environment/Basic08Test.java | 45 --
.../java/junit44/environment/Basic09Test.java | 45 --
.../java/junit44/environment/Basic10Test.java | 45 --
.../surefire-946-self-destruct-plugin/pom.xml | 53 --
.../surefire/selfdestruct/SelfDestructMojo.java | 161 ------
.../boom/pom.xml | 51 --
.../apache/maven/surefire/crb/ClassRuleIT.java | 43 --
.../class-rule/pom.xml | 17 -
.../ExampleClassRule.java | 29 -
.../surefire-972-bizarre-noclassdef/pom.xml | 36 --
.../surefire-975-wrong-encoding/pom.xml | 34 --
.../src/test/java/EncodingInReportTest.java | 33 --
.../module1/pom.xml | 36 --
.../src/main/java/surefire979/TestBase.java | 36 --
.../module2/pom.xml | 37 --
.../FailingStaticInitializerTest.java | 36 --
.../pom.xml | 28 -
.../pom.xml | 47 --
.../src/test/java/sample/CategoryActivated.java | 25 -
.../test/java/sample/CategoryNotSelected.java | 25 -
.../parameterized/Parameterized01Test.java | 61 ---
.../parameterized/Parameterized02Test.java | 61 ---
.../parameterized/Parameterized03Test.java | 61 ---
.../surefire-995-categoryInheritance/pom.xml | 90 ----
.../java/jiras/surefire955/CategorizedTest.java | 35 --
.../java/jiras/surefire955/NotIncludedTest.java | 33 --
.../java/jiras/surefire955/SomeCategory.java | 24 -
.../surefire955/SpecialCategorizedTest.java | 34 --
.../surefire955/SpecialNonCategoryTest.java | 33 --
.../test/resources/system-properties/pom.xml | 98 ----
.../src/test/config/propsfile.properties | 2 -
.../test/java/systemProperties/BasicTest.java | 90 ----
.../test-helper-dump-pid-plugin/pom.xml | 59 --
.../plugins/surefire/dumppid/DumpPidMojo.java | 70 ---
.../resources/testng-afterSuiteFailure/pom.xml | 76 ---
.../afterSuiteFailure/TestNGSuiteTest.java | 40 --
.../test/resources/testng-beforeMethod/pom.xml | 76 ---
.../testng/beforeMethod/TestNGSuiteTest.java | 40 --
.../testng-beforeMethodFailure/pom.xml | 76 ---
.../beforeMethodFailure/TestNGSuiteTest.java | 40 --
.../test/resources/testng-execute-error/pom.xml | 80 ---
.../src/test/java/it/BasicTest.java | 36 --
.../testng-group-thread-parallel/pom.xml | 84 ---
.../testng/groupThreadParallel/TestNGTest.java | 113 ----
.../src/test/resources/testng-groups/pom.xml | 55 --
.../java/testng/groups/TestNGGroupTest.java | 76 ---
.../src/test/resources/testng-jdk14/pom.xml | 66 ---
.../java/testng/jdk14/TestNGJavadocTest.java | 63 ---
.../resources/testng-junit-together/pom.xml | 85 ---
.../src/test/java/JunitTest.java | 47 --
.../src/test/java/TestNGJunitTest.java | 49 --
.../resources/testng-junit4-together/pom.xml | 50 --
.../src/test/java/Junit4NoRunWithTest.java | 53 --
.../src/test/java/Junit4SimpleRunWithTest.java | 56 --
.../src/test/java/TestNGTest.java | 50 --
.../resources/testng-listener-reporter/pom.xml | 90 ----
.../src/test/java/listenReport/FileHelper.java | 44 --
.../src/test/java/listenReport/Reporter.java | 37 --
.../test/java/listenReport/ResultListener.java | 87 ---
.../test/java/listenReport/SuiteListener.java | 39 --
.../test/java/listenReport/TestNGSuiteTest.java | 32 --
.../src/test/resources/testng-listeners/pom.xml | 43 --
.../java/listeners/MarkAsFailureListener.java | 83 ---
.../src/test/java/listeners/SimpleTest.java | 35 --
.../testng-method-pattern-after/pom.xml | 79 ---
.../src/test/java/testng/BasicTest.java | 79 ---
.../testng-method-pattern-before/pom.xml | 79 ---
.../src/test/java/testng/BasicTest.java | 79 ---
.../resources/testng-method-pattern/pom.xml | 80 ---
.../src/test/java/testng/BasicTest.java | 73 ---
.../testng-multiple-method-patterns/pom.xml | 108 ----
.../test/java/jiras/surefire745/BasicTest.java | 47 --
.../test/java/jiras/surefire745/TestFive.java | 44 --
.../test/java/jiras/surefire745/TestFour.java | 44 --
.../test/java/jiras/surefire745/TestThree.java | 46 --
.../test/java/jiras/surefire745/TestTwo.java | 38 --
.../test/resources/testng-objectFactory/pom.xml | 66 ---
.../java/testng/objectfactory/FileHelper.java | 25 -
.../TestNGCustomObjectFactory.java | 22 -
.../testng/objectfactory/TestNGSuiteTest.java | 11 -
.../resources/testng-parallel-suites/pom.xml | 81 ---
.../java/testng/suiteXml/ShouldNotRunTest.java | 35 --
.../java/testng/suiteXml/TestNGSuiteTest.java | 43 --
.../src/test/resources/testng1.xml | 30 --
.../src/test/resources/testng2.xml | 30 --
.../testng-parallel-with-annotations/pom.xml | 42 --
.../TestNGParallelTest.java | 69 ---
.../resources/testng-path with spaces/pom.xml | 76 ---
.../testng/pathWithSpaces/TestNGSuiteTest.java | 35 --
.../src/test/resources/test.txt | 1 -
.../src/test/resources/testng-simple/pom.xml | 103 ----
.../java/testng/simple/TestNGSuiteTestA.java | 32 --
.../java/testng/simple/TestNGSuiteTestB.java | 32 --
.../java/testng/simple/TestNGSuiteTestC.java | 32 --
.../testng-single-method-5-14-9/pom.xml | 57 --
.../src/test/java/testng/BasicTest.java | 73 ---
.../test/resources/testng-single-method/pom.xml | 80 ---
.../src/test/java/testng/BasicTest.java | 73 ---
.../resources/testng-succes-percentage/pom.xml | 65 ---
.../testng/TestNGSuccessPercentFailingTest.java | 44 --
.../testng/TestNGSuccessPercentPassingTest.java | 43 --
.../src/test/resources/testng-suite-xml/pom.xml | 84 ---
.../testng-suite-xml/src/test-data/testng1.xml | 30 --
.../testng-suite-xml/src/test-data/testng2.xml | 30 --
.../java/testng/suiteXml/TestNGSuiteTest.java | 54 --
.../resources/testng-testRunnerFactory/pom.xml | 72 ---
.../testng/testrunnerfactory/FileHelper.java | 25 -
.../TestNGCustomTestRunnerFactory.java | 22 -
.../testrunnerfactory/TestNGSuiteTest.java | 11 -
.../resources/testng-twoTestCaseSuite/pom.xml | 81 ---
.../test/java/testng/two/TestNGSuiteTest.java | 33 --
.../src/test/java/testng/two/TestNGTestTwo.java | 32 --
.../src/test/resources/suite.xml | 7 -
.../src/test/resources/timeout-forked/pom.xml | 58 --
.../src/test/java/timeoutForked/BasicTest.java | 38 --
.../test/resources/unicode-testnames/pom.xml | 56 --
.../java/junit/twoTestCases/EscapeTest.java | 86 ---
.../test/java/junit/twoTestCases/XXYZTest.java | 30 --
.../src/test/resources/webapp/pom.xml | 109 ----
.../webapp/src/main/webapp/WEB-INF/web.xml | 7 -
.../resources/webapp/src/main/webapp/index.jsp | 5 -
.../webapp/src/test/java/WebAppTest.java | 66 ---
.../pom.xml | 56 --
.../src/test/java/MyTest.java | 27 -
.../resources/working-directory-missing/pom.xml | 53 --
.../src/test/java/MyTest.java | 27 -
.../resources/working-directory/child/pom.xml | 44 --
.../src/test/java/workingDir/BasicTest.java | 45 --
.../test/resources/working-directory/pom.xml | 52 --
surefire-its/pom.xml | 202 +++++++
.../maven/surefire/its/AbstractFailFastIT.java | 105 ++++
.../maven/surefire/its/AbstractJigsawIT.java | 111 ++++
.../maven/surefire/its/AbstractTestCaseIT.java | 41 ++
.../its/AbstractTestMultipleMethodPatterns.java | 483 +++++++++++++++++
.../surefire/its/AdditionalClasspathIT.java | 39 ++
.../maven/surefire/its/AggregateReportIT.java | 57 ++
.../apache/maven/surefire/its/ArgLineIT.java | 39 ++
.../maven/surefire/its/ArgLinePropertiesIT.java | 39 ++
.../surefire/its/AssumptionFailureReportIT.java | 34 ++
.../maven/surefire/its/CheckSingleTestIT.java | 70 +++
.../its/CheckTestFailIfNoTestsForkModeIT.java | 81 +++
.../surefire/its/CheckTestFailIfNoTestsIT.java | 63 +++
.../its/CheckTestNgBeforeMethodFailureIT.java | 47 ++
.../surefire/its/CheckTestNgBeforeMethodIT.java | 44 ++
.../its/CheckTestNgCustomObjectFactoryIT.java | 58 ++
.../CheckTestNgCustomTestRunnerFactoryIT.java | 59 ++
.../surefire/its/CheckTestNgExecuteErrorIT.java | 69 +++
.../its/CheckTestNgGroupThreadParallelIT.java | 43 ++
.../maven/surefire/its/CheckTestNgJdk14IT.java | 41 ++
.../its/CheckTestNgListenerReporterIT.java | 105 ++++
.../surefire/its/CheckTestNgListenersIT.java | 37 ++
.../its/CheckTestNgPathWithSpacesIT.java | 42 ++
.../surefire/its/CheckTestNgReportTestIT.java | 74 +++
.../surefire/its/CheckTestNgSuiteXmlIT.java | 60 +++
.../its/CheckTestNgSuiteXmlSingleIT.java | 44 ++
.../surefire/its/CheckTestNgVersionsIT.java | 223 ++++++++
.../maven/surefire/its/ClassPathOrderIT.java | 39 ++
.../surefire/its/ClasspathFilteringIT.java | 39 ++
.../surefire/its/ClasspathScopeFilteringIT.java | 39 ++
.../maven/surefire/its/ConsoleOutputIT.java | 106 ++++
.../maven/surefire/its/CrashDetectionIT.java | 61 +++
.../surefire/its/DefaultConfigurationIT.java | 38 ++
.../surefire/its/EnvironmentVariableIT.java | 40 ++
.../surefire/its/EnvironmentVariablesIT.java | 47 ++
.../maven/surefire/its/FailFastJUnitIT.java | 77 +++
.../maven/surefire/its/FailFastTestNgIT.java | 69 +++
.../maven/surefire/its/ForkConsoleOutputIT.java | 87 +++
.../its/ForkConsoleOutputWithErrorsIT.java | 47 ++
.../apache/maven/surefire/its/ForkModeIT.java | 241 +++++++++
.../surefire/its/ForkModeMultiModuleIT.java | 162 ++++++
.../maven/surefire/its/ForkModeTestNGIT.java | 35 ++
.../its/IncludesExcludesFromFileIT.java | 95 ++++
.../maven/surefire/its/IncludesExcludesIT.java | 68 +++
.../maven/surefire/its/JUnit44HamcrestIT.java | 38 ++
.../surefire/its/JUnit47ConcurrencyIT.java | 58 ++
.../maven/surefire/its/JUnit47ParallelIT.java | 540 +++++++++++++++++++
.../its/JUnit47ParallelNotThreadSafeIT.java | 52 ++
.../surefire/its/JUnit47RedirectOutputIT.java | 71 +++
.../JUnit47RerunFailingTestWithCucumberIT.java | 80 +++
.../its/JUnit47StaticInnerClassTestsIT.java | 34 ++
.../surefire/its/JUnit47WithCucumberIT.java | 70 +++
.../surefire/its/JUnit48TestCategoriesIT.java | 145 +++++
.../JUnit4ForkAlwaysStaticInitPollutionIT.java | 38 ++
.../maven/surefire/its/JUnit4IgnoreIT.java | 52 ++
.../surefire/its/JUnit4RerunFailingTestsIT.java | 278 ++++++++++
.../maven/surefire/its/JUnit4RunListenerIT.java | 73 +++
.../maven/surefire/its/JUnit4VersionsIT.java | 87 +++
.../apache/maven/surefire/its/JUnitDepIT.java | 70 +++
.../maven/surefire/its/Java9FullApiIT.java | 109 ++++
.../maven/surefire/its/LongWindowsPathIT.java | 88 +++
.../apache/maven/surefire/its/ModulePathIT.java | 45 ++
.../surefire/its/NoRunnableTestsInClassIT.java | 39 ++
.../surefire/its/PlainOldJavaClasspathIT.java | 38 ++
.../maven/surefire/its/PlexusConflictIT.java | 50 ++
.../apache/maven/surefire/its/PojoSimpleIT.java | 38 ++
.../apache/maven/surefire/its/ReporterTime.java | 26 +
.../apache/maven/surefire/its/ReportersIT.java | 45 ++
.../maven/surefire/its/ResultCountingIT.java | 66 +++
.../apache/maven/surefire/its/RunOrderIT.java | 108 ++++
.../surefire/its/RunOrderParallelForksIT.java | 31 ++
.../maven/surefire/its/SiblingAggregatorIT.java | 47 ++
.../maven/surefire/its/SmartStackTraceIT.java | 44 ++
.../surefire/its/SystemPropertiesTestIT.java | 55 ++
.../maven/surefire/its/TestMethodPatternIT.java | 115 ++++
.../its/TestMultipleMethodPatternsIT.java | 67 +++
.../its/TestMultipleMethodPatternsTestNGIT.java | 64 +++
.../surefire/its/TestMultipleMethodsIT.java | 74 +++
.../maven/surefire/its/TestNgGroupsIT.java | 69 +++
.../its/TestNgParallelWithAnnotationsIT.java | 38 ++
.../surefire/its/TestNgSuccessPercentageIT.java | 45 ++
.../maven/surefire/its/TestSingleMethodIT.java | 141 +++++
.../maven/surefire/its/TimeoutForkedTestIT.java | 43 ++
.../maven/surefire/its/TwoTestCasesIT.java | 130 +++++
.../apache/maven/surefire/its/UmlautDirIT.java | 64 +++
.../maven/surefire/its/UnicodeTestNamesIT.java | 75 +++
.../surefire/its/UseIsolatedClassLoaderIT.java | 38 ++
.../maven/surefire/its/WorkingDirectoryIT.java | 134 +++++
.../WorkingDirectoryIsInvalidPropertyIT.java | 39 ++
.../surefire/its/WorkingDirectoryMissingIT.java | 39 ++
.../surefire/its/XmlReporterRunTimeIT.java | 75 +++
.../surefire/its/fixture/Configuration.java | 29 +
.../its/fixture/FailsafeOutputValidator.java | 47 ++
.../surefire/its/fixture/HelperAssertions.java | 174 ++++++
.../fixture/IntegrationTestSuiteResults.java | 91 ++++
.../surefire/its/fixture/MavenLauncher.java | 504 +++++++++++++++++
.../surefire/its/fixture/MavenLauncherTest.java | 47 ++
.../surefire/its/fixture/OutputValidator.java | 230 ++++++++
.../maven/surefire/its/fixture/Settings.java | 72 +++
.../SurefireJUnit4IntegrationTestCase.java | 60 +++
.../surefire/its/fixture/SurefireLauncher.java | 492 +++++++++++++++++
.../its/fixture/SurefireLauncherTest.java | 43 ++
.../its/fixture/SurefireVerifierException.java | 37 ++
.../maven/surefire/its/fixture/TestFile.java | 155 ++++++
.../surefire/its/fixture/TestFramework.java | 29 +
.../Surefire1024VerifyFailsafeIfTestedIT.java | 48 ++
.../jiras/Surefire1028UnableToRunSingleIT.java | 59 ++
...onFilterableJUnitRunnerWithCategoriesIT.java | 71 +++
.../jiras/Surefire1041FailingJUnitRunnerIT.java | 38 ++
.../jiras/Surefire1053SystemPropertiesIT.java | 72 +++
...urefire1055CorrectConcurrentTestCountIT.java | 41 ++
.../Surefire1080ParallelForkDoubleTestIT.java | 54 ++
...urefire1082ParallelJUnitParameterizedIT.java | 212 ++++++++
.../its/jiras/Surefire1095NpeInRunListener.java | 94 ++++
.../jiras/Surefire1098BalancedRunOrderIT.java | 119 ++++
.../Surefire1122ParallelAndFlakyTestsIT.java | 48 ++
...fire1135ImproveIgnoreMessageForTestNGIT.java | 152 ++++++
...urefire1136CwdPropagationInForkedModeIT.java | 43 ++
.../its/jiras/Surefire1144XmlRunTimeIT.java | 58 ++
...Surefire1146RerunFailedAndParameterized.java | 75 +++
.../Surefire1152RerunFailingTestsInSuiteIT.java | 64 +++
.../Surefire1153IncludesAndSpecifiedTestIT.java | 46 ++
.../jiras/Surefire1158RemoveInfoLinesIT.java | 142 +++++
.../Surefire1177TestngParallelSuitesIT.java | 59 ++
.../surefire/its/jiras/Surefire1179IT.java | 43 ++
.../jiras/Surefire1185DoNotSpawnTestsIT.java | 62 +++
.../its/jiras/Surefire1202RerunAndSkipIT.java | 58 ++
.../jiras/Surefire1209RerunAndForkCountIT.java | 75 +++
.../its/jiras/Surefire1211JUnitTestNgIT.java | 62 +++
.../its/jiras/Surefire1260NewTestsPattern.java | 49 ++
.../surefire/its/jiras/Surefire1264IT.java | 58 ++
.../surefire/its/jiras/Surefire1265Java9IT.java | 57 ++
.../jiras/Surefire1278GroupNameEndingIT.java | 44 ++
...urefire1295AttributeJvmCrashesToTestsIT.java | 125 +++++
.../jiras/Surefire1364SystemPropertiesIT.java | 203 +++++++
.../its/jiras/Surefire1367AssumptionLogsIT.java | 157 ++++++
.../Surefire1396CustomProviderClassPathIT.java | 52 ++
.../jiras/Surefire141PluggableProvidersIT.java | 179 ++++++
.../jiras/Surefire146ForkPerTestNoSetupIT.java | 38 ++
.../its/jiras/Surefire162CharsetProviderIT.java | 51 ++
.../Surefire224WellFormedXmlFailuresIT.java | 78 +++
.../jiras/Surefire257NotRerunningTestsIT.java | 41 ++
.../Surefire260TestWithIdenticalNamesIT.java | 72 +++
.../its/jiras/Surefire34SecurityManagerIT.java | 48 ++
.../Surefire376TestNgAfterSuiteFailureIT.java | 44 ++
.../Surefire377TestNgAndJUnitTogetherIT.java | 52 ++
.../Surefire408ManualProviderSelectionIT.java | 42 ++
.../jiras/Surefire42NotExtendingTestCaseIT.java | 38 ++
.../its/jiras/Surefire44InnerClassTestIT.java | 38 ++
.../its/jiras/Surefire500PuzzlingErrorIT.java | 42 ++
.../Surefire510TestClassPathForkModesIT.java | 53 ++
.../Surefire569RunTestFromDependencyJarsIT.java | 44 ++
.../Surefire570MultipleReportDirectoriesIT.java | 68 +++
.../jiras/Surefire613TestCountInParallelIT.java | 45 ++
...refire621TestCountingJunit3InParallelIT.java | 98 ++++
...re628ConsoleOutputBeforeAndAfterClassIT.java | 48 ++
...e634UnsettableSystemPropertiesWarningIT.java | 39 ++
...urefire649EmptyStringSystemPropertiesIT.java | 84 +++
.../its/jiras/Surefire673MockitoIT.java | 38 ++
.../Surefire674BuildFailingWhenErrorsIT.java | 39 ++
...fire674BuildFailingWhenFailsafeErrorsIT.java | 38 ++
.../Surefire685CommaSeparatedIncludesIT.java | 38 ++
.../its/jiras/Surefire697NiceSummaryIT.java | 39 ++
.../jiras/Surefire705ParallelForkTimeoutIT.java | 40 ++
.../Surefire733AllOverrridesCapturedIT.java | 36 ++
...e735ForkFailWithRedirectConsoleOutputIT.java | 80 +++
.../its/jiras/Surefire740TruncatedCommaIT.java | 48 ++
...refire747MethodParallelWithSuiteCountIT.java | 168 ++++++
.../its/jiras/Surefire772BothReportsIT.java | 87 +++
.../jiras/Surefire772NoFailsafeReportsIT.java | 108 ++++
.../jiras/Surefire772NoSurefireReportsIT.java | 98 ++++
.../jiras/Surefire772SpecifiedReportsIT.java | 82 +++
.../Surefire801ForkModeNoneClassLoaderIT.java | 38 ++
.../jiras/Surefire803MultiFailsafeExecsIT.java | 47 ++
.../Surefire806SpecifiedTestControlsIT.java | 52 ++
.../jiras/Surefire809GroupExpressionsIT.java | 114 ++++
.../jiras/Surefire812Log4JClassLoaderIT.java | 36 ++
.../its/jiras/Surefire817SystemExitIT.java | 47 ++
.../its/jiras/Surefire818NpeIgnoresTestsIT.java | 39 ++
.../its/jiras/Surefire828EmptyGroupExprIT.java | 97 ++++
.../jiras/Surefire832ProviderSelectionIT.java | 49 ++
.../Surefire839TestWithoutCategoriesIT.java | 45 ++
.../jiras/Surefire847AdditionalFailureIT.java | 33 ++
...refire855AllowFailsafeUseArtifactFileIT.java | 58 ++
...refire901MIssingResultfileWhenNoTestsIT.java | 39 ++
...urefire907PerThreadWithoutThreadCountIT.java | 42 ++
...refire920TestFailureIgnoreWithTimeoutIT.java | 45 ++
.../Surefire926FailureWith2ProvidersIT.java | 36 ++
.../its/jiras/Surefire930TestNgSuiteXmlIT.java | 37 ++
.../its/jiras/Surefire943ReportContentIT.java | 159 ++++++
...efire946KillMainProcessInReusableForkIT.java | 71 +++
.../jiras/Surefire972BizarreNoClassDefIT.java | 32 ++
.../jiras/Surefire975DefaultVMEncodingIT.java | 40 ++
.../jiras/Surefire979WrongClassLoaderIT.java | 39 ++
...re985ParameterizedRunnerAndCategoriesIT.java | 68 +++
.../jiras/Surefire995CategoryInheritanceIT.java | 90 ++++
.../test/resources/SurefireToolchains/pom.xml | 72 +++
.../main/java/test/surefiretoolchains/App.java | 29 +
.../java/test/surefiretoolchains/AppTest.java | 36 ++
.../additional-classpath/extraResource/test.txt | 0
.../extraResource2/test2.txt | 0
.../test/resources/additional-classpath/pom.xml | 65 +++
.../java/additionalClasspath/BasicTest.java | 34 ++
.../resources/aggregate-report/child1/pom.xml | 52 ++
.../test/java/aggregateReport/FailingTest.java | 33 ++
.../resources/aggregate-report/child2/pom.xml | 52 ++
.../test/java/aggregateReport/BasicTest.java | 87 +++
.../src/test/resources/aggregate-report/pom.xml | 67 +++
.../src/test/resources/ant-ignore/.gitignore | 3 +
.../src/test/resources/ant-ignore/build.xml | 52 ++
.../src/test/resources/ant-ignore/ivy.xml | 6 +
.../src/test/resources/ant-ignore/pom.xml | 47 ++
.../src/test/resources/ant-ignore/src/ivy.xml | 6 +
.../src/test/java/antignore/BasicTest.java | 42 ++
.../test/resources/argLine-parameter/pom.xml | 61 +++
.../test/java/argLine/TestSurefireArgLine.java | 40 ++
.../test/resources/argLine-properties/pom.xml | 84 +++
.../TestSurefireArgLineProperties.java | 58 ++
.../src/test/resources/it.properties | 19 +
.../resources/assumpationFailureReport/pom.xml | 63 +++
.../src/test/java/assumpationFailure/Test1.java | 35 ++
.../test/resources/classpath-filtering/pom.xml | 65 +++
.../test/java/classpathFiltering/BasicTest.java | 44 ++
.../src/test/resources/classpath-order/pom.xml | 64 +++
.../surefire-classpath-order.properties | 2 +
.../main/resources/surefire-report.properties | 2 +
.../src/test/java/it/BasicTest.java | 61 +++
.../surefire-classpath-order.properties | 2 +
.../resources/classpath-scope-filtering/pom.xml | 63 +++
.../test/java/classpathFiltering/BasicTest.java | 44 ++
.../src/test/resources/consoleOutput/pom.xml | 46 ++
.../src/test/java/consoleOutput/Test1.java | 81 +++
.../resources/consoleOutputEncoding/pom.xml | 71 +++
.../src/test/java/consoleOutput/Test1.java | 47 ++
.../test/resources/consoleoutput-noisy/pom.xml | 63 +++
.../test/java/consoleoutput_noisy/Test1.java | 85 +++
.../test/java/consoleoutput_noisy/Test2.java | 53 ++
.../src/test/resources/crash-detection/pom.xml | 58 ++
.../java/junit44/environment/BasicTest.java | 46 ++
.../test/resources/crash-during-test/pom.xml | 65 +++
.../java/junit44/environment/BasicTest.java | 52 ++
.../java/junit44/environment/SomeOtherTest.java | 28 +
.../default-configuration-abstract/pom.xml | 47 ++
.../AbstractConcreteBasicTest.java | 87 +++
.../abstractClasses/NonInstantiableTest.java | 28 +
.../pom.xml | 47 ++
.../classWithNoTests/NoMethodsTestCase.java | 22 +
.../default-configuration-noTests/pom.xml | 72 +++
.../resources/default-configuration/pom.xml | 47 ++
.../java/defaultConfiguration/BasicTest.java | 87 +++
.../resources/environment-variables/pom.xml | 64 +++
.../src/test/java/environment/BasicTest.java | 46 ++
.../src/test/resources/fail-fast-junit/pom.xml | 104 ++++
.../src/test/java/pkg/ATest.java | 20 +
.../src/test/java/pkg/BTest.java | 18 +
.../src/test/java/pkg/CTest.java | 17 +
.../src/test/java/pkg/DTest.java | 17 +
.../src/test/java/pkg/ETest.java | 12 +
.../src/test/resources/fail-fast-testng/pom.xml | 59 ++
.../src/test/java/pkg/ATest.java | 19 +
.../src/test/java/pkg/BTest.java | 18 +
.../src/test/java/pkg/CTest.java | 17 +
.../src/test/java/pkg/DTest.java | 17 +
.../src/test/java/pkg/ETest.java | 12 +
.../src/test/resources/failingBuilds/pom.xml | 40 ++
.../test/java/failingbuilds/ExceptionsTest.java | 38 ++
.../failsafe-buildfail/invoker.properties | 19 +
.../test/resources/failsafe-buildfail/pom.xml | 83 +++
.../failsafe-buildfail/src/test/java/MyAT.java | 25 +
.../failsafe-buildfail/src/test/java/MyIT.java | 26 +
.../failsafe-nofail/invoker.properties | 19 +
.../src/test/resources/failsafe-nofail/pom.xml | 83 +++
.../failsafe-nofail/src/test/java/MyAT.java | 25 +
.../failsafe-nofail/src/test/java/MyIT.java | 26 +
.../src/test/resources/failsafe-notests/pom.xml | 61 +++
.../failsafe-notests/src/test/java/AClass.java | 25 +
.../failsafe-regular/invoker.properties | 19 +
.../src/test/resources/failsafe-regular/pom.xml | 83 +++
.../failsafe-regular/src/test/java/MyAT.java | 26 +
.../failsafe-regular/src/test/java/MyIT.java | 26 +
.../resources/failure-result-counting/pom.xml | 38 ++
.../failureresultcounting/BeforeClassError.java | 43 ++
.../BeforeClassFailure.java | 43 ++
.../java/failureresultcounting/BeforeError.java | 48 ++
.../failureresultcounting/BeforeFailure.java | 43 ++
.../java/failureresultcounting/NoErrors.java | 43 ++
.../failureresultcounting/OrdinaryError.java | 42 ++
.../java/failureresultcounting/RunTests.java | 33 ++
.../src/test/resources/failureOutput/pom.xml | 50 ++
.../src/test/java/forkConsoleOutput/Test1.java | 85 +++
.../src/test/java/forkConsoleOutput/Test2.java | 35 ++
.../src/test/resources/failureOutput/test | 15 +
...pache.maven.surefire.test.SucceedingTest.xml | 68 +++
...g.apache.maven.surefire.test.FailingTest.txt | 84 +++
...pache.maven.surefire.test.SucceedingTest.txt | 4 +
.../test/resources/fork-consoleOutput/pom.xml | 47 ++
.../src/test/java/forkConsoleOutput/Test1.java | 43 ++
.../fork-consoleOutputWithErrors/pom.xml | 50 ++
.../src/test/java/forkConsoleOutput/Test1.java | 43 ++
.../src/test/java/forkConsoleOutput/Test2.java | 35 ++
.../src/test/resources/fork-fail/pom.xml | 60 +++
.../fork-fail/src/test/java/forkMode/Test1.java | 58 ++
.../fork-fail/src/test/java/forkMode/Test2.java | 34 ++
.../fork-fail/src/test/java/forkMode/Test3.java | 34 ++
.../fork-mode-multimodule/module-a/pom.xml | 36 ++
.../module-a/src/test/java/forkMode/Test1.java | 67 +++
.../module-a/src/test/java/forkMode/Test2.java | 36 ++
.../module-a/src/test/java/forkMode/Test3.java | 34 ++
.../fork-mode-multimodule/module-b/pom.xml | 36 ++
.../module-b/src/test/java/forkMode/Test1.java | 67 +++
.../module-b/src/test/java/forkMode/Test2.java | 36 ++
.../module-b/src/test/java/forkMode/Test3.java | 34 ++
.../resources/fork-mode-multimodule/pom.xml | 66 +++
.../fork-mode-resource-loading/pom.xml | 54 ++
.../test/java/forkMode/ResourceLoadTest.java | 46 ++
.../src/test/resources/myFile.txt | 1 +
.../src/test/resources/fork-mode-testng/pom.xml | 50 ++
.../src/test/java/forkMode/Test1.java | 65 +++
.../src/test/java/forkMode/Test2.java | 33 ++
.../src/test/java/forkMode/Test3.java | 34 ++
.../src/test/resources/fork-mode/pom.xml | 59 ++
.../fork-mode/src/test/java/forkMode/Test1.java | 67 +++
.../fork-mode/src/test/java/forkMode/Test2.java | 34 ++
.../fork-mode/src/test/java/forkMode/Test3.java | 34 ++
.../src/test/resources/fork-timeout/pom.xml | 47 ++
.../test/java/forktimeout/BaseForkTimeout.java | 53 ++
.../src/test/java/forktimeout/Test1.java | 34 ++
.../src/test/java/forktimeout/Test2.java | 30 ++
.../src/test/java/forktimeout/Test3.java | 32 ++
.../src/test/java/forktimeout/Test4.java | 32 ++
.../src/test/java/forktimeout/Test5.java | 32 ++
.../common-excludes.txt | 3 +
.../path-includes.txt | 3 +
.../includes-excludes-from-file/pom.xml | 153 ++++++
.../regex-includes.txt | 3 +
.../simple-includes.txt | 4 +
.../simple-mixed-includes.txt | 3 +
.../src/test/java/org/test/DefaultTest.java | 34 ++
.../src/test/java/org/test/DontRunTest.java | 30 ++
.../java/org/test/NotIncludedByDefault.java | 34 ++
.../src/test/java/org/test/aTestXmlFile.xml | 24 +
.../test/resources/includes-excludes/pom.xml | 135 +++++
.../src/test/java/org/test/DefaultTest.java | 34 ++
.../src/test/java/org/test/DontRunTest.java | 30 ++
.../java/org/test/NotIncludedByDefault.java | 34 ++
.../src/test/java/org/test/aTestXmlFile.xml | 24 +
.../test/resources/isolated-classloader/pom.xml | 56 ++
.../java/isolatedClassloader/BasicTest.java | 86 +++
.../src/test/resources/java9-full-api/pom.xml | 132 +++++
.../java9-full-api/src/test/java/J9IT.java | 37 ++
.../java9-full-api/src/test/java/J9Test.java | 36 ++
.../resources/junit-fork-mode-always/pom.xml | 57 ++
.../src/test/java/junit4/forkMode/Test1.java | 60 +++
.../src/test/java/junit4/forkMode/Test2.java | 36 ++
.../src/test/java/junit4/forkMode/Test3.java | 36 ++
.../src/test/resources/junit-ignore/pom.xml | 61 +++
.../ClassAndMethodIgnoreNothingToRunTest.java | 37 ++
...sLevelIgnore1WithMethodThatIsNormalTest.java | 36 ++
...sLevelIgnore2WithMethodThatIsNormalTest.java | 36 ++
...IgnoredMethodsAnd1AssumptionFailureTest.java | 57 ++
.../src/test/resources/junit-innerClass/pom.xml | 55 ++
.../test/java/junit/innerClass/BasicTest.java | 39 ++
.../junit-notExtendingTestCase/pom.xml | 55 ++
.../junit/notExtendingTestCase/SuiteTest.java | 49 ++
.../junit/notExtendingTestCase/TestHelper.java | 24 +
.../test/resources/junit-pathWithUmlaut/pom.xml | 55 ++
.../src/test/java/umlautTest/BasicTest.java | 87 +++
.../resources/junit-twoTestCaseSuite/pom.xml | 59 ++
.../java/junit/twoTestCaseSuite/BasicTest.java | 86 +++
.../java/junit/twoTestCaseSuite/TestTwo.java | 29 +
.../twoTestCaseSuite/WrapperTestSuite.java | 40 ++
.../test/resources/junit-twoTestCases/pom.xml | 55 ++
.../test/java/junit/twoTestCases/BasicTest.java | 86 +++
.../test/java/junit/twoTestCases/TestTwo.java | 29 +
.../junit4-forkAlways-staticInit/pom.xml | 38 ++
.../src/test/java/junit4/App2Test.java | 50 ++
.../src/test/java/junit4/AppTest.java | 50 ++
.../junit4-rerun-failing-tests/pom.xml | 55 ++
.../test/java/junit4/FlakyFirstTimeTest.java | 62 +++
.../src/test/java/junit4/PassingTest.java | 39 ++
.../test/resources/junit4-runlistener/pom.xml | 71 +++
.../java/runListener/EchoingRunListener.java | 82 +++
.../src/test/java/runListener/FileHelper.java | 44 ++
.../runListener/FileWritingRunListener1.java | 40 ++
.../runListener/FileWritingRunListener2.java | 40 ++
.../java/runListener/JUnit4RunListenerTest.java | 32 ++
.../resources/junit4-twoTestCaseSuite/pom.xml | 62 +++
.../test/java/twoTestCaseSuite/BasicTest.java | 64 +++
.../java/twoTestCaseSuite/Junit4TestSuite.java | 33 ++
.../java/twoTestCaseSuite/Junit4TestTwo.java | 27 +
surefire-its/src/test/resources/junit4/pom.xml | 55 ++
.../junit4/src/test/java/junit4/BasicTest.java | 65 +++
.../src/test/resources/junit44-dep/pom.xml | 71 +++
.../src/test/java/junit44Dep/BasicTest.java | 67 +++
.../test/resources/junit44-environment/pom.xml | 59 ++
.../java/junit44/environment/BasicTest.java | 40 ++
.../src/test/resources/junit44-hamcrest/pom.xml | 54 ++
.../test/java/junit44/hamcrest/BasicTest.java | 66 +++
.../resources/junit44-method-pattern/pom.xml | 60 +++
.../src/test/java/junit4/BasicTest.java | 77 +++
.../resources/junit44-multiple-methods/pom.xml | 68 +++
.../src/test/java/junit4/BasicTest.java | 83 +++
.../src/test/java/junit4/TestThree.java | 77 +++
.../src/test/java/junit4/TestTwo.java | 77 +++
.../resources/junit44-single-method/pom.xml | 60 +++
.../src/test/java/junit4/BasicTest.java | 71 +++
.../test/resources/junit47-concurrency/pom.xml | 61 +++
.../src/test/java/junit47/BasicTest.java | 71 +++
.../src/test/resources/junit47-cucumber/pom.xml | 81 +++
.../sample/cucumber/FailingCucumberTest.java | 31 ++
.../test/java/org/sample/cucumber/StepDefs.java | 57 ++
.../sample/cucumber/SuccessCucumberTest.java | 31 ++
.../src/test/resources/failing/Sample.feature | 10 +
.../src/test/resources/success/Sample.feature | 10 +
.../test/resources/junit47-parallel-nts/pom.xml | 64 +++
.../java/surefireparallelnts/ParallelTest.java | 37 ++
.../RunningInSequenceTest.java | 37 ++
.../junit47-parallel-with-suite/pom.xml | 38 ++
.../src/test/java/surefire747/SuiteTest1.java | 93 ++++
.../src/test/java/surefire747/SuiteTest2.java | 93 ++++
.../src/test/java/surefire747/TestSuite.java | 52 ++
.../src/test/resources/junit47-parallel/pom.xml | 70 +++
.../test/java/surefireparallel/Suite1Test.java | 39 ++
.../test/java/surefireparallel/Suite2Test.java | 39 ++
.../test/java/surefireparallel/TestClass.java | 50 ++
.../java/surefireparallel/Waiting1Test.java | 50 ++
.../java/surefireparallel/Waiting2Test.java | 50 ++
.../java/surefireparallel/Waiting3Test.java | 50 ++
.../java/surefireparallel/Waiting4Test.java | 50 ++
.../java/surefireparallel/Waiting5Test.java | 50 ++
.../java/surefireparallel/Waiting6Test.java | 50 ++
.../java/surefireparallel/Waiting7Test.java | 50 ++
.../java/surefireparallel/Waiting8Test.java | 50 ++
.../resources/junit47-redirect-output/pom.xml | 58 ++
.../test/java/junit47ConsoleOutput/Test0.java | 63 +++
.../test/java/junit47ConsoleOutput/Test1.java | 43 ++
.../test/java/junit47ConsoleOutput/Test2.java | 43 ++
.../test/java/junit47ConsoleOutput/Test3.java | 30 ++
.../pom.xml | 77 +++
.../org/sample/cucumber/FlakeCucumberTest.java | 29 +
.../test/java/org/sample/cucumber/StepDefs.java | 56 ++
.../org/sample/cucumber/Sample.feature | 10 +
.../junit47-static-inner-class-tests/pom.xml | 40 ++
.../src/test/java/junit4/BasicTest.java | 33 ++
.../java/junit4/TopLevelAbstractClassTest.java | 33 ++
.../test/java/junit4/TopLevelInterfaceTest.java | 33 ++
.../test/resources/junit48-categories/pom.xml | 70 +++
.../src/test/java/junit4/BasicTest.java | 72 +++
.../src/test/java/junit4/CategoryA.java | 21 +
.../src/test/java/junit4/CategoryB.java | 21 +
.../src/test/java/junit4/CategoryC.java | 21 +
.../src/test/java/junit4/CategoryCTest.java | 68 +++
.../src/test/java/junit4/NoCategoryTest.java | 38 ++
.../resources/junit48-method-pattern/pom.xml | 103 ++++
.../src/test/java/junit4/BasicTest.java | 79 +++
.../src/test/java/junit4/SampleCategory.java | 25 +
.../junit48-multiple-method-patterns/pom.xml | 195 +++++++
.../test/java/jiras/surefire745/BasicTest.java | 53 ++
.../test/java/jiras/surefire745/TestFive.java | 49 ++
.../test/java/jiras/surefire745/TestFour.java | 49 ++
.../test/java/jiras/surefire745/TestThree.java | 51 ++
.../test/java/jiras/surefire745/TestTwo.java | 42 ++
.../resources/junit48-multiple-methods/pom.xml | 103 ++++
.../src/test/java/junit4/BasicTest.java | 83 +++
.../src/test/java/junit4/TestThree.java | 77 +++
.../src/test/java/junit4/TestTwo.java | 76 +++
.../resources/junit48-single-method/pom.xml | 103 ++++
.../src/test/java/junit4/BasicTest.java | 71 +++
.../resources/junit48-smartStackTrace/pom.xml | 57 ++
.../test/java/junit4/SmartStackTraceTest.java | 50 ++
.../test/resources/large-test-results/pom.xml | 55 ++
.../test/java/largeTestResults/BasicTest.java | 65 +++
.../test/resources/long-windows-path/pom.xml | 57 ++
.../test/java/longwindowspath/BasicTest.java | 36 ++
.../src/test/resources/modulepath/pom.xml | 45 ++
.../modulepath/src/main/java/com/app/Main.java | 34 ++
.../modulepath/src/main/java/module-info.java | 21 +
.../src/test/java/com/app/AppTest.java | 36 ++
.../src/test/resources/norunnableTests/pom.xml | 58 ++
.../java/junit/norunnabletests/BasicTest.java | 28 +
.../src/test/resources/parallel-runtime/pom.xml | 42 ++
.../src/test/java/runorder/parallel/Test1.java | 69 +++
.../src/test/java/runorder/parallel/Test2.java | 54 ++
.../src/test/java/runorder/parallel/Test3.java | 55 ++
.../resources/plain-old-java-classpath/pom.xml | 57 ++
.../java/plainOldJavaClasspath/BasicTest.java | 87 +++
.../src/test/resources/plexus-conflict/pom.xml | 59 ++
.../plexusConflict/CommandlineExtender.java | 35 ++
.../src/test/java/plexusConflict/BasicTest.java | 37 ++
.../src/test/resources/pojo-simple/pom.xml | 50 ++
.../pojo-simple/src/test/java/PojoTest.java | 33 ++
surefire-its/src/test/resources/pom.xml | 40 ++
.../src/test/resources/reporters/pom.xml | 49 ++
.../src/test/java/reporters/Test1.java | 30 ++
.../src/test/java/reporters/Test2.java | 30 ++
.../src/test/resources/result-counting/pom.xml | 41 ++
.../test/java/resultcounting/MySuiteTest1.java | 43 ++
.../test/java/resultcounting/MySuiteTest2.java | 44 ++
.../test/java/resultcounting/MySuiteTest3.java | 45 ++
.../src/test/java/resultcounting/Test1.java | 76 +++
.../src/test/java/resultcounting/Test2.java | 127 +++++
.../src/test/resources/runOrder/pom.xml | 60 +++
.../src/test/java/junit/runOrder/TestA.java | 31 ++
.../src/test/java/junit/runOrder/TestB.java | 31 ++
.../src/test/java/junit/runOrder/TestC.java | 31 ++
.../test/resources/runorder-parallel/pom.xml | 42 ++
.../src/test/java/runorder/parallel/Test1.java | 92 ++++
.../src/test/java/runorder/parallel/Test2.java | 50 ++
.../src/test/java/runorder/parallel/Test3.java | 83 +++
surefire-its/src/test/resources/settings.xml | 53 ++
.../sibling-aggregator/aggregator/pom.xml | 51 ++
.../resources/sibling-aggregator/child1/pom.xml | 44 ++
.../main/java/siblingAggregator/FooHolder.java | 24 +
.../resources/sibling-aggregator/child2/pom.xml | 49 ++
.../java/siblingAggregator/FooHolderTest.java | 27 +
.../resources/small-result-counting/pom.xml | 38 ++
.../test/java/smallresultcounting/Test1.java | 66 +++
.../test/java/smallresultcounting/Test2.java | 107 ++++
.../jiras-surefire-1024-it/pom.xml | 79 +++
.../jiras-surefire-1024-testjar/pom.xml | 47 ++
.../src/main/java/jiras/surefire1024/A1IT.java | 12 +
.../src/test/resources/surefire-1024/pom.xml | 51 ++
.../pom.xml | 53 ++
.../test/java/jiras/surefire1028/SomeTest.java | 36 ++
.../pom.xml | 69 +++
.../jiras/surefire1036/IntegrationTest.java | 24 +
.../jiras/surefire1036/TestSomeIntegration.java | 37 ++
.../java/jiras/surefire1036/TestSomeUnit.java | 36 ++
.../TestSomethingWithMockitoRunner.java | 52 ++
.../pom.xml | 60 +++
.../src/test/java/test/AppTest.java | 38 ++
.../src/test/java/test/BadRunner.java | 43 ++
.../surefire-1053-system-properties/pom.xml | 65 +++
.../src/test/java/jiras/surefire1053/ATest.java | 32 ++
.../surefire-1055-parallelTestCount/pom.xml | 66 +++
.../src/test/java/foo/Method1Test.java | 30 ++
.../src/test/java/foo/Methods2Test.java | 36 ++
.../src/test/java/foo/Methods3Test.java | 43 ++
.../src/test/java/foo/Methods4Test.java | 48 ++
.../src/test/java/foo/Methods5Test.java | 54 ++
.../src/test/java/foo/Methods6Test.java | 42 ++
.../src/test/java/foo/SleepUtil.java | 35 ++
.../pom.xml | 74 +++
.../java/com/cal/HelloWorldFlakyCotTest.java | 35 ++
.../java/com/cal/HelloWorldFlakyErrorTest.java | 35 ++
.../src/test/java/com/cal/HelloWorldTest.java | 40 ++
.../src/test/java/com/cal/SimpleTest.java | 46 ++
.../pom.xml | 64 +++
.../java/jiras/surefire1082/Jira1082Test.java | 60 +++
.../java/jiras/surefire1082/Jira1264Test.java | 36 ++
.../surefire-1095-npe-in-runlistener/pom.xml | 70 +++
.../test/java/jiras/surefire1095/Listener.java | 38 ++
.../test/java/jiras/surefire1095/SomeTest.java | 31 ++
.../surefire-1098-balanced-runorder/pom.xml | 62 +++
.../src/test/java/jiras/surefire1098/ATest.java | 34 ++
.../src/test/java/jiras/surefire1098/BTest.java | 34 ++
.../src/test/java/jiras/surefire1098/CTest.java | 34 ++
.../src/test/java/jiras/surefire1098/DTest.java | 34 ++
.../pom.xml | 78 +++
.../src/test/java/test/FlakyTest.java | 41 ++
.../pom.xml | 79 +++
.../java/testng/SkipExceptionReportTest.java | 1 +
.../pom.xml | 69 +++
...CurrentWorkingDirectoryInForkedModeTest.java | 51 ++
.../resources/surefire-1144-xml-runtime/pom.xml | 50 ++
.../src/test/java/surefire1144/Test1.java | 82 +++
.../pom.xml | 62 +++
.../CustomDescriptionParameterizedTest.java | 62 +++
...omDescriptionWithCommaParameterizedTest.java | 63 +++
.../surefire1146/SimpleParameterizedTest.java | 62 +++
.../java/jiras/surefire1146/StandardTest.java | 40 ++
.../pom.xml | 143 +++++
.../test/java/jiras/surefire1152/FlakyIT.java | 39 ++
.../java/jiras/surefire1152/FlakyITSuite.java | 29 +
.../java/jiras/surefire1152/FlakyParent.java | 45 ++
.../test/java/jiras/surefire1152/FlakyTest.java | 39 ++
.../java/jiras/surefire1152/FlakyTestSuite.java | 29 +
.../pom.xml | 60 +++
.../java/jiras/surefire1153/IncludedUT.java | 30 ++
.../jiras/surefire1153/NotIncludedTest.java | 30 ++
.../surefire-1158-remove-info-lines/pom.xml | 69 +++
.../src/test/java/jira1158/JUnitTest.java | 31 ++
.../src/test/java/jira1158/TestNGSuiteTest.java | 32 ++
.../pom.xml | 73 +++
.../src/test/java/debug/ParallelTest.java | 45 ++
.../src/test/resources/surefire-1185/pom.xml | 66 +++
.../src/test/java/pkg/RunningTest.java | 29 +
.../src/test/java/pkg/UnlistedTest.java | 29 +
.../surefire-1202-rerun-and-failfast/pom.xml | 118 ++++
.../src/test/java/pkg/ATest.java | 45 ++
.../src/test/java/pkg/BTest.java | 42 ++
.../src/test/java/pkg/CTest.java | 35 ++
.../src/test/java/pkg/DTest.java | 35 ++
.../src/test/java/pkg/ETest.java | 31 ++
.../surefire-1209-rerun-and-forkcount/pom.xml | 115 ++++
.../src/test/java/pkg/ATest.java | 45 ++
.../src/test/java/pkg/BTest.java | 42 ++
.../src/test/java/pkg/CTest.java | 35 ++
.../src/test/java/pkg/DTest.java | 35 ++
.../src/test/java/pkg/ETest.java | 31 ++
.../src/test/resources/surefire-1211/pom.xml | 71 +++
.../src/test/java/jira1211/JUnitTest.java | 31 ++
.../src/test/java/jira1211/TestNGSuiteTest.java | 32 ++
.../surefire-1260-new-tests-pattern/pom.xml | 60 +++
.../src/test/java/pkg/JUnit3Tests.java | 34 ++
.../src/test/java/pkg/JUnit4Tests.java | 42 ++
.../src/test/resources/surefire-1264/pom.xml | 52 ++
.../core/surefireJunitTests/ATest.java | 33 ++
.../core/surefireJunitTests/BTest.java | 33 ++
.../core/surefireJunitTests/BaseTest.java | 52 ++
.../core/surefireJunitTests/CTest.java | 33 ++
.../core/surefireJunitTests/DTest.java | 33 ++
.../src/test/resources/surefire-1265/pom.xml | 49 ++
.../surefire-1265/src/test/java/J9Test.java | 15 +
.../surefire-1278-group-name-ending/pom.xml | 58 ++
.../src/test/java/pkg/ATest.java | 40 ++
.../src/test/resources/surefire-1364/pom.xml | 155 ++++++
.../surefire-1364/src/test/java/FirstTest.java | 30 ++
.../surefire-1364/src/test/java/SecondTest.java | 30 ++
.../surefire-1364/src/test/java/ThirdTest.java | 30 ++
.../src/test/resources/surefire-1367/pom.xml | 59 ++
.../surefire-1367/src/test/java/ATest.java | 38 ++
.../surefire-1367/src/test/java/BTest.java | 34 ++
.../pom.xml | 52 ++
.../testprovider/ClassPathTestProvider.java | 63 +++
....maven.surefire.providerapi.SurefireProvider | 1 +
.../pom.xml | 82 +++
.../test/java/pluggableproviders/EmptyIT.java | 26 +
.../test/java/pluggableproviders/EmptyTest.java | 26 +
.../pom.xml | 51 ++
.../surefire/testprovider/TestProvider.java | 75 +++
....maven.surefire.providerapi.SurefireProvider | 1 +
.../surefire-141-pluggableproviders/pom.xml | 68 +++
.../src/test/java/surefire141/BasicTest.java | 87 +++
.../src/test/java/surefire141/TestTwo.java | 29 +
.../surefire-146-forkPerTestNoSetup/pom.xml | 58 ++
.../java/forkPerTestNoSetup/TestSurefire2.java | 86 +++
.../surefire-162-charsetProvider/pom.xml | 38 ++
.../jcharset/jcharset/1.2.1/jcharset-1.2.1.jar | Bin 0 -> 22719 bytes
.../jcharset/1.2.1/jcharset-1.2.1.jar.md5 | 1 +
.../jcharset/1.2.1/jcharset-1.2.1.jar.sha1 | 1 +
.../jcharset/jcharset/1.2.1/jcharset-1.2.1.pom | 9 +
.../jcharset/1.2.1/jcharset-1.2.1.pom.md5 | 1 +
.../jcharset/1.2.1/jcharset-1.2.1.pom.sha1 | 1 +
.../repo/jcharset/jcharset/maven-metadata.xml | 11 +
.../jcharset/jcharset/maven-metadata.xml.md5 | 1 +
.../jcharset/jcharset/maven-metadata.xml.sha1 | 1 +
.../charsetProvider/MSUREFIRE77TestCase.java | 40 ++
.../surefire-224-wellFormedXmlFailures/pom.xml | 58 ++
.../wellFormedXmlFailures/TestSurefire3.java | 62 +++
.../surefire-257-rerunningTests/module1/pom.xml | 23 +
.../main/java/surefire257/MyModule1Class.java | 26 +
.../java/surefire257/MyModule1ClassTest.java | 33 ++
.../surefire-257-rerunningTests/module2/pom.xml | 23 +
.../main/java/surefire257/MyModule2Class.java | 6 +
.../java/surefire257/MyModule2ClassTest.java | 13 +
.../surefire-257-rerunningTests/pom.xml | 43 ++
.../surefire-260-testWithIdenticalNames/pom.xml | 64 +++
.../src/test/java/surefire260/TestA.java | 35 ++
.../src/test/java/surefire260/TestB.java | 31 ++
.../src/test/java/surefire260/TestC.java | 31 ++
.../surefire-34-securityManager-success/pom.xml | 61 +++
.../test/java/junit4/SecurityManagerTest.java | 56 ++
.../surefire-34-securityManager/pom.xml | 61 +++
.../test/java/junit4/SecurityManagerTest.java | 60 +++
.../pom.xml | 77 +++
.../test/java/junit/twoTestCases/BasicTest.java | 86 +++
.../test/java/junit/twoTestCases/TestTwo.java | 29 +
.../surefire-500-puzzling-error/pom.xml | 37 ++
.../test/java/surefire500/ExplodingTest.java | 49 ++
.../src/test/java/surefire500/PassingTest.java | 53 ++
.../src/test/java/surefire500/Suite.java | 30 ++
.../surefire-510-testClassPath/pom.xml | 57 ++
.../src/test/java/surefire510/Test1.java | 40 ++
.../module1/pom.xml | 50 ++
.../pom.xml | 17 +
.../testjar/pom.xml | 47 ++
.../testjar/src/test/java/org/test/TestA.java | 29 +
.../testjar/src/test/java/org/test/TestB.java | 29 +
.../module1/pom.xml | 23 +
.../maven/surefire570/MyModule1Class.java | 26 +
.../maven/surefire570/MyModule1ClassTest.java | 38 ++
...ireReport.surefireReportTest.MyClassTest.xml | 71 +++
...ireReport.surefireReportTest.MyClassTest.txt | 13 +
.../module2/pom.xml | 23 +
.../surefire570/module2/MyModule2Class.java | 6 +
.../surefire570/module2/MyModule2ClassTest.java | 18 +
...ireReport.surefireReportTest.MyClassTest.xml | 71 +++
...ireReport.surefireReportTest.MyClassTest.txt | 13 +
.../pom.xml | 117 ++++
.../surefire-613-testCount-in-parallel/pom.xml | 38 ++
.../src/test/java/surefire163/Test1.java | 90 ++++
.../src/test/java/surefire163/Test2.java | 127 +++++
.../pom.xml | 217 ++++++++
.../src/it/java/mho/JUnit4AdapterSuiteTest.java | 39 ++
.../src/it/java/mho/MySuiteTest1.java | 48 ++
.../src/it/java/mho/MySuiteTest2.java | 49 ++
.../src/it/java/mho/MySuiteTest3.java | 49 ++
.../pom.xml | 39 ++
.../src/test/java/surefire628/Test1.java | 48 ++
.../src/test/java/surefire628/Test2.java | 42 ++
.../pom.xml | 61 +++
.../src/test/java/junit4/BasicTest.java | 64 +++
.../surefire-649-systemProperties/pom.xml | 67 +++
.../jiras/surefire649/SystemPropertiesTest.java | 32 ++
.../pom.xml | 64 +++
.../SystemPropertyVariablesTest.java | 32 ++
.../test/resources/surefire-673-mockito/pom.xml | 37 ++
.../src/test/java/surefire673/TestMockito.java | 36 ++
.../surefire-674-buildFailingWhenErrors/pom.xml | 41 ++
.../src/test/java/resultcounting/Test2.java | 36 ++
.../surefire-685-commaseparatedIncludes/pom.xml | 63 +++
.../src/test/java/surefire685/TestA.java | 29 +
.../src/test/java/surefire685/TestB.java | 29 +
.../src/test/java/surefire685/TestC.java | 29 +
.../resources/surefire-697-niceSummary/pom.xml | 55 ++
.../test/java/junit/surefire697/BasicTest.java | 65 +++
.../test/java/junit/surefire697/TestTwo.java | 31 ++
.../surefire-733-allOverridesCaptured/pom.xml | 56 ++
.../src/test/java/junit/surefire733/ATest.java | 46 ++
.../TEST-junit.twoTestCases.BasicTest.xml | 62 +++
.../TEST-junit.twoTestCases.TestTwo.xml | 62 +++
.../surefire-740-comma-truncated/pom.xml | 61 +++
.../resources/surefire-772-both-reports/pom.xml | 91 ++++
.../TEST-junit.twoTestCases.BasicTest.xml | 62 +++
.../TEST-junit.twoTestCases.TestTwo.xml | 62 +++
.../TEST-junit.twoTestCases.BasicTest.xml | 62 +++
.../TEST-junit.twoTestCases.TestTwo.xml | 62 +++
.../surefire-772-no-failsafe-reports/pom.xml | 91 ++++
.../TEST-junit.twoTestCases.BasicTest.xml | 62 +++
.../TEST-junit.twoTestCases.TestTwo.xml | 62 +++
.../resources/surefire-772-no-reports/pom.xml | 56 ++
.../surefire-772-no-surefire-reports/pom.xml | 91 ++++
.../TEST-junit.twoTestCases.BasicTest.xml | 62 +++
.../TEST-junit.twoTestCases.TestTwo.xml | 62 +++
.../TEST-junit.twoTestCases.BasicTest.xml | 62 +++
.../TEST-junit.twoTestCases.TestTwo.xml | 62 +++
.../surefire-772-specified-reports/pom.xml | 96 ++++
.../pom.xml | 80 +++
.../org/apache/maven/surefire/test/App.java | 37 ++
.../apache/maven/surefire/test/FailingTest.java | 84 +++
.../maven/surefire/test/SucceedingTest.java | 84 +++
.../pom.xml | 61 +++
.../org/apache/maven/surefire/test/App.java | 37 ++
.../org/apache/maven/surefire/test/TheTest.java | 42 ++
.../surefire-806-specifiedTests-multi/pom.xml | 86 +++
.../java/defaultConfiguration/FirstTest.java | 36 ++
.../java/defaultConfiguration/FourthTest.java | 36 ++
.../java/defaultConfiguration/SecondTest.java | 36 ++
.../java/defaultConfiguration/ThirdTest.java | 36 ++
.../surefire-806-specifiedTests-single/pom.xml | 70 +++
.../java/defaultConfiguration/FirstTest.java | 36 ++
.../java/defaultConfiguration/FourthTest.java | 36 ++
.../java/defaultConfiguration/SecondTest.java | 36 ++
.../java/defaultConfiguration/ThirdTest.java | 36 ++
.../surefire-809-groupExpr-junit48/pom.xml | 57 ++
.../src/test/java/junit4/BasicTest.java | 88 +++
.../src/test/java/junit4/CategoryA.java | 21 +
.../src/test/java/junit4/CategoryB.java | 21 +
.../src/test/java/junit4/CategoryC.java | 21 +
.../src/test/java/junit4/CategoryCTest.java | 80 +++
.../src/test/java/junit4/NoCategoryTest.java | 38 ++
.../surefire-809-groupExpr-testng/pom.xml | 45 ++
.../src/test/java/testng/BasicTest.java | 72 +++
.../src/test/java/testng/CategoryCTest.java | 63 +++
.../src/test/java/testng/NoCategoryTest.java | 38 ++
.../surefire-812-log4j-classloader/pom.xml | 44 ++
.../src/main/resources/log4j.properties | 24 +
.../src/test/java/surefire812/LoggingTest.java | 36 ++
.../resources/surefire-817-system-exit/pom.xml | 69 +++
.../src/test/java/jiras/surefire817/Test.java | 29 +
.../surefire-818-ignored-tests-on-npe/pom.xml | 37 ++
.../src/test/java/cyril/test/FirstTest.java | 55 ++
.../src/test/java/cyril/test/IgnoredTest.java | 35 ++
.../src/test/java/cyril/test/Message.java | 37 ++
.../src/test/java/cyril/test/MyService.java | 28 +
.../src/test/java/cyril/test/MyServiceImpl.java | 12 +
.../pom.xml | 44 ++
.../java/surefire/testcase/JunitParamsTest.java | 51 ++
.../surefire/testcase/NonJunitParamsTest.java | 37 ++
.../surefire-828-emptyGroupExpr-junit48/pom.xml | 98 ++++
.../src/test/java/junit4/BasicTest.java | 88 +++
.../src/test/java/junit4/CategoryA.java | 21 +
.../src/test/java/junit4/CategoryB.java | 21 +
.../src/test/java/junit4/CategoryC.java | 21 +
.../src/test/java/junit4/CategoryCTest.java | 80 +++
.../src/test/java/junit4/NoCategoryTest.java | 38 ++
.../surefire-828-emptyGroupExpr-testng/pom.xml | 78 +++
.../src/test/java/testng/BasicTest.java | 72 +++
.../src/test/java/testng/CategoryCTest.java | 63 +++
.../src/test/java/testng/NoCategoryTest.java | 38 ++
.../surefire-832-provider-selection/pom.xml | 58 ++
.../src/test/java/junit4/BasicTest.java | 88 +++
.../src/test/java/junit4/CategoryA.java | 21 +
.../src/test/java/junit4/CategoryB.java | 21 +
.../src/test/java/junit4/CategoryC.java | 21 +
.../src/test/java/junit4/CategoryCTest.java | 80 +++
.../src/test/java/junit4/NoCategoryTest.java | 38 ++
.../surefire-847-testngfail/README.txt | 2 +
.../resources/surefire-847-testngfail/pom.xml | 60 +++
.../test/java/org/codehaus/SomeFailedTest.java | 32 ++
.../test/java/org/codehaus/SomePassedTest.java | 34 ++
.../src/test/resources/suite.xml | 8 +
.../surefire-855-failsafe-use-bundle/pom.xml | 127 +++++
.../src/main/java/pkg/AClassInOSGiBundle.java | 24 +
.../main/resources/main/surefire855.properties | 1 +
.../java/jiras/surefre855/bundle/FooIT.java | 166 ++++++
.../bundle/properties/surefire855.properties | 1 +
.../surefire-855-failsafe-use-jar/pom.xml | 115 ++++
.../src/main/java/pkg/ToRunJavadoc.java | 8 +
.../main/resources/main/surefire855.properties | 1 +
.../test/java/jiras/surefire855/jar/FooIT.java | 179 ++++++
.../jar/properties/surefire855.properties | 1 +
.../surefire-855-failsafe-use-war/pom.xml | 124 +++++
.../main/java/pkg/ToCreateClassesDirectory.java | 24 +
.../main/resources/main/surefire855.properties | 1 +
.../test/java/jiras/surefire855/war/FooIT.java | 163 ++++++
.../war/properties/surefire855.properties | 1 +
.../surefire-926-2-provider-failure/pom.xml | 41 ++
.../src/test/java/com/company/JUnitTest.java | 31 ++
.../src/test/java/com/company/TestNGTest.java | 31 ++
.../surefire-930-failsafe-runtests/pom.xml | 53 ++
.../failsafe/ExampleIntegrationTest.java | 32 ++
.../maven/plugins/failsafe/ExampleTest.java | 32 ++
.../maven/plugins/failsafe/TestConstants.java | 33 ++
.../test/resources/testng-integrationTest.xml | 18 +
.../src/test/resources/testng.xml | 17 +
.../surefire-931-provider-failure/pom.xml | 41 ++
.../main/java/com/mycompany/testfailed/App.java | 32 ++
.../java/com/mycompany/testfailed/AppTest.java | 37 ++
.../resources/surefire-942-testngSuite/pom.xml | 37 ++
.../src/test/java/org/BasicTest.java | 67 +++
.../src/test/resources/config.xml | 8 +
.../surefire-943-report-content/pom.xml | 44 ++
.../test/java/org/sample/module/My1Test.java | 50 ++
.../test/java/org/sample/module/My2Test.java | 49 ++
.../test/java/org/sample/module/My3Test.java | 41 ++
.../test/java/org/sample/module/My4Test.java | 41 ++
.../test/java/org/sample/module/My5Test.java | 39 ++
.../pom.xml | 61 +++
.../java/junit44/environment/Basic01Test.java | 45 ++
.../java/junit44/environment/Basic02Test.java | 45 ++
.../java/junit44/environment/Basic03Test.java | 45 ++
.../java/junit44/environment/Basic04Test.java | 45 ++
.../java/junit44/environment/Basic05Test.java | 45 ++
.../java/junit44/environment/Basic06Test.java | 45 ++
.../java/junit44/environment/Basic07Test.java | 45 ++
.../java/junit44/environment/Basic08Test.java | 45 ++
.../java/junit44/environment/Basic09Test.java | 45 ++
.../java/junit44/environment/Basic10Test.java | 45 ++
.../surefire-946-self-destruct-plugin/pom.xml | 53 ++
.../surefire/selfdestruct/SelfDestructMojo.java | 161 ++++++
.../boom/pom.xml | 51 ++
.../apache/maven/surefire/crb/ClassRuleIT.java | 43 ++
.../class-rule/pom.xml | 17 +
.../ExampleClassRule.java | 29 +
.../surefire-972-bizarre-noclassdef/pom.xml | 36 ++
.../surefire-975-wrong-encoding/pom.xml | 34 ++
.../src/test/java/EncodingInReportTest.java | 33 ++
.../module1/pom.xml | 36 ++
.../src/main/java/surefire979/TestBase.java | 36 ++
.../module2/pom.xml | 37 ++
.../FailingStaticInitializerTest.java | 36 ++
.../pom.xml | 28 +
.../pom.xml | 47 ++
.../src/test/java/sample/CategoryActivated.java | 25 +
.../test/java/sample/CategoryNotSelected.java | 25 +
.../parameterized/Parameterized01Test.java | 61 +++
.../parameterized/Parameterized02Test.java | 61 +++
.../parameterized/Parameterized03Test.java | 61 +++
.../surefire-995-categoryInheritance/pom.xml | 90 ++++
.../java/jiras/surefire955/CategorizedTest.java | 35 ++
.../java/jiras/surefire955/NotIncludedTest.java | 33 ++
.../java/jiras/surefire955/SomeCategory.java | 24 +
.../surefire955/SpecialCategorizedTest.java | 34 ++
.../surefire955/SpecialNonCategoryTest.java | 33 ++
.../test/resources/system-properties/pom.xml | 98 ++++
.../src/test/config/propsfile.properties | 2 +
.../test/java/systemProperties/BasicTest.java | 90 ++++
.../test-helper-dump-pid-plugin/pom.xml | 59 ++
.../plugins/surefire/dumppid/DumpPidMojo.java | 70 +++
.../resources/testng-afterSuiteFailure/pom.xml | 76 +++
.../afterSuiteFailure/TestNGSuiteTest.java | 40 ++
.../test/resources/testng-beforeMethod/pom.xml | 76 +++
.../testng/beforeMethod/TestNGSuiteTest.java | 40 ++
.../testng-beforeMethodFailure/pom.xml | 76 +++
.../beforeMethodFailure/TestNGSuiteTest.java | 40 ++
.../test/resources/testng-execute-error/pom.xml | 80 +++
.../src/test/java/it/BasicTest.java | 36 ++
.../testng-group-thread-parallel/pom.xml | 84 +++
.../testng/groupThreadParallel/TestNGTest.java | 113 ++++
.../src/test/resources/testng-groups/pom.xml | 55 ++
.../java/testng/groups/TestNGGroupTest.java | 76 +++
.../src/test/resources/testng-jdk14/pom.xml | 66 +++
.../java/testng/jdk14/TestNGJavadocTest.java | 63 +++
.../resources/testng-junit-together/pom.xml | 85 +++
.../src/test/java/JunitTest.java | 47 ++
.../src/test/java/TestNGJunitTest.java | 49 ++
.../resources/testng-junit4-together/pom.xml | 50 ++
.../src/test/java/Junit4NoRunWithTest.java | 53 ++
.../src/test/java/Junit4SimpleRunWithTest.java | 56 ++
.../src/test/java/TestNGTest.java | 50 ++
.../resources/testng-listener-reporter/pom.xml | 90 ++++
.../src/test/java/listenReport/FileHelper.java | 44 ++
.../src/test/java/listenReport/Reporter.java | 37 ++
.../test/java/listenReport/ResultListener.java | 87 +++
.../test/java/listenReport/SuiteListener.java | 39 ++
.../test/java/listenReport/TestNGSuiteTest.java | 32 ++
.../src/test/resources/testng-listeners/pom.xml | 43 ++
.../java/listeners/MarkAsFailureListener.java | 83 +++
.../src/test/java/listeners/SimpleTest.java | 35 ++
.../testng-method-pattern-after/pom.xml | 79 +++
.../src/test/java/testng/BasicTest.java | 79 +++
.../testng-method-pattern-before/pom.xml | 79 +++
.../src/test/java/testng/BasicTest.java | 79 +++
.../resources/testng-method-pattern/pom.xml | 80 +++
.../src/test/java/testng/BasicTest.java | 73 +++
.../testng-multiple-method-patterns/pom.xml | 108 ++++
.../test/java/jiras/surefire745/BasicTest.java | 47 ++
.../test/java/jiras/surefire745/TestFive.java | 44 ++
.../test/java/jiras/surefire745/TestFour.java | 44 ++
.../test/java/jiras/surefire745/TestThree.java | 46 ++
.../test/java/jiras/surefire745/TestTwo.java | 38 ++
.../test/resources/testng-objectFactory/pom.xml | 66 +++
.../java/testng/objectfactory/FileHelper.java | 25 +
.../TestNGCustomObjectFactory.java | 22 +
.../testng/objectfactory/TestNGSuiteTest.java | 11 +
.../resources/testng-parallel-suites/pom.xml | 81 +++
.../java/testng/suiteXml/ShouldNotRunTest.java | 35 ++
.../java/testng/suiteXml/TestNGSuiteTest.java | 43 ++
.../src/test/resources/testng1.xml | 30 ++
.../src/test/resources/testng2.xml | 30 ++
.../testng-parallel-with-annotations/pom.xml | 42 ++
.../TestNGParallelTest.java | 69 +++
.../resources/testng-path with spaces/pom.xml | 76 +++
.../testng/pathWithSpaces/TestNGSuiteTest.java | 35 ++
.../src/test/resources/test.txt | 1 +
.../src/test/resources/testng-simple/pom.xml | 103 ++++
.../java/testng/simple/TestNGSuiteTestA.java | 32 ++
.../java/testng/simple/TestNGSuiteTestB.java | 32 ++
.../java/testng/simple/TestNGSuiteTestC.java | 32 ++
.../testng-single-method-5-14-9/pom.xml | 57 ++
.../src/test/java/testng/BasicTest.java | 73 +++
.../test/resources/testng-single-method/pom.xml | 80 +++
.../src/test/java/testng/BasicTest.java | 73 +++
.../resources/testng-succes-percentage/pom.xml | 65 +++
.../testng/TestNGSuccessPercentFailingTest.java | 44 ++
.../testng/TestNGSuccessPercentPassingTest.java | 43 ++
.../src/test/resources/testng-suite-xml/pom.xml | 84 +++
.../testng-suite-xml/src/test-data/testng1.xml | 30 ++
.../testng-suite-xml/src/test-data/testng2.xml | 30 ++
.../java/testng/suiteXml/TestNGSuiteTest.java | 54 ++
.../resources/testng-testRunnerFactory/pom.xml | 72 +++
.../testng/testrunnerfactory/FileHelper.java | 25 +
.../TestNGCustomTestRunnerFactory.java | 22 +
.../testrunnerfactory/TestNGSuiteTest.java | 11 +
.../resources/testng-twoTestCaseSuite/pom.xml | 81 +++
.../test/java/testng/two/TestNGSuiteTest.java | 33 ++
.../src/test/java/testng/two/TestNGTestTwo.java | 32 ++
.../src/test/resources/suite.xml | 7 +
.../src/test/resources/timeout-forked/pom.xml | 58 ++
.../src/test/java/timeoutForked/BasicTest.java | 38 ++
.../test/resources/unicode-testnames/pom.xml | 56 ++
.../java/junit/twoTestCases/EscapeTest.java | 86 +++
.../test/java/junit/twoTestCases/XXYZTest.java | 30 ++
surefire-its/src/test/resources/webapp/pom.xml | 109 ++++
.../webapp/src/main/webapp/WEB-INF/web.xml | 7 +
.../resources/webapp/src/main/webapp/index.jsp | 5 +
.../webapp/src/test/java/WebAppTest.java | 66 +++
.../pom.xml | 56 ++
.../src/test/java/MyTest.java | 27 +
.../resources/working-directory-missing/pom.xml | 53 ++
.../src/test/java/MyTest.java | 27 +
.../resources/working-directory/child/pom.xml | 44 ++
.../src/test/java/workingDir/BasicTest.java | 45 ++
.../test/resources/working-directory/pom.xml | 52 ++
1954 files changed, 53304 insertions(+), 53304 deletions(-)
----------------------------------------------------------------------
[22/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test/java/testng/suiteXml/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test/java/testng/suiteXml/TestNGSuiteTest.java b/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test/java/testng/suiteXml/TestNGSuiteTest.java
deleted file mode 100644
index 0ebf3df..0000000
--- a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test/java/testng/suiteXml/TestNGSuiteTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package testng.suiteXml;
-
-/*
- * 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.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-
-/**
- * Tests that forcing testng to run tests via the
- * <code>"${maven.test.forcetestng}"</code> configuration option
- * works.
- *
- * @author jkuhnert
- */
-public class TestNGSuiteTest {
-
- /**
- * Sets up testObject
- */
- @BeforeClass
- public void configureTest()
- {
- testObject = new Object();
- }
-
- Object testObject;
-
- /**
- * Tests reporting an error
- */
- @Test
- public void isTestObjectNull()
- {
- assert testObject != null : "testObject is null";
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml
deleted file mode 100644
index 818d53e..0000000
--- a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml
+++ /dev/null
@@ -1,72 +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/xsd/maven-4.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>testng-testrunnerfactory</artifactId>
- <version>1.0</version>
- <name>TestNG using custom test runner factory</name>
-
- <dependencies>
- <dependency>
- <!--
- TestNG 5.9 is the earliest version to expose the testrunfactory flag.
- -testrunfactory parameter is buggy in 5.13.1 because expects String instead of Class
- -testrunfactory works in 5.10 but fails on missing testng.css because not generated by TestNG itself.
- Every next version changed API.
- Here API applicable up to 5.12.1.
- -->
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.10</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <properties>
- <property>
- <name>testrunfactory</name>
- <value>testng.testrunnerfactory.TestNGCustomTestRunnerFactory</value>
- </property>
- </properties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java
deleted file mode 100644
index 4b998ed..0000000
--- a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package testng.testrunnerfactory;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class FileHelper
-{
- public static void writeFile( String fileName, String content )
- {
- try
- {
- File target = new File( System.getProperty("user.dir"), "target" ).getCanonicalFile();
- File listenerOutput = new File( target, fileName );
- FileWriter out = new FileWriter( listenerOutput, true );
- out.write( content );
- out.flush();
- out.close();
- }
- catch ( IOException exception )
- {
- throw new RuntimeException( exception );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGCustomTestRunnerFactory.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGCustomTestRunnerFactory.java b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGCustomTestRunnerFactory.java
deleted file mode 100644
index d52ec96..0000000
--- a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGCustomTestRunnerFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package testng.testrunnerfactory;
-
-import org.testng.ISuite;
-import org.testng.ITestRunnerFactory;
-import org.testng.TestRunner;
-import org.testng.xml.XmlTest;
-//import org.testng.IInvokedMethodListener;
-
-import java.util.List;
-
-public class TestNGCustomTestRunnerFactory
- implements ITestRunnerFactory
-{
-
- public TestRunner newTestRunner( ISuite suite, XmlTest test/*, List<IInvokedMethodListener> listeners*/ )
- {
- FileHelper.writeFile( "testrunnerfactory-output.txt",
- "Instantiated Test Runner for suite:\n\t" + suite
- + "\nand test:\n\t" + test +"\n\n" );
- return new TestRunner( suite, test, test.skipFailedInvocationCounts()/*, listeners*/ );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGSuiteTest.java b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGSuiteTest.java
deleted file mode 100644
index 6ad173d..0000000
--- a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGSuiteTest.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package testng.testrunnerfactory;
-
-import org.testng.annotations.Test;
-
-public class TestNGSuiteTest
-{
- @Test
- public void doNothing()
- {
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml b/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml
deleted file mode 100644
index f7477fe..0000000
--- a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml
+++ /dev/null
@@ -1,81 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>testng-twoTestCaseSuite</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>TestNG Suite XML with two test cases</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <profiles>
- <profile>
- <id>testng-old</id>
- <activation>
- <property><name>testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- <classifier>${testNgClassifier}</classifier>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>testng-new</id>
- <activation>
- <property><name>!testNgClassifier</name></property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testNgVersion}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <suiteXmlFiles>
- <file>src/test/resources/suite.xml</file>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/src/test/java/testng/two/TestNGSuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/src/test/java/testng/two/TestNGSuiteTest.java b/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/src/test/java/testng/two/TestNGSuiteTest.java
deleted file mode 100644
index db8dc94..0000000
--- a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/src/test/java/testng/two/TestNGSuiteTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package testng.two;
-
-/*
- * 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.testng.annotations.Test;
-
-
-public class TestNGSuiteTest {
-
- @Test
- public void doNothing()
- {
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/src/test/java/testng/two/TestNGTestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/src/test/java/testng/two/TestNGTestTwo.java b/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/src/test/java/testng/two/TestNGTestTwo.java
deleted file mode 100644
index 9ab2c86..0000000
--- a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/src/test/java/testng/two/TestNGTestTwo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package testng.two;
-
-/*
- * 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.testng.annotations.Test;
-
-
-public class TestNGTestTwo {
-
- @Test
- public void testTwo()
- {
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/src/test/resources/suite.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/src/test/resources/suite.xml b/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/src/test/resources/suite.xml
deleted file mode 100644
index a768654..0000000
--- a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/src/test/resources/suite.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<suite name="Foo">
- <test name="Bar">
- <packages>
- <package name="testng.two" />
- </packages>
- </test>
-</suite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml b/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml
deleted file mode 100644
index fc95eb3..0000000
--- a/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml
+++ /dev/null
@@ -1,58 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>timeout-forked</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Timeout forked process</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkedProcessTimeoutInSeconds>${forkTimeout}</forkedProcessTimeoutInSeconds>
- <reportFormat>plain</reportFormat>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/timeout-forked/src/test/java/timeoutForked/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/timeout-forked/src/test/java/timeoutForked/BasicTest.java b/surefire-integration-tests/src/test/resources/timeout-forked/src/test/java/timeoutForked/BasicTest.java
deleted file mode 100644
index 863ac6d..0000000
--- a/surefire-integration-tests/src/test/resources/timeout-forked/src/test/java/timeoutForked/BasicTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package timeoutForked;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- public void testSleep() throws Exception
- {
- int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "10000" ));
- Thread.sleep(sleepLength);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml b/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml
deleted file mode 100644
index 31dd0d0..0000000
--- a/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml
+++ /dev/null
@@ -1,56 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>unicode-testnames</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Testcases with unicode names</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/EscapeTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/EscapeTest.java b/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/EscapeTest.java
deleted file mode 100644
index 69ea6e1..0000000
--- a/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/EscapeTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package junit.twoTestCases;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class EscapeTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public EscapeTest( String name )
- {
- super( name );
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite();
- Test test = new EscapeTest( "testSetUp" );
- suite.addTest( test );
-
- return new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/XXYZTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/XXYZTest.java b/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/XXYZTest.java
deleted file mode 100644
index 6496e1b..0000000
--- a/surefire-integration-tests/src/test/resources/unicode-testnames/src/test/java/junit/twoTestCases/XXYZTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package junit.twoTestCases;
-/*
- * 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 junit.framework.TestCase;
-
-
-public class 而索其情Test
- extends TestCase
-{
- public void testIHopeTheChineseDoesntMeanAnyhtingOffensive索其(){
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/webapp/pom.xml b/surefire-integration-tests/src/test/resources/webapp/pom.xml
deleted file mode 100644
index 6777637..0000000
--- a/surefire-integration-tests/src/test/resources/webapp/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.surefire.its</groupId>
- <artifactId>webapp</artifactId>
- <packaging>war</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>sample webapp with Jetty test</name>
- <build>
- <finalName>webapp</finalName>
- <plugins>
- <plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
-
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>exploded</goal>
- </goals>
- <configuration>
- <webappDirectory>${project.build.directory}/webapp</webappDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>5.1.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>5.1.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jetty</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>5.1.10</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>default-tools.jar</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>system</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/webapp/src/main/webapp/WEB-INF/web.xml b/surefire-integration-tests/src/test/resources/webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 9f88c1f..0000000
--- a/surefire-integration-tests/src/test/resources/webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
-<web-app>
- <display-name>Archetype Created Web Application</display-name>
-</web-app>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/webapp/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/webapp/src/main/webapp/index.jsp b/surefire-integration-tests/src/test/resources/webapp/src/main/webapp/index.jsp
deleted file mode 100644
index c38169b..0000000
--- a/surefire-integration-tests/src/test/resources/webapp/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java b/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java
deleted file mode 100644
index b4c4e15..0000000
--- a/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.io.InputStream;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.mortbay.jetty.Server;
-
-
-public class WebAppTest
- extends TestCase
-{
- private Server server = null;
-
- public void setUp()
- throws Exception
- {
- System.setProperty( "org.mortbay.xml.XmlParser.NotValidating", "true" );
-
- server = new Server();
- String testPort = ":18080";
- server.addListener( testPort );
- server.addWebApplication( "127.0.0.1", "/webapp", "target/webapp" );
-
- server.start();
- }
-
- public void testBlah()
- throws Exception
- {
- URL url = new URL( "http://127.0.0.1:18080/webapp/index.jsp" );
- InputStream stream = url.openStream();
- StringBuffer sb = new StringBuffer();
- for ( int i = stream.read(); i != -1; i = stream.read() )
- {
- sb.append( (char) i );
- }
- String value = sb.toString();
- assertTrue( value, value.contains( "Hello" ) );
- }
-
- public void tearDown()
- throws Exception
- {
- if ( server != null )
- server.stop();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml b/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml
deleted file mode 100644
index fa19695..0000000
--- a/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml
+++ /dev/null
@@ -1,56 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>localhost</groupId>
- <artifactId>working-directory-test</artifactId>
- <version>1.0</version>
- <name>Don't run tests if working directory is invalid property.</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <workingDirectory>${notSet}</workingDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/src/test/java/MyTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/src/test/java/MyTest.java b/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/src/test/java/MyTest.java
deleted file mode 100644
index d59a11f..0000000
--- a/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/src/test/java/MyTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-import junit.framework.TestCase;
-
-/*
- * 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.
- */
-
-
-public class MyTest extends TestCase {
- public void testSomething() {
- assertTrue(true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml b/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml
deleted file mode 100644
index 515a414..0000000
--- a/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml
+++ /dev/null
@@ -1,53 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>localhost</groupId>
- <artifactId>working-directory-test</artifactId>
- <version>1.0</version>
- <name>Run tests in a nonexistent working directory</name>
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <workingDirectory>${project.build.directory}/surefire-working-directory</workingDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/working-directory-missing/src/test/java/MyTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory-missing/src/test/java/MyTest.java b/surefire-integration-tests/src/test/resources/working-directory-missing/src/test/java/MyTest.java
deleted file mode 100644
index d59a11f..0000000
--- a/surefire-integration-tests/src/test/resources/working-directory-missing/src/test/java/MyTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-import junit.framework.TestCase;
-
-/*
- * 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.
- */
-
-
-public class MyTest extends TestCase {
- public void testSomething() {
- assertTrue(true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml b/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
deleted file mode 100644
index bdfbed8..0000000
--- a/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
+++ /dev/null
@@ -1,44 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>working-directory</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>working-directory-child</artifactId>
- <name>Test for working directory configuration</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/working-directory/child/src/test/java/workingDir/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory/child/src/test/java/workingDir/BasicTest.java b/surefire-integration-tests/src/test/resources/working-directory/child/src/test/java/workingDir/BasicTest.java
deleted file mode 100644
index 1708202..0000000
--- a/surefire-integration-tests/src/test/resources/working-directory/child/src/test/java/workingDir/BasicTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package workingDir;
-
-/*
- * 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 junit.framework.TestCase;
-import java.io.*;
-import java.util.Properties;
-
-public class BasicTest
- extends TestCase
-{
-
- public void testWorkingDir()
- throws Exception
- {
- File target = new File( "target" ).getAbsoluteFile();
- File outFile = new File( target, "out.txt" );
- FileOutputStream os = new FileOutputStream( outFile );
- String userDir = System.getProperty( "user.dir" );
- Properties p = new Properties();
- p.setProperty( "user.dir", userDir );
- p.store( os, "" );
- os.flush();
- os.close();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/working-directory/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory/pom.xml b/surefire-integration-tests/src/test/resources/working-directory/pom.xml
deleted file mode 100644
index 1a7b7d7..0000000
--- a/surefire-integration-tests/src/test/resources/working-directory/pom.xml
+++ /dev/null
@@ -1,52 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>working-directory</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for working directory configuration (parent)</name>
- <packaging>pom</packaging>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <modules>
- <module>child</module>
- </modules>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
new file mode 100644
index 0000000..e679753
--- /dev/null
+++ b/surefire-its/pom.xml
@@ -0,0 +1,202 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire</artifactId>
+ <version>2.21.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>surefire-is</artifactId>
+
+ <name>Maven Surefire Integration Tests</name>
+ <description>Used internally testing MOJOs. The project is not deployed.</description>
+
+ <properties>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-report-parser</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-verifier</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <!-- Java 9 requires version 3.6+ (todo use in parent POM. Note: versions 3.6, 3.7 are compiled with Java 7) -->
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.7</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <test>*Test</test>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ <configuration>
+ <jvm>${jdk.home}/bin/java</jvm>
+ <runOrder>alphabetical</runOrder>
+ <threadCount>1</threadCount>
+ <perCoreThreadCount>false</perCoreThreadCount>
+ <forkMode>once</forkMode>
+ <argLine>-server -Xmx64m -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.awt.headless=true</argLine>
+ <includes>
+ <include>org/apache/**/*IT*.java</include>
+ </includes>
+ <!-- Pass current surefire version to the main suite so that it -->
+ <!-- can forward to all integration test projects. SUREFIRE-513 -->
+ <systemPropertyVariables>
+ <surefire.version>${project.version}</surefire.version>
+ <maven.home>${maven.home}</maven.home>
+ <maven.settings.file>${project.basedir}/../surefire-setup-integration-tests/target/private/it-settings.xml
+ </maven.settings.file>
+ <maven.toolchains.file>${project.basedir}/../surefire-setup-integration-tests/target/private/toolchains.xml
+ </maven.toolchains.file>
+ <maven.repo.local>${project.basedir}/../surefire-setup-integration-tests/target/it-repo</maven.repo.local>
+ <maven.test.tmpdir>${project.build.directory}</maven.test.tmpdir>
+ <user.localRepository>${settings.localRepository}</user.localRepository>
+ <useInterpolatedSettings>false</useInterpolatedSettings>
+ <testBuildDirectory>${project.build.testOutputDirectory}</testBuildDirectory>
+ <verifier.forkMode>forked</verifier.forkMode>
+ <jdk.home>${jdk.home}</jdk.home>
+ <jacoco.agent>${jacoco-it.agent}</jacoco.agent>
+ </systemPropertyVariables>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ <useFile>false</useFile>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>require-maven-2.1.0</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <!-- Some plugin features require a recent Maven runtime to work (e.g. SystemPropertiesTest) -->
+ <version>[2.1.0,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <!-- todo dont skip since of failsafe:2.19 internal use if having src/main/java/... -->
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jacoco-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>jacoco-agent-it</id>
+ <goals>
+ <goal>prepare-agent-integration</goal>
+ </goals>
+ <configuration>
+ <propertyName>jacoco-it.agent</propertyName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
new file mode 100644
index 0000000..9a49d1a
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
@@ -0,0 +1,105 @@
+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.MavenLauncher;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.runners.Parameterized.Parameter;
+
+/**
+ * Base test class for SUREFIRE-580, configuration parameter {@code skipAfterFailureCount}.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.19
+ */
+@RunWith( Parameterized.class )
+public abstract class AbstractFailFastIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Parameter( 0 )
+ public String description;
+
+ @Parameter( 1 )
+ public String profile;
+
+ @Parameter( 2 )
+ public Map<String, String> properties;
+
+ @Parameter( 3 )
+ public int total;
+
+ @Parameter( 4 )
+ public int failures;
+
+ @Parameter( 5 )
+ public int errors;
+
+ @Parameter( 6 )
+ public int skipped;
+
+ protected abstract String withProvider();
+
+ protected final OutputValidator prepare( String description, String profile, Map<String, String> properties )
+ {
+ MavenLauncher launcher = unpack( "/fail-fast-" + withProvider(), "_" + description )
+ .maven();
+
+ if ( profile != null )
+ {
+ launcher.addGoal( "-P " + profile );
+ }
+
+ if ( failures != 0 || errors != 0 )
+ {
+ launcher.withFailure();
+ }
+
+ return launcher.sysProp( properties ).executeTest();
+ }
+
+ protected final OutputValidator prepare( String description, Map<String, String> properties )
+ {
+ return prepare( description, null, properties );
+ }
+
+ protected static Map<String, String> props( int forkCount, int skipAfterFailureCount, boolean reuseForks )
+ {
+ Map<String, String> props = new HashMap<String, String>( 3 );
+ props.put( "surefire.skipAfterFailureCount", "" + skipAfterFailureCount );
+ props.put( "forkCount", "" + forkCount );
+ props.put( "reuseForks", "" + reuseForks );
+ return props;
+ }
+
+ @Test
+ public void test()
+ {
+ prepare( description, profile, properties )
+ .assertTestSuiteResults( total, errors, failures, skipped );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
new file mode 100644
index 0000000..7f73d48
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
@@ -0,0 +1,111 @@
+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 java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME;
+import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME_KEY;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+/**
+ * Abstract test class for Jigsaw tests.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.20.1
+ */
+public abstract class AbstractJigsawIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private static final double JIGSAW_JAVA_VERSION = 9.0d;
+
+ protected abstract String getProjectDirectoryName();
+
+ protected SurefireLauncher assumeJigsaw() throws IOException
+ {
+ assumeTrue( "There's no JDK 9 provided.",
+ isJavaVersion9AtLeast() || EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() );
+ // fail( EXT_JDK_HOME_KEY + " was provided with value " + EXT_JDK_HOME + " but it is not Jigsaw Java 9." );
+
+ SurefireLauncher launcher = unpack();
+
+ return EXT_JDK_HOME == null ? launcher : launcher.setLauncherJavaHome( EXT_JDK_HOME );
+ }
+
+ protected SurefireLauncher assumeJava9Property() throws IOException
+ {
+ assumeTrue( "There's no JDK 9 provided.", EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() );
+ return unpack();
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( getProjectDirectoryName() );
+ }
+
+ private static boolean isJavaVersion9AtLeast()
+ {
+ return Double.valueOf( System.getProperty( "java.specification.version" ) ) >= JIGSAW_JAVA_VERSION;
+ }
+
+ private static boolean isExtJavaVerion9AtLeast() throws IOException
+ {
+ File release = new File( EXT_JDK_HOME, "release" );
+
+ if ( !release.isFile() )
+ {
+ fail( EXT_JDK_HOME_KEY + " was provided with value " + EXT_JDK_HOME + " but file does not exist "
+ + EXT_JDK_HOME + File.separator + "release"
+ );
+ }
+
+ Properties properties = new Properties();
+ try ( InputStream is = new FileInputStream( release ) )
+ {
+ properties.load( is );
+ }
+ String javaVersion = properties.getProperty( "JAVA_VERSION" ).replace( "\"", "" );
+ StringTokenizer versions = new StringTokenizer( javaVersion, "._" );
+
+ if ( versions.countTokens() == 1 )
+ {
+ javaVersion = versions.nextToken();
+ }
+ else if ( versions.countTokens() >= 2 )
+ {
+ javaVersion = versions.nextToken() + "." + versions.nextToken();
+ }
+ else
+ {
+ fail( "unexpected java version format" );
+ }
+
+ return Double.valueOf( javaVersion ) >= JIGSAW_JAVA_VERSION;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
new file mode 100644
index 0000000..0260ba0
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
@@ -0,0 +1,41 @@
+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;
+
+/**
+ * Test files with "Abstract" in their name that aren't really abstract,
+ * and abstract classes that don't say "Abstract" in their name
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class AbstractTestCaseIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void abstractTestCase()
+ {
+ unpack( "/default-configuration-abstract" ).executeTest().verifyErrorFree( 1 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java
new file mode 100644
index 0000000..01932fa
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java
@@ -0,0 +1,483 @@
+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.Settings;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import static org.apache.maven.surefire.its.fixture.TestFramework.*;
+import static org.apache.maven.surefire.its.fixture.Configuration.*;
+import static org.hamcrest.core.AnyOf.anyOf;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assume.assumeThat;
+
+/**
+ * Test project using multiple method patterns, including wildcards in class and method names.
+ */
+public abstract class AbstractTestMultipleMethodPatterns
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private static final String CSV_DELIMITER_SHORT = ",";
+ private static final String CSV_DELIMITER_LONG = ", ";
+ private static final String NOT_DELIMITER = "!";
+
+ protected abstract Settings getSettings();
+
+ protected abstract SurefireLauncher unpack();
+
+ protected SurefireLauncher prepare( String tests )
+ {
+ SurefireLauncher launcher = unpack().addGoal( "-P " + getSettings().profile() );
+ String[] includedExcluded = splitIncludesExcludes( tests );
+ switch ( getSettings().getConfiguration() ) {
+ case TEST:
+ launcher.setTestToRun( tests );
+ break;
+ case INCLUDES:
+ launcher.sysProp( "included", tests );
+ break;
+ case INCLUDES_EXCLUDES:
+ launcher.sysProp( "included", includedExcluded[0] );
+ launcher.sysProp( "excluded", includedExcluded[1] );
+ break;
+ default:
+ throw new IllegalArgumentException( "Unsupported configuration " + getSettings().getConfiguration() );
+ }
+ return launcher;
+ }
+
+ private static String[] splitIncludesExcludes( String patterns )
+ {
+ String included = "";
+ String excluded = "";
+ for ( String pattern : patterns.split( CSV_DELIMITER_SHORT ) )
+ {
+ pattern = pattern.trim();
+ if ( pattern.startsWith( NOT_DELIMITER ) )
+ {
+ excluded += pattern.substring( NOT_DELIMITER.length() ).trim();
+ excluded += CSV_DELIMITER_LONG;
+ }
+ else
+ {
+ included += pattern;
+ included += CSV_DELIMITER_LONG;
+ }
+ }
+ return new String[]{ trimEndComma( included ), trimEndComma( excluded ) };
+ }
+
+ private static String trimEndComma( String pattern )
+ {
+ pattern = pattern.trim();
+ return pattern.endsWith( CSV_DELIMITER_LONG )
+ ? pattern.substring( 0, pattern.length() - CSV_DELIMITER_LONG.length() ) : pattern;
+ }
+
+ @Test
+ public void simpleNameTest()
+ throws Exception
+ {
+ prepare( "TestTwo" )
+ .executeTest()
+ .verifyErrorFree( 2 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
+ }
+
+ @Test
+ public void simpleNameTestAsParallel()
+ throws Exception
+ {
+ assumeThat( getSettings().getFramework(), anyOf( is( JUNIT47 ), is( TestNG ) ) );
+ prepare( "TestTwo" )
+ .parallel( "classes" )
+ .useUnlimitedThreads()
+ .executeTest()
+ .verifyErrorFree( 2 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
+ }
+
+ @Test
+ public void simpleNameTestWithJavaExt()
+ throws Exception
+ {
+ prepare( "TestTwo.java" )
+ .executeTest()
+ .verifyErrorFree( 2 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
+ }
+
+ @Test
+ public void simpleNameTestWithWildcardPkg()
+ throws Exception
+ {
+ prepare( "**/TestTwo" )
+ .executeTest()
+ .verifyErrorFree( 2 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
+ }
+
+ @Test
+ public void simpleNameTestWithJavaExtWildcardPkg()
+ throws Exception
+ {
+ prepare( "**/TestTwo.java" )
+ .executeTest()
+ .verifyErrorFree( 2 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
+ }
+
+ @Test
+ public void fullyQualifiedTest()
+ throws Exception
+ {
+ prepare( "jiras/surefire745/TestTwo.java" )
+ .executeTest()
+ .verifyErrorFree( 2 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
+ }
+
+ @Test
+ public void shouldMatchSimpleClassNameAndMethod()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "BasicTest#testSuccessTwo" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
+ }
+
+ /**
+ * This method name was shorten because it cause 261 character long path on Windows with Jenkins Pipeline.
+ */
+ @Test
+ public void matchSimpleClassAndMethodWithJavaExt()
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "BasicTest.java#testSuccessTwo" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
+ }
+
+ /**
+ * This method name was shorten because it cause 261 character long path on Windows with Jenkins Pipeline.
+ */
+ @Test
+ public void matchSimpleClassAndMethodWithWildcardPkg()
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "**/BasicTest#testSuccessTwo" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
+ }
+
+ /**
+ * This method name was shorten because it cause 261 character long path on Windows with Jenkins Pipeline.
+ */
+ @Test
+ public void matchSimpleClassAndMethodWithJavaExtWildcardPkg()
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "**/BasicTest.java#testSuccessTwo" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
+ }
+
+ @Test
+ public void shouldMatchWildcardPackageAndClassAndMethod()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "jiras/**/BasicTest#testSuccessTwo" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
+ }
+
+ @Test
+ public void regexClass()
+ throws Exception
+ {
+ prepare( "%regex[.*.TestTwo.*]" )
+ .executeTest()
+ .verifyErrorFree( 2 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessOne" )
+ .verifyTextInLog( "jiras.surefire745.TestTwo#testSuccessTwo" );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "#testSuccessTwo" )
+ .maven().debugLogging()
+ .executeTest()
+ .verifyErrorFree( 5 )
+ .verifyErrorFreeLog();
+ }
+
+ @Test
+ public void testRegexSuccessTwo()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "%regex[#testSuccessTwo]" )
+ .executeTest()
+ .verifyErrorFree( 5 )
+ .verifyErrorFreeLog();
+ }
+
+ @Test
+ public void regexClassAndMethod()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "%regex[.*.BasicTest.*#testSuccessTwo]" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
+ }
+
+ @Test
+ public void shouldMatchExactClassAndMethodWildcard()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "BasicTest#test*One" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessOne" );
+ }
+
+ @Test
+ public void shouldMatchExactClassAndMethodsWildcard()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "BasicTest#testSuccess*" )
+ .executeTest()
+ .verifyErrorFree( 2 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessOne" )
+ .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessTwo" );
+ }
+
+ @Test
+ public void shouldMatchExactClassAndMethodCharacters()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "BasicTest#test???????One" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.BasicTest#testSuccessOne" );
+ }
+
+ @Test
+ public void shouldMatchExactClassAndMethodsPostfix()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "TestFive#testSuccess???" )
+ .executeTest()
+ .verifyErrorFree( 2 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.TestFive#testSuccessOne" )
+ .verifyTextInLog( "jiras.surefire745.TestFive#testSuccessTwo" );
+ }
+
+ @Test
+ public void shouldMatchExactClassAndMethodPostfix()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "TestFive#testSuccess?????" )
+ .executeTest()
+ .verifyErrorFree( 1 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.TestFive#testSuccessThree" );
+ }
+
+ @Test
+ public void shouldMatchExactClassAndMultipleMethods()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "TestFive#testSuccessOne+testSuccessThree" )
+ .executeTest()
+ .verifyErrorFree( 2 )
+ .verifyErrorFreeLog()
+ .verifyTextInLog( "jiras.surefire745.TestFive#testSuccessOne" )
+ .verifyTextInLog( "jiras.surefire745.TestFive#testSuccessThree" );
+ }
+
+ @Test
+ public void shouldMatchMultiplePatterns()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ String test = "jiras/surefire745/BasicTest#testSuccessOne+testSuccessTwo"//2
+ + ',' + "jiras/**/TestTwo"//2
+ + ',' + "jiras/surefire745/TestThree#testSuccess*"//2
+ + ',' + "TestFour#testSuccess???"//2
+ + ',' + "jiras/surefire745/*Five#test*One";//1
+
+ prepare( test )
+ .executeTest()
+ .verifyErrorFree( 9 )
+ .verifyErrorFreeLog();
+ }
+
+ @Test
+ public void shouldMatchMultiplePatternsAsParallel()
+ throws Exception
+ {
+ assumeThat( getSettings().getFramework(), anyOf( is( JUNIT47 ), is( TestNG ) ) );
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ String test = "jiras/surefire745/BasicTest#testSuccessOne+testSuccessTwo"//2
+ + ',' + "jiras/**/TestTwo"//2
+ + ',' + "jiras/surefire745/TestThree#testSuccess*"//2
+ + ',' + "TestFour#testSuccess???"//2
+ + ',' + "jiras/surefire745/*Five#test*One";//1
+
+ prepare( test )
+ .parallel( "classes" )
+ .useUnlimitedThreads()
+ .executeTest()
+ .verifyErrorFree( 9 )
+ .verifyErrorFreeLog();
+ }
+
+ @Test
+ public void shouldMatchMultiplePatternsComplex()
+ throws Exception
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ String test = "**/BasicTest#testSuccessOne+testSuccessTwo"//2
+ + ',' + "jiras/**/TestTwo"//2
+ + ',' + "?????/surefire745/TestThree#testSuccess*"//2
+ + ',' + "jiras/surefire745/TestFour.java#testSuccess???"//2
+ + ',' + "jiras/surefire745/*Five#test*One";//1
+
+ prepare( test )
+ .executeTest()
+ .verifyErrorFree( 9 )
+ .verifyErrorFreeLog();
+ }
+
+ @Test
+ public void shouldMatchMultiplePatternsComplexAsParallel()
+ throws Exception
+ {
+ assumeThat( getSettings().getFramework(), anyOf( is( JUNIT47 ), is( TestNG ) ) );
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ String test = "**/BasicTest#testSuccessOne+testSuccessTwo"//2
+ + ',' + "jiras/**/TestTwo"//2
+ + ',' + "?????/surefire745/TestThree#testSuccess*"//2
+ + ',' + "jiras/surefire745/TestFour.java#testSuccess???"//2
+ + ',' + "jiras/surefire745/*Five#test*One";//1
+
+ prepare( test )
+ .parallel( "classes" )
+ .useUnlimitedThreads()
+ .executeTest()
+ .verifyErrorFree( 9 )
+ .verifyErrorFreeLog();
+ }
+
+ @Test
+ public void shouldNotRunExcludedClasses()
+ {
+ prepare( "!BasicTest, !**/TestTwo, !**/TestThree.java" )
+ .executeTest()
+ .verifyErrorFree( 6 )
+ .verifyErrorFreeLog();
+ }
+
+ @Test
+ public void shouldNotRunExcludedClassesIfIncluded()
+ {
+ prepare( "TestF*.java, !**/TestFour.java" )
+ .executeTest()
+ .verifyErrorFree( 3 )
+ .verifyErrorFreeLog();
+ }
+
+ @Test
+ public void shouldNotRunExcludedMethods()
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "!#*Fail*, !%regex[#.*One], !#testSuccessThree" )
+ .executeTest()
+ .verifyErrorFree( 5 )
+ .verifyErrorFreeLog();
+ }
+
+ @Test
+ public void shouldNotRunExcludedClassesAndMethods()
+ {
+ assumeThat( getSettings().getConfiguration(), is( TEST ) );
+ prepare( "!#*Fail*, !TestFour#testSuccessTwo" )
+ .executeTest()
+ .verifyErrorFree( 11 )
+ .verifyErrorFreeLog();
+ }
+
+ @Test
+ public void negativeTest()
+ {
+ assumeThat( getSettings().getConfiguration(), anyOf( is( INCLUDES ), is( INCLUDES_EXCLUDES ),
+ is( INCLUDES_FILE ), is( INCLUDES_EXCLUDES_FILE ) ) );
+ String pattern = "TestFive#testSuccessOne+testSuccessThree";
+ prepare( pattern )
+ .failNever()
+ .executeTest()
+ .verifyTextInLog( "Method filter prohibited in includes|excludes|includesFile|excludesFile parameter: "
+ + pattern );
+ }
+}
[08/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting7Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting7Test.java b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting7Test.java
new file mode 100644
index 0000000..ca00a6a
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting7Test.java
@@ -0,0 +1,50 @@
+package surefireparallel;
+
+/*
+ * 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.Test;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.16
+ */
+public class Waiting7Test
+{
+ @Test
+ public void a()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void b()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void c()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting8Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting8Test.java b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting8Test.java
new file mode 100644
index 0000000..96d1c66
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting8Test.java
@@ -0,0 +1,50 @@
+package surefireparallel;
+
+/*
+ * 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.Test;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.16
+ */
+public class Waiting8Test
+{
+ @Test
+ public void a()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void b()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void c()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-redirect-output/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-redirect-output/pom.xml b/surefire-its/src/test/resources/junit47-redirect-output/pom.xml
new file mode 100644
index 0000000..38ec727
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-redirect-output/pom.xml
@@ -0,0 +1,58 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-consoleOutput</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>fork-consoleOutput</name>
+ <url>http://maven.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <printSummary>${printSummary}</printSummary>
+ <useFile>true</useFile>
+ <redirectTestOutputToFile>${redirect.to.file}</redirectTestOutputToFile>
+ <threadCount>2</threadCount>
+ <parallel>${parallel}</parallel>
+ <runOrder>alphabetical</runOrder>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <redirect.to.file>true</redirect.to.file>
+ <forkMode>once</forkMode>
+ <printSummary>true</printSummary>
+ <parallel>none</parallel>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test0.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test0.java b/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test0.java
new file mode 100644
index 0000000..102faaa
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test0.java
@@ -0,0 +1,63 @@
+package junit47ConsoleOutput;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class Test0 {
+
+ public Test0(){
+ System.out.println("Constructor");
+ }
+
+ @Test
+ public void testT0() throws Exception {
+ System.out.println("testT0");
+ }
+
+ @Test
+ public void testT1() throws Exception {
+ System.out.println("testT1");
+ }
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ System.out.println("setUpBeforeClass");
+ }
+
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ System.out.println("tearDownAfterClass");
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ System.out.println("setUp");
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ System.out.println("tearDown");
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test1.java b/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test1.java
new file mode 100644
index 0000000..40e084e
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test1.java
@@ -0,0 +1,43 @@
+package junit47ConsoleOutput;
+
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class Test1
+{
+ @Test
+ public void test6281() {
+ System.out.println( "Test1 on" + Thread.currentThread().getName());
+ }
+
+ @BeforeClass
+ public static void testWithFailingAssumption2() {
+ System.out.println( "BeforeTest1 on" + Thread.currentThread().getName());
+ }
+
+ @AfterClass
+ public static void testWithFailingAssumption3() {
+ System.out.println( "AfterTest1 on" + Thread.currentThread().getName());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test2.java b/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test2.java
new file mode 100644
index 0000000..1a14fc7
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test2.java
@@ -0,0 +1,43 @@
+package junit47ConsoleOutput;
+
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class Test2
+{
+ @Test
+ public void test6281() {
+ System.out.println( "Test2 on" + Thread.currentThread().getName());
+ }
+
+ @BeforeClass
+ public static void testWithFailingAssumption2() {
+ System.out.println( "BeforeTest2 on" + Thread.currentThread().getName());
+ }
+
+ @AfterClass
+ public static void testWithFailingAssumption3() {
+ System.out.println( "AfterTest2 on" + Thread.currentThread().getName());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test3.java b/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test3.java
new file mode 100644
index 0000000..35b0032
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-redirect-output/src/test/java/junit47ConsoleOutput/Test3.java
@@ -0,0 +1,30 @@
+package junit47ConsoleOutput;
+
+/*
+ * 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.Test;
+
+public class Test3
+{
+ @Test
+ public void test3() {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml
new file mode 100644
index 0000000..24ee294
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/pom.xml
@@ -0,0 +1,77 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>junit47-rerun-failing-tests-with-cucumber</artifactId>
+ <name>Test for rerun failing cucumber tests in JUnit 47</name>
+
+ <properties>
+ <cucumber.version>2.0.0</cucumber.version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-java</artifactId>
+ <version>${cucumber.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.cucumber</groupId>
+ <artifactId>cucumber-junit</artifactId>
+ <version>${cucumber.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/FlakeCucumberTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/FlakeCucumberTest.java b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/FlakeCucumberTest.java
new file mode 100644
index 0000000..ecda87b
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/FlakeCucumberTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+package org.sample.cucumber;
+
+import cucumber.api.junit.Cucumber;
+import org.junit.runner.RunWith;
+
+@RunWith( Cucumber.class )
+public class FlakeCucumberTest
+{
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/StepDefs.java b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
new file mode 100644
index 0000000..d253222
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package org.sample.cucumber;
+
+import cucumber.api.java.en.Given;
+import cucumber.api.java.en.Then;
+import cucumber.api.java.en.When;
+
+import static org.junit.Assert.fail;
+
+public class StepDefs
+{
+ private static int testFailures = 0;
+
+ @Given( "^I have some code$" )
+ public void I_have_some_code()
+ throws Throwable
+ {
+ // do nothing
+ }
+
+ @When( "^I run test$" )
+ public void I_run_test()
+ throws Throwable
+ {
+ // do nothing
+ }
+
+ @Then( "^I get a flake$" )
+ public void I_get_a_flake()
+ throws Throwable
+ {
+ // This test will error out with only one retry, but will pass with two
+ if( testFailures < 2 ) {
+ testFailures++;
+ fail( "failing the test on purpose." );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/resources/org/sample/cucumber/Sample.feature
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/resources/org/sample/cucumber/Sample.feature b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/resources/org/sample/cucumber/Sample.feature
new file mode 100644
index 0000000..d5b5dac
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-rerun-failing-tests-with-cucumber/src/test/resources/org/sample/cucumber/Sample.feature
@@ -0,0 +1,10 @@
+Feature: Sample
+
+ In order to use Maven
+ As a user
+ I want to do tests.
+
+ Scenario: Do a flake test
+ Given I have some code
+ When I run test
+ Then I get a flake
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-static-inner-class-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-static-inner-class-tests/pom.xml b/surefire-its/src/test/resources/junit47-static-inner-class-tests/pom.xml
new file mode 100644
index 0000000..81f26c2
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-static-inner-class-tests/pom.xml
@@ -0,0 +1,40 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4-test</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>junit47-static-inner-class-tests</name>
+ <url>http://maven.apache.org</url>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>never</forkMode>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/BasicTest.java b/surefire-its/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/BasicTest.java
new file mode 100644
index 0000000..f11de6d
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/BasicTest.java
@@ -0,0 +1,33 @@
+package junit4;
+
+/*
+ * 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.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+@RunWith(Enclosed.class)
+public class BasicTest {
+ public static class InnerTest {
+ @Test
+ public void testSomething() {
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelAbstractClassTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelAbstractClassTest.java b/surefire-its/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelAbstractClassTest.java
new file mode 100644
index 0000000..b47e755
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelAbstractClassTest.java
@@ -0,0 +1,33 @@
+package junit4;
+
+/*
+ * 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.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+@RunWith(Enclosed.class)
+public abstract class TopLevelAbstractClassTest {
+ public static class InnerTest {
+ @Test
+ public void testSomething() {
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelInterfaceTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelInterfaceTest.java b/surefire-its/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelInterfaceTest.java
new file mode 100644
index 0000000..eaa6756
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-static-inner-class-tests/src/test/java/junit4/TopLevelInterfaceTest.java
@@ -0,0 +1,33 @@
+package junit4;
+
+/*
+ * 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.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+@RunWith(Enclosed.class)
+public interface TopLevelInterfaceTest {
+ public static class InnerTest {
+ @Test
+ public void testSomething() {
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-categories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-categories/pom.xml b/surefire-its/src/test/resources/junit48-categories/pom.xml
new file mode 100644
index 0000000..a83b687
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-categories/pom.xml
@@ -0,0 +1,70 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4.8.1</name>
+
+
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <groups>junit4.CategoryA,junit4.CategoryB</groups>
+ <excludedGroups></excludedGroups>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <groups>${groups}</groups>
+ <excludedGroups>${excludedGroups}</excludedGroups>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/BasicTest.java b/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/BasicTest.java
new file mode 100644
index 0000000..3108e1a
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/BasicTest.java
@@ -0,0 +1,72 @@
+package junit4;
+/*
+ * 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.AfterClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+
+public class BasicTest
+{
+ static int catACount = 0;
+ static int catBCount = 0;
+ static int catCCount = 0;
+ static int catNoneCount = 0;
+
+ @Test
+ @Category(CategoryA.class)
+ public void testInCategoryA()
+ {
+ System.out.println( "Ran testInCategoryA" );
+ catACount++;
+ }
+
+ @Test
+ @Category(CategoryB.class)
+ public void testInCategoryB()
+ {
+ System.out.println( "Ran testInCategoryB" );
+ catBCount++;
+ }
+
+ @Test
+ @Category(CategoryC.class)
+ public void testInCategoryC()
+ {
+ System.out.println( "Ran testInCategoryC" );
+ catCCount++;
+ }
+
+ @Test
+ public void testInNoCategory()
+ {
+ System.out.println( "Ran testInNoCategory" );
+ catNoneCount++;
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+ System.out.println("catA: " + catACount + "\n" +
+ "catB: " + catBCount + "\n" +
+ "catC: " + catCCount + "\n" +
+ "catNone: " + catNoneCount);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryA.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryA.java b/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryA.java
new file mode 100644
index 0000000..9b8b855
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryA.java
@@ -0,0 +1,21 @@
+package junit4;
+/*
+ * 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.
+ */
+
+interface CategoryA {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryB.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryB.java b/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryB.java
new file mode 100644
index 0000000..f10f3b1
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryB.java
@@ -0,0 +1,21 @@
+package junit4;
+/*
+ * 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.
+ */
+
+interface CategoryB {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryC.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryC.java b/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryC.java
new file mode 100644
index 0000000..3e9e854
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryC.java
@@ -0,0 +1,21 @@
+package junit4;
+/*
+ * 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.
+ */
+
+interface CategoryC {}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryCTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryCTest.java b/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryCTest.java
new file mode 100644
index 0000000..af88bc8
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/CategoryCTest.java
@@ -0,0 +1,68 @@
+package junit4;
+/*
+ * 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.AfterClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+
+@Category(CategoryC.class)
+public class CategoryCTest
+{
+ static int catACount = 0;
+ static int catBCount = 0;
+ static int catCCount = 0;
+ static int catNoneCount = 0;
+
+ @Test
+ public void testInCategoryA()
+ {
+ catACount++;
+ }
+
+ @Test
+ @Category(CategoryB.class)
+ public void testInCategoryB()
+ {
+ catBCount++;
+ }
+
+ @Test
+ @Category(CategoryC.class)
+ public void testInCategoryC()
+ {
+ catCCount++;
+ }
+
+ @Test
+ public void testInNoCategory()
+ {
+ catNoneCount++;
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+ System.out.println("mA: " + catACount + "\n" +
+ "mB: " + catBCount + "\n" +
+ "mC: " + catCCount + "\n" +
+ "CatNone: " + catNoneCount);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/NoCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/NoCategoryTest.java b/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/NoCategoryTest.java
new file mode 100644
index 0000000..f08f40f
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-categories/src/test/java/junit4/NoCategoryTest.java
@@ -0,0 +1,38 @@
+package junit4;
+/*
+ * 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.AfterClass;
+import org.junit.Test;
+
+public class NoCategoryTest {
+ static int catNoneCount = 0;
+
+ @Test
+ public void testInNoCategory()
+ {
+ catNoneCount++;
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+ System.out.println("NoCategoryTest.CatNone: " + catNoneCount);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-method-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-method-pattern/pom.xml b/surefire-its/src/test/resources/junit48-method-pattern/pom.xml
new file mode 100644
index 0000000..8689549
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-method-pattern/pom.xml
@@ -0,0 +1,103 @@
+<?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/xsd/maven-4.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>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4.8.1</name>
+
+ <properties>
+ <junitVersion>4.8.1</junitVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <test>BasicTest#testSuccess*</test>
+ <forkMode>once</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>surefire-junit47</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>surefire-junit4</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java b/surefire-its/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java
new file mode 100644
index 0000000..218488c
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java
@@ -0,0 +1,79 @@
+package junit4;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+
+public class BasicTest
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ @Category(SampleCategory.class)
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-method-pattern/src/test/java/junit4/SampleCategory.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-method-pattern/src/test/java/junit4/SampleCategory.java b/surefire-its/src/test/resources/junit48-method-pattern/src/test/java/junit4/SampleCategory.java
new file mode 100644
index 0000000..db057af
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-method-pattern/src/test/java/junit4/SampleCategory.java
@@ -0,0 +1,25 @@
+package junit4;
+
+/*
+ * 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.
+ */
+
+public interface SampleCategory
+{
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-multiple-method-patterns/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-multiple-method-patterns/pom.xml b/surefire-its/src/test/resources/junit48-multiple-method-patterns/pom.xml
new file mode 100644
index 0000000..f307687
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-multiple-method-patterns/pom.xml
@@ -0,0 +1,195 @@
+<?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/xsd/maven-4.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>jiras-surefire-745-junit</artifactId>
+ <version>1.0</version>
+
+ <properties>
+ <included/>
+ <excluded/>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>junit4-test</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>junit47-test</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>junit4-includes</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>${included}</include>
+ </includes>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>junit47-includes</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>${included}</include>
+ </includes>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>junit4-includes-excludes</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>${included}</include>
+ </includes>
+ <excludes>
+ <exclude>${excluded}</exclude>
+ </excludes>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>junit47-includes-excludes</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>${included}</include>
+ </includes>
+ <excludes>
+ <exclude>${excluded}</exclude>
+ </excludes>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/BasicTest.java b/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/BasicTest.java
new file mode 100644
index 0000000..44d5978
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/BasicTest.java
@@ -0,0 +1,53 @@
+package jiras.surefire745;
+
+
+/*
+ * 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.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+import static org.junit.Assert.*;
+
+
+public class BasicTest
+{
+ @Rule
+ public final TestName testName = new TestName();
+
+ @Test
+ public void testSuccessOne()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ }
+
+ @Test
+ public void testFailure()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ fail( );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFive.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFive.java b/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFive.java
new file mode 100644
index 0000000..7d88f70
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFive.java
@@ -0,0 +1,49 @@
+package jiras.surefire745;
+
+/*
+ * 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.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+
+public class TestFive
+{
+ @Rule
+ public final TestName testName = new TestName();
+
+ @Test
+ public void testSuccessOne()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ }
+
+ @Test
+ public void testSuccessThree()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFour.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFour.java b/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFour.java
new file mode 100644
index 0000000..824b0d5
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestFour.java
@@ -0,0 +1,49 @@
+package jiras.surefire745;
+
+/*
+ * 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.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+
+public class TestFour
+{
+ @Rule
+ public final TestName testName = new TestName();
+
+ @Test
+ public void testSuccessOne()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ }
+
+ @Test
+ public void testSuccessThree()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestThree.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestThree.java b/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestThree.java
new file mode 100644
index 0000000..a868e7c
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestThree.java
@@ -0,0 +1,51 @@
+package jiras.surefire745;
+
+/*
+ * 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.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+import static org.junit.Assert.*;
+
+public class TestThree
+{
+ @Rule
+ public final TestName testName = new TestName();
+
+ @Test
+ public void testSuccessOne()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ }
+
+ @Test
+ public void testFailOne()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ fail();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestTwo.java b/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestTwo.java
new file mode 100644
index 0000000..5f1182d
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-multiple-method-patterns/src/test/java/jiras/surefire745/TestTwo.java
@@ -0,0 +1,42 @@
+package jiras.surefire745;
+
+/*
+ * 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.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+public class TestTwo
+{
+ @Rule
+ public final TestName testName = new TestName();
+
+ @Test
+ public void testSuccessOne()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ System.out.println( getClass() + "#" + testName.getMethodName() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-multiple-methods/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-multiple-methods/pom.xml b/surefire-its/src/test/resources/junit48-multiple-methods/pom.xml
new file mode 100644
index 0000000..09ef51e
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-multiple-methods/pom.xml
@@ -0,0 +1,103 @@
+<?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/xsd/maven-4.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>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4.8.1</name>
+
+ <properties>
+ <junitVersion>4.8.1</junitVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <test>junit4/BasicTest#testSuccessOne+testFailOne,junit4/TestThree#testSuccessTwo</test>
+ <forkMode>once</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>surefire-junit47</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>surefire-junit4</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-multiple-methods/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-multiple-methods/src/test/java/junit4/BasicTest.java b/surefire-its/src/test/resources/junit48-multiple-methods/src/test/java/junit4/BasicTest.java
new file mode 100644
index 0000000..de387d3
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-multiple-methods/src/test/java/junit4/BasicTest.java
@@ -0,0 +1,83 @@
+package junit4;
+
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testFailOne()
+ {
+ Assert.assertFalse( false );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestThree.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestThree.java b/surefire-its/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestThree.java
new file mode 100644
index 0000000..16bc283
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestThree.java
@@ -0,0 +1,77 @@
+package junit4;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class TestThree
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestTwo.java b/surefire-its/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestTwo.java
new file mode 100644
index 0000000..137bf8b
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-multiple-methods/src/test/java/junit4/TestTwo.java
@@ -0,0 +1,76 @@
+package junit4;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class TestTwo
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-single-method/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-single-method/pom.xml b/surefire-its/src/test/resources/junit48-single-method/pom.xml
new file mode 100644
index 0000000..96061ce
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-single-method/pom.xml
@@ -0,0 +1,103 @@
+<?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/xsd/maven-4.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>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4.8.1</name>
+
+ <properties>
+ <junitVersion>4.8.1</junitVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <test>BasicTest#testSuccessOne</test>
+ <forkMode>once</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>surefire-junit47</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>surefire-junit4</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java b/surefire-its/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java
new file mode 100644
index 0000000..d983259
--- /dev/null
+++ b/surefire-its/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java
@@ -0,0 +1,71 @@
+package junit4;
+
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
[09/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-dep/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-dep/pom.xml b/surefire-its/src/test/resources/junit44-dep/pom.xml
new file mode 100644
index 0000000..d26c024
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-dep/pom.xml
@@ -0,0 +1,71 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit44-dep</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for junit-dep</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <version>${junit-dep.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>provided381</id>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <parallel>classes</parallel>
+ <threadCount>1</threadCount>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-dep/src/test/java/junit44Dep/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-dep/src/test/java/junit44Dep/BasicTest.java b/surefire-its/src/test/resources/junit44-dep/src/test/java/junit44Dep/BasicTest.java
new file mode 100644
index 0000000..219b8da
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-dep/src/test/java/junit44Dep/BasicTest.java
@@ -0,0 +1,67 @@
+package junit44Dep;
+
+/*
+ * 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.hamcrest.core.Is;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ Assert.assertFalse( "tearDown was called", tearDownCalled );
+ Assert.assertThat( true, Is.is( true ) );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+ Assert.assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-environment/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-environment/pom.xml b/surefire-its/src/test/resources/junit44-environment/pom.xml
new file mode 100644
index 0000000..eb04443
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-environment/pom.xml
@@ -0,0 +1,59 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit44-environment</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for setting environment variables</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <environmentVariables>
+ <DUMMY_ENV_VAR>foo</DUMMY_ENV_VAR>
+ </environmentVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java b/surefire-its/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java
new file mode 100644
index 0000000..ee20aa6
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java
@@ -0,0 +1,40 @@
+package junit44.environment;
+
+/*
+ * 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 static org.hamcrest.core.Is.*;
+import static org.hamcrest.core.IsNull.*;
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+
+ @Test
+ public void testEnvVar()
+ {
+ Assert.assertThat( System.getenv( "PATH" ), notNullValue() );
+ Assert.assertThat( System.getenv( "DUMMY_ENV_VAR" ), is( "foo" ) );
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-hamcrest/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-hamcrest/pom.xml b/surefire-its/src/test/resources/junit44-hamcrest/pom.xml
new file mode 100644
index 0000000..4140b41
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-hamcrest/pom.xml
@@ -0,0 +1,54 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit44-hamcrest</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit44 with Hamcrest extensions</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-hamcrest/src/test/java/junit44/hamcrest/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-hamcrest/src/test/java/junit44/hamcrest/BasicTest.java b/surefire-its/src/test/resources/junit44-hamcrest/src/test/java/junit44/hamcrest/BasicTest.java
new file mode 100644
index 0000000..b847675
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-hamcrest/src/test/java/junit44/hamcrest/BasicTest.java
@@ -0,0 +1,66 @@
+package junit44.hamcrest;
+
+/*
+ * 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.hamcrest.core.Is;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ Assert.assertThat( true, Is.is( true ) );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+ Assert.assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-method-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-method-pattern/pom.xml b/surefire-its/src/test/resources/junit44-method-pattern/pom.xml
new file mode 100644
index 0000000..e9ac59e
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-method-pattern/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4</name>
+
+
+ <properties>
+ <junitVersion>4.4</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <test>BasicTest#testSuccess*</test>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java b/surefire-its/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java
new file mode 100644
index 0000000..925d9b5
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java
@@ -0,0 +1,77 @@
+package junit4;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-multiple-methods/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-multiple-methods/pom.xml b/surefire-its/src/test/resources/junit44-multiple-methods/pom.xml
new file mode 100644
index 0000000..9858f4c
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-multiple-methods/pom.xml
@@ -0,0 +1,68 @@
+<?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/xsd/maven-4.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>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4</name>
+
+ <!--
+ This is using junit 4.0 provider.
+ Same test in junit48-multiple-methods is used with different provider junit 4.7.
+ -->
+
+ <properties>
+ <junitVersion>4.4</junitVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <test>junit4/BasicTest#testSuccessOne+testFailOne,junit4/TestThree#testSuccessTwo</test>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-multiple-methods/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-multiple-methods/src/test/java/junit4/BasicTest.java b/surefire-its/src/test/resources/junit44-multiple-methods/src/test/java/junit4/BasicTest.java
new file mode 100644
index 0000000..4b31b9e
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-multiple-methods/src/test/java/junit4/BasicTest.java
@@ -0,0 +1,83 @@
+package junit4;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testFailOne()
+ {
+ Assert.assertFalse( false );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestThree.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestThree.java b/surefire-its/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestThree.java
new file mode 100644
index 0000000..16bc283
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestThree.java
@@ -0,0 +1,77 @@
+package junit4;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class TestThree
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestTwo.java b/surefire-its/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestTwo.java
new file mode 100644
index 0000000..620cf23
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestTwo.java
@@ -0,0 +1,77 @@
+package junit4;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class TestTwo
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-single-method/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-single-method/pom.xml b/surefire-its/src/test/resources/junit44-single-method/pom.xml
new file mode 100644
index 0000000..c74aee2
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-single-method/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4</name>
+
+
+ <properties>
+ <junitVersion>4.4</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <test>BasicTest#testSuccessOne</test>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java b/surefire-its/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java
new file mode 100644
index 0000000..027917d
--- /dev/null
+++ b/surefire-its/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java
@@ -0,0 +1,71 @@
+package junit4;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-concurrency/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-concurrency/pom.xml b/surefire-its/src/test/resources/junit47-concurrency/pom.xml
new file mode 100644
index 0000000..21bd802
--- /dev/null
+++ b/surefire-its/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/xsd/maven-4.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/4d00932a/surefire-its/src/test/resources/junit47-concurrency/src/test/java/junit47/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-concurrency/src/test/java/junit47/BasicTest.java b/surefire-its/src/test/resources/junit47-concurrency/src/test/java/junit47/BasicTest.java
new file mode 100644
index 0000000..1f11060
--- /dev/null
+++ b/surefire-its/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
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-cucumber/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-cucumber/pom.xml b/surefire-its/src/test/resources/junit47-cucumber/pom.xml
new file mode 100644
index 0000000..a57d3c4
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-cucumber/pom.xml
@@ -0,0 +1,81 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>junit47-cucumber</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Tests cucumber with JUnit47 provider</name>
+
+ <properties>
+ <cucumber.version>1.1.3</cucumber.version>
+ <junit.version>4.11</junit.version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkCount>0</forkCount>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-java</artifactId>
+ <version>${cucumber.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>info.cukes</groupId>
+ <artifactId>cucumber-junit</artifactId>
+ <version>${cucumber.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/FailingCucumberTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/FailingCucumberTest.java b/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/FailingCucumberTest.java
new file mode 100644
index 0000000..ed86734
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/FailingCucumberTest.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package org.sample.cucumber;
+
+import org.junit.runner.RunWith;
+
+import cucumber.api.junit.Cucumber;
+
+@RunWith( Cucumber.class )
+@Cucumber.Options( features = { "classpath:failing" } )
+public class FailingCucumberTest
+{
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/StepDefs.java b/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
new file mode 100644
index 0000000..ba25f69
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package org.sample.cucumber;
+
+import cucumber.api.java.en.Given;
+import cucumber.api.java.en.Then;
+import cucumber.api.java.en.When;
+
+import static org.junit.Assert.fail;
+
+public class StepDefs
+{
+ @Given( "^I have some code$" )
+ public void I_have_some_code()
+ throws Throwable
+ {
+ // do nothing
+ }
+
+ @When( "^I run test$" )
+ public void I_run_test()
+ throws Throwable
+ {
+ // do nothing
+ }
+
+ @Then( "^I get no failures$" )
+ public void I_get_no_failures()
+ throws Throwable
+ {
+ // do nothing
+ }
+
+ @Then( "^I get a failure$" )
+ public void I_get_a_failure()
+ throws Throwable
+ {
+ fail( "failing the test on purpose." );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/SuccessCucumberTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/SuccessCucumberTest.java b/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/SuccessCucumberTest.java
new file mode 100644
index 0000000..318f5e6
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/SuccessCucumberTest.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package org.sample.cucumber;
+
+import org.junit.runner.RunWith;
+
+import cucumber.api.junit.Cucumber;
+
+@RunWith( Cucumber.class )
+@Cucumber.Options( features = { "classpath:success" } )
+public class SuccessCucumberTest
+{
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-cucumber/src/test/resources/failing/Sample.feature
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-cucumber/src/test/resources/failing/Sample.feature b/surefire-its/src/test/resources/junit47-cucumber/src/test/resources/failing/Sample.feature
new file mode 100644
index 0000000..e8ac945
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-cucumber/src/test/resources/failing/Sample.feature
@@ -0,0 +1,10 @@
+Feature: Sample
+
+ In order to use Maven
+ As a user
+ I want to do tests.
+
+ Scenario: Do a failing test
+ Given I have some code
+ When I run test
+ Then I get a failure
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-cucumber/src/test/resources/success/Sample.feature
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-cucumber/src/test/resources/success/Sample.feature b/surefire-its/src/test/resources/junit47-cucumber/src/test/resources/success/Sample.feature
new file mode 100644
index 0000000..26f0d2d
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-cucumber/src/test/resources/success/Sample.feature
@@ -0,0 +1,10 @@
+Feature: Sample
+
+ In order to use Maven
+ As a user
+ I want to do tests.
+
+ Scenario: Do a successful test
+ Given I have some code
+ When I run test
+ Then I get no failures
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel-nts/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel-nts/pom.xml b/surefire-its/src/test/resources/junit47-parallel-nts/pom.xml
new file mode 100644
index 0000000..92a2fb3
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel-nts/pom.xml
@@ -0,0 +1,64 @@
+<?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/xsd/maven-4.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-parallel-nts</artifactId>
+ <version>1.0</version>
+ <name>junit47-parallel-nts</name>
+ <url>http://maven.apache.org</url>
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>1.0-1</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/ParallelTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/ParallelTest.java b/surefire-its/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/ParallelTest.java
new file mode 100644
index 0000000..b59c51b
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/ParallelTest.java
@@ -0,0 +1,37 @@
+package surefireparallelnts;
+
+/*
+ * 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.Test;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.19
+ */
+public class ParallelTest
+{
+ @Test
+ public void test()
+ throws InterruptedException
+ {
+ String name = Thread.currentThread().getName();
+ System.out.println( "maven-surefire-plugin@NotThreadSafe".equals( name ) ? "wrong-thread" : "expected-thread" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/RunningInSequenceTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/RunningInSequenceTest.java b/surefire-its/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/RunningInSequenceTest.java
new file mode 100644
index 0000000..7ec56ed
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/RunningInSequenceTest.java
@@ -0,0 +1,37 @@
+package surefireparallelnts;
+
+/*
+ * 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.Test;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.19
+ */
+@net.jcip.annotations.NotThreadSafe
+public class RunningInSequenceTest
+{
+ @Test
+ public void test()
+ throws InterruptedException
+ {
+ System.out.println( "xxx-" + Thread.currentThread().getName() );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel-with-suite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel-with-suite/pom.xml b/surefire-its/src/test/resources/junit47-parallel-with-suite/pom.xml
new file mode 100644
index 0000000..5dcbaba
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel-with-suite/pom.xml
@@ -0,0 +1,38 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4-test</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>surefire-747-parallel-method-skips-test</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <parallel>methods</parallel>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <perCoreThreadCount>false</perCoreThreadCount>
+ <threadCount>5</threadCount>
+ <includes>
+ <include>**/TestSuite.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java b/surefire-its/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java
new file mode 100644
index 0000000..9ac0b90
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java
@@ -0,0 +1,93 @@
+package surefire747;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class SuiteTest1
+{
+ private static final int PERFORMANCE_TEST_MULTIPLICATION_FACTOR = 4;
+
+ private static long startedAt;
+
+ public SuiteTest1()
+ {
+ System.out.println( "SuiteTest1.constructor" );
+ }
+
+ @BeforeClass
+ public static void beforeClass()
+ {
+ startedAt = System.currentTimeMillis();
+ }
+
+ @AfterClass
+ public static void afterClass()
+ {
+ System.out.println( String.format( "%s test finished after duration=%d", SuiteTest1.class.getSimpleName(),
+ System.currentTimeMillis() - startedAt ) );
+ }
+
+ @Before
+ public void setUp()
+ {
+ System.out.println( "SuiteTest1.setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ System.out.println( "SuiteTest1.tearDown" );
+ }
+
+ @Test
+ public void first()
+ throws InterruptedException
+ {
+ System.out.println( "begin SuiteTest1.first" );
+ Thread.sleep( 500 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR );
+ System.out.println( "end SuiteTest1.first" );
+ }
+
+ @Test
+ public void second()
+ throws InterruptedException
+ {
+ System.out.println( "begin SuiteTest1.second" );
+ Thread.sleep( 500 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR );
+ System.out.println( "end SuiteTest1.second" );
+ }
+
+ @Test
+ public void third()
+ throws InterruptedException
+ {
+ System.out.println( "begin SuiteTest1.third" );
+ Thread.sleep( 500 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR );
+ System.out.println( "end SuiteTest1.third" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java b/surefire-its/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java
new file mode 100644
index 0000000..99ad7cd
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java
@@ -0,0 +1,93 @@
+package surefire747;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class SuiteTest2
+{
+ private static final int PERFORMANCE_TEST_MULTIPLICATION_FACTOR = 4;
+
+ private static long startedAt;
+
+ public SuiteTest2()
+ {
+ System.out.println( "SuiteTest2.constructor" );
+ }
+
+ @BeforeClass
+ public static void beforeClass()
+ {
+ startedAt = System.currentTimeMillis();
+ }
+
+ @AfterClass
+ public static void afterClass()
+ {
+ System.out.println( String.format( "%s test finished after duration=%d", SuiteTest2.class.getSimpleName(),
+ System.currentTimeMillis() - startedAt ) );
+ }
+
+ @Before
+ public void setUp()
+ {
+ System.out.println( "SuiteTest2.setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ System.out.println( "SuiteTest2.tearDown" );
+ }
+
+ @Test
+ public void first()
+ throws InterruptedException
+ {
+ System.out.println( "begin SuiteTest2.first" );
+ Thread.sleep( 500 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR );
+ System.out.println( "end SuiteTest2.first" );
+ }
+
+ @Test
+ public void second()
+ throws InterruptedException
+ {
+ System.out.println( "begin SuiteTest2.second" );
+ Thread.sleep( 500 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR );
+ System.out.println( "end SuiteTest2.second" );
+ }
+
+ @Test
+ public void third()
+ throws InterruptedException
+ {
+ System.out.println( "begin SuiteTest2.third" );
+ Thread.sleep( 500 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR );
+ System.out.println( "end SuiteTest2.third" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java b/surefire-its/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java
new file mode 100644
index 0000000..4e95481
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java
@@ -0,0 +1,52 @@
+package surefire747;
+
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * @author Kristian Rosenvold
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses(
+{
+ SuiteTest1.class,
+ SuiteTest2.class
+})
+public class TestSuite
+{
+ private static long startedAt;
+
+ @BeforeClass
+ public static void beforeClass()
+ {
+ startedAt = System.currentTimeMillis();
+ }
+
+ @AfterClass
+ public static void afterClass()
+ {
+ System.out.println( String.format( "%s suite finished after duration=%d", TestSuite.class.getSimpleName(),
+ System.currentTimeMillis() - startedAt ) );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel/pom.xml b/surefire-its/src/test/resources/junit47-parallel/pom.xml
new file mode 100644
index 0000000..e9d6a6c
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel/pom.xml
@@ -0,0 +1,70 @@
+<?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/xsd/maven-4.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-parallel</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>junit47-parallel</name>
+ <url>http://maven.apache.org</url>
+
+ <developers>
+ <developer>
+ <id>tibordigana</id>
+ <name>Tibor Digaňa (tibor17)</name>
+ <email>tibordigana@apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>Europe/Bratislava</timezone>
+ </developer>
+ </developers>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <argLine/>
+ <jacoco.agent/>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${argLine} ${jacoco.agent}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite1Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite1Test.java b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite1Test.java
new file mode 100644
index 0000000..99419fe
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite1Test.java
@@ -0,0 +1,39 @@
+package surefireparallel;
+
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.16
+ */
+@RunWith( Suite.class )
+@Suite.SuiteClasses(
+ {
+ Waiting1Test.class,
+ Waiting2Test.class,
+ Waiting3Test.class,
+ Waiting4Test.class
+ })
+public class Suite1Test
+{
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite2Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite2Test.java b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite2Test.java
new file mode 100644
index 0000000..32814ff
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite2Test.java
@@ -0,0 +1,39 @@
+package surefireparallel;
+
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.16
+ */
+@RunWith( Suite.class )
+@Suite.SuiteClasses(
+ {
+ Waiting5Test.class,
+ Waiting6Test.class,
+ Waiting7Test.class,
+ Waiting8Test.class
+ })
+public class Suite2Test
+{
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java
new file mode 100644
index 0000000..3648443
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java
@@ -0,0 +1,50 @@
+package surefireparallel;
+
+/*
+ * 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.Test;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.16
+ */
+public class TestClass
+{
+ @Test
+ public void a()
+ throws InterruptedException
+ {
+ Thread.sleep( 5000L );
+ }
+
+ @Test
+ public void b()
+ throws InterruptedException
+ {
+ Thread.sleep( 5000L );
+ }
+
+ @Test
+ public void c()
+ throws InterruptedException
+ {
+ Thread.sleep( 5000L );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting1Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting1Test.java b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting1Test.java
new file mode 100644
index 0000000..1d58841
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting1Test.java
@@ -0,0 +1,50 @@
+package surefireparallel;
+
+/*
+ * 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.Test;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.16
+ */
+public class Waiting1Test
+{
+ @Test
+ public void a()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void b()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void c()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting2Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting2Test.java b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting2Test.java
new file mode 100644
index 0000000..55da772
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting2Test.java
@@ -0,0 +1,50 @@
+package surefireparallel;
+
+/*
+ * 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.Test;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.16
+ */
+public class Waiting2Test
+{
+ @Test
+ public void a()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void b()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void c()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting3Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting3Test.java b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting3Test.java
new file mode 100644
index 0000000..5098fd4
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting3Test.java
@@ -0,0 +1,50 @@
+package surefireparallel;
+
+/*
+ * 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.Test;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.16
+ */
+public class Waiting3Test
+{
+ @Test
+ public void a()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void b()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void c()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting4Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting4Test.java b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting4Test.java
new file mode 100644
index 0000000..8418448
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting4Test.java
@@ -0,0 +1,50 @@
+package surefireparallel;
+
+/*
+ * 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.Test;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.16
+ */
+public class Waiting4Test
+{
+ @Test
+ public void a()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void b()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void c()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting5Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting5Test.java b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting5Test.java
new file mode 100644
index 0000000..2b99160
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting5Test.java
@@ -0,0 +1,50 @@
+package surefireparallel;
+
+/*
+ * 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.Test;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.16
+ */
+public class Waiting5Test
+{
+ @Test
+ public void a()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void b()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void c()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting6Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting6Test.java b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting6Test.java
new file mode 100644
index 0000000..9ae9c01
--- /dev/null
+++ b/surefire-its/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting6Test.java
@@ -0,0 +1,50 @@
+package surefireparallel;
+
+/*
+ * 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.Test;
+
+/**
+ * @author Tibor Digana (tibor17)
+ * @since 2.16
+ */
+public class Waiting6Test
+{
+ @Test
+ public void a()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void b()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+
+ @Test
+ public void c()
+ throws InterruptedException
+ {
+ Thread.sleep( 300L );
+ }
+}
\ No newline at end of file
[45/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
deleted file mode 100644
index 2669b2f..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.TestFile;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.junit.Test;
-
-import java.nio.charset.Charset;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
-
-import static org.hamcrest.core.AnyOf.anyOf;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.Assert.assertThat;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1082">SUREFIRE-1082</a>
- * @since 2.18
- */
-public class Surefire1082ParallelJUnitParameterizedIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private static Set<String> printOnlyTestLinesFromConsole( OutputValidator validator )
- throws VerificationException
- {
- return printOnlyTestLines( validator.loadLogLines() );
- }
-
- private static Set<String> printOnlyTestLinesFromOutFile( OutputValidator validator )
- throws VerificationException
- {
- TestFile report = validator.getSurefireReportsFile( "jiras.surefire1082.Jira1082Test-output.txt" );
- report.assertFileExists();
- return printOnlyTestLines( validator.loadFile( report.getFile(), Charset.forName( "UTF-8" ) ) );
- }
-
- private static Set<String> printOnlyTestLines( Collection<String> logs )
- throws VerificationException
- {
- Set<String> log = new TreeSet<String>();
- for ( String line : logs )
- {
- if ( line.startsWith( "class jiras.surefire1082." ) )
- {
- log.add( line );
- }
- }
- return log;
- }
-
- private static Matcher<Set<String>> regex( Set<String> r )
- {
- return new IsRegex( r );
- }
-
- private static void assertParallelRun( Set<String> log )
- {
- assertThat( log.size(), is( 4 ) );
-
- Set<String> expectedLogs1 = new TreeSet<String>();
- expectedLogs1.add( "class jiras.surefire1082.Jira1082Test a 0 pool-[\\d]+-thread-1" );
- expectedLogs1.add( "class jiras.surefire1082.Jira1082Test b 0 pool-[\\d]+-thread-1" );
- expectedLogs1.add( "class jiras.surefire1082.Jira1082Test a 1 pool-[\\d]+-thread-2" );
- expectedLogs1.add( "class jiras.surefire1082.Jira1082Test b 1 pool-[\\d]+-thread-2" );
-
- Set<String> expectedLogs2 = new TreeSet<String>();
- expectedLogs2.add( "class jiras.surefire1082.Jira1082Test a 1 pool-[\\d]+-thread-1" );
- expectedLogs2.add( "class jiras.surefire1082.Jira1082Test b 1 pool-[\\d]+-thread-1" );
- expectedLogs2.add( "class jiras.surefire1082.Jira1082Test a 0 pool-[\\d]+-thread-2" );
- expectedLogs2.add( "class jiras.surefire1082.Jira1082Test b 0 pool-[\\d]+-thread-2" );
-
- assertThat( log, anyOf( regex( expectedLogs1 ), regex( expectedLogs2 ) ) );
- }
-
- @Test
- public void checkClassesRunParallel()
- throws VerificationException
- {
- OutputValidator validator = unpack().setTestToRun( "Jira1082Test" )
- .parallelClasses()
- .useUnlimitedThreads()
- .executeTest()
- .verifyErrorFree( 4 );
-
- validator.getSurefireReportsXmlFile( "TEST-jiras.surefire1082.Jira1082Test.xml" )
- .assertFileExists();
-
- validator.assertThatLogLine( containsString( "Running jiras.surefire1082.Jira1082Test" ), is( 1 ) );
-
- Set<String> log = printOnlyTestLinesFromConsole( validator );
- assertParallelRun( log );
- }
-
- @Test
- public void checkOutFileClassesRunParallel()
- throws VerificationException
- {
- OutputValidator validator = unpack().redirectToFile( true )
- .setTestToRun( "Jira1082Test" )
- .parallelClasses()
- .useUnlimitedThreads()
- .executeTest()
- .verifyErrorFree( 4 );
-
- validator.getSurefireReportsXmlFile( "TEST-jiras.surefire1082.Jira1082Test.xml" )
- .assertFileExists();
-
- validator.assertThatLogLine( containsString( "Running jiras.surefire1082.Jira1082Test" ), is( 1 ) );
-
- Set<String> log = printOnlyTestLinesFromOutFile( validator );
- assertParallelRun( log );
- }
-
- @Test
- public void shouldRunTwo() throws VerificationException
- {
- OutputValidator validator = unpack().redirectToFile( true )
- .parallelClasses()
- .useUnlimitedThreads()
- .executeTest()
- .verifyErrorFree( 8 );
-
- validator.getSurefireReportsXmlFile( "TEST-jiras.surefire1082.Jira1082Test.xml" )
- .assertFileExists();
-
- validator.getSurefireReportsXmlFile( "TEST-jiras.surefire1082.Jira1264Test.xml" )
- .assertFileExists();
-
- validator.getSurefireReportsFile( "jiras.surefire1082.Jira1082Test-output.txt" )
- .assertFileExists();
-
- validator.getSurefireReportsFile( "jiras.surefire1082.Jira1264Test-output.txt" )
- .assertFileExists();
-
- validator.assertThatLogLine( containsString( "Running jiras.surefire1082.Jira1082Test" ), is( 1 ) );
-
- validator.assertThatLogLine( containsString( "Running jiras.surefire1082.Jira1264Test" ), is( 1 ) );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-1082-parallel-junit-parameterized" );
- }
-
- private static class IsRegex
- extends BaseMatcher<Set<String>>
- {
- private final Set<String> expectedRegex;
-
- IsRegex( Set<String> expectedRegex )
- {
- this.expectedRegex = expectedRegex;
- }
-
- @Override
- public boolean matches( Object o )
- {
- if ( o != null && o instanceof Set )
- {
- Set<String> actual = (Set<String>) o;
- boolean matches = actual.size() == expectedRegex.size();
- Iterator<String> regex = expectedRegex.iterator();
- for ( String s : actual )
- {
- if ( s == null || !regex.hasNext() || !s.matches( regex.next() ) )
- {
- matches = false;
- }
- }
- return matches;
- }
- else
- {
- return false;
- }
- }
-
- @Override
- public void describeTo( Description description )
- {
- description.appendValue( expectedRegex );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
deleted file mode 100644
index f894265..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } )
-/**
- *
- * In the surefire plugin, it is possible to specify one or more RunListener when running tests with JUnit.
- * However, it does not look like the listener is properly called by the plugin. In particular, there is a problem
- * with the method:
- * <pre>
- * public void testRunStarted(Description description)
- * </pre>
- * it's javadoc at
- * <a href="http://junit.sourceforge.net/javadoc/org/junit/runner/notification/RunListener.html#testRunStarted%28org.junit.runner.Description%29"/>
- * states:
- * "Parameters:
- * description - describes the tests to be run "
- * however, in all maven projects I tried ("mvn test"), the surefire plugin seems like passing a null reference instead
- * of a Description instance that "describes the tests to be run "
- * Note: other methods in the RunListener I tested seems fine (i.e., they get a valid Description object as input)
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1095}"/>
- * @since 2.18
- */
-public final class Surefire1095NpeInRunListener
- extends SurefireJUnit4IntegrationTestCase
-{
-
- /**
- * Method Request.classes( String, Class[] ); exists in JUnit 4.0 - 4.4
- * See JUnit4Reflector.
- */
- @Test
- public void testRunStartedWithJUnit40()
- {
- unpack().setJUnitVersion( "4.0" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyTextInLog( "Running JUnit 4.0" )
- .verifyTextInLog( "testRunStarted [jiras.surefire1095.SomeTest]" );
- }
-
- /**
- * Method Request.classes( Class[] ); Since of JUnit 4.5
- * See JUnit4Reflector.
- */
- @Test
- public void testRunStartedWithJUnit45()
- {
- unpack().setJUnitVersion( "4.5" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyTextInLog( "Running JUnit 4.5" )
- .verifyTextInLog( "testRunStarted [jiras.surefire1095.SomeTest]" );
- }
-
- @Test
- public void testRunStartedWithJUnit47()
- {
- unpack().setJUnitVersion( "4.7" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyTextInLog( "Running JUnit 4.7" )
- .verifyTextInLog( "testRunStarted [jiras.surefire1095.SomeTest]" );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-1095-npe-in-runlistener" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
deleted file mode 100644
index e81f066..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import static org.junit.Assert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.AnyOf.anyOf;
-
-/**
- * The purpose of this IT is to assert that the run order of test classes is according to the settings:<br>
- *
- * runOrder=balanced<br>
- * parallel=classes<br>
- * threadCount=2<br>
- * perCoreThreadCount=false<br>
- * <br>
- * The list of tests should be reordered to (DTest, CTest, BTest, ATest) in the second run.
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1098">SUREFIRE-1098</a>
- * @since 2.18
- */
-public class Surefire1098BalancedRunOrderIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void reorderedParallelClasses()
- throws VerificationException
- {
- SurefireLauncher launcher = unpack();
-
- launcher
- // .runOrder( "balanced" ) call it in 3.x and remove it in surefire-1098-balanced-runorder/pom.xml
- // as soon as there is prefix available "failsafe" and "surefire" in system property for this parameter.
- .parallelClasses().threadCount( 2 ).disablePerCoreThreadCount()
- .executeTest().verifyErrorFree( 4 );
-
- OutputValidator validator =
- launcher
- // .runOrder( "balanced" ) call it in 3.x and remove it in surefire-1098-balanced-runorder/pom.xml
- // as soon as there is prefix available "failsafe" and "surefire" in system property for this parameter.
- .parallelClasses().threadCount( 2 ).disablePerCoreThreadCount()
- .executeTest().verifyErrorFree( 4 );
-
- List<String> log = printOnlyTestLines( validator );
- assertThat( log.size(), is( 4 ) );
- Collections.sort( log );
- final int[] threadPoolIdsOfLongestTest = extractThreadPoolIds( log.get( 3 ) );
- final int pool = threadPoolIdsOfLongestTest[0];
- int thread = threadPoolIdsOfLongestTest[1];
- assertThat( thread, anyOf( is( 1 ), is( 2 ) ) );
- thread = thread == 1 ? 2 : 1;
- // If the longest test class DTest is running in pool-2-thread-1, the others should run in pool-2-thread-2
- // and vice versa.
- assertThat( log.get( 0 ), is( testLine( "A", pool, thread ) ) );
- assertThat( log.get( 1 ), is( testLine( "B", pool, thread ) ) );
- assertThat( log.get( 2 ), is( testLine( "C", pool, thread ) ) );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-1098-balanced-runorder" );
- }
-
- private static List<String> printOnlyTestLines( OutputValidator validator )
- throws VerificationException
- {
- List<String> log = new ArrayList<String>( validator.loadLogLines() );
- for ( Iterator<String> it = log.iterator(); it.hasNext(); ) {
- String line = it.next();
- if ( !line.startsWith( "class jiras.surefire1098." ) ) {
- it.remove();
- }
- }
- return log;
- }
-
- private static int[] extractThreadPoolIds(String logLine)
- {
- //Example to parse "class jiras.surefire1098.DTest pool-2-thread-1" into {2, 1}.
- String t = logLine.split( " " )[2];
- String[] ids = t.split( "-" );
- return new int[]{ Integer.parseInt( ids[1] ), Integer.parseInt( ids[3] )};
- }
-
- private String testLine(String test, int pool, int thread)
- {
- return String.format( "class jiras.surefire1098.%sTest pool-%d-thread-%d", test, pool, thread );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
deleted file mode 100644
index 2f9dca8..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * @author agudian
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1122">SUREFIRE-1122</a>
- */
-public class Surefire1122ParallelAndFlakyTestsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void nonParallelCreatesCorrectReport()
- {
- unpack( "surefire-1122-parallel-and-flakyTests" )
- .executeTest()
- .assertTestSuiteResults( 2, 0, 0, 0, 1 );
- }
-
- @Test
- public void parallelCreatesCorrectReport()
- {
- unpack( "surefire-1122-parallel-and-flakyTests" )
- .activateProfile( "parallel" )
- .executeTest()
- .assertTestSuiteResults( 2, 0, 0, 0, 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1135ImproveIgnoreMessageForTestNGIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1135ImproveIgnoreMessageForTestNGIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1135ImproveIgnoreMessageForTestNGIT.java
deleted file mode 100644
index f7324c9..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1135ImproveIgnoreMessageForTestNGIT.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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 static org.apache.maven.shared.utils.xml.Xpp3DomBuilder.build;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-
-import java.io.FileNotFoundException;
-
-import org.apache.maven.shared.utils.xml.Xpp3Dom;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * Test surefire-report on TestNG test
- *
- * @author <a href="mailto:michal.bocek@gmail.com">Michal Bocek</a>
- */
-public class Surefire1135ImproveIgnoreMessageForTestNGIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- private enum ResultType
- {
- SKIPPED( "skipped" ), FAILURE( "failure" );
-
- private final String type;
-
- ResultType(String type)
- {
- this.type = type;
- }
-
- public String getType() {
- return type;
- }
- }
-
- @Test
- public void testNgReport688() throws Exception {
- testNgReport( "6.8.8", null, ResultType.SKIPPED,
- "Skip test",
- /*"org.testng.SkipException"*/ null,
- /*"SkipExceptionReportTest.java:30"*/ null );
- }
-
- @Test
- public void testNgReport57() throws Exception {
- testNgReport( "5.7", "jdk15", ResultType.SKIPPED,
- "Skip test",
- /*"org.testng.SkipException"*/ null,
- /*"SkipExceptionReportTest.java:30"*/ null );
- }
-
- private void testNgReport( String version, String classifier, ResultType resultType, String message, String type,
- String stackTrace )
- throws Exception
- {
- OutputValidator outputValidator =
- runTest( version, classifier, resultType, "/surefire-1135-improve-ignore-message-for-testng" );
-
- Xpp3Dom[] children = readTests( outputValidator, "testng.SkipExceptionReportTest" );
- assertThat( "Report should contains only one test case", children.length, is( 1 ) );
-
- Xpp3Dom test = children[0];
- assertThat( "Not expected classname", test.getAttribute( "classname" ),
- is( "testng.SkipExceptionReportTest" ) );
-
- assertThat( "Not expected test name", test.getAttribute( "name" ), is( "testSkipException" ) );
-
- children = test.getChildren( resultType.getType() );
- assertThat( "Test should contains only one " + resultType.getType() + " element", children,
- is( arrayWithSize( 1 ) ) );
-
- Xpp3Dom result = children[0];
- if ( message == null )
- {
- assertThat( "Subelement message attribute must be null", result.getAttribute( "message" ),
- is( nullValue() ) );
- }
- else
- {
- assertThat( "Subelement should contains message attribute", result.getAttribute( "message" ),
- is( message ) );
- }
-
- if ( type == null )
- {
- assertThat( "Subelement type attribute must be null", result.getAttribute( "type" ), is( nullValue() ) );
- }
- else
- {
- assertThat( "Subelement should contains type attribute", result.getAttribute( "type" ), is( type ) );
- }
-
- if ( stackTrace == null )
- {
- assertThat( "Element body must be null", result.getValue() , isEmptyOrNullString() );
- }
- else
- {
- assertThat( "Element body must contains", result.getValue(), containsString( stackTrace ) );
- }
- }
-
- private OutputValidator runTest( String version, String classifier, ResultType resultType, String resource )
- {
- int skipped = ResultType.SKIPPED.equals( resultType ) ? 1 : 0;
- int failure = ResultType.FAILURE.equals( resultType ) ? 1 : 0;
-
- SurefireLauncher launcher = unpack( resource ).sysProp( "testNgVersion", version );
-
- if ( classifier != null )
- {
- launcher.sysProp( "testNgClassifier", classifier );
- }
-
- return launcher.addSurefireReportGoal()
- .executeCurrentGoals()
- .assertTestSuiteResults( 1, 0, failure, skipped );
- }
-
- private static Xpp3Dom[] readTests( OutputValidator validator, String className )
- throws FileNotFoundException
- {
- Xpp3Dom testResult =
- build( validator.getSurefireReportsXmlFile( "TEST-" + className + ".xml" ).getFileInputStream(),
- "UTF-8"
- );
- return testResult.getChildren( "testcase" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java
deleted file mode 100644
index 8aaecea..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1136CwdPropagationInForkedModeIT.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-1136 Correct current working directory propagation in forked mode
- *
- * Note: variables expansion behaves differently on MVN 2.x since not existing variables
- * are resolved to 'null' value so that ${surefire.forkNumber} cannot work.
- *
- * @author Norbert Wnuk
- */
-public class Surefire1136CwdPropagationInForkedModeIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testTestNgAndJUnitTogether()
- {
- OutputValidator outputValidator = unpack( "surefire-1136-cwd-propagation-in-forked-mode" ).executeTest();
- outputValidator.assertTestSuiteResults( 1, 0, 0, 0 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1144XmlRunTimeIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1144XmlRunTimeIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1144XmlRunTimeIT.java
deleted file mode 100644
index d81d7c2..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1144XmlRunTimeIT.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.plugins.surefire.report.ReportTestSuite;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-
-import java.util.List;
-
-import static org.apache.maven.surefire.its.fixture.HelperAssertions.extractReports;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-
-/**
- * Test that runtime reported on console matches runtime in XML
- *
- * @author <a href="mailto:eloussi2@illinois.edu">Lamyaa Eloussi</a>
- */
-public class Surefire1144XmlRunTimeIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testXmlRunTime()
- throws Exception
- {
- OutputValidator outputValidator = unpack( "/surefire-1144-xml-runtime" ).forkOnce().executeTest();
-
- List<ReportTestSuite> reports = extractReports( outputValidator.getBaseDir() );
- assertThat( reports, hasSize( 1 ) );
-
- ReportTestSuite report = reports.get( 0 );
- float xmlTime = report.getTimeElapsed();
-
- assertThat( xmlTime, is(greaterThanOrEqualTo( 1.6f ) ) ); //include beforeClass and afterClass
- outputValidator.verifyTextInLog( Float.toString( xmlTime ) ); //same time in console
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
deleted file mode 100644
index f78c16a..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1146">SUREFIRE-1146</a>
- */
-public class Surefire1146RerunFailedAndParameterized
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void testsAreRerun()
- {
- OutputValidator outputValidator = unpack( "surefire-1146-rerunFailingTests-with-Parameterized" ).executeTest();
- verify(outputValidator, 8, 0, 0, 0, 5);
- }
-
- private void verify( OutputValidator outputValidator, int run, int failures, int errors, int skipped, int flakes )
- {
- outputValidator.verifyTextInLog( "Flakes:" );
- outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionParameterizedTest.flakyTest[0: (Test11); Test12; Test13;](jiras.surefire1146.CustomDescriptionParameterizedTest)" );
- outputValidator.verifyTextInLog( "Run 1: CustomDescriptionParameterizedTest.flakyTest:" );
- outputValidator.verifyTextInLog( "Run 2: CustomDescriptionParameterizedTest.flakyTest:" );
- outputValidator.verifyTextInLog( "Run 3: PASS" );
-
- outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest.flakyTest[0: (Test11), Test12, Test13;](jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest)" );
- outputValidator.verifyTextInLog( "Run 1: CustomDescriptionWithCommaParameterizedTest.flakyTest:" );
- outputValidator.verifyTextInLog( "Run 2: CustomDescriptionWithCommaParameterizedTest.flakyTest:" );
- outputValidator.verifyTextInLog( "Run 3: PASS" );
-
- outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest.flakyTest[2: (Test31), Test32, Test33;](jiras.surefire1146.CustomDescriptionWithCommaParameterizedTest)" );
- outputValidator.verifyTextInLog( "Run 1: CustomDescriptionWithCommaParameterizedTest.flakyTest:" );
- outputValidator.verifyTextInLog( "Run 2: PASS" );
-
- outputValidator.verifyTextInLog( "jiras.surefire1146.SimpleParameterizedTest.flakyTest[0](jiras.surefire1146.SimpleParameterizedTest)" );
- outputValidator.verifyTextInLog( "Run 1: SimpleParameterizedTest.flakyTest:" );
- outputValidator.verifyTextInLog( "Run 2: SimpleParameterizedTest.flakyTest:" );
- outputValidator.verifyTextInLog( "Run 3: PASS" );
-
- outputValidator.verifyTextInLog( "jiras.surefire1146.StandardTest.flakyTest(jiras.surefire1146.StandardTest)" );
- outputValidator.verifyTextInLog( "Run 1: StandardTest.flakyTest:" );
- outputValidator.verifyTextInLog( "Run 2: PASS" );
-
- verifyStatistics( outputValidator, run, failures, errors, skipped, flakes );
- }
-
- private void verifyStatistics( OutputValidator outputValidator, int run, int failures, int errors, int skipped,
- int flakes )
- {
- outputValidator.verifyTextInLog( "Tests run: " + run + ", Failures: " + failures + ", Errors: " + errors
- + ", Skipped: " + skipped + ", Flakes: " + flakes );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java
deleted file mode 100644
index 58e951a..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1152RerunFailingTestsInSuiteIT.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * SUREFIRE-1152 Assert rerunFailingTestsCount works with test suites
- *
- * @author Sean Flanigan
- */
-public class Surefire1152RerunFailingTestsInSuiteIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private static final String RUNNING_WITH_PROVIDER47 =
- "Using configured provider org.apache.maven.surefire.junitcore.JUnitCoreProvider";
-
- public OutputValidator runMethodPattern( String projectName, String... goals )
- {
- SurefireLauncher launcher = unpack( projectName );
- for ( String goal : goals )
- {
- launcher.addGoal( goal );
- }
- OutputValidator outputValidator = launcher.showErrorStackTraces().debugLogging().executeVerify();
- outputValidator.assertTestSuiteResults( 3, 0, 0, 0, 3 );
- outputValidator.assertIntegrationTestSuiteResults( 1, 0, 0, 0 );
- return outputValidator;
- }
-
- @Test
- public void testJUnit48Provider4()
- {
- runMethodPattern( "surefire-1152-rerunFailingTestsCount-suite", "-P surefire-junit4" );
- }
-
- @Test
- public void testJUnit48Provider47()
- {
- runMethodPattern( "surefire-1152-rerunFailingTestsCount-suite", "-P surefire-junit47" )
- .verifyTextInLog( RUNNING_WITH_PROVIDER47 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
deleted file mode 100644
index 3a2c826..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-/*
- * 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 Surefire1153IncludesAndSpecifiedTestIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void testSpecifiedTestInIncludes()
- {
- unpack( "/surefire-1153-includesAndSpecifiedTest" )
- .setTestToRun( "#testIncluded" )
- .executeTest()
- .verifyErrorFree( 1 );
- }
-
- @Test
- public void testSpecifiedTestNotInIncludes()
- {
- unpack( "/surefire-1153-includesAndSpecifiedTest" )
- .setTestToRun( "#testNotIncluded" )
- .executeTest()
- .verifyErrorFree( 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
deleted file mode 100644
index 706f6b5..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-/*
- * 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.SurefireVerifierException;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.ArrayList;
-
-import static org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase.unpack;
-import static org.junit.runners.Parameterized.*;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1158">SUREFIRE-1158</a>
- * @since 2.19
- */
-@RunWith( Parameterized.class )
-public class Surefire1158RemoveInfoLinesIT
-{
-
- @Parameters(name = "{0}")
- public static Iterable<Object[]> data()
- {
- ArrayList<Object[]> args = new ArrayList<Object[]>();
- args.add( new Object[] { "junit-option-ff", "JUnitTest", "-ff", "surefire-junit47", false, true } );
- args.add( new Object[] { "testng-option-ff", "TestNGSuiteTest", "-ff", "surefire-testng", false, false } );
- args.add( new Object[] { "junit-option-X", "JUnitTest", "-X", "surefire-junit47", true, true } );
- args.add( new Object[] { "testng-option-X", "TestNGSuiteTest", "-X", "surefire-testng", true, false } );
- args.add( new Object[] { "junit-option-e", "JUnitTest", "-e", "surefire-junit47", true, true } );
- args.add( new Object[] { "testng-option-e", "TestNGSuiteTest", "-e", "surefire-testng", true, false } );
- return args;
- }
-
- @Parameter(0)
- public String description;
-
- @Parameter(1)
- public String testToRun;
-
- @Parameter(2)
- public String cliOption;
-
- @Parameter(3)
- public String provider;
-
- @Parameter(4)
- public boolean printsInfoLines;
-
- @Parameter(5)
- public boolean isJUnit;
-
- @Test
- public void shouldRunWithCliOption()
- throws Exception
- {
- OutputValidator validator = assertTest();
- if ( isJUnit )
- {
- assertJUnitTestLogs( validator );
- }
- else
- {
- assertTestNGTestLogs( validator );
- }
- }
-
- private OutputValidator assertTest()
- throws Exception
- {
- final String[] cli = {"--batch-mode"};
- return unpack( getClass(), "/surefire-1158-remove-info-lines", "_" + description, cli )
- .sysProp( "provider", provider ).addGoal( cliOption ).setTestToRun( testToRun )
- .executeTest()
- .verifyErrorFreeLog().assertTestSuiteResults( 1, 0, 0, 0 );
- }
-
- private void assertJUnitTestLogs( OutputValidator validator )
- {
- try
- {
- validator.verifyTextInLog( "Surefire report directory:" );
- validator.verifyTextInLog( "Using configured provider org.apache.maven.surefire.junitcore.JUnitCoreProvider" );
- validator.verifyTextInLog( "parallel='none', perCoreThreadCount=true, threadCount=0, "
- + "useUnlimitedThreads=false, threadCountSuites=0, threadCountClasses=0, "
- + "threadCountMethods=0, parallelOptimized=true" );
- if ( !printsInfoLines )
- {
- fail();
- }
- }
- catch ( SurefireVerifierException e )
- {
- if ( printsInfoLines )
- {
- fail();
- }
- }
- }
-
- private void assertTestNGTestLogs( OutputValidator validator )
- {
- try
- {
- validator.verifyTextInLog( "Surefire report directory:" );
- validator.verifyTextInLog( "Using configured provider org.apache.maven.surefire.testng.TestNGProvider" );
- validator.verifyTextInLog( "Configuring TestNG with: TestNGMapConfigurator" );
- if ( !printsInfoLines )
- {
- fail();
- }
- }
- catch ( SurefireVerifierException e )
- {
- if ( printsInfoLines )
- {
- fail();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java
deleted file mode 100644
index 8c2c213..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1177TestngParallelSuitesIT.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.startsWith;
-
-/**
- * IT for https://issues.apache.org/jira/browse/SUREFIRE-1177
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19
- */
-public class Surefire1177TestngParallelSuitesIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void shouldRunTwoSuitesInParallel()
- throws VerificationException
- {
- assumeJavaVersion( 1.7d );
-
- unpack().executeTest()
- .verifyErrorFree( 2 )
- .assertThatLogLine( containsString( "ShouldNotRunTest#shouldNotRun()" ), is( 0 ) )
- .assertThatLogLine( startsWith( "TestNGSuiteTest#shouldRunAndPrintItself()" ), is( 2 ) )
- .assertThatLogLine( is( "TestNGSuiteTest#shouldRunAndPrintItself() 1." ), is( 1 ) )
- .assertThatLogLine( is( "TestNGSuiteTest#shouldRunAndPrintItself() 2." ), is( 1 ) );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "testng-parallel-suites" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1179IT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1179IT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1179IT.java
deleted file mode 100644
index e4e8e31..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1179IT.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * Fix for TestNG parameter -dataproviderthreadcount.
- */
-public class Surefire1179IT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void suiteXmlForkCountTwoReuse()
- {
- unpack().executeTest().verifyErrorFreeLog().verifyTextInLog( " CONCURRENCY=30." );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-1179-testng-parallel-dataprovider" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
deleted file mode 100644
index 74a4e46..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1185DoNotSpawnTestsIT.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
-
-/**
- * Surefire 2.19 spawns unnecessary tests in surefire-junit4 provider.
- * https://issues.apache.org/jira/browse/SUREFIRE-1185
- * Example, UnlistedTest is the problem here because it runs with filtered out methods:
- *
- * Running pkg.UnlistedTest
- * Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in pkg.UnlistedTest
- * Running pkg.RunningTest
- * Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in pkg.RunningTest
- *
- * Results:
- *
- * Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
- */
-public class Surefire1185DoNotSpawnTestsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void doNotSpawnUnwantedTests()
- throws VerificationException
- {
- unpack().setTestToRun( "RunningTest#test" )
- .executeTest()
- .assertTestSuiteResults( 1 )
- .assertThatLogLine( containsString( "in pkg.RunningTest" ), is( 1 ) )
- .assertThatLogLine( containsString( "in pkg.UnlistedTest" ), is( 0 ) );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-1185" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
deleted file mode 100644
index f886446..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * Allow rerunFailingTestsCount, skipAfterFailureCount together
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1202">SUREFIRE-1202</a>
- * @since 2.19.1
- */
-public class Surefire1202RerunAndSkipIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void junit47()
- throws VerificationException
- {
- unpack().executeTest()
- .assertTestSuiteResults( 5, 0, 0, 3, 4 );
- }
-
- @Test
- public void junit4()
- throws VerificationException
- {
- unpack().addGoal( "-Pjunit4" )
- .executeTest()
- .assertTestSuiteResults( 5, 0, 0, 3, 4 );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-1202-rerun-and-failfast" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
deleted file mode 100644
index 6ee87fb..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1209">SUREFIRE-1209</a>
- * @since 2.19
- */
-public class Surefire1209RerunAndForkCountIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void reusableForksJUnit47()
- throws VerificationException
- {
- unpack().executeTest()
- .assertTestSuiteResults( 5, 0, 0, 0, 4 );
- }
-
- @Test
- public void notReusableForksJUnit47()
- throws VerificationException
- {
- unpack().reuseForks( false )
- .executeTest()
- .assertTestSuiteResults( 5, 0, 0, 0, 4 );
- }
-
- @Test
- public void reusableForksJUnit4()
- throws VerificationException
- {
- unpack().addGoal( "-Pjunit4" )
- .executeTest()
- .assertTestSuiteResults( 5, 0, 0, 0, 4 );
- }
-
- @Test
- public void notReusableForksJUnit4()
- throws VerificationException
- {
- unpack().addGoal( "-Pjunit4" )
- .reuseForks( false )
- .executeTest()
- .assertTestSuiteResults( 5, 0, 0, 0, 4 );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-1209-rerun-and-forkcount" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
deleted file mode 100644
index 53cd764..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1211">SUREFIRE-1211</a>
- * @since 2.19.1
- */
-public class Surefire1211JUnitTestNgIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void withJUnit()
- {
- assumeJavaVersion( 1.7d );
-
- unpack().threadCount( 1 )
- .executeTest()
- .verifyErrorFree( 2 );
- }
-
- @Test
- public void withoutJUnit()
- {
- assumeJavaVersion( 1.7d );
-
- unpack().threadCount( 1 )
- .sysProp( "junit", "false" )
- .executeTest()
- .verifyErrorFree( 1 );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "surefire-1211" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java
deleted file mode 100644
index c4031c2..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.*;
-import org.junit.Test;
-
-/**
- * Added included pattern Tests.java.
- * <p>
- * Found in Surefire 2.19.1.
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1260">SUREFIRE-1260</a>
- * @since 2.20
- */
-public class Surefire1260NewTestsPattern
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void defaultConfig()
- {
- unpack()
- .executeTest()
- .verifyErrorFree( 5 );
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "/surefire-1260-new-tests-pattern" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java
deleted file mode 100644
index bd9af17..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1264IT.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1264">SUREFIRE-1264</a>
- * @since 2.20.1
- */
-public class Surefire1264IT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void positiveTests()
- {
- unpack( "surefire-1264" )
- .setForkJvm()
- .parallelAll()
- .useUnlimitedThreads()
- .sysProp( "canFail", "false" )
- .executeTest()
- .assertTestSuiteResults( 16, 0, 0, 0 );
- }
-
- @Test
- public void negativeTests()
- {
- unpack( "surefire-1264" )
- .setForkJvm()
- .parallelAll()
- .useUnlimitedThreads()
- .sysProp( "canFail", "true" )
- .mavenTestFailureIgnore( true )
- .executeTest()
- .assertTestSuiteResults( 16, 0, 16, 0 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
deleted file mode 100644
index 2e92805..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.AbstractJigsawIT;
-import org.junit.Test;
-
-import java.io.IOException;
-
-@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } )
-/**
- * IsolatedClassLoader should take platform ClassLoader as a parent ClassLoader if running on the top of JDK9.
- * The IsolatedClassLoader should not fail like this:
- *
- * [ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test (default-test) on project
- * maven-surefire-plugin-example: Execution default-test of goal
- * org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test failed:
- * java.lang.NoClassDefFoundError: java/sql/SQLException: java.sql.SQLException -> [Help 1]
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1265">SUREFIRE-1265</a>
- * @since 2.20.1
- */
-public class Surefire1265Java9IT
- extends AbstractJigsawIT
-{
- @Test
- public void shouldRunInPluginJava9() throws IOException
- {
- assumeJigsaw()
- .executeTest()
- .verifyErrorFree( 2 );
- }
-
- @Override
- protected String getProjectDirectoryName()
- {
- return "/surefire-1265";
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1278GroupNameEndingIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1278GroupNameEndingIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1278GroupNameEndingIT.java
deleted file mode 100644
index c0b0339..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1278GroupNameEndingIT.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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 the group filter for TestNG
- *
- */
-public class Surefire1278GroupNameEndingIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testOnlyGroups()
- {
- unpack().setGroups( "group" ).executeTest().verifyErrorFree( 1 );
- }
-
- public SurefireLauncher unpack()
- {
- return unpack( "/surefire-1278-group-name-ending" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
deleted file mode 100644
index 3ca758a..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1295AttributeJvmCrashesToTestsIT.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Iterator;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX;
-import static org.apache.commons.lang3.SystemUtils.IS_OS_MAC_OSX;
-import static org.fest.assertions.Assertions.assertThat;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-
-/**
- * https://issues.apache.org/jira/browse/SUREFIRE-1295
- * https://github.com/apache/maven-surefire/pull/136
- *
- * @author michaeltandy
- * @since 2.20
- */
-public class Surefire1295AttributeJvmCrashesToTestsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Before
- public void skipWindows()
- {
- assumeTrue( IS_OS_LINUX || IS_OS_MAC_OSX );
- }
-
- @Test
- public void crashInFork() throws VerificationException, InterruptedException
- {
- SurefireLauncher launcher = unpack( "crash-during-test" );
-
- checkCrashTypes( launcher );
- }
-
- @Test
- public void crashInSingleUseFork() throws VerificationException, InterruptedException
- {
- SurefireLauncher launcher = unpack( "crash-during-test" )
- .forkCount( 1 )
- .reuseForks( false );
-
- checkCrashTypes( launcher );
- }
-
- @Test
- public void crashInReusableFork() throws VerificationException, InterruptedException
- {
- SurefireLauncher launcher = unpack( "crash-during-test" )
- .forkPerThread()
- .reuseForks( true )
- .threadCount( 1 );
-
- checkCrashTypes( launcher );
- }
-
- private static void checkCrashTypes( SurefireLauncher launcher )
- throws VerificationException, InterruptedException
- {
- checkCrash( launcher.addGoal( "-DcrashType=exit" ) );
- checkCrash( launcher.addGoal( "-DcrashType=abort" ) );
- checkCrash( launcher.addGoal( "-DcrashType=segfault" ) );
- }
-
- private static void checkCrash( SurefireLauncher launcher ) throws VerificationException, InterruptedException
- {
- OutputValidator validator = launcher.maven()
- .withFailure()
- .executeTest()
- .verifyTextInLog( "The forked VM terminated without properly saying "
- + "goodbye. VM crash or System.exit called?"
- )
- .verifyTextInLog( "Crashed tests:" );
-
- // Cannot flush log.txt stream because it is consumed internally by Verifier.
- // Waiting for the stream to become flushed on disk.
- TimeUnit.SECONDS.sleep( 1L );
-
- for ( Iterator<String> it = validator.loadLogLines().iterator(); it.hasNext(); )
- {
- String line = it.next();
- if ( line.contains( "Crashed tests:" ) )
- {
- line = it.next();
- if ( it.hasNext() )
- {
- assertThat( line ).contains( "junit44.environment.BasicTest" );
- }
- else
- {
- fail( "Could not find any line after 'Crashed tests:'." );
- }
- }
- }
-
- }
-
-
-}
[10/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java b/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java
new file mode 100644
index 0000000..d206283
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test1.java
@@ -0,0 +1,60 @@
+package junit4.forkMode;
+
+/*
+ * 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.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+
+import org.junit.Test;
+
+public class Test1
+{
+
+ @Test
+ public void test1()
+ throws IOException
+ {
+ dumpPidFile( "test1" );
+ }
+
+ public static void dumpPidFile( String name )
+ throws IOException
+ {
+ String fileName = name + "-pid";
+ File target = new File( "target" );
+ if ( !( target.exists() && target.isDirectory() ) )
+ {
+ target = new File( "." );
+ }
+ File pidFile = new File( target, fileName );
+ FileWriter fw = new FileWriter( pidFile );
+ // DGF little known trick... this is guaranteed to be unique to the PID
+ // In fact, it usually contains the pid and the local host name!
+ String pid = ManagementFactory.getRuntimeMXBean().getName();
+ fw.write( pid );
+ fw.flush();
+ fw.close();
+
+ System.out.println( "pid = " + pid );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java b/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java
new file mode 100644
index 0000000..f57f1b8
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test2.java
@@ -0,0 +1,36 @@
+package junit4.forkMode;
+
+/*
+ * 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.io.IOException;
+
+import org.junit.Test;
+
+public class Test2
+{
+
+ @Test
+ public void test2()
+ throws IOException
+ {
+ Test1.dumpPidFile( "test2" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java b/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java
new file mode 100644
index 0000000..af7f6fd
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-fork-mode-always/src/test/java/junit4/forkMode/Test3.java
@@ -0,0 +1,36 @@
+package junit4.forkMode;
+
+/*
+ * 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.io.IOException;
+
+import org.junit.Test;
+
+public class Test3
+{
+
+ @Test
+ public void test3()
+ throws IOException
+ {
+ Test1.dumpPidFile( "test3" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-ignore/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-ignore/pom.xml b/surefire-its/src/test/resources/junit-ignore/pom.xml
new file mode 100644
index 0000000..d9c3817
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-ignore/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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit-ignore</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test of @Ignore annotation</name>
+
+ <properties>
+ <junit.version>4.4</junit.version>
+ <surefire.parallel></surefire.parallel>
+ <surefire.threadcount>3</surefire.threadcount>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <parallel>${surefire.parallel}</parallel>
+ <perCoreThreadCount>false</perCoreThreadCount>
+ <threadCount>${surefire.threadcount}</threadCount>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java b/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
new file mode 100644
index 0000000..66e858e
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
@@ -0,0 +1,37 @@
+package junit.ignore;
+
+/*
+ * 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.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore( "ignore this test" )
+public class ClassAndMethodIgnoreNothingToRunTest
+{
+
+ @Ignore( "ignore this test" )
+ @Test
+ public void testIgnorable()
+ {
+ Assert.fail( "you should have ignored me!" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java b/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
new file mode 100644
index 0000000..7012f87
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
@@ -0,0 +1,36 @@
+package junit.ignore;
+
+/*
+ * 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.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore( "ignore this test" )
+public class ClassLevelIgnore1WithMethodThatIsNormalTest
+{
+
+ @Test
+ public void testIgnorable()
+ {
+ Assert.fail( "you should have ignored me!" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2WithMethodThatIsNormalTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2WithMethodThatIsNormalTest.java b/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2WithMethodThatIsNormalTest.java
new file mode 100644
index 0000000..ee64317
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2WithMethodThatIsNormalTest.java
@@ -0,0 +1,36 @@
+package junit.ignore;
+
+/*
+ * 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.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore( "ignore this test" )
+public class ClassLevelIgnore2WithMethodThatIsNormalTest
+{
+
+ @Test
+ public void testIgnorable()
+ {
+ Assert.fail( "you should have ignored me!" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/NormalClassWithThreeIgnoredMethodsAnd1AssumptionFailureTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/NormalClassWithThreeIgnoredMethodsAnd1AssumptionFailureTest.java b/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/NormalClassWithThreeIgnoredMethodsAnd1AssumptionFailureTest.java
new file mode 100644
index 0000000..cc50d1d
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-ignore/src/test/java/junit/ignore/NormalClassWithThreeIgnoredMethodsAnd1AssumptionFailureTest.java
@@ -0,0 +1,57 @@
+package junit.ignore;
+
+/*
+ * 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.Assume;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class NormalClassWithThreeIgnoredMethodsAnd1AssumptionFailureTest
+{
+
+ @Ignore
+ @Test
+ public void testWithIgnore1()
+ {
+ }
+
+ @Ignore("Ignorance is bliss2")
+ @Test
+ public void testWithIgnore2()
+ {
+ }
+
+ @Ignore("Ignorance \"is\' <>bliss2")
+ @Test
+ public void testWithQuotesInIgnore()
+ {
+ }
+
+ @Test
+ public void testWithAssumptionFailure()
+ {
+ Assume.assumeNotNull( new Object[]{ null} );
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-innerClass/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-innerClass/pom.xml b/surefire-its/src/test/resources/junit-innerClass/pom.xml
new file mode 100644
index 0000000..fb1ffd6
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-innerClass/pom.xml
@@ -0,0 +1,55 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit-innerClass</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test JUnit classes with inner classes</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java b/surefire-its/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java
new file mode 100644
index 0000000..81be27e
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java
@@ -0,0 +1,39 @@
+package junit.innerClass;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class BasicTest
+ extends TestCase
+{
+
+ public void testFoo()
+ {
+ new Foo( "x", "y" );
+ }
+
+ public class Foo
+ {
+ public Foo( String x, String y )
+ {
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-notExtendingTestCase/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-notExtendingTestCase/pom.xml b/surefire-its/src/test/resources/junit-notExtendingTestCase/pom.xml
new file mode 100644
index 0000000..8a95201
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-notExtendingTestCase/pom.xml
@@ -0,0 +1,55 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit-notExtendingTestCase</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit tests that don't extend TestCase</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/SuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/SuiteTest.java b/surefire-its/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/SuiteTest.java
new file mode 100644
index 0000000..69fa59a
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/SuiteTest.java
@@ -0,0 +1,49 @@
+package junit.notExtendingTestCase;
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+
+public class SuiteTest
+ extends TestSuite
+{
+ public static Test suite() {
+ SuiteTest suite = new SuiteTest();
+ suite.addTest( new Test() {
+
+ public int countTestCases()
+ {
+ return 1;
+ }
+
+ public void run( TestResult result )
+ {
+ result.startTest( this );
+ result.endTest( this );
+
+ }
+
+ } );
+ return suite;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/TestHelper.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/TestHelper.java b/surefire-its/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/TestHelper.java
new file mode 100644
index 0000000..1065dca
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/TestHelper.java
@@ -0,0 +1,24 @@
+package junit.notExtendingTestCase;
+
+/*
+ * 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.
+ */
+
+public class TestHelper {
+ public TestHelper(String two, String arguments) {}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml b/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml
new file mode 100644
index 0000000..890839e
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-pathWithUmlaut/pom.xml
@@ -0,0 +1,55 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit-path-with-umlaut</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test path with Ãœmlaut</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java b/surefire-its/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java
new file mode 100644
index 0000000..0c27bb5
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java
@@ -0,0 +1,87 @@
+package umlautTest;
+
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public BasicTest( String name, String extraName )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ Test test = new BasicTest( "testSetUp", "dummy" );
+ suite.addTest( test );
+
+ return new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-twoTestCaseSuite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-twoTestCaseSuite/pom.xml b/surefire-its/src/test/resources/junit-twoTestCaseSuite/pom.xml
new file mode 100644
index 0000000..f2075ae
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-twoTestCaseSuite/pom.xml
@@ -0,0 +1,59 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit-twoTestCaseSuite</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for single suite with two test cases</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <includes>
+ <include>**/WrapperTestSuite.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java b/surefire-its/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java
new file mode 100644
index 0000000..bc0d2c7
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java
@@ -0,0 +1,86 @@
+package junit.twoTestCaseSuite;
+
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public BasicTest( String name, String extraName )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ Test test = new BasicTest( "testSetUp", "dummy" );
+ suite.addTest( test );
+
+ return new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/TestTwo.java b/surefire-its/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/TestTwo.java
new file mode 100644
index 0000000..f403819
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/TestTwo.java
@@ -0,0 +1,29 @@
+package junit.twoTestCaseSuite;
+
+/*
+ * 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 junit.framework.TestCase;
+
+
+public class TestTwo
+ extends TestCase
+{
+ public void testTwo() {}
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/WrapperTestSuite.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/WrapperTestSuite.java b/surefire-its/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/WrapperTestSuite.java
new file mode 100644
index 0000000..9bd71b5
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/WrapperTestSuite.java
@@ -0,0 +1,40 @@
+package junit.twoTestCaseSuite;
+
+
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class WrapperTestSuite
+ extends TestSuite
+{
+ public WrapperTestSuite( String name )
+ {
+ super( name );
+ }
+
+ public static Test suite() {
+ WrapperTestSuite suite = new WrapperTestSuite( "My Acceptance Test Suite" );
+ suite.addTestSuite( TestTwo.class );
+ suite.addTest( BasicTest.suite() );
+ return suite;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-twoTestCases/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-twoTestCases/pom.xml b/surefire-its/src/test/resources/junit-twoTestCases/pom.xml
new file mode 100644
index 0000000..89684ad
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-twoTestCases/pom.xml
@@ -0,0 +1,55 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit-twoTestCases</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for two test cases</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java b/surefire-its/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java
new file mode 100644
index 0000000..2efc5ed
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java
@@ -0,0 +1,86 @@
+package junit.twoTestCases;
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public BasicTest( String name )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ Test test = new BasicTest( "testSetUp" );
+ suite.addTest( test );
+
+ return new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/TestTwo.java b/surefire-its/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/TestTwo.java
new file mode 100644
index 0000000..9af4558
--- /dev/null
+++ b/surefire-its/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/TestTwo.java
@@ -0,0 +1,29 @@
+package junit.twoTestCases;
+
+/*
+ * 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 junit.framework.TestCase;
+
+
+public class TestTwo
+ extends TestCase
+{
+ public void testTwo() {}
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-forkAlways-staticInit/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-forkAlways-staticInit/pom.xml b/surefire-its/src/test/resources/junit4-forkAlways-staticInit/pom.xml
new file mode 100644
index 0000000..4bfc081
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-forkAlways-staticInit/pom.xml
@@ -0,0 +1,38 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.surefire.test</groupId>
+ <artifactId>junit4-forkAlways-staticInit</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>JUnit4 ForkAlways StaticInit Pollution</name>
+ <description>
+ Test that static initializers on classes other than the one being executed in the current test-set will not be run, and cannot pollute the environment.
+ </description>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>always</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java b/surefire-its/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java
new file mode 100644
index 0000000..90f56d4
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java
@@ -0,0 +1,50 @@
+package junit4;
+
+/*
+ * 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.Properties;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit test for simple App.
+ */
+public class App2Test
+ extends TestCase
+{
+
+ static
+ {
+ System.out.println( "Loading " + App2Test.class.getName() );
+
+ Properties p = System.getProperties();
+ p.setProperty( "Foo", "Bar2" );
+ System.setProperties( p );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ System.out.println( "Expecting: Bar2\nGot: " + System.getProperty( "Foo" ) );
+ assertEquals( "Expecting: Bar2\nGot: " + System.getProperty( "Foo" ), "Bar2", System.getProperty( "Foo" ) );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java b/surefire-its/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java
new file mode 100644
index 0000000..4b2b0d7
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java
@@ -0,0 +1,50 @@
+package junit4;
+
+/*
+ * 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.Properties;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+
+ static
+ {
+ System.out.println( "Loading " + AppTest.class.getName() );
+
+ Properties p = System.getProperties();
+ p.setProperty( "Foo", "Bar" );
+ System.setProperties( p );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ System.out.println( "Expecting: Bar\nGot: " + System.getProperty( "Foo" ) );
+ assertEquals( "Expecting: Bar\nGot: " + System.getProperty( "Foo" ), "Bar", System.getProperty( "Foo" ) );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-rerun-failing-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-rerun-failing-tests/pom.xml b/surefire-its/src/test/resources/junit4-rerun-failing-tests/pom.xml
new file mode 100644
index 0000000..9456a29
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-rerun-failing-tests/pom.xml
@@ -0,0 +1,55 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4-rerun-failing-tests</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for rerun failing tests in JUnit 4</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/FlakyFirstTimeTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/FlakyFirstTimeTest.java b/surefire-its/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/FlakyFirstTimeTest.java
new file mode 100644
index 0000000..264462c
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/FlakyFirstTimeTest.java
@@ -0,0 +1,62 @@
+package junit4;
+
+/*
+ * 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.Assert;
+import org.junit.Test;
+
+
+public class FlakyFirstTimeTest
+{
+ private static int failingCount = 0;
+
+ private static int errorCount = 0;
+
+
+ @Test
+ public void testFailingTestOne()
+ {
+ System.out.println( "Failing test" );
+ // This test will fail with only one retry, but will pass with two
+ if ( failingCount < 2 )
+ {
+ failingCount++;
+ Assert.fail( "Failing test" );
+ }
+ }
+
+ @Test
+ public void testErrorTestOne() throws Exception
+ {
+ System.out.println( "Error test" );
+ // This test will error out with only one retry, but will pass with two
+ if ( errorCount < 2 )
+ {
+ errorCount++;
+ throw new IllegalArgumentException("...");
+ }
+ }
+
+ @Test
+ public void testPassingTest() throws Exception
+ {
+ System.out.println( "Passing test" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/PassingTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/PassingTest.java b/surefire-its/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/PassingTest.java
new file mode 100644
index 0000000..7cb0b57
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/PassingTest.java
@@ -0,0 +1,39 @@
+package junit4;
+
+/*
+ * 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.Assert;
+import org.junit.Test;
+
+
+public class PassingTest
+{
+ @Test
+ public void testPassingTestOne()
+ {
+ System.out.println( "Passing test one" );
+ }
+
+ @Test
+ public void testPassingTestTwo() throws Exception
+ {
+ System.out.println( "Passing test two" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-runlistener/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-runlistener/pom.xml b/surefire-its/src/test/resources/junit4-runlistener/pom.xml
new file mode 100644
index 0000000..d776533
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-runlistener/pom.xml
@@ -0,0 +1,71 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4-runlistener</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>JUnit4 RunListener test</name>
+
+ <properties>
+ <junitVersion>4.4</junitVersion>
+ <provider>surefire-junit4</provider>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <properties>
+ <property>
+ <name>listener</name>
+ <value>runListener.FileWritingRunListener1,runListener.FileWritingRunListener2,runListener.EchoingRunListener</value>
+ </property>
+ </properties>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>${provider}</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/EchoingRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/EchoingRunListener.java b/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/EchoingRunListener.java
new file mode 100644
index 0000000..305c656
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/EchoingRunListener.java
@@ -0,0 +1,82 @@
+package runListener;
+
+/*
+ * 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.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
+/**
+ * {@link org.junit.runner.notification.RunListener} to generate an output file whose existence can be checked by surefire-integration.
+ *
+ * @author <a href="mailto:matthew.gilliard@gmail.com">Matthew Gilliard</a>
+ */
+public class EchoingRunListener
+ extends RunListener
+{
+
+ @Override
+ public void testRunStarted( Description description )
+ throws Exception
+ {
+ System.out.println("testRunStarted " + description);
+ }
+
+ @Override
+ public void testRunFinished( Result result )
+ throws Exception
+ {
+ System.out.println("testRunFinished " + result);
+ }
+
+ @Override
+ public void testStarted( Description description )
+ throws Exception
+ {
+ System.out.println("testStarted " + description);
+ }
+
+ @Override
+ public void testFinished( Description description )
+ throws Exception
+ {
+ System.out.println("testFinished " + description);
+ }
+
+ @Override
+ public void testFailure( Failure failure )
+ throws Exception
+ {
+ System.out.println("testFailure " + failure);
+ }
+
+ @Override
+ public void testIgnored( Description description )
+ throws Exception
+ {
+ System.out.println("testIgnored " + description);
+ }
+
+ public void testAssumptionFailure( Failure failure )
+ {
+ System.out.println("testAssumptionFailure " + failure);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/FileHelper.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/FileHelper.java b/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/FileHelper.java
new file mode 100644
index 0000000..85d0a5b
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/FileHelper.java
@@ -0,0 +1,44 @@
+package runListener;
+
+/*
+ * 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.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+public class FileHelper
+{
+ public static void writeFile( String fileName, String content )
+ {
+ try
+ {
+ File target = new File( "target" ).getAbsoluteFile();
+ File listenerOutput = new File( target, fileName );
+ FileWriter out = new FileWriter( listenerOutput );
+ out.write( content );
+ out.flush();
+ out.close();
+ }
+ catch ( IOException e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java b/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java
new file mode 100644
index 0000000..24f479d
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java
@@ -0,0 +1,40 @@
+package runListener;
+
+/*
+ * 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.runner.Description;
+import org.junit.runner.notification.RunListener;
+
+/**
+ * {@link RunListener} to generate an output file whose existence can be checked by surefire-integration.
+ *
+ * @author <a href="mailto:matthew.gilliard@gmail.com">Matthew Gilliard</a>
+ */
+public class FileWritingRunListener1
+ extends RunListener
+{
+
+ @Override
+ public void testStarted( Description description )
+ {
+ FileHelper.writeFile( "runlistener-output-1.txt", "This written by RunListener#testStarted()" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java b/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java
new file mode 100644
index 0000000..49c2824
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java
@@ -0,0 +1,40 @@
+package runListener;
+
+/*
+ * 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.runner.Description;
+import org.junit.runner.notification.RunListener;
+
+/**
+ * {@link RunListener} to generate an output file whose existence can be checked by surefire-integration.
+ *
+ * @author <a href="mailto:matthew.gilliard@gmail.com">Matthew Gilliard</a>
+ */
+public class FileWritingRunListener2
+ extends RunListener
+{
+
+ @Override
+ public void testStarted( Description description )
+ {
+ FileHelper.writeFile( "runlistener-output-2.txt", "This written by RunListener#testStarted()" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/JUnit4RunListenerTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/JUnit4RunListenerTest.java b/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/JUnit4RunListenerTest.java
new file mode 100644
index 0000000..12c32ac
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-runlistener/src/test/java/runListener/JUnit4RunListenerTest.java
@@ -0,0 +1,32 @@
+package runListener;
+
+/*
+ * 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.Assert;
+import org.junit.Test;
+
+public class JUnit4RunListenerTest {
+
+ @Test
+ public void simpleTest()
+ {
+ Assert.assertEquals( 2, 1 + 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-twoTestCaseSuite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-twoTestCaseSuite/pom.xml b/surefire-its/src/test/resources/junit4-twoTestCaseSuite/pom.xml
new file mode 100644
index 0000000..867cd09
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-twoTestCaseSuite/pom.xml
@@ -0,0 +1,62 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4-twoTestCaseSuite</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4 suite with two test cases</name>
+
+
+ <properties>
+ <junitVersion>4.4</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <includes>
+ <include>**/Junit4TestSuite.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/BasicTest.java b/surefire-its/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/BasicTest.java
new file mode 100644
index 0000000..a793610
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/BasicTest.java
@@ -0,0 +1,64 @@
+package twoTestCaseSuite;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestSuite.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestSuite.java b/surefire-its/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestSuite.java
new file mode 100644
index 0000000..011c70e
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestSuite.java
@@ -0,0 +1,33 @@
+package twoTestCaseSuite;
+
+/*
+ * 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.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ BasicTest.class,
+ Junit4TestTwo.class
+})
+public class Junit4TestSuite
+{
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestTwo.java b/surefire-its/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestTwo.java
new file mode 100644
index 0000000..849e64b
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestTwo.java
@@ -0,0 +1,27 @@
+package twoTestCaseSuite;
+
+/*
+ * 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.Test;
+
+public class Junit4TestTwo
+{
+ @Test public void secondTest() {}
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4/pom.xml b/surefire-its/src/test/resources/junit4/pom.xml
new file mode 100644
index 0000000..bba9b00
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4/pom.xml
@@ -0,0 +1,55 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4</name>
+
+ <properties>
+ <junitVersion>4.4</junitVersion>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/junit4/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/junit4/src/test/java/junit4/BasicTest.java b/surefire-its/src/test/resources/junit4/src/test/java/junit4/BasicTest.java
new file mode 100644
index 0000000..e9234f2
--- /dev/null
+++ b/surefire-its/src/test/resources/junit4/src/test/java/junit4/BasicTest.java
@@ -0,0 +1,65 @@
+package junit4;
+
+/*
+ * 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.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ @Before
+ public void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ @After
+ public void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ @Test
+ public void testSetUp()
+ {
+ Assert.assertTrue( "setUp was not called", setUpCalled );
+ }
+
+
+ @AfterClass
+ public static void oneTimeTearDown()
+ {
+
+ }
+
+}
[37/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml b/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
deleted file mode 100644
index eb04443..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
+++ /dev/null
@@ -1,59 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit44-environment</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for setting environment variables</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <environmentVariables>
- <DUMMY_ENV_VAR>foo</DUMMY_ENV_VAR>
- </environmentVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java b/surefire-integration-tests/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java
deleted file mode 100644
index ee20aa6..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-environment/src/test/java/junit44/environment/BasicTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package junit44.environment;
-
-/*
- * 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 static org.hamcrest.core.Is.*;
-import static org.hamcrest.core.IsNull.*;
-import org.junit.Assert;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
-
- @Test
- public void testEnvVar()
- {
- Assert.assertThat( System.getenv( "PATH" ), notNullValue() );
- Assert.assertThat( System.getenv( "DUMMY_ENV_VAR" ), is( "foo" ) );
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml b/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
deleted file mode 100644
index 4140b41..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
+++ /dev/null
@@ -1,54 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit44-hamcrest</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit44 with Hamcrest extensions</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-hamcrest/src/test/java/junit44/hamcrest/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-hamcrest/src/test/java/junit44/hamcrest/BasicTest.java b/surefire-integration-tests/src/test/resources/junit44-hamcrest/src/test/java/junit44/hamcrest/BasicTest.java
deleted file mode 100644
index b847675..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-hamcrest/src/test/java/junit44/hamcrest/BasicTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package junit44.hamcrest;
-
-/*
- * 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.hamcrest.core.Is;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- Assert.assertThat( true, Is.is( true ) );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- Assert.assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
deleted file mode 100644
index e9ac59e..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
+++ /dev/null
@@ -1,60 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit 4</name>
-
-
- <properties>
- <junitVersion>4.4</junitVersion>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <test>BasicTest#testSuccess*</test>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index 925d9b5..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package junit4;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml b/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml
deleted file mode 100644
index 9858f4c..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml
+++ /dev/null
@@ -1,68 +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/xsd/maven-4.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>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit 4</name>
-
- <!--
- This is using junit 4.0 provider.
- Same test in junit48-multiple-methods is used with different provider junit 4.7.
- -->
-
- <properties>
- <junitVersion>4.4</junitVersion>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <test>junit4/BasicTest#testSuccessOne+testFailOne,junit4/TestThree#testSuccessTwo</test>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/junit44-multiple-methods/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index 4b31b9e..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package junit4;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testFailOne()
- {
- Assert.assertFalse( false );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestThree.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestThree.java b/surefire-integration-tests/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestThree.java
deleted file mode 100644
index 16bc283..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestThree.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package junit4;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class TestThree
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestTwo.java b/surefire-integration-tests/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestTwo.java
deleted file mode 100644
index 620cf23..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/src/test/java/junit4/TestTwo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package junit4;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class TestTwo
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml b/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
deleted file mode 100644
index c74aee2..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
+++ /dev/null
@@ -1,60 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit 4</name>
-
-
- <properties>
- <junitVersion>4.4</junitVersion>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <test>BasicTest#testSuccessOne</test>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index 027917d..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package junit4;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/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
deleted file mode 100644
index 21bd802..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml
+++ /dev/null
@@ -1,61 +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/xsd/maven-4.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/4d00932a/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
deleted file mode 100644
index 1f11060..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-concurrency/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/4d00932a/surefire-integration-tests/src/test/resources/junit47-cucumber/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-cucumber/pom.xml b/surefire-integration-tests/src/test/resources/junit47-cucumber/pom.xml
deleted file mode 100644
index a57d3c4..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-cucumber/pom.xml
+++ /dev/null
@@ -1,81 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>junit47-cucumber</artifactId>
- <packaging>jar</packaging>
-
- <name>Tests cucumber with JUnit47 provider</name>
-
- <properties>
- <cucumber.version>1.1.3</cucumber.version>
- <junit.version>4.11</junit.version>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkCount>0</forkCount>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>info.cukes</groupId>
- <artifactId>cucumber-java</artifactId>
- <version>${cucumber.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>info.cukes</groupId>
- <artifactId>cucumber-junit</artifactId>
- <version>${cucumber.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/FailingCucumberTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/FailingCucumberTest.java b/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/FailingCucumberTest.java
deleted file mode 100644
index ed86734..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/FailingCucumberTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-
-package org.sample.cucumber;
-
-import org.junit.runner.RunWith;
-
-import cucumber.api.junit.Cucumber;
-
-@RunWith( Cucumber.class )
-@Cucumber.Options( features = { "classpath:failing" } )
-public class FailingCucumberTest
-{
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/StepDefs.java b/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
deleted file mode 100644
index ba25f69..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/StepDefs.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-
-package org.sample.cucumber;
-
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-
-import static org.junit.Assert.fail;
-
-public class StepDefs
-{
- @Given( "^I have some code$" )
- public void I_have_some_code()
- throws Throwable
- {
- // do nothing
- }
-
- @When( "^I run test$" )
- public void I_run_test()
- throws Throwable
- {
- // do nothing
- }
-
- @Then( "^I get no failures$" )
- public void I_get_no_failures()
- throws Throwable
- {
- // do nothing
- }
-
- @Then( "^I get a failure$" )
- public void I_get_a_failure()
- throws Throwable
- {
- fail( "failing the test on purpose." );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/SuccessCucumberTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/SuccessCucumberTest.java b/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/SuccessCucumberTest.java
deleted file mode 100644
index 318f5e6..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/java/org/sample/cucumber/SuccessCucumberTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-
-package org.sample.cucumber;
-
-import org.junit.runner.RunWith;
-
-import cucumber.api.junit.Cucumber;
-
-@RunWith( Cucumber.class )
-@Cucumber.Options( features = { "classpath:success" } )
-public class SuccessCucumberTest
-{
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/resources/failing/Sample.feature
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/resources/failing/Sample.feature b/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/resources/failing/Sample.feature
deleted file mode 100644
index e8ac945..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/resources/failing/Sample.feature
+++ /dev/null
@@ -1,10 +0,0 @@
-Feature: Sample
-
- In order to use Maven
- As a user
- I want to do tests.
-
- Scenario: Do a failing test
- Given I have some code
- When I run test
- Then I get a failure
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/resources/success/Sample.feature
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/resources/success/Sample.feature b/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/resources/success/Sample.feature
deleted file mode 100644
index 26f0d2d..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-cucumber/src/test/resources/success/Sample.feature
+++ /dev/null
@@ -1,10 +0,0 @@
-Feature: Sample
-
- In order to use Maven
- As a user
- I want to do tests.
-
- Scenario: Do a successful test
- Given I have some code
- When I run test
- Then I get no failures
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml b/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml
deleted file mode 100644
index 92a2fb3..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml
+++ /dev/null
@@ -1,64 +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/xsd/maven-4.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-parallel-nts</artifactId>
- <version>1.0</version>
- <name>junit47-parallel-nts</name>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- </dependency>
- <dependency>
- <groupId>com.github.stephenc.jcip</groupId>
- <artifactId>jcip-annotations</artifactId>
- <version>1.0-1</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/ParallelTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/ParallelTest.java b/surefire-integration-tests/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/ParallelTest.java
deleted file mode 100644
index b59c51b..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/ParallelTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package surefireparallelnts;
-
-/*
- * 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.Test;
-
-/**
- * @author Tibor Digana (tibor17)
- * @since 2.19
- */
-public class ParallelTest
-{
- @Test
- public void test()
- throws InterruptedException
- {
- String name = Thread.currentThread().getName();
- System.out.println( "maven-surefire-plugin@NotThreadSafe".equals( name ) ? "wrong-thread" : "expected-thread" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/RunningInSequenceTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/RunningInSequenceTest.java b/surefire-integration-tests/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/RunningInSequenceTest.java
deleted file mode 100644
index 7ec56ed..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/src/test/java/surefireparallelnts/RunningInSequenceTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package surefireparallelnts;
-
-/*
- * 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.Test;
-
-/**
- * @author Tibor Digana (tibor17)
- * @since 2.19
- */
-@net.jcip.annotations.NotThreadSafe
-public class RunningInSequenceTest
-{
- @Test
- public void test()
- throws InterruptedException
- {
- System.out.println( "xxx-" + Thread.currentThread().getName() );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml b/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
deleted file mode 100644
index 5dcbaba..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4-test</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>surefire-747-parallel-method-skips-test</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- </dependency>
- </dependencies>
- <properties>
- <parallel>methods</parallel>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <perCoreThreadCount>false</perCoreThreadCount>
- <threadCount>5</threadCount>
- <includes>
- <include>**/TestSuite.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java b/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java
deleted file mode 100644
index 9ac0b90..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest1.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package surefire747;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class SuiteTest1
-{
- private static final int PERFORMANCE_TEST_MULTIPLICATION_FACTOR = 4;
-
- private static long startedAt;
-
- public SuiteTest1()
- {
- System.out.println( "SuiteTest1.constructor" );
- }
-
- @BeforeClass
- public static void beforeClass()
- {
- startedAt = System.currentTimeMillis();
- }
-
- @AfterClass
- public static void afterClass()
- {
- System.out.println( String.format( "%s test finished after duration=%d", SuiteTest1.class.getSimpleName(),
- System.currentTimeMillis() - startedAt ) );
- }
-
- @Before
- public void setUp()
- {
- System.out.println( "SuiteTest1.setUp" );
- }
-
- @After
- public void tearDown()
- {
- System.out.println( "SuiteTest1.tearDown" );
- }
-
- @Test
- public void first()
- throws InterruptedException
- {
- System.out.println( "begin SuiteTest1.first" );
- Thread.sleep( 500 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR );
- System.out.println( "end SuiteTest1.first" );
- }
-
- @Test
- public void second()
- throws InterruptedException
- {
- System.out.println( "begin SuiteTest1.second" );
- Thread.sleep( 500 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR );
- System.out.println( "end SuiteTest1.second" );
- }
-
- @Test
- public void third()
- throws InterruptedException
- {
- System.out.println( "begin SuiteTest1.third" );
- Thread.sleep( 500 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR );
- System.out.println( "end SuiteTest1.third" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java b/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java
deleted file mode 100644
index 99ad7cd..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/SuiteTest2.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package surefire747;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class SuiteTest2
-{
- private static final int PERFORMANCE_TEST_MULTIPLICATION_FACTOR = 4;
-
- private static long startedAt;
-
- public SuiteTest2()
- {
- System.out.println( "SuiteTest2.constructor" );
- }
-
- @BeforeClass
- public static void beforeClass()
- {
- startedAt = System.currentTimeMillis();
- }
-
- @AfterClass
- public static void afterClass()
- {
- System.out.println( String.format( "%s test finished after duration=%d", SuiteTest2.class.getSimpleName(),
- System.currentTimeMillis() - startedAt ) );
- }
-
- @Before
- public void setUp()
- {
- System.out.println( "SuiteTest2.setUp" );
- }
-
- @After
- public void tearDown()
- {
- System.out.println( "SuiteTest2.tearDown" );
- }
-
- @Test
- public void first()
- throws InterruptedException
- {
- System.out.println( "begin SuiteTest2.first" );
- Thread.sleep( 500 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR );
- System.out.println( "end SuiteTest2.first" );
- }
-
- @Test
- public void second()
- throws InterruptedException
- {
- System.out.println( "begin SuiteTest2.second" );
- Thread.sleep( 500 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR );
- System.out.println( "end SuiteTest2.second" );
- }
-
- @Test
- public void third()
- throws InterruptedException
- {
- System.out.println( "begin SuiteTest2.third" );
- Thread.sleep( 500 * PERFORMANCE_TEST_MULTIPLICATION_FACTOR );
- System.out.println( "end SuiteTest2.third" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java b/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java
deleted file mode 100644
index 4e95481..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/src/test/java/surefire747/TestSuite.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package surefire747;
-
-/*
- * 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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * @author Kristian Rosenvold
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses(
-{
- SuiteTest1.class,
- SuiteTest2.class
-})
-public class TestSuite
-{
- private static long startedAt;
-
- @BeforeClass
- public static void beforeClass()
- {
- startedAt = System.currentTimeMillis();
- }
-
- @AfterClass
- public static void afterClass()
- {
- System.out.println( String.format( "%s suite finished after duration=%d", TestSuite.class.getSimpleName(),
- System.currentTimeMillis() - startedAt ) );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml b/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml
deleted file mode 100644
index e9d6a6c..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml
+++ /dev/null
@@ -1,70 +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/xsd/maven-4.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-parallel</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>junit47-parallel</name>
- <url>http://maven.apache.org</url>
-
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- </dependency>
- </dependencies>
-
- <properties>
- <argLine/>
- <jacoco.agent/>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${argLine} ${jacoco.agent}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite1Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite1Test.java b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite1Test.java
deleted file mode 100644
index 99419fe..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite1Test.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package surefireparallel;
-
-/*
- * 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.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * @author Tibor Digana (tibor17)
- * @since 2.16
- */
-@RunWith( Suite.class )
-@Suite.SuiteClasses(
- {
- Waiting1Test.class,
- Waiting2Test.class,
- Waiting3Test.class,
- Waiting4Test.class
- })
-public class Suite1Test
-{
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite2Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite2Test.java b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite2Test.java
deleted file mode 100644
index 32814ff..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Suite2Test.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package surefireparallel;
-
-/*
- * 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.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * @author Tibor Digana (tibor17)
- * @since 2.16
- */
-@RunWith( Suite.class )
-@Suite.SuiteClasses(
- {
- Waiting5Test.class,
- Waiting6Test.class,
- Waiting7Test.class,
- Waiting8Test.class
- })
-public class Suite2Test
-{
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java
deleted file mode 100644
index 3648443..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/TestClass.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package surefireparallel;
-
-/*
- * 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.Test;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.16
- */
-public class TestClass
-{
- @Test
- public void a()
- throws InterruptedException
- {
- Thread.sleep( 5000L );
- }
-
- @Test
- public void b()
- throws InterruptedException
- {
- Thread.sleep( 5000L );
- }
-
- @Test
- public void c()
- throws InterruptedException
- {
- Thread.sleep( 5000L );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting1Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting1Test.java b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting1Test.java
deleted file mode 100644
index 1d58841..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting1Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package surefireparallel;
-
-/*
- * 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.Test;
-
-/**
- * @author Tibor Digana (tibor17)
- * @since 2.16
- */
-public class Waiting1Test
-{
- @Test
- public void a()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void b()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void c()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting2Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting2Test.java b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting2Test.java
deleted file mode 100644
index 55da772..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting2Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package surefireparallel;
-
-/*
- * 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.Test;
-
-/**
- * @author Tibor Digana (tibor17)
- * @since 2.16
- */
-public class Waiting2Test
-{
- @Test
- public void a()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void b()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void c()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting3Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting3Test.java b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting3Test.java
deleted file mode 100644
index 5098fd4..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting3Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package surefireparallel;
-
-/*
- * 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.Test;
-
-/**
- * @author Tibor Digana (tibor17)
- * @since 2.16
- */
-public class Waiting3Test
-{
- @Test
- public void a()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void b()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void c()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting4Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting4Test.java b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting4Test.java
deleted file mode 100644
index 8418448..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting4Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package surefireparallel;
-
-/*
- * 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.Test;
-
-/**
- * @author Tibor Digana (tibor17)
- * @since 2.16
- */
-public class Waiting4Test
-{
- @Test
- public void a()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void b()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void c()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting5Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting5Test.java b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting5Test.java
deleted file mode 100644
index 2b99160..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting5Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package surefireparallel;
-
-/*
- * 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.Test;
-
-/**
- * @author Tibor Digana (tibor17)
- * @since 2.16
- */
-public class Waiting5Test
-{
- @Test
- public void a()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void b()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void c()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting6Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting6Test.java b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting6Test.java
deleted file mode 100644
index 9ae9c01..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting6Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package surefireparallel;
-
-/*
- * 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.Test;
-
-/**
- * @author Tibor Digana (tibor17)
- * @since 2.16
- */
-public class Waiting6Test
-{
- @Test
- public void a()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void b()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void c()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting7Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting7Test.java b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting7Test.java
deleted file mode 100644
index ca00a6a..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting7Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package surefireparallel;
-
-/*
- * 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.Test;
-
-/**
- * @author Tibor Digana (tibor17)
- * @since 2.16
- */
-public class Waiting7Test
-{
- @Test
- public void a()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void b()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void c()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting8Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting8Test.java b/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting8Test.java
deleted file mode 100644
index 96d1c66..0000000
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/src/test/java/surefireparallel/Waiting8Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package surefireparallel;
-
-/*
- * 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.Test;
-
-/**
- * @author Tibor Digana (tibor17)
- * @since 2.16
- */
-public class Waiting8Test
-{
- @Test
- public void a()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void b()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-
- @Test
- public void c()
- throws InterruptedException
- {
- Thread.sleep( 300L );
- }
-}
\ No newline at end of file
[20/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
new file mode 100644
index 0000000..6aac330
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.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 org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * Asserts proper behaviour of console output when forking
+ * SUREFIRE-639
+ * SUREFIRE-651
+ *
+ * @author Kristian Rosenvold
+ */
+public class ForkConsoleOutputIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void printSummaryTrueWithRedirect()
+ {
+ unpack().setForkJvm()
+ .redirectToFile( true )
+ .printSummary( true )
+ .executeTest()
+ .getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
+ .assertFileExists();
+ }
+
+ @Test
+ public void printSummaryTrueWithoutRedirect()
+ {
+ unpack().setForkJvm()
+ .redirectToFile( false )
+ .printSummary( true )
+ .executeTest()
+ .getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
+ .assertFileNotExists();
+ }
+
+ @Test
+ public void printSummaryFalseWithRedirect()
+ {
+ unpack().setForkJvm()
+ .redirectToFile( true )
+ .printSummary( false )
+ .debugLogging()
+ .showErrorStackTraces()
+ .executeTest()
+ .getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
+ .assertFileExists();
+ }
+
+ @Test
+ public void printSummaryFalseWithoutRedirect()
+ {
+ unpack().setForkJvm()
+ .redirectToFile( false )
+ .printSummary( false )
+ .executeTest()
+ .getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
+ .assertFileNotExists();
+ }
+
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/fork-consoleOutput" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
new file mode 100644
index 0000000..e5feb7f
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
@@ -0,0 +1,47 @@
+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;
+
+/**
+ * Asserts proper behaviour of console output when forking
+ * SUREFIRE-639
+ * SUREFIRE-651
+ *
+ * @author Kristian Rosenvold
+ */
+public class ForkConsoleOutputWithErrorsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void xmlFileContainsConsoleOutput()
+ {
+ unpack( "/fork-consoleOutputWithErrors" )
+ .setForkJvm()
+ .failNever()
+ .redirectToFile( true )
+ .executeTest()
+ .getSurefireReportsXmlFile( "TEST-forkConsoleOutput.Test2.xml" )
+ .assertContainsText( "sout: Will Fail soon" )
+ .assertContainsText( "serr: Will Fail now" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
new file mode 100644
index 0000000..574d144
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
@@ -0,0 +1,241 @@
+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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Test forkMode
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class ForkModeIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ private OutputValidator outputValidator;
+
+ @BeforeClass
+ public static void installDumpPidPlugin()
+ throws Exception
+ {
+ unpack( ForkModeIT.class, "test-helper-dump-pid-plugin", "plugin" ).executeInstall();
+ }
+
+ @Test
+ public void testForkModeAlways()
+ {
+ String[] pids = doTest( unpack( getProject() ).setForkJvm().forkAlways() );
+ assertDifferentPids( pids );
+ assertEndWith( pids, "_1_1", 3 );
+ assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
+ }
+
+ @Test
+ public void testForkModePerTest()
+ {
+ String[] pids = doTest( unpack( getProject() ).setForkJvm().forkPerTest() );
+ assertDifferentPids( pids );
+ assertEndWith( pids, "_1_1", 3 );
+ assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
+ }
+
+ @Test
+ public void testForkModeNever()
+ {
+ String[] pids = doTest( unpack( getProject() ).forkNever() );
+ assertSamePids( pids );
+ assertEndWith( pids, "_1_1", 3 );
+ assertEquals( "my pid is equal to pid 1 of the test", getMainPID(), pids[0] );
+ }
+
+ @Test
+ public void testForkModeNone()
+ {
+ String[] pids = doTest( unpack( getProject() ).forkMode( "none" ) );
+ assertSamePids( pids );
+ assertEndWith( pids, "_1_1", 3 );
+ assertEquals( "my pid is equal to pid 1 of the test", getMainPID(), pids[0] );
+ }
+
+ @Test
+ public void testForkModeOncePerThreadSingleThread()
+ {
+ String[] pids = doTest( unpack( getProject() )
+ .setForkJvm()
+ .forkPerThread()
+ .reuseForks( true )
+ .threadCount( 1 ) );
+ assertSamePids( pids );
+ assertEndWith( pids, "_1_1", 3 );
+ assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
+ }
+
+ @Test
+ public void testForkModeOncePerThreadTwoThreads()
+ {
+ String[] pids = doTest( unpack( getProject() )
+ .forkPerThread()
+ .reuseForks( true )
+ .threadCount( 2 )
+ .addGoal( "-DsleepLength=1200" ) );
+ assertDifferentPids( pids, 2 );
+ assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
+ }
+
+ @Test
+ public void testForkCountZero()
+ {
+ String[] pids = doTest( unpack( getProject() ).forkCount( 0 ) );
+ assertSamePids( pids );
+ assertEndWith( pids, "_1_1", 3 );
+ assertEquals( "my pid is equal to pid 1 of the test", getMainPID(), pids[0] );
+ }
+
+ @Test
+ public void testForkCountOneNoReuse()
+ {
+ String[] pids = doTest( unpack( getProject() ).setForkJvm().forkCount( 1 ).reuseForks( false ) );
+ assertDifferentPids( pids );
+ assertEndWith( pids, "_1_1", 3 );
+ assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
+ }
+
+ @Test
+ public void testForkCountOneReuse()
+ {
+ String[] pids = doTest( unpack( getProject() ).setForkJvm().forkCount( 1 ).reuseForks( true ) );
+ assertSamePids( pids );
+ assertEndWith( pids, "_1_1", 3 );
+ assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
+ }
+
+ @Test
+ public void testForkCountTwoNoReuse()
+ {
+ String[] pids =
+ doTest( unpack( getProject() ).setForkJvm().forkCount( 2 ).reuseForks( false ).addGoal( "-DsleepLength=1200" ) );
+ assertDifferentPids( pids );
+ assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
+ }
+
+ @Test
+ public void testForkCountTwoReuse()
+ {
+ String[] pids =
+ doTest( unpack( getProject() ).forkCount( 2 ).reuseForks( true ).addGoal( "-DsleepLength=1200" ) );
+ assertDifferentPids( pids, 2 );
+ assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
+ }
+
+ private void assertEndWith( String[] pids, String suffix, int expectedMatches )
+ {
+ int matches = 0;
+ for ( String pid : pids )
+ {
+ if ( pid.endsWith( suffix ) )
+ {
+ matches++;
+ }
+ }
+
+ assertEquals( "suffix " + suffix + " matched the correct number of pids", expectedMatches, matches );
+ }
+
+ private void assertDifferentPids( String[] pids, int numOfDifferentPids )
+ {
+ Set<String> pidSet = new HashSet<String>( Arrays.asList( pids ) );
+ assertEquals( "number of different pids is not as expected", numOfDifferentPids, pidSet.size() );
+ }
+
+ @Test
+ public void testForkModeOnce()
+ {
+ String[] pids = doTest( unpack( getProject() ).forkOnce() );
+ assertSamePids( pids );
+ assertFalse( "pid 1 is not the same as the main process' pid", pids[0].equals( getMainPID() ) );
+ }
+
+ private String getMainPID()
+ {
+ final TestFile targetFile = outputValidator.getTargetFile( "maven.pid" );
+ String pid = targetFile.slurpFile();
+ return pid + " testValue_1_1";
+ }
+
+ private void assertSamePids( String[] pids )
+ {
+ assertEquals( "pid 1 didn't match pid 2", pids[0], pids[1] );
+ assertEquals( "pid 1 didn't match pid 3", pids[0], pids[2] );
+ }
+
+ private void assertDifferentPids( String[] pids )
+ {
+ if ( pids[0].equals( pids[1] ) )
+ {
+ fail( "pid 1 matched pid 2: " + pids[0] );
+ }
+
+ if ( pids[0].equals( pids[2] ) )
+ {
+ fail( "pid 1 matched pid 3: " + pids[0] );
+ }
+
+ if ( pids[1].equals( pids[2] ) )
+ {
+ fail( "pid 2 matched pid 3: " + pids[0] );
+ }
+ }
+
+ private String[] doTest( SurefireLauncher forkMode )
+ {
+ forkMode.sysProp( "testProperty", "testValue_${surefire.threadNumber}_${surefire.forkNumber}" );
+ forkMode.addGoal( "org.apache.maven.plugins.surefire:maven-dump-pid-plugin:dump-pid" );
+ outputValidator = forkMode.executeTest();
+ outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 );
+ String[] pids = new String[3];
+ for ( int i = 1; i <= pids.length; i++ )
+ {
+ final TestFile targetFile = outputValidator.getTargetFile( "test" + i + "-pid" );
+ String pid = targetFile.slurpFile();
+ pids[i - 1] = pid;
+ }
+ return pids;
+ }
+
+ protected String getProject()
+ {
+ return "fork-mode";
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
new file mode 100644
index 0000000..22588cc
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeMultiModuleIT.java
@@ -0,0 +1,162 @@
+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.*;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test forkMode in a multi module project with parallel maven builds
+ *
+ * @author Andreas Gudian
+ */
+public class ForkModeMultiModuleIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testForkCountOneNoReuse()
+ {
+ List<String> pids = doTest( unpack( getProject() ).forkCount( 1 ).reuseForks( false ) );
+ assertAllDifferentPids( pids );
+ int matchesOne = countSuffixMatches( pids, "_1_1");
+ int matchesTwo = countSuffixMatches( pids, "_2_2" );
+ assertTrue( "At least one fork had forkNumber 1", matchesOne >= 1 );
+ assertTrue( "At least one fork had forkNumber 2", matchesTwo >= 1 );
+ assertEquals( "No other forkNumbers than 1 and 2 have been used", 6, matchesOne + matchesTwo);
+ }
+
+
+ @Test
+ public void testForkCountOneReuse()
+ {
+ List<String> pids = doTest( unpack( getProject() ).forkCount( 1 ).reuseForks( true ) );
+ assertDifferentPids( pids, 2 );
+ assertEndWith( pids, "_1_1", 3 );
+ assertEndWith( pids, "_2_2", 3 );
+ }
+
+ @Test
+ public void testForkCountTwoNoReuse()
+ {
+ List<String> pids = doTest( unpack( getProject() ).forkCount( 2 ).reuseForks( false ) );
+ assertAllDifferentPids( pids );
+ int matchesOne = countSuffixMatches( pids, "_1_1");
+ int matchesTwo = countSuffixMatches( pids, "_2_2" );
+ int matchesThree = countSuffixMatches( pids, "_3_3");
+ int matchesFour = countSuffixMatches( pids, "_4_4" );
+ assertTrue( "At least one fork had forkNumber 1", matchesOne >= 1 );
+ assertTrue( "At least one fork had forkNumber 2", matchesTwo >= 1 );
+ assertTrue( "At least one fork had forkNumber 3", matchesThree >= 1 );
+ assertTrue( "At least one fork had forkNumber 4", matchesFour >= 1 );
+ assertEquals( "No other forkNumbers than 1, 2, 3, or 4 have been used", 6, matchesOne + matchesTwo + matchesThree + matchesFour );
+ }
+
+ @Test
+ public void testForkCountTwoReuse()
+ {
+ List<String> pids =
+ doTest( unpack( getProject() ).forkCount( 2 ).reuseForks( true ) );
+ assertDifferentPids( pids, 4 );
+
+ int matchesOne = countSuffixMatches( pids, "_1_1");
+ int matchesTwo = countSuffixMatches( pids, "_2_2" );
+ int matchesThree = countSuffixMatches( pids, "_3_3");
+ int matchesFour = countSuffixMatches( pids, "_4_4" );
+ assertTrue( "At least one fork had forkNumber 1", matchesOne >= 1 );
+ assertTrue( "At least one fork had forkNumber 2", matchesTwo >= 1 );
+ assertTrue( "At least one fork had forkNumber 3", matchesThree >= 1 );
+ assertTrue( "At least one fork had forkNumber 4", matchesFour >= 1 );
+ assertEquals( "No other forkNumbers than 1, 2, 3, or 4 have been used", 6, matchesOne + matchesTwo + matchesThree + matchesFour );
+ }
+
+ private void assertEndWith( List<String> pids, String suffix, int expectedMatches )
+ {
+ int matches = countSuffixMatches( pids, suffix );
+
+ assertEquals( "suffix " + suffix + " matched the correct number of pids", expectedMatches, matches );
+ }
+
+ private int countSuffixMatches( List<String> pids, String suffix )
+ {
+ int matches = 0;
+ for ( String pid : pids )
+ {
+ if ( pid.endsWith( suffix ) )
+ {
+ matches++;
+ }
+ }
+ return matches;
+ }
+
+ private void assertDifferentPids( List<String> pids, int numOfDifferentPids )
+ {
+ Set<String> pidSet = new HashSet<String>( pids );
+ assertEquals( "number of different pids is not as expected", numOfDifferentPids, pidSet.size() );
+ }
+
+ private void assertAllDifferentPids( List<String> pids )
+ {
+ assertDifferentPids( pids, pids.size() );
+ }
+
+ private List<String> doTest( SurefireLauncher forkMode )
+ {
+ forkMode.addGoal( "-T2" );
+ forkMode.sysProp( "testProperty", "testValue_${surefire.threadNumber}_${surefire.forkNumber}" );
+ final OutputValidator outputValidator = forkMode.setForkJvm().executeTest();
+ List<String> pids = new ArrayList<String>( 6 );
+ pids.addAll( validateModule( outputValidator, "module-a" ) );
+ pids.addAll( validateModule( outputValidator, "module-b" ) );
+
+ return pids;
+ }
+
+ private List<String> validateModule( OutputValidator outputValidator, String module )
+ {
+ HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, new File( outputValidator.getBaseDir(), module ) );
+
+ List<String> pids = new ArrayList<String>( 3 );
+ for ( int i = 1; i <= 3; i++ )
+ {
+ final TestFile targetFile = outputValidator.getTargetFile( module, "test" + i + "-pid" );
+ String pid = targetFile.slurpFile();
+ pids.add( pid );
+ }
+
+ return pids;
+ }
+
+ protected String getProject()
+ {
+ return "fork-mode-multimodule";
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java
new file mode 100644
index 0000000..5ba0577
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java
@@ -0,0 +1,35 @@
+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.
+ */
+
+/**
+ * Test forkMode
+ *
+ * @author <a href="mailto:velo.br@gmail.com">Marvin Froeder</a>
+ */
+public class ForkModeTestNGIT
+ extends ForkModeIT
+{
+ @Override
+ protected String getProject()
+ {
+ return "fork-mode-testng";
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
new file mode 100644
index 0000000..a6c539c
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
@@ -0,0 +1,95 @@
+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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * Test include/exclude from files.
+ * <br>
+ * Based on {@link IncludesExcludesIT}.
+ */
+public class IncludesExcludesFromFileIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/includes-excludes-from-file" );
+ }
+
+ @Test
+ public void testSimple()
+ {
+ testWithProfile( "simple" );
+ }
+
+ @Test
+ public void testSimpleMixed()
+ {
+ testWithProfile( "simple-mixed" );
+ }
+
+ @Test
+ public void testRegex()
+ {
+ testWithProfile( "regex" );
+ }
+
+ @Test
+ public void testPath()
+ {
+ testWithProfile( "path" );
+ }
+
+ @Test
+ public void testMissingExcludes()
+ {
+ expectBuildFailure("missing-excludes-file", "Failed to load list from file", "no-such-excludes-file");
+ }
+
+ @Test
+ public void testMissingIncludes()
+ {
+ expectBuildFailure( "missing-includes-file", "Failed to load list from file", "no-such-includes-file" );
+ }
+
+ private void testWithProfile( String profile )
+ {
+ final OutputValidator outputValidator = unpack().
+ activateProfile( profile ).executeTest().verifyErrorFree( 2 );
+
+ outputValidator.getTargetFile( "testTouchFile.txt" ).assertFileExists();
+ outputValidator.getTargetFile( "defaultTestTouchFile.txt" ).assertFileExists();
+ }
+
+ private void expectBuildFailure( final String profile, final String... messages )
+ {
+ final OutputValidator outputValidator = unpack().activateProfile( profile )
+ .maven().withFailure().executeTest();
+
+ for ( String message : messages )
+ {
+ outputValidator.verifyTextInLog( message );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
new file mode 100644
index 0000000..46bdeb6
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
@@ -0,0 +1,68 @@
+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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * Test include/exclude patterns.
+ *
+ * @author Benjamin Bentmann
+ */
+public class IncludesExcludesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/includes-excludes" );
+ }
+
+ /**
+ * Test surefire inclusions/exclusions
+ */
+ @Test
+ public void testIncludesExcludes()
+ {
+ testWithProfile( "simple" );
+ }
+
+ @Test
+ public void testRegexIncludesExcludes()
+ {
+ testWithProfile( "regex" );
+ }
+
+ @Test
+ public void testPathBasedIncludesExcludes()
+ {
+ testWithProfile( "path" );
+ }
+
+ private void testWithProfile( String profile )
+ {
+ final OutputValidator outputValidator = unpack().
+ activateProfile( profile ).executeTest().verifyErrorFree( 2 );
+ outputValidator.getTargetFile( "testTouchFile.txt" ).assertFileExists();
+ outputValidator.getTargetFile( "defaultTestTouchFile.txt" ).assertFileExists();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
new file mode 100644
index 0000000..7bf90f0
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
@@ -0,0 +1,38 @@
+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;
+
+/**
+ * Test project using JUnit4.4 (including Hamcrest extensions)
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class JUnit44HamcrestIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testJUnit44Hamcrest()
+ {
+ executeErrorFreeTest( "junit44-hamcrest", 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java
new file mode 100644
index 0000000..57007a7
--- /dev/null
+++ b/surefire-its/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/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
new file mode 100644
index 0000000..5aee1a8
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelIT.java
@@ -0,0 +1,540 @@
+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;
+
+/**
+ * Testing JUnitCoreWrapper with ParallelComputerBuilder.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.16
+ */
+public class JUnit47ParallelIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void unknownThreadCountSuites()
+ {
+ unpack().parallelSuites().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
+ "Use threadCount or threadCountSuites > 0 or useUnlimitedThreads=true for parallel='suites'" );
+ }
+
+ @Test
+ public void unknownThreadCountClasses()
+ {
+ unpack().parallelClasses().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
+ "Use threadCount or threadCountClasses > 0 or useUnlimitedThreads=true for parallel='classes'" );
+ }
+
+ @Test
+ public void unknownThreadCountMethods()
+ {
+ unpack().parallelMethods().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
+ "Use threadCount or threadCountMethods > 0 or useUnlimitedThreads=true for parallel='methods'" );
+
+ }
+
+ @Test
+ public void unknownThreadCountBoth()
+ {
+ unpack().parallelBoth().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
+ "Use useUnlimitedThreads=true, " +
+ "or only threadCount > 0, " +
+ "or (threadCountClasses > 0 and threadCountMethods > 0), " +
+ "or (threadCount > 0 and threadCountClasses > 0 and threadCountMethods > 0), " +
+ "or (threadCount > 0 and threadCountClasses > 0 and threadCount > threadCountClasses) " +
+ "for parallel='both' or parallel='classesAndMethods'" );
+ }
+
+ @Test
+ public void unknownThreadCountAll()
+ {
+ unpack().parallelAll().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
+ "Use useUnlimitedThreads=true, " +
+ "or only threadCount > 0, " +
+ "or (threadCountSuites > 0 and threadCountClasses > 0 and threadCountMethods > 0), " +
+ "or every thread-count is specified, " +
+ "or (threadCount > 0 and threadCountSuites > 0 and threadCountClasses > 0 " +
+ "and threadCount > threadCountSuites + threadCountClasses) " +
+ "for parallel='all'" );
+ }
+
+ @Test
+ public void unknownThreadCountSuitesAndClasses()
+ {
+ unpack().parallelSuitesAndClasses().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
+ "Use useUnlimitedThreads=true, " +
+ "or only threadCount > 0, " +
+ "or (threadCountSuites > 0 and threadCountClasses > 0), " +
+ "or (threadCount > 0 and threadCountSuites > 0 and threadCountClasses > 0) " +
+ "or (threadCount > 0 and threadCountSuites > 0 and threadCount > threadCountSuites) " +
+ "for parallel='suitesAndClasses' or 'both'" );
+ }
+
+ @Test
+ public void unknownThreadCountSuitesAndMethods()
+ {
+ unpack().parallelSuitesAndMethods().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
+ "Use useUnlimitedThreads=true, " +
+ "or only threadCount > 0, " +
+ "or (threadCountSuites > 0 and threadCountMethods > 0), " +
+ "or (threadCount > 0 and threadCountSuites > 0 and threadCountMethods > 0), " +
+ "or (threadCount > 0 and threadCountSuites > 0 and threadCount > threadCountSuites) " +
+ "for parallel='suitesAndMethods'" );
+ }
+
+ @Test
+ public void unknownThreadCountClassesAndMethods()
+ {
+ unpack().parallelClassesAndMethods().setTestToRun( "TestClass" ).failNever().executeTest().verifyTextInLog(
+ "Use useUnlimitedThreads=true, " +
+ "or only threadCount > 0, " +
+ "or (threadCountClasses > 0 and threadCountMethods > 0), " +
+ "or (threadCount > 0 and threadCountClasses > 0 and threadCountMethods > 0), " +
+ "or (threadCount > 0 and threadCountClasses > 0 and threadCount > threadCountClasses) " +
+ "for parallel='both' or parallel='classesAndMethods'" );
+ }
+
+ @Test
+ public void serial()
+ {
+ // takes 7.2 sec
+ unpack().setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsSuites1()
+ {
+ // takes 3.6 sec
+ unpack().parallelSuites().useUnlimitedThreads().setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
+ 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsSuites2()
+ {
+ // takes 3.6 sec
+ unpack().parallelSuites().useUnlimitedThreads().threadCountSuites( 5 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsClasses1()
+ {
+ // takes 1.8 sec
+ unpack().parallelClasses().useUnlimitedThreads().setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
+ 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsClasses2()
+ {
+ // takes 1.8 sec
+ unpack().parallelClasses().useUnlimitedThreads().threadCountClasses( 5 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsMethods1()
+ {
+ // takes 2.4 sec
+ unpack().parallelMethods().useUnlimitedThreads().setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
+ 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsMethods2()
+ {
+ // takes 2.4 sec
+ unpack().parallelMethods().useUnlimitedThreads().threadCountMethods( 5 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsSuitesAndClasses1()
+ {
+ // takes 0.9 sec
+ unpack().parallelSuitesAndClasses().useUnlimitedThreads().setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsSuitesAndClasses2()
+ {
+ // takes 0.9 sec
+ // 1.8 sec with 4 parallel classes
+ unpack().parallelSuitesAndClasses().useUnlimitedThreads().threadCountSuites( 5 ).threadCountClasses(
+ 15 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsSuitesAndMethods1()
+ {
+ // takes 1.2 sec
+ unpack().parallelSuitesAndMethods().useUnlimitedThreads().setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsSuitesAndMethods2()
+ {
+ // takes 1.2 sec
+ unpack().parallelSuitesAndMethods().useUnlimitedThreads().threadCountSuites( 5 ).threadCountMethods(
+ 15 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsClassesAndMethods1()
+ {
+ // takes 0.6 sec
+ unpack().parallelClassesAndMethods().useUnlimitedThreads().setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsClassesAndMethods2()
+ {
+ // takes 0.6 sec
+ unpack().parallelClassesAndMethods().useUnlimitedThreads().threadCountClasses( 5 ).threadCountMethods(
+ 15 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsAll1()
+ {
+ // takes 0.3 sec
+ unpack().parallelAll().useUnlimitedThreads().setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void unlimitedThreadsAll2()
+ {
+ // takes 0.3 sec
+ unpack().parallelAll().useUnlimitedThreads().threadCountSuites( 5 ).threadCountClasses( 15 ).threadCountMethods(
+ 30 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void threadCountSuites()
+ {
+ // takes 3.6 sec
+ unpack().parallelSuites().threadCount( 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void threadCountClasses()
+ {
+ // takes 3.6 sec for single core
+ // takes 1.8 sec for double core
+ unpack().parallelClasses().threadCount( 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void threadCountMethods()
+ {
+ // takes 2.4 sec
+ unpack().parallelMethods().threadCount( 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void threadCountClassesAndMethodsOneCore()
+ {
+ // takes 4.8 sec
+ unpack().disablePerCoreThreadCount().disableParallelOptimization().parallelClassesAndMethods().threadCount(
+ 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void threadCountClassesAndMethodsOneCoreOptimized()
+ {
+ // the number of reused threads in leafs depends on the number of runners and CPU
+ unpack().disablePerCoreThreadCount().parallelClassesAndMethods().threadCount( 3 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void threadCountClassesAndMethods()
+ {
+ // takes 2.4 sec for double core CPU
+ unpack().disableParallelOptimization().parallelClassesAndMethods().threadCount( 3 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void threadCountClassesAndMethodsOptimized()
+ {
+ // the number of reused threads in leafs depends on the number of runners and CPU
+ unpack().parallelClassesAndMethods().threadCount( 3 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void threadCountSuitesAndMethods()
+ {
+ // usually 24 times 0.3 sec = 7.2 sec with one core CPU
+ // takes 1.8 sec for double core CPU
+ unpack().disableParallelOptimization().parallelSuitesAndMethods().threadCount( 3 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void threadCountSuitesAndMethodsOptimized()
+ {
+ // the number of reused threads in leafs depends on the number of runners and CPU
+ unpack().parallelSuitesAndMethods().threadCount( 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
+ 24 );
+ }
+
+ @Test
+ public void threadCountSuitesAndClasses()
+ {
+ unpack().disableParallelOptimization().parallelSuitesAndClasses().threadCount( 3 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void threadCountSuitesAndClassesOptimized()
+ {
+ // the number of reused threads in leafs depends on the number of runners and CPU
+ unpack().parallelSuitesAndClasses().threadCount( 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
+ 24 );
+ }
+
+ @Test
+ public void threadCountAll()
+ {
+ unpack().disableParallelOptimization().parallelAll().threadCount( 3 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void threadCountAllOptimized()
+ {
+ // the number of reused threads in leafs depends on the number of runners and CPU
+ unpack().parallelAll().threadCount( 3 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void everyThreadCountSuitesAndClasses()
+ {
+ // takes 1.8 sec for double core CPU
+ unpack().parallelSuitesAndClasses().threadCount( 3 ).threadCountSuites( 34 ).threadCountClasses(
+ 66 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void everyThreadCountSuitesAndMethods()
+ {
+ // takes 1.8 sec for double core CPU
+ unpack().parallelSuitesAndMethods().threadCount( 3 ).threadCountSuites( 34 ).threadCountMethods(
+ 66 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void everyThreadCountClassesAndMethods()
+ {
+ // takes 1.8 sec for double core CPU
+ unpack().parallelClassesAndMethods().threadCount( 3 ).threadCountClasses( 34 ).threadCountMethods(
+ 66 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void everyThreadCountAll()
+ {
+ // takes 2.4 sec for double core CPU
+ unpack().parallelAll().threadCount( 3 ).threadCountSuites( 17 ).threadCountClasses( 34 ).threadCountMethods(
+ 49 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void reusableThreadCountSuitesAndClasses()
+ {
+ // 4 * cpu to 5 * cpu threads to run test classes
+ // takes cca 1.8 sec
+ unpack().disableParallelOptimization().parallelSuitesAndClasses().disablePerCoreThreadCount().threadCount(
+ 6 ).threadCountSuites( 2 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void reusableThreadCountSuitesAndClassesOptimized()
+ {
+ // the number of reused threads in leafs depends on the number of runners and CPU
+ unpack().parallelSuitesAndClasses().disablePerCoreThreadCount().threadCount( 6 ).threadCountSuites(
+ 2 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void reusableThreadCountSuitesAndMethods()
+ {
+ // 4 * cpu to 5 * cpu threads to run test methods
+ // takes cca 1.8 sec
+ unpack().disableParallelOptimization().parallelSuitesAndMethods().disablePerCoreThreadCount().threadCount(
+ 6 ).threadCountSuites( 2 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void reusableThreadCountSuitesAndMethodsOptimized()
+ {
+ // the number of reused threads in leafs depends on the number of runners and CPU
+ unpack().parallelSuitesAndMethods().disablePerCoreThreadCount().threadCount( 6 ).threadCountSuites(
+ 2 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void reusableThreadCountClassesAndMethods()
+ {
+ // 4 * cpu to 5 * cpu threads to run test methods
+ // takes cca 1.8 sec
+ unpack().disableParallelOptimization().parallelClassesAndMethods().disablePerCoreThreadCount().threadCount(
+ 6 ).threadCountClasses( 2 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void reusableThreadCountClassesAndMethodsOptimized()
+ {
+ // the number of reused threads in leafs depends on the number of runners and CPU
+ unpack().parallelClassesAndMethods().disablePerCoreThreadCount().threadCount( 6 ).threadCountClasses(
+ 2 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void reusableThreadCountAll()
+ {
+ // 8 * cpu to 13 * cpu threads to run test methods
+ // takes 0.9 sec
+ unpack().disableParallelOptimization().parallelAll().disablePerCoreThreadCount().threadCount(
+ 14 ).threadCountSuites( 2 ).threadCountClasses( 4 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void reusableThreadCountAllOptimized()
+ {
+ // the number of reused threads in leafs depends on the number of runners and CPU
+ unpack().parallelAll().disablePerCoreThreadCount().threadCount( 14 ).threadCountSuites( 2 ).threadCountClasses(
+ 4 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void suites()
+ {
+ // takes 3.6 sec
+ unpack().parallelSuites().threadCountSuites( 5 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
+ 24 );
+ }
+
+ @Test
+ public void classes()
+ {
+ // takes 1.8 sec on any CPU because the suites are running in a sequence
+ unpack().parallelClasses().threadCountClasses( 5 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
+ 24 );
+ }
+
+ @Test
+ public void methods()
+ {
+ // takes 2.4 sec on any CPU because every class has only three methods
+ // and the suites and classes are running in a sequence
+ unpack().parallelMethods().threadCountMethods( 5 ).setTestToRun( "Suite*Test" ).executeTest().verifyErrorFree(
+ 24 );
+ }
+
+ @Test
+ public void suitesAndClasses()
+ {
+ // takes 0.9 sec
+ unpack().parallelSuitesAndClasses().threadCountSuites( 5 ).threadCountClasses( 15 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void suitesAndMethods()
+ {
+ // takes 1.2 sec on any CPU
+ unpack().parallelSuitesAndMethods().threadCountSuites( 5 ).threadCountMethods( 15 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void classesAndMethods()
+ {
+ // takes 0.6 sec on any CPU
+ unpack().parallelClassesAndMethods().threadCountClasses( 5 ).threadCountMethods( 15 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void all()
+ {
+ // takes 0.3 sec on any CPU
+ unpack().parallelAll().threadCountSuites( 5 ).threadCountClasses( 15 ).threadCountMethods( 30 ).setTestToRun(
+ "Suite*Test" ).executeTest().verifyErrorFree( 24 );
+ }
+
+ @Test
+ public void shutdown()
+ {
+ // executes for 2.5 sec until timeout has elapsed
+ unpack().parallelMethods().threadCountMethods( 2 ).parallelTestsTimeoutInSeconds( 2.5d ).setTestToRun(
+ "TestClass" ).failNever().executeTest().verifyTextInLog(
+ "The test run has finished abruptly after timeout of 2.5 seconds." );
+ }
+
+ @Test
+ public void forcedShutdown()
+ {
+ // executes for 2.5 sec until timeout has elapsed
+ unpack().parallelMethods().threadCountMethods( 2 ).parallelTestsTimeoutForcedInSeconds( 2.5d ).setTestToRun(
+ "TestClass" ).failNever().executeTest().verifyTextInLog(
+ "The test run has finished abruptly after timeout of 2.5 seconds." );
+ }
+
+ @Test
+ public void timeoutAndForcedShutdown()
+ {
+ // executes for one sec until timeout has elapsed
+ unpack().parallelMethods().threadCountMethods( 2 ).parallelTestsTimeoutInSeconds(
+ 1 ).parallelTestsTimeoutForcedInSeconds( 2.5d ).setTestToRun(
+ "TestClass" ).failNever().executeTest().verifyTextInLog(
+ "The test run has finished abruptly after timeout of 1.0 seconds." );
+ }
+
+ @Test
+ public void forcedShutdownVerifyingLogs()
+ {
+ // executes for 2.5 sec until timeout has elapsed
+ unpack().parallelMethods().threadCountMethods( 3 ).disablePerCoreThreadCount()
+ .parallelTestsTimeoutForcedInSeconds( 1.05d ).setTestToRun( "Waiting*Test" ).failNever().executeTest()
+ .verifyTextInLog( "The test run has finished abruptly after timeout of 1.05 seconds." )
+ .verifyTextInLog( "These tests were executed in prior to the shutdown operation:" )
+ .verifyTextInLog( "These tests are incomplete:" );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "junit47-parallel" )
+ .showErrorStackTraces();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java
new file mode 100644
index 0000000..bf393ca
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.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;
+
+/**
+ * Testing {@code @net.jcip.annotations.NotThreadSafe} with ParallelComputerBuilder.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.19
+ */
+public class JUnit47ParallelNotThreadSafeIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "junit47-parallel-nts" );
+ }
+
+ @Test
+ public void test()
+ {
+ unpack()
+ .parallelAll()
+ .useUnlimitedThreads()
+ .executeTest()
+ .verifyErrorFree( 2 )
+ .verifyTextInLog( "xxx-maven-surefire-plugin@NotThreadSafe" )
+ .verifyTextInLog( "expected-thread" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
new file mode 100644
index 0000000..aa38dac
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.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.commons.lang.StringUtils;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
+public class JUnit47RedirectOutputIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testPrintSummaryTrueWithRedirect()
+ throws Exception
+ {
+ final OutputValidator clean = unpack().redirectToFile( true ).addGoal( "clean" ).executeTest();
+ checkReports( clean );
+ }
+
+ @Test
+ public void testClassesParallel()
+ throws Exception
+ {
+ final OutputValidator clean =
+ unpack().redirectToFile( true ).parallelClasses().addGoal( "clean" ).executeTest();
+ checkReports( clean );
+ }
+
+ private void checkReports( OutputValidator validator )
+ throws IOException
+ {
+ String report = StringUtils.trimToNull(
+ validator.getSurefireReportsFile( "junit47ConsoleOutput.Test1-output.txt" ).readFileToString() );
+ assertNotNull( report );
+ String report2 = StringUtils.trimToNull(
+ validator.getSurefireReportsFile( "junit47ConsoleOutput.Test2-output.txt" ).readFileToString() );
+ assertNotNull( report2 );
+ assertFalse( validator.getSurefireReportsFile( "junit47ConsoleOutput.Test3-output.txt" ).exists() );
+ }
+
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/junit47-redirect-output" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
new file mode 100644
index 0000000..9fe1775
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47RerunFailingTestWithCucumberIT.java
@@ -0,0 +1,80 @@
+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 static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests using the JUnit 47 provider to rerun failing tests with the cucumber runner. The main
+ * problem that the junit4 provider has with the cucumber runner is that the junit Description
+ * instance created by the runner has a null test class attribute. This requires that tests are
+ * rerun based on their description.
+ *
+ * @author mpkorstanje
+ */
+public class JUnit47RerunFailingTestWithCucumberIT
+ extends SurefireJUnit4IntegrationTestCase {
+
+ @Before
+ public void assumeJdk17() {
+ assumeJavaVersion(1.7d);
+ }
+
+
+ private SurefireLauncher unpack() {
+ return unpack("junit47-rerun-failing-tests-with-cucumber")
+ .setJUnitVersion("4.12");
+ }
+
+ @Test
+ public void testRerunFailingErrorTestsFalse() {
+ unpack()
+ .maven()
+ .addGoal("-Dsurefire.rerunFailingTestsCount=" + 0)
+ .withFailure()
+ .executeTest()
+ .assertTestSuiteResults(1, 0, 1, 0, 0);
+ }
+
+ @Test
+ public void testRerunFailingErrorTestsWithOneRetry() {
+ unpack()
+ .maven()
+ .addGoal("-Dsurefire.rerunFailingTestsCount=" + 1)
+ .withFailure()
+ .executeTest()
+ .assertTestSuiteResults(1, 0, 1, 0, 0);
+ }
+
+ @Test
+ public void testRerunFailingErrorTestsTwoRetry() {
+ unpack()
+ .maven()
+ .addGoal("-Dsurefire.rerunFailingTestsCount=" + 2)
+ .executeTest()
+ .assertTestSuiteResults(1, 0, 0, 0, 2);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47StaticInnerClassTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47StaticInnerClassTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47StaticInnerClassTestsIT.java
new file mode 100644
index 0000000..e50e6d7
--- /dev/null
+++ b/surefire-its/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/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java
new file mode 100644
index 0000000..38c2eae
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java
@@ -0,0 +1,70 @@
+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.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( 1.6d );
+ }
+
+ @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/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
new file mode 100644
index 0000000..fdb56f7
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
@@ -0,0 +1,145 @@
+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 project using "groups" support
+ *
+ * @author <a href="mailto:todd@apache.org">Todd Lipcon</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class JUnit48TestCategoriesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testCategoriesAB()
+ {
+ runAB( unpacked() );
+ }
+
+ @Test
+ public void testCategoriesABForkAlways()
+ {
+ runAB( unpacked().forkAlways() );
+ }
+
+ @Test
+ public void testCategoriesACFullyQualifiedClassName()
+ {
+ runACFullyQualifiedClassName( unpacked() );
+ }
+
+ @Test
+ public void testCategoriesACFullyQualifiedClassNameForkAlways()
+ {
+ runACFullyQualifiedClassName( unpacked().forkAlways() );
+ }
+
+ @Test
+ public void testCategoriesACClassNameSuffix()
+ {
+ runACClassNameSuffix( unpacked() );
+ }
+
+ @Test
+ public void testCategoriesACClassNameSuffixForkAlways()
+ {
+ runACClassNameSuffix( unpacked().forkAlways() );
+ }
+
+ @Test
+ public void testCategoriesBadCategory()
+ {
+ runBadCategory( unpacked() );
+ }
+
+ @Test
+ public void testBadCategoryForkAlways()
+ {
+ runBadCategory( unpacked().forkAlways() );
+ }
+
+ private static void runAB( SurefireLauncher unpacked )
+ {
+ unpacked.executeTest()
+ .verifyErrorFreeLog()
+ .assertTestSuiteResults( 3, 0, 0, 0 )
+ .verifyTextInLog( "catA: 1" )
+ .verifyTextInLog( "catB: 1" )
+ .verifyTextInLog( "catC: 0" )
+ .verifyTextInLog( "catNone: 0" );
+ }
+
+ private static void runACClassNameSuffix( SurefireLauncher unpacked )
+ {
+ unpacked.groups( "CategoryA,CategoryC" )
+ .executeTest()
+ .verifyErrorFreeLog()
+ .assertTestSuiteResults( 6, 0, 0, 0 )
+ .verifyTextInLog( "catA: 1" )
+ .verifyTextInLog( "catB: 0" )
+ .verifyTextInLog( "catC: 1" )
+ .verifyTextInLog( "catNone: 0" )
+ .verifyTextInLog( "mA: 1" )
+
+ // This seems questionable !? The class is annotated with category C and method with B
+ .verifyTextInLog( "mB: 1" )
+
+ .verifyTextInLog( "mC: 1" )
+ .verifyTextInLog( "CatNone: 1" );
+ }
+
+ private static void runACFullyQualifiedClassName( SurefireLauncher unpacked )
+ {
+ unpacked.groups( "junit4.CategoryA,junit4.CategoryC" )
+ .executeTest()
+ .verifyErrorFreeLog()
+ .assertTestSuiteResults( 6, 0, 0, 0 )
+ .verifyTextInLog( "catA: 1" )
+ .verifyTextInLog( "catB: 0" )
+ .verifyTextInLog( "catC: 1" )
+ .verifyTextInLog( "catNone: 0" )
+ .verifyTextInLog( "mA: 1" )
+
+ // This seems questionable !? The class is annotated with category C and method with B
+ .verifyTextInLog( "mB: 1" )
+
+ .verifyTextInLog( "mC: 1" )
+ .verifyTextInLog( "CatNone: 1" );
+ }
+
+ private static void runBadCategory( SurefireLauncher unpacked )
+ {
+ unpacked.failIfNoTests( false )
+ .groups( "BadCategory" )
+ .executeTest()
+ .verifyErrorFreeLog();
+ }
+
+ private SurefireLauncher unpacked()
+ {
+ return unpack( "/junit48-categories" );
+ // .debugSurefireFork();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
new file mode 100644
index 0000000..19b937d
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
@@ -0,0 +1,38 @@
+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;
+
+/**
+ * Test JUnit 4 tests marked with "Ignore" attribute
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class JUnit4ForkAlwaysStaticInitPollutionIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testJunit4Ignore()
+ {
+ executeErrorFreeTest( "junit4-forkAlways-staticInit", 2 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4IgnoreIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4IgnoreIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4IgnoreIT.java
new file mode 100644
index 0000000..71ec3d8
--- /dev/null
+++ b/surefire-its/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:dfabulich@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" );
+ }
+}
[18/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
new file mode 100644
index 0000000..fdcea20
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
@@ -0,0 +1,43 @@
+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;
+
+/**
+ * Test
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class TimeoutForkedTestIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testTimeoutForked()
+ throws Exception
+ {
+ unpack( "/timeout-forked" ).addGoal( "-DsleepLength=10000" ).addGoal(
+ "-DforkTimeout=1" ).maven().withFailure().executeTest();
+ // SUREFIRE-468 test that had to be reverted due to SUREFIRE-705
+ //assertFalse( getSurefireReportsFile( "TEST-timeoutForked.BasicTest.xml" ).exists() );
+ // assertFalse( getSurefireReportsFile( "timeoutForked.BasicTest.txt" ).exists() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
new file mode 100644
index 0000000..c218769
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
@@ -0,0 +1,130 @@
+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.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.apache.maven.plugins.surefire.report.ReportTestSuite;
+import org.apache.maven.surefire.its.fixture.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * Test running two test cases; confirms reporting works correctly
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class TwoTestCasesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testTwoTestCases()
+ throws Exception
+ {
+ unpack( "junit-twoTestCases" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .executeTest()
+ .verifyErrorFreeLog()
+ .assertTestSuiteResults( 2, 0, 0, 0 );
+ }
+
+ /**
+ * Runs two tests encapsulated in a suite
+ */
+ @Test
+ public void testTwoTestCaseSuite()
+ throws Exception
+ {
+ final OutputValidator outputValidator = unpack( "junit-twoTestCaseSuite" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .executeTest();
+ outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0, 0 );
+ List<ReportTestSuite> reports = HelperAssertions.extractReports( outputValidator.getBaseDir() );
+ Set<String> classNames = extractClassNames( reports );
+ assertContains( classNames, "junit.twoTestCaseSuite.BasicTest" );
+ assertContains( classNames, "junit.twoTestCaseSuite.TestTwo" );
+ assertEquals( "wrong number of classes", 2, classNames.size() );
+ IntegrationTestSuiteResults results = HelperAssertions.parseReportList( reports );
+ HelperAssertions.assertTestSuiteResults( 2, 0, 0, 0, results );
+ }
+
+ private void assertContains( Set<String> set, String expected )
+ {
+ if ( set.contains( expected ) )
+ {
+ return;
+ }
+ fail( "Set didn't contain " + expected );
+ }
+
+ private Set<String> extractClassNames( List<ReportTestSuite> reports )
+ {
+ HashSet<String> classNames = new HashSet<String>();
+ for ( ReportTestSuite suite : reports )
+ {
+ classNames.add( suite.getFullClassName() );
+ }
+ return classNames;
+ }
+
+ @Test
+ public void testJunit4Suite()
+ throws Exception
+ {
+ final OutputValidator outputValidator = unpack( "junit4-twoTestCaseSuite" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .executeTest();
+ outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0, 0 );
+
+ List<ReportTestSuite> reports =
+ HelperAssertions.extractReports( outputValidator.getBaseDir() );
+ Set<String> classNames = extractClassNames( reports );
+ assertContains( classNames, "twoTestCaseSuite.BasicTest" );
+ assertContains( classNames, "twoTestCaseSuite.Junit4TestTwo" );
+ assertEquals( "wrong number of classes", 2, classNames.size() );
+ IntegrationTestSuiteResults results = HelperAssertions.parseReportList( reports );
+ HelperAssertions.assertTestSuiteResults( 2, 0, 0, 0, results );
+ }
+
+ @Test
+ public void testTestNGSuite()
+ throws Exception
+ {
+ final OutputValidator outputValidator = unpack( "testng-twoTestCaseSuite" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .executeTest();
+ outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0, 0 );
+ List<ReportTestSuite> reports = HelperAssertions.extractReports( outputValidator.getBaseDir() );
+ Set<String> classNames = extractClassNames( reports );
+ assertContains( classNames, "testng.two.TestNGTestTwo" );
+ assertContains( classNames, "testng.two.TestNGSuiteTest" );
+ assertEquals( "wrong number of classes", 2, classNames.size() );
+ IntegrationTestSuiteResults results = HelperAssertions.parseReportList( reports );
+ HelperAssertions.assertTestSuiteResults( 2, 0, 0, 0, results );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
new file mode 100644
index 0000000..8848dc2
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
@@ -0,0 +1,64 @@
+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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.MavenLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Test a directory with an umlaut
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class UmlautDirIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testUmlaut()
+ throws Exception
+ {
+ specialUnpack().executeTest().verifyErrorFreeLog().assertTestSuiteResults( 1, 0, 0, 0 );
+ }
+
+ @Test
+ public void testUmlautIsolatedClassLoader()
+ throws Exception
+ {
+ specialUnpack().useSystemClassLoader( false ).executeTest().assertTestSuiteResults( 1, 0, 0, 0 );
+ }
+
+ SurefireLauncher specialUnpack()
+ throws VerificationException, IOException
+ {
+ SurefireLauncher unpack = unpack( "junit-pathWithUmlaut" );
+ MavenLauncher maven = unpack.maven();
+
+ File dest = new File( maven.getUnpackedAt().getParentFile().getPath(), "/junit-pathWith\u00DCmlaut" );
+ maven.moveUnpackTo( dest );
+ return unpack;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
new file mode 100644
index 0000000..64db960
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
@@ -0,0 +1,75 @@
+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 LicenseUni.
+ */
+
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.TestFile;
+import org.junit.Test;
+
+import java.io.File;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+
+/**
+ * Verifies unicode filenames pass through correctly.
+ */
+public class UnicodeTestNamesIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private static final String TXT_REPORT = "junit.twoTestCases.\u800C\u7D22\u5176\u60C5Test.txt";
+ private static final String XML_REPORT = "TEST-junit.twoTestCases.\u800C\u7D22\u5176\u60C5Test.xml";
+
+ @Test
+ public void checkFileNamesWithUnicode()
+ {
+ SurefireLauncher unpacked = unpack( "unicode-testnames" );
+ File basedir = unpacked.getUnpackedAt();
+
+ unpacked.execute( "clean" );
+
+ File xxyz = new File( basedir, "src/test/java/junit/twoTestCases/XXYZTest.java" );
+ File dest = new File( basedir, "src/test/java/junit/twoTestCases/\u800C\u7D22\u5176\u60C5Test.java" );
+
+ //noinspection ResultOfMethodCallIgnored
+ dest.delete();
+ assertTrue( xxyz.renameTo( dest ) );
+
+ assertTrue( dest.exists() );
+ assumeFalse( new File( basedir, "src/test/java/junit/twoTestCases/????Test.java" ).exists() );
+
+ OutputValidator outputValidator =
+ unpacked.executeTest()
+ .assertTestSuiteResults( 2, 0, 0, 0 );
+
+ TestFile surefireReportFile = outputValidator.getSurefireReportsFile( TXT_REPORT );
+ assertTrue( surefireReportFile.exists() );
+ surefireReportFile.assertContainsText( "junit.twoTestCases.????Test" );
+
+ TestFile surefireXmlReportFile = outputValidator.getSurefireReportsXmlFile( XML_REPORT );
+ assertTrue( surefireXmlReportFile.exists() );
+ assertFalse( surefireXmlReportFile.readFileToString().isEmpty() );
+ surefireXmlReportFile.assertContainsText( "junit.twoTestCases.\u800C\u7D22\u5176\u60C5Test" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java
new file mode 100644
index 0000000..b87f603
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java
@@ -0,0 +1,38 @@
+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;
+
+/**
+ * Test useSystemClassLoader option
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class UseIsolatedClassLoaderIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testUseSystemClassLoader()
+ {
+ executeErrorFreeTest( "/isolated-classloader", 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
new file mode 100644
index 0000000..66fa3df
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
@@ -0,0 +1,134 @@
+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.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test working directory configuration, SUREFIRE-416
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class WorkingDirectoryIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void testWorkingDirectory()
+ throws Exception
+ {
+ final SurefireLauncher unpack = getUnpacked();
+ final OutputValidator child = getPreparedChild( unpack );
+ unpack.executeTest().verifyErrorFreeLog();
+ child.assertTestSuiteResults( 1, 0, 0, 0 );
+ verifyOutputDirectory( child );
+ }
+
+ @Test
+ public void testWorkingDirectoryNoFork()
+ throws Exception
+ {
+ final SurefireLauncher unpack = getUnpacked();
+ final OutputValidator child = getPreparedChild( unpack );
+ unpack.forkNever().executeTest().verifyErrorFreeLog();
+ child.assertTestSuiteResults( 1, 0, 0, 0 );
+ verifyOutputDirectory( child );
+ }
+
+ @Test
+ public void testWorkingDirectoryChildOnly()
+ throws Exception
+ {
+ final SurefireLauncher unpack = getUnpacked();
+ final SurefireLauncher child = unpack.getSubProjectLauncher( "child" );
+ //child.getTargetFile( "out.txt" ).delete();
+ final OutputValidator outputValidator = child.executeTest().assertTestSuiteResults( 1, 0, 0, 0 );
+ verifyOutputDirectory( outputValidator );
+ }
+
+ @Test
+ public void testWorkingDirectoryChildOnlyNoFork()
+ throws Exception
+ {
+
+ final SurefireLauncher unpack = getUnpacked();
+ final SurefireLauncher child = unpack.getSubProjectLauncher( "child" );
+ //child.getTargetFile( "out.txt" ).delete();
+ final OutputValidator outputValidator = child.forkNever().executeTest().assertTestSuiteResults( 1, 0, 0, 0 );
+ verifyOutputDirectory( outputValidator );
+ }
+
+ private SurefireLauncher getUnpacked()
+ throws VerificationException, IOException
+ {
+ return unpack( "working-directory" );
+ }
+
+ private OutputValidator getPreparedChild( SurefireLauncher unpack )
+ throws VerificationException
+ {
+ final OutputValidator child = unpack.getSubProjectValidator( "child" );
+ getOutFile( child ).delete();
+ return child;
+ }
+
+
+ private TestFile getOutFile( OutputValidator child )
+ {
+ return child.getTargetFile( "out.txt" );
+ }
+
+ public void verifyOutputDirectory( OutputValidator childTestDir )
+ throws IOException
+ {
+ final TestFile outFile = getOutFile( childTestDir );
+ assertTrue( "out.txt doesn't exist: " + outFile.getAbsolutePath(), outFile.exists() );
+ Properties p = new Properties();
+ FileInputStream is = outFile.getFileInputStream();
+ p.load( is );
+ is.close();
+ String userDirPath = p.getProperty( "user.dir" );
+ assertNotNull( "user.dir was null in property file", userDirPath );
+ File userDir = new File( userDirPath );
+ // test if not a symlink
+ if ( childTestDir.getBaseDir().getCanonicalFile().equals( childTestDir.getBaseDir().getAbsoluteFile() ) )
+ {
+ assertTrue( "wrong user.dir ! symlink ",
+ childTestDir.getBaseDir().getAbsolutePath().equalsIgnoreCase( userDir.getAbsolutePath() ) );
+ }
+ else
+ {
+ assertEquals( "wrong user.dir symlink ", childTestDir.getBaseDir().getCanonicalPath(),
+ userDir.getCanonicalPath() );
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java
new file mode 100644
index 0000000..1415b6e
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java
@@ -0,0 +1,39 @@
+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;
+
+/**
+ * Test when the configured working directory is an invalid property, SUREFIRE-715
+ *
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class WorkingDirectoryIsInvalidPropertyIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testWorkingDirectory()
+ throws Exception
+ {
+ unpack( "working-directory-is-invalid-property" ).maven().withFailure().executeTest().verifyTextInLog(
+ "workingDirectory cannot be null" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
new file mode 100644
index 0000000..5247160
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
@@ -0,0 +1,39 @@
+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;
+
+/**
+ * Test when the configured working directory does not exist, SUREFIRE-607
+ *
+ * @author <a href="mailto:stephenc@apache.org">Stephen Connolly</a>
+ */
+public class WorkingDirectoryMissingIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testWorkingDirectory()
+ {
+ unpack( "working-directory-missing" ).executeTest().verifyErrorFreeLog();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
new file mode 100644
index 0000000..e8ee58b
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
@@ -0,0 +1,75 @@
+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.plugins.surefire.report.ReportTestSuite;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.extractReports;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.lessThan;
+
+/**
+ * Test reported runtime
+ *
+ * @author Kristian Rosenvold
+ */
+public class XmlReporterRunTimeIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testForkModeAlways()
+ throws Exception
+ {
+ // just generate .surefire-<hash> in order to apply runOrder
+ unpack( "/runorder-parallel" )
+ .executeTest()
+ .verifyErrorFree( 9 );
+
+ // now assert test results match expected values
+ OutputValidator outputValidator = unpack( "/runorder-parallel" )
+ .executeTest()
+ .verifyErrorFree( 9 );
+
+ for ( ReportTestSuite report : extractReports( outputValidator.getBaseDir() ) )
+ {
+ if ( "runorder.parallel.Test1".equals( report.getFullClassName() ) )
+ {
+ // should be 6f but because of having Windows sleep discrepancy it is 5.95f
+ assertThat( "runorder.parallel.Test1 report.getTimeElapsed found:" + report.getTimeElapsed(),
+ report.getTimeElapsed(), allOf( greaterThanOrEqualTo( 5.95f ), lessThan( 7f ) ) );
+ }
+ else if ( "runorder.parallel.Test2".equals( report.getFullClassName() ) )
+ {
+ // should be 5f but because of having Windows sleep discrepancy it is 4.95f
+ assertThat( "runorder.parallel.Test2 report.getTimeElapsed found:" + report.getTimeElapsed(),
+ report.getTimeElapsed(), allOf( greaterThanOrEqualTo( 4.95f ), lessThan( 6f ) ) );
+ }
+ else
+ {
+ System.out.println( "report = " + report );
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/Configuration.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/Configuration.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/Configuration.java
new file mode 100644
index 0000000..dcd8184
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/Configuration.java
@@ -0,0 +1,29 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.
+ */
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.19
+ */
+public enum Configuration
+{
+ TEST, INCLUDES, INCLUDES_FILE, INCLUDES_EXCLUDES, INCLUDES_EXCLUDES_FILE
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
new file mode 100644
index 0000000..b96cf9b
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
@@ -0,0 +1,47 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.it.VerificationException;
+
+public class FailsafeOutputValidator
+ extends OutputValidator
+{
+ public FailsafeOutputValidator( OutputValidator source )
+ {
+ super( source.verifier );
+ }
+
+ @Override
+ public OutputValidator verifyErrorFree( int total )
+ {
+ try
+ {
+ verifier.verifyErrorFreeLog();
+ this.assertIntegrationTestSuiteResults( total, 0, 0, 0 );
+ return this;
+ }
+ catch ( VerificationException e )
+ {
+ throw new SurefireVerifierException( e );
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
new file mode 100644
index 0000000..ed0d40c
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
@@ -0,0 +1,174 @@
+package org.apache.maven.surefire.its.fixture;
+/*
+ * 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.plugin.surefire.log.api.ConsoleLogger;
+import org.apache.maven.plugin.surefire.log.api.PrintStreamLogger;
+import org.apache.maven.plugins.surefire.report.ReportTestSuite;
+import org.apache.maven.plugins.surefire.report.SurefireReportParser;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+@SuppressWarnings( { "JavaDoc" } )
+public class HelperAssertions
+{
+ /**
+ * assert that the reports in the specified testDir have the right summary statistics
+ */
+ public static void assertTestSuiteResults( int total, int errors, int failures, int skipped, File testDir )
+ {
+ IntegrationTestSuiteResults suite = parseTestResults( testDir );
+ assertTestSuiteResults( total, errors, failures, skipped, suite );
+ }
+
+ public static void assertTestSuiteResults( int total, int errors, int failures, int skipped, int flakes, File testDir )
+ {
+ IntegrationTestSuiteResults suite = parseTestResults( testDir );
+ assertTestSuiteResults( total, errors, failures, skipped, flakes, suite );
+ }
+
+ public static void assertTestSuiteResults( int total, File testDir )
+ {
+ IntegrationTestSuiteResults suite = parseTestResults( testDir );
+ assertTestSuiteResults( total, suite );
+ }
+
+ /**
+ * assert that the reports in the specified testDir have the right summary statistics
+ */
+ public static void assertIntegrationTestSuiteResults( int total, int errors, int failures, int skipped,
+ File testDir )
+ {
+ IntegrationTestSuiteResults suite = parseIntegrationTestResults( testDir );
+ assertTestSuiteResults( total, errors, failures, skipped, suite );
+ }
+
+ public static void assertIntegrationTestSuiteResults( int total, File testDir )
+ {
+ IntegrationTestSuiteResults suite = parseIntegrationTestResults( testDir );
+ assertTestSuiteResults( total, suite );
+ }
+
+ public static void assertTestSuiteResults( int total, int errors, int failures, int skipped,
+ IntegrationTestSuiteResults actualSuite )
+ {
+ assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
+ assertEquals( "wrong number of errors", errors, actualSuite.getErrors() );
+ assertEquals( "wrong number of failures", failures, actualSuite.getFailures() );
+ assertEquals( "wrong number of skipped", skipped, actualSuite.getSkipped() );
+ }
+
+ public static void assertTestSuiteResults( int total, IntegrationTestSuiteResults actualSuite )
+ {
+ assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
+ }
+
+ public static void assertTestSuiteResults( int total, int errors, int failures, int skipped, int flakes,
+ IntegrationTestSuiteResults actualSuite )
+ {
+ assertTestSuiteResults(total, errors, failures, skipped, actualSuite);
+ assertEquals( "wrong number of flaky tests", flakes, actualSuite.getFlakes() );
+ }
+
+ public static IntegrationTestSuiteResults parseTestResults( File... testDirs )
+ {
+ List<ReportTestSuite> reports = extractReports( testDirs );
+ return parseReportList( reports );
+ }
+
+ public static IntegrationTestSuiteResults parseIntegrationTestResults( File... testDirs )
+ {
+ List<ReportTestSuite> reports = extractITReports( testDirs );
+ return parseReportList( reports );
+ }
+
+ /**
+ * Converts a list of ReportTestSuites into an IntegrationTestSuiteResults object, suitable for summary assertions
+ */
+ public static IntegrationTestSuiteResults parseReportList( List<ReportTestSuite> reports )
+ {
+ assertTrue( "No reports!", !reports.isEmpty() );
+ int total = 0, errors = 0, failures = 0, skipped = 0, flakes = 0;
+ for ( ReportTestSuite report : reports )
+ {
+ total += report.getNumberOfTests();
+ errors += report.getNumberOfErrors();
+ failures += report.getNumberOfFailures();
+ skipped += report.getNumberOfSkipped();
+ flakes += report.getNumberOfFlakes();
+ }
+ return new IntegrationTestSuiteResults( total, errors, failures, skipped, flakes );
+ }
+
+ public static List<ReportTestSuite> extractReports( File... testDirs )
+ {
+ List<File> reportsDirs = new ArrayList<File>();
+ for ( File testDir : testDirs )
+ {
+ File reportsDir = new File( testDir, "target/surefire-reports" );
+ assertTrue( "Reports directory is missing: " + reportsDir.getAbsolutePath(), reportsDir.exists() );
+ reportsDirs.add( reportsDir );
+ }
+ ConsoleLogger logger = new PrintStreamLogger( System.out );
+ SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.getDefault(), logger );
+ try
+ {
+ return parser.parseXMLReportFiles();
+ }
+ catch ( Exception e )
+ {
+ throw new RuntimeException( "Couldn't parse XML reports", e );
+ }
+ }
+
+ public static List<ReportTestSuite> extractITReports( File... testDirs )
+ {
+ List<File> reportsDirs = new ArrayList<File>();
+ for ( File testDir : testDirs )
+ {
+ File reportsDir = new File( testDir, "target/failsafe-reports" );
+ assertTrue( "Reports directory is missing: " + reportsDir.getAbsolutePath(), reportsDir.exists() );
+ reportsDirs.add( reportsDir );
+ }
+ ConsoleLogger logger = new PrintStreamLogger( System.out );
+ SurefireReportParser parser = new SurefireReportParser( reportsDirs, Locale.getDefault(), logger );
+ try
+ {
+ return parser.parseXMLReportFiles();
+ }
+ catch ( Exception e )
+ {
+ throw new RuntimeException( "Couldn't parse XML reports", e );
+ }
+ }
+
+ public static void assumeJavaVersion( double expectedVersion )
+ {
+ String thisVersion = System.getProperty( "java.specification.version" );
+ assumeTrue( "java.specification.version: " + thisVersion,
+ Double.valueOf( thisVersion ) >= expectedVersion );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java
new file mode 100644
index 0000000..f147281
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/IntegrationTestSuiteResults.java
@@ -0,0 +1,91 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.
+ */
+
+
+public class IntegrationTestSuiteResults
+{
+ private int total, errors, failures, skipped, flakes;
+
+ public IntegrationTestSuiteResults( int total, int errors, int failures, int skipped )
+ {
+ this.total = total;
+ this.errors = errors;
+ this.failures = failures;
+ this.skipped = skipped;
+ }
+
+ public IntegrationTestSuiteResults( int total, int errors, int failures, int skipped, int flakes )
+ {
+ this(total, errors, failures, skipped);
+ this.flakes = flakes;
+ }
+
+ public int getTotal()
+ {
+ return total;
+ }
+
+ public void setTotal( int total )
+ {
+ this.total = total;
+ }
+
+ public int getErrors()
+ {
+ return errors;
+ }
+
+ public void setErrors( int errors )
+ {
+ this.errors = errors;
+ }
+
+ public int getFailures()
+ {
+ return failures;
+ }
+
+ public void setFailures( int failures )
+ {
+ this.failures = failures;
+ }
+
+ public int getSkipped()
+ {
+ return skipped;
+ }
+
+ public void setSkipped( int skipped )
+ {
+ this.skipped = skipped;
+ }
+
+ public int getFlakes()
+ {
+ return flakes;
+ }
+
+ public void setFlakes( int flakes )
+ {
+ this.flakes = flakes;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
new file mode 100755
index 0000000..bd12dda
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -0,0 +1,504 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.commons.lang.text.StrSubstitutor;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.shared.utils.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+import static java.util.Collections.unmodifiableList;
+
+/**
+ * Encapsulate all needed features to start a maven run
+ * <br>
+ *
+ * @author Kristian Rosenvold
+ */
+public class MavenLauncher
+{
+ private final List<String> cliOptions = new ArrayList<String>();
+
+ private final List<String> goals = new ArrayList<String>();
+
+ private final Map<String, String> envvars = new HashMap<String, String>();
+
+ private File unpackedAt;
+
+ private Verifier verifier;
+
+ private OutputValidator validator;
+
+ private final Class testCaseBeingRun;
+
+ private final String resourceName;
+
+ private final String suffix;
+
+ private final String[] cli;
+
+ private boolean expectFailure;
+
+ public MavenLauncher( Class testClass, String resourceName, String suffix, String[] cli )
+ {
+ this.testCaseBeingRun = testClass;
+ this.resourceName = resourceName;
+ this.suffix = suffix != null ? suffix : "";
+ this.cli = cli == null ? null : cli.clone();
+ resetGoals();
+ resetCliOptions();
+ }
+
+ public MavenLauncher( Class testClass, String resourceName, String suffix )
+ {
+ this( testClass, resourceName, suffix, null );
+ }
+
+ public File getUnpackedAt()
+ {
+ return ensureUnpacked();
+ }
+
+ private File ensureUnpacked()
+ {
+ if ( unpackedAt == null )
+ {
+ unpackedAt = simpleExtractResources( testCaseBeingRun, resourceName );
+ }
+ return unpackedAt;
+ }
+
+ public void moveUnpackTo( File dest )
+ throws IOException
+ {
+ FileUtils.deleteDirectory( dest );
+ //noinspection ResultOfMethodCallIgnored
+ getUnpackedAt().renameTo( dest );
+ unpackedAt = dest;
+ }
+
+ public void resetGoals()
+ {
+ goals.clear();
+ }
+
+ void addCliOption( String cliOption )
+ {
+ cliOptions.add( cliOption );
+ }
+
+
+
+ private StackTraceElement findTopElemenent( StackTraceElement[] stackTrace, Class testClassToLookFor )
+ {
+ StackTraceElement bestmatch = null;
+ for ( StackTraceElement stackTraceElement : stackTrace )
+ {
+ if ( stackTraceElement.getClassName().equals( testClassToLookFor.getName() ) )
+ {
+ bestmatch = stackTraceElement;
+ }
+ }
+ return bestmatch;
+ }
+
+ StackTraceElement[] getStackTraceElements()
+ {
+ try
+ {
+ throw new RuntimeException();
+ }
+ catch ( RuntimeException e )
+ {
+ return e.getStackTrace();
+ }
+ }
+
+ public void reset()
+ {
+ resetGoals();
+ resetCliOptions();
+ }
+
+ private void resetCliOptions()
+ {
+ cliOptions.clear();
+ }
+
+ public MavenLauncher getSubProjectLauncher( String subProject )
+ throws VerificationException
+ {
+ MavenLauncher mavenLauncher =
+ new MavenLauncher( testCaseBeingRun, resourceName + File.separator + subProject, suffix, cli );
+ mavenLauncher.unpackedAt = new File( ensureUnpacked(), subProject );
+ return mavenLauncher;
+ }
+
+ public OutputValidator getSubProjectValidator( String subProject )
+ throws VerificationException
+ {
+ final File subFile = getValidator().getSubFile( subProject );
+ return new OutputValidator( new Verifier( subFile.getAbsolutePath() ) );
+ }
+
+
+ public MavenLauncher addEnvVar( String key, String value )
+ {
+ envvars.put( key, value );
+ return this;
+ }
+
+ public MavenLauncher assertNotPresent( String subFile )
+ {
+ getVerifier().assertFileNotPresent( getValidator().getSubFile( subFile ).getAbsolutePath() );
+ return this;
+ }
+
+ public MavenLauncher showErrorStackTraces()
+ {
+ addCliOption( "-e" );
+ return this;
+ }
+
+ public MavenLauncher debugLogging()
+ {
+ addCliOption( "-X" );
+ return this;
+ }
+
+ public MavenLauncher failNever()
+ {
+ addCliOption( "-fn" );
+ return this;
+ }
+
+ public MavenLauncher offline()
+ {
+ addCliOption( "-o" );
+ return this;
+ }
+
+ public MavenLauncher skipClean()
+ {
+ writeGoal( "-Dclean.skip=true" );
+ return this;
+ }
+
+ public MavenLauncher addGoal( String goal )
+ {
+ writeGoal( goal );
+ return this;
+ }
+
+ public FailsafeOutputValidator executeVerify()
+ {
+ return new FailsafeOutputValidator( conditionalExec( "verify" ) );
+ }
+
+ public OutputValidator executeTest()
+ {
+ return conditionalExec( "test" );
+ }
+
+ List<String> getGoals()
+ {
+ return unmodifiableList( goals );
+ }
+
+ private void writeGoal( String newGoal )
+ {
+ if ( newGoal != null && newGoal.startsWith( "-D" ) )
+ {
+ final String sysPropKey =
+ newGoal.contains( "=" ) ? newGoal.substring( 0, newGoal.indexOf( '=' ) ) : newGoal;
+
+ final String sysPropStarter = sysPropKey + "=";
+
+ for ( ListIterator<String> it = goals.listIterator(); it.hasNext(); )
+ {
+ String goal = it.next();
+ if ( goal.equals( sysPropKey ) || goal.startsWith( sysPropStarter ) )
+ {
+ System.out.printf( "[WARNING] System property already exists '%s'. Overriding to '%s'.\n",
+ goal, newGoal );
+ it.set( newGoal );
+ return;
+ }
+ }
+ }
+ goals.add( newGoal );
+ }
+
+ private OutputValidator conditionalExec(String goal)
+ {
+ OutputValidator verify;
+ try
+ {
+ verify = execute( goal );
+ }
+ catch ( SurefireVerifierException exc )
+ {
+ if ( expectFailure )
+ {
+ return getValidator();
+ }
+ else
+ {
+ throw exc;
+ }
+ }
+ if ( expectFailure )
+ {
+ throw new RuntimeException( "Expecting build failure, got none!" );
+ }
+ return verify;
+
+ }
+
+ public MavenLauncher withFailure()
+ {
+ this.expectFailure = true;
+ return this;
+ }
+
+
+ public OutputValidator execute( String goal )
+ {
+ addGoal( goal );
+ return executeCurrentGoals();
+ }
+
+ public OutputValidator executeCurrentGoals()
+ {
+
+ String userLocalRepo = System.getProperty( "user.localRepository" );
+ String testBuildDirectory = System.getProperty( "testBuildDirectory" );
+ boolean useInterpolatedSettings = Boolean.getBoolean( "useInterpolatedSettings" );
+
+ try
+ {
+ if ( useInterpolatedSettings )
+ {
+ File interpolatedSettings = new File( testBuildDirectory, "interpolated-settings" );
+
+ if ( !interpolatedSettings.exists() )
+ {
+ // hack "a la" invoker plugin to download dependencies from local repo
+ // and not download from central
+
+ Map<String, String> values = new HashMap<String, String>( 1 );
+ values.put( "localRepositoryUrl", toUrl( userLocalRepo ) );
+ StrSubstitutor strSubstitutor = new StrSubstitutor( values );
+
+ String fileContent = FileUtils.fileRead( new File( testBuildDirectory, "settings.xml" ) );
+
+ String filtered = strSubstitutor.replace( fileContent );
+
+ FileUtils.fileWrite( interpolatedSettings.getAbsolutePath(), filtered );
+
+ }
+
+ addCliOption( "-s " + interpolatedSettings.getCanonicalPath() );
+ }
+ getVerifier().setCliOptions( cliOptions );
+
+ getVerifier().executeGoals( goals, envvars );
+ return getValidator();
+ }
+ catch ( IOException e )
+ {
+ throw new SurefireVerifierException( e.getMessage(), e );
+ }
+ catch ( VerificationException e )
+ {
+ throw new SurefireVerifierException( e.getMessage(), e );
+ }
+ finally
+ {
+ getVerifier().resetStreams();
+ }
+ }
+
+ private static String toUrl( String filename )
+ {
+ /*
+ * NOTE: Maven fails to properly handle percent-encoded "file:" URLs (WAGON-111) so don't use File.toURI() here
+ * as-is but use the decoded path component in the URL.
+ */
+ String url = "file://" + new File( filename ).toURI().getPath();
+ if ( url.endsWith( "/" ) )
+ {
+ url = url.substring( 0, url.length() - 1 );
+ }
+ return url;
+ }
+
+ public MavenLauncher activateProfile( String profile )
+ {
+ return addGoal( "-P" + profile );
+ }
+
+ public MavenLauncher sysProp( String variable, String value )
+ {
+ return addGoal( "-D" + variable + "=" + value );
+ }
+
+ public MavenLauncher sysProp( Map<String, String> properties )
+ {
+ for ( Map.Entry<String, String> property : properties.entrySet() )
+ {
+ sysProp( property.getKey(), property.getValue() );
+ }
+ return this;
+ }
+
+ public MavenLauncher sysProp( String variable, boolean value )
+ {
+ return addGoal( "-D" + variable + "=" + value );
+ }
+
+ public MavenLauncher sysProp( String variable, int value )
+ {
+ return addGoal( "-D" + variable + "=" + value );
+ }
+
+ public MavenLauncher sysProp( String variable, double value )
+ {
+ return addGoal( "-D" + variable + "=" + value );
+ }
+
+ public MavenLauncher showExceptionMessages()
+ {
+ addCliOption( "-e" );
+ return this;
+ }
+
+ public MavenLauncher deleteSiteDir()
+ {
+ try
+ {
+ FileUtils.deleteDirectory( getValidator().getSubFile( "site" ) );
+ }
+ catch ( IOException e )
+ {
+ throw new SurefireVerifierException( e );
+ }
+ return this;
+ }
+
+ public OutputValidator getValidator()
+ {
+ if ( validator == null )
+ {
+ this.validator = new OutputValidator( getVerifier() );
+ }
+ return validator;
+ }
+
+ public void setForkJvm( boolean forkJvm ) {
+ getVerifier().setForkJvm( forkJvm );
+ }
+
+ private Verifier getVerifier()
+ {
+ if ( verifier == null )
+ {
+ try
+ {
+ verifier =
+ cli == null
+ ? new Verifier( ensureUnpacked().getAbsolutePath(), null, false )
+ : new Verifier( ensureUnpacked().getAbsolutePath(), null, false, cli );
+ }
+ catch ( VerificationException e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
+ return verifier;
+ }
+
+ private File simpleExtractResources( Class<?> cl, String resourcePath )
+ {
+ if ( !resourcePath.startsWith( "/" ) )
+ {
+ resourcePath = "/" + resourcePath;
+ }
+ File tempDir = getUnpackDir();
+ File testDir = new File( tempDir, resourcePath );
+ try
+ {
+ File parentPom = new File( tempDir.getParentFile(), "pom.xml" );
+ if (!parentPom.exists()){
+ URL resource = cl.getResource( "/pom.xml" );
+ FileUtils.copyURLToFile( resource, parentPom );
+ }
+
+ FileUtils.deleteDirectory( testDir );
+ File file = ResourceExtractor.extractResourceToDestination( cl, resourcePath, tempDir, true );
+ return file.getCanonicalFile();
+ }
+ catch ( IOException e )
+ {
+ throw new RuntimeException( e );
+ }
+
+ }
+
+ File getUnpackDir()
+ {
+ String tempDirPath = System.getProperty( "maven.test.tmpdir", System.getProperty( "java.io.tmpdir" ) );
+ return new File( tempDirPath,
+ testCaseBeingRun.getSimpleName() + "_" + getTestMethodName() + suffix );
+ }
+
+ public File getArtifactPath( String gid, String aid, String version, String ext )
+ {
+ return new File( verifier.getArtifactPath( gid, aid, version, ext ) );
+ }
+
+ String getTestMethodName()
+ {
+ // dirty. Im sure we can use junit4 rules to attach testname to thread instead
+ StackTraceElement[] stackTrace = getStackTraceElements();
+ StackTraceElement topInTestClass;
+ topInTestClass = findTopElemenent( stackTrace, testCaseBeingRun );
+ if ( topInTestClass == null )
+ {
+ // Look in superclass...
+ topInTestClass = findTopElemenent( stackTrace, testCaseBeingRun.getSuperclass() );
+ }
+ if ( topInTestClass != null )
+ {
+ return topInTestClass.getMethodName();
+ }
+ throw new IllegalStateException( "Cannot find " + testCaseBeingRun.getName() + "in stacktrace" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java
new file mode 100644
index 0000000..42657c0
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncherTest.java
@@ -0,0 +1,47 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.hamcrest.CoreMatchers.hasItems;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.20
+ */
+public class MavenLauncherTest
+{
+ @Test
+ public void shouldNotDuplicateSystemProperties()
+ {
+ MavenLauncher launcher = new MavenLauncher( getClass(), "", "" )
+ .addGoal( "-DskipTests" )
+ .addGoal( "-Dx=a" )
+ .addGoal( "-DskipTests" )
+ .addGoal( "-Dx=b" );
+
+ assertThat( launcher.getGoals(), hasItems( "-Dx=b", "-DskipTests" ) );
+
+ assertThat( launcher.getGoals().size(), is( 2 ) );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
new file mode 100644
index 0000000..a76f86f
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
@@ -0,0 +1,230 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.hamcrest.Matcher;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+/**
+ * A specialized verifier that enforces a standard use case for surefire IT's
+ *
+ * @author Kristian Rosenvold
+ */
+public class OutputValidator
+{
+ protected final Verifier verifier;
+
+ protected final File baseDir;
+
+ public OutputValidator( Verifier verifier )
+ {
+ this.verifier = verifier;
+ this.baseDir = new File( verifier.getBasedir() );
+ }
+
+ public OutputValidator verifyTextInLog( String text )
+ {
+ try
+ {
+ verifier.verifyTextInLog( text );
+ }
+ catch ( VerificationException e )
+ {
+ throw new SurefireVerifierException( e );
+ }
+ return this;
+ }
+
+
+ public OutputValidator verifyErrorFreeLog()
+ {
+ try
+ {
+ verifier.verifyErrorFreeLog();
+ }
+ catch ( VerificationException e )
+ {
+ throw new SurefireVerifierException( e );
+ }
+ return this;
+ }
+
+ public OutputValidator verifyErrorFree( int total )
+ {
+ try
+ {
+ verifier.verifyErrorFreeLog();
+ this.assertTestSuiteResults( total, 0, 0, 0 );
+ return this;
+ }
+ catch ( VerificationException e )
+ {
+ throw new SurefireVerifierException( e );
+ }
+ }
+
+ public OutputValidator assertThatLogLine( Matcher<String> line, Matcher<Integer> nTimes )
+ throws VerificationException
+ {
+ int counter = 0;
+ for ( String log : loadLogLines() )
+ {
+ if ( line.matches( log ) )
+ {
+ counter++;
+ }
+ }
+ assertThat( "log pattern does not match nTimes", counter, nTimes );
+ return this;
+ }
+
+ public Collection<String> loadLogLines()
+ throws VerificationException
+ {
+ return verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
+ }
+
+ public List<String> loadFile( File file, Charset charset )
+ {
+ //noinspection unchecked
+ try
+ {
+ return FileUtils.readLines( file, charset.name() );
+ }
+ catch ( IOException e )
+ {
+ throw new SurefireVerifierException( e );
+ }
+ }
+
+ public String getBasedir()
+ {
+ return verifier.getBasedir();
+ }
+
+ /**
+ * Returns a file, referenced from the extracted root (where pom.xml is located)
+ *
+ * @param path The subdirectory under basedir
+ * @return A file
+ */
+ public File getSubFile( String path )
+ {
+ return new File( getBasedir(), path );
+ }
+
+ public OutputValidator assertTestSuiteResults( int total, int errors, int failures, int skipped )
+ {
+ HelperAssertions.assertTestSuiteResults( total, errors, failures, skipped, baseDir );
+ return this;
+ }
+
+ public OutputValidator assertTestSuiteResults( int total, int errors, int failures, int skipped, int flakes )
+ {
+ HelperAssertions.assertTestSuiteResults( total, errors, failures, skipped, flakes, baseDir );
+ return this;
+ }
+
+ public OutputValidator assertTestSuiteResults( int total )
+ {
+ HelperAssertions.assertTestSuiteResults( total, baseDir );
+ return this;
+ }
+
+ public OutputValidator assertIntegrationTestSuiteResults( int total, int errors, int failures, int skipped )
+ {
+ HelperAssertions.assertIntegrationTestSuiteResults( total, errors, failures, skipped, baseDir );
+ return this;
+ }
+
+ public OutputValidator assertIntegrationTestSuiteResults( int total )
+ {
+ HelperAssertions.assertIntegrationTestSuiteResults( total, baseDir );
+ return this;
+ }
+
+ public TestFile getTargetFile( String modulePath, String fileName )
+ {
+ File targetDir = getSubFile( modulePath + "/target" );
+ return new TestFile( new File( targetDir, fileName ), this );
+ }
+
+ public TestFile getTargetFile( String fileName )
+ {
+ File targetDir = getSubFile( "target" );
+ return new TestFile( new File( targetDir, fileName ), this );
+ }
+
+ public TestFile getSurefireReportsFile( String fileName )
+ {
+ File targetDir = getSurefireReportsDirectory();
+ return new TestFile( new File( targetDir, fileName ), this );
+ }
+
+ public TestFile getSurefireReportsXmlFile( String fileName )
+ {
+ File targetDir = getSurefireReportsDirectory();
+ return new TestFile( new File( targetDir, fileName ), Charset.forName( "UTF-8" ), this );
+ }
+
+ public File getSurefireReportsDirectory()
+ {
+ return getSubFile( "target/surefire-reports" );
+ }
+
+ public TestFile getSiteFile( String fileName )
+ {
+ File targetDir = getSubFile( "target/site" );
+ return new TestFile( new File( targetDir, fileName ), this );
+ }
+
+ public File getBaseDir()
+ {
+ return baseDir;
+ }
+
+ public boolean stringsAppearInSpecificOrderInLog( String[] strings )
+ throws VerificationException
+ {
+ int i = 0;
+ for ( String line : loadLogLines() )
+ {
+ if ( line.startsWith( strings[i] ) )
+ {
+ if ( i == strings.length - 1 )
+ {
+ return true;
+ }
+ ++i;
+ }
+ }
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/Settings.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/Settings.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/Settings.java
new file mode 100644
index 0000000..28013fb
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/Settings.java
@@ -0,0 +1,72 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.
+ */
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.19
+ */
+public enum Settings
+{
+ JUNIT4_TEST( TestFramework.JUNIT4, Configuration.TEST ),
+ JUNIT47_TEST( TestFramework.JUNIT47, Configuration.TEST ),
+ JUNIT4_INCLUDES( TestFramework.JUNIT4, Configuration.INCLUDES ),
+ JUNIT47_INCLUDES( TestFramework.JUNIT47, Configuration.INCLUDES ),
+ JUNIT4_INCLUDES_EXCLUDES( TestFramework.JUNIT4, Configuration.INCLUDES_EXCLUDES ),
+ JUNIT47_INCLUDES_EXCLUDES( TestFramework.JUNIT47, Configuration.INCLUDES_EXCLUDES ),
+ JUNIT4_INCLUDES_FILE( TestFramework.JUNIT4, Configuration.INCLUDES_FILE ),
+ JUNIT47_INCLUDES_FILE( TestFramework.JUNIT47, Configuration.INCLUDES_FILE ),
+ JUNIT4_INCLUDES_EXCLUDES_FILE( TestFramework.JUNIT4, Configuration.INCLUDES_EXCLUDES_FILE ),
+ JUNIT47_INCLUDES_EXCLUDES_FILE( TestFramework.JUNIT47, Configuration.INCLUDES_EXCLUDES_FILE ),
+ TestNG_TEST( TestFramework.TestNG, Configuration.TEST ),
+ TestNG_INCLUDES( TestFramework.TestNG, Configuration.INCLUDES ),
+ TestNG_INCLUDES_EXCLUDES( TestFramework.TestNG, Configuration.INCLUDES_EXCLUDES ),
+ TestNG_INCLUDES_FILE( TestFramework.TestNG, Configuration.INCLUDES_FILE ),
+ TestNG_INCLUDES_EXCLUDES_FILE( TestFramework.TestNG, Configuration.INCLUDES_EXCLUDES_FILE );
+
+ private final TestFramework framework;
+ private final Configuration configuration;
+
+ Settings( TestFramework framework, Configuration configuration )
+ {
+ this.framework = framework;
+ this.configuration = configuration;
+ }
+
+ public String path()
+ {
+ return name().replace( '_', '-' ).toLowerCase();
+ }
+
+ public String profile()
+ {
+ return path();
+ }
+
+ public TestFramework getFramework()
+ {
+ return framework;
+ }
+
+ public Configuration getConfiguration()
+ {
+ return configuration;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
new file mode 100644
index 0000000..ee04dbc
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
@@ -0,0 +1,60 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.
+ */
+
+/**
+ * Contains commonly used features for most tests, encapsulating
+ * common use cases.
+ * <br>
+ * Also includes thread-safe access to the extracted resource
+ * files, which AbstractSurefireIntegrationTestClass does not.
+ * Thread safe only for running in "classes" mode.
+ *
+ * @author Kristian Rosenvold
+ */
+public abstract class SurefireJUnit4IntegrationTestCase
+{
+ public OutputValidator executeErrorFreeTest( String sourceName, int total )
+ {
+ return unpack( sourceName ).executeTest().verifyErrorFree( total );
+ }
+
+ public SurefireLauncher unpack( String sourceName )
+ {
+ return unpack( getClass(), sourceName, "" );
+ }
+
+ public SurefireLauncher unpack( String sourceName, String suffix )
+ {
+ return unpack( getClass(), sourceName, suffix );
+ }
+
+ public static SurefireLauncher unpack( Class testClass, String sourceName, String suffix, String[] cli )
+ {
+ MavenLauncher mavenLauncher = new MavenLauncher( testClass, sourceName, suffix, cli );
+ return new SurefireLauncher( mavenLauncher );
+ }
+
+ public static SurefireLauncher unpack( Class testClass, String sourceName, String suffix )
+ {
+ return unpack( testClass, sourceName, suffix, null );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
new file mode 100755
index 0000000..76d96e0
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -0,0 +1,492 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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.it.VerificationException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+/**
+ * Encapsulate all needed features to start a surefire run
+ * <br>
+ * Also includes thread-safe access to the extracted resource
+ * files
+ *
+ * @author Kristian Rosenvold -
+ */
+public final class SurefireLauncher
+{
+ public static final String EXT_JDK_HOME_KEY = "jdk.home";
+
+ public static final String EXT_JDK_HOME = System.getProperty( EXT_JDK_HOME_KEY );
+
+ private static final File JAVA_HOME = javaHome();
+
+ private final MavenLauncher mavenLauncher;
+
+ private final String surefireVersion = System.getProperty( "surefire.version" );
+
+ public SurefireLauncher( MavenLauncher mavenLauncher )
+ {
+ this.mavenLauncher = mavenLauncher;
+ reset();
+ }
+
+ public MavenLauncher maven()
+ {
+ return mavenLauncher;
+ }
+
+ String getTestMethodName()
+ {
+ return mavenLauncher.getTestMethodName();
+ }
+
+ public void reset()
+ {
+ mavenLauncher.reset();
+ for ( String s : getInitialGoals() )
+ {
+ mavenLauncher.addGoal( s );
+ }
+ setInProcessJavaHome();
+ }
+
+ private static File javaHome()
+ {
+ String javaHome = isBlank( EXT_JDK_HOME ) ? System.getenv( "JAVA_HOME" ) : EXT_JDK_HOME;
+ if ( isBlank( javaHome ) )
+ {
+ javaHome = System.getProperty( "java.home" );
+ File jre = new File( javaHome );
+ if ( "jre".equals( jre.getName() ) )
+ {
+ javaHome = jre.getParent();
+ }
+ }
+
+ try
+ {
+ File javaHomeAsDir = new File( javaHome ).getCanonicalFile();
+ if ( !javaHomeAsDir.isDirectory() )
+ {
+ throw new RuntimeException( javaHomeAsDir.getAbsolutePath() + " is not a JAVA_HOME directory." );
+ }
+ System.out.println( "Using JAVA_HOME=" + javaHomeAsDir.getAbsolutePath() + " in forked launcher." );
+ return javaHomeAsDir;
+ }
+ catch ( IOException e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
+
+ private void setInProcessJavaHome()
+ {
+ setLauncherJavaHome( JAVA_HOME.getPath() );
+ }
+
+ public SurefireLauncher setLauncherJavaHome( String javaHome )
+ {
+ mavenLauncher.addEnvVar( "JAVA_HOME", javaHome );
+ return this;
+ }
+
+ public SurefireLauncher getSubProjectLauncher( String subProject )
+ throws VerificationException
+ {
+ return new SurefireLauncher( mavenLauncher.getSubProjectLauncher( subProject ) );
+ }
+
+ public OutputValidator getSubProjectValidator( String subProject )
+ throws VerificationException
+ {
+ return mavenLauncher.getSubProjectValidator( subProject );
+ }
+
+ public SurefireLauncher addEnvVar( String key, String value )
+ {
+ mavenLauncher.addEnvVar( key, value );
+ return this;
+ }
+
+ public SurefireLauncher setMavenOpts(String opts){
+ addEnvVar( "MAVEN_OPTS", opts );
+ return this;
+ }
+
+ private List<String> getInitialGoals()
+ {
+ List<String> goals = new ArrayList<>();
+
+ goals.add( "-Dsurefire.version=" + surefireVersion );
+
+ String jacocoAgent = System.getProperty( "jacoco.agent", "" );
+ goals.add( "-Djacoco.agent=" + jacocoAgent );
+
+ return goals;
+ }
+
+ public SurefireLauncher showErrorStackTraces()
+ {
+ mavenLauncher.showErrorStackTraces();
+ return this;
+ }
+
+ public SurefireLauncher debugLogging()
+ {
+ mavenLauncher.debugLogging();
+ return this;
+ }
+
+ @SuppressWarnings( "UnusedDeclaration" )
+ public SurefireLauncher debugSurefireFork()
+ {
+ mavenLauncher.sysProp( "maven.surefire.debug", "true" );
+ return this;
+ }
+
+ public SurefireLauncher failNever()
+ {
+ mavenLauncher.failNever();
+ return this;
+ }
+
+ public SurefireLauncher groups( String groups )
+ {
+ mavenLauncher.sysProp( "groups", groups );
+ return this;
+ }
+
+ public SurefireLauncher addGoal( String goal )
+ {
+ mavenLauncher.addGoal( goal );
+ return this;
+ }
+
+ public OutputValidator executeTest()
+ {
+ return mavenLauncher.execute( "test" );
+ }
+
+ public OutputValidator executeInstall()
+ throws VerificationException
+ {
+ return mavenLauncher.execute( "install" );
+ }
+
+
+ public FailsafeOutputValidator executeVerify()
+ {
+ OutputValidator verify = execute( "verify" );
+ return new FailsafeOutputValidator( verify );
+ }
+
+ public OutputValidator execute( String goal )
+ {
+ return mavenLauncher.execute( goal );
+ }
+
+ public OutputValidator executeSurefireReport()
+ {
+ return mavenLauncher.execute( "surefire-report:report" );
+ }
+
+
+ public OutputValidator executeCurrentGoals()
+ {
+ return mavenLauncher.executeCurrentGoals();
+ }
+
+
+ public SurefireLauncher printSummary( boolean printsummary )
+ {
+ mavenLauncher.sysProp( "printSummary", printsummary );
+ return this;
+ }
+
+ public SurefireLauncher redirectToFile( boolean redirect )
+ {
+ mavenLauncher.sysProp( "maven.test.redirectTestOutputToFile", redirect );
+ return this;
+ }
+
+ public SurefireLauncher forkOnce()
+ {
+ return forkMode( "once" );
+ }
+
+ public SurefireLauncher forkNever()
+ {
+ return forkMode( "never" );
+ }
+
+ public SurefireLauncher forkAlways()
+ {
+ return forkMode( "always" );
+ }
+
+ public SurefireLauncher forkPerTest()
+ {
+ return forkMode( "pertest" );
+ }
+
+ public SurefireLauncher forkPerThread()
+ {
+ return forkMode( "perthread" );
+ }
+
+ public SurefireLauncher threadCount( int threadCount )
+ {
+ mavenLauncher.sysProp( "threadCount", threadCount );
+ return this;
+ }
+
+ public SurefireLauncher forkCount( int forkCount )
+ {
+ mavenLauncher.sysProp( "forkCount", forkCount );
+ return this;
+ }
+
+ public SurefireLauncher reuseForks( boolean reuseForks )
+ {
+ mavenLauncher.sysProp( "reuseForks", reuseForks );
+ return this;
+ }
+
+ public SurefireLauncher forkMode( String forkMode )
+ {
+ mavenLauncher.sysProp( "forkMode", forkMode );
+ return this;
+ }
+
+ public SurefireLauncher runOrder( String runOrder )
+ {
+ mavenLauncher.sysProp( "surefire.runOrder", runOrder );
+ return this;
+ }
+
+ public SurefireLauncher failIfNoTests( boolean fail )
+ {
+ mavenLauncher.sysProp( "failIfNoTests", fail );
+ return this;
+ }
+
+
+ public SurefireLauncher mavenTestFailureIgnore( boolean fail )
+ {
+ mavenLauncher.sysProp( "maven.test.failure.ignore", fail );
+ return this;
+ }
+
+ public SurefireLauncher failIfNoSpecifiedTests( boolean fail )
+ {
+ mavenLauncher.sysProp( "surefire.failIfNoSpecifiedTests", fail );
+ return this;
+ }
+
+ public SurefireLauncher useSystemClassLoader( boolean useSystemClassLoader )
+ {
+ mavenLauncher.sysProp( "useSystemClassLoader", useSystemClassLoader );
+ return this;
+ }
+
+ public SurefireLauncher activateProfile( String profile )
+ {
+ mavenLauncher.activateProfile( profile );
+ return this;
+ }
+
+
+ protected String getSurefireVersion()
+ {
+ return surefireVersion;
+ }
+
+ public SurefireLauncher disablePerCoreThreadCount()
+ {
+ mavenLauncher.sysProp( "perCoreThreadCount", false );
+ return this;
+ }
+
+ public SurefireLauncher disableParallelOptimization()
+ {
+ mavenLauncher.sysProp( "parallelOptimized", "false" );
+ return this;
+ }
+
+ public SurefireLauncher parallel( String parallel )
+ {
+ mavenLauncher.sysProp( "parallel", parallel );
+ return this;
+ }
+
+ public SurefireLauncher parallelSuites()
+ {
+ return parallel( "suites" );
+ }
+
+ public SurefireLauncher parallelClasses()
+ {
+ return parallel( "classes" );
+ }
+
+ public SurefireLauncher parallelMethods()
+ {
+ return parallel( "methods" );
+ }
+
+ public SurefireLauncher parallelBoth()
+ {
+ return parallel( "both" );
+ }
+
+ public SurefireLauncher parallelSuitesAndClasses()
+ {
+ return parallel( "suitesAndClasses" );
+ }
+
+ public SurefireLauncher parallelSuitesAndMethods()
+ {
+ return parallel( "suitesAndMethods" );
+ }
+
+ public SurefireLauncher parallelClassesAndMethods()
+ {
+ return parallel( "classesAndMethods" );
+ }
+
+ public SurefireLauncher parallelAll()
+ {
+ return parallel( "all" );
+ }
+
+ public SurefireLauncher useUnlimitedThreads()
+ {
+ mavenLauncher.sysProp( "useUnlimitedThreads", true );
+ return this;
+ }
+
+ public SurefireLauncher threadCountSuites( int count )
+ {
+ mavenLauncher.sysProp( "threadCountSuites", count );
+ return this;
+ }
+
+ public SurefireLauncher threadCountClasses( int count )
+ {
+ mavenLauncher.sysProp( "threadCountClasses", count );
+ return this;
+ }
+
+ public SurefireLauncher threadCountMethods( int count )
+ {
+ mavenLauncher.sysProp( "threadCountMethods", count );
+ return this;
+ }
+
+ public SurefireLauncher parallelTestsTimeoutInSeconds( double timeout )
+ {
+ mavenLauncher.sysProp( "surefire.parallel.timeout", timeout );
+ return this;
+ }
+
+ public SurefireLauncher parallelTestsTimeoutForcedInSeconds( double timeout )
+ {
+ mavenLauncher.sysProp( "surefire.parallel.forcedTimeout", timeout );
+ return this;
+ }
+
+ public SurefireLauncher argLine( String value )
+ {
+ mavenLauncher.sysProp( "argLine", value );
+ return this;
+ }
+
+ public SurefireLauncher sysProp( String variable, String value )
+ {
+ mavenLauncher.sysProp( variable, value );
+ return this;
+ }
+
+ public SurefireLauncher setJUnitVersion( String version )
+ {
+ mavenLauncher.sysProp( "junit.version", version );
+ return this;
+ }
+
+ public SurefireLauncher setGroups( String groups )
+ {
+ mavenLauncher.sysProp( "groups", groups );
+ return this;
+ }
+
+ public SurefireLauncher setExcludedGroups( String excludedGroups )
+ {
+ mavenLauncher.sysProp( "excludedGroups", excludedGroups );
+ return this;
+ }
+
+
+ public File getUnpackedAt()
+ {
+ return mavenLauncher.getUnpackedAt();
+ }
+
+ public SurefireLauncher addFailsafeReportOnlyGoal()
+ {
+ mavenLauncher.addGoal( getReportPluginGoal( ":failsafe-report-only" ) );
+ return this;
+ }
+
+ public SurefireLauncher addSurefireReportGoal()
+ {
+ mavenLauncher.addGoal( getReportPluginGoal( "report" ) );
+ return this;
+ }
+
+ public SurefireLauncher addSurefireReportOnlyGoal()
+ {
+ mavenLauncher.addGoal( getReportPluginGoal( "report-only" ) );
+ return this;
+ }
+
+ private String getReportPluginGoal( String goal )
+ {
+ return "org.apache.maven.plugins:maven-surefire-report-plugin:" + getSurefireVersion() + ":" + goal;
+ }
+
+ public SurefireLauncher setTestToRun( String basicTest )
+ {
+ mavenLauncher.sysProp( "test", basicTest );
+ return this;
+ }
+
+ public SurefireLauncher setForkJvm()
+ {
+ mavenLauncher.setForkJvm( true );
+ return this;
+ }
+}
[44/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1364SystemPropertiesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1364SystemPropertiesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1364SystemPropertiesIT.java
deleted file mode 100644
index d13b0f2..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1364SystemPropertiesIT.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * Report XML should contain system properties of forked JVM.
- *
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.20.1
- */
-public class Surefire1364SystemPropertiesIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void junit3Forked()
- {
- SurefireLauncher launcher = unpack( "surefire-1364" );
- OutputValidator validator = launcher.setForkJvm()
- .activateProfile( "junit3" )
- .forkMode( "once" )
- .executeTest()
- .verifyErrorFree( 2 );
-
- validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
-
- validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
- }
-
- @Test
- public void junit3InProcess()
- {
- SurefireLauncher launcher = unpack( "surefire-1364" );
- OutputValidator validator = launcher.setForkJvm()
- .activateProfile( "junit3" )
- .forkMode( "never" )
- .executeTest()
- .verifyErrorFree( 2 );
-
- validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
-
- validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
- }
-
- @Test
- public void junit4Forked()
- {
- SurefireLauncher launcher = unpack( "surefire-1364" );
- OutputValidator validator = launcher.setForkJvm()
- .forkMode( "once" )
- .executeTest()
- .verifyErrorFree( 2 );
-
- validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
-
- validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
- }
-
- @Test
- public void junit4InProcess()
- {
- SurefireLauncher launcher = unpack( "surefire-1364" );
- OutputValidator validator = launcher.setForkJvm()
- .forkMode( "never" )
- .executeTest()
- .verifyErrorFree( 2 );
-
- validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
-
- validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
- }
-
- @Test
- public void junit47Forked()
- {
- SurefireLauncher launcher = unpack( "surefire-1364" );
- OutputValidator validator = launcher.setForkJvm()
- .activateProfile( "junit47" )
- .forkMode( "once" )
- .executeTest()
- .verifyErrorFree( 2 );
-
- validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
-
- validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
- }
-
- @Test
- public void junit47InProcess()
- {
- SurefireLauncher launcher = unpack( "surefire-1364" );
- OutputValidator validator = launcher.setForkJvm()
- .activateProfile( "junit47" )
- .forkMode( "never" )
- .executeTest()
- .verifyErrorFree( 2 );
-
- validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
-
- validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
- }
-
- @Test
- public void junit47ForkedParallel()
- {
- SurefireLauncher launcher = unpack( "surefire-1364" );
- OutputValidator validator = launcher.setForkJvm()
- .activateProfile( "junit47" )
- .forkMode( "once" )
- .parallelClasses()
- .threadCount( 2 )
- .disablePerCoreThreadCount()
- .executeTest()
- .verifyErrorFree( 2 );
-
- validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
-
- validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
- }
-
- @Test
- public void junit47InProcessParallel()
- {
- SurefireLauncher launcher = unpack( "surefire-1364" );
- OutputValidator validator = launcher.setForkJvm()
- .activateProfile( "junit47" )
- .forkMode( "never" )
- .parallelClasses()
- .threadCount( 2 )
- .disablePerCoreThreadCount()
- .executeTest()
- .verifyErrorFree( 2 );
-
- validator.getSurefireReportsXmlFile( "TEST-FirstTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
-
- validator.getSurefireReportsXmlFile( "TEST-SecondTest.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
- }
-
- @Test
- public void testNg()
- {
- SurefireLauncher launcher = unpack( "surefire-1364" );
- OutputValidator validator = launcher.setForkJvm()
- .activateProfile( "testng" )
- .forkMode( "once" )
- .executeTest()
- .verifyErrorFree( 3 );
-
- validator.getSurefireReportsXmlFile( "TEST-TestSuite.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
- }
-
- @Test
- public void testNgInProcess()
- {
- SurefireLauncher launcher = unpack( "surefire-1364" );
- OutputValidator validator = launcher.setForkJvm()
- .activateProfile( "testng" )
- .forkMode( "never" )
- .executeTest()
- .verifyErrorFree( 3 );
-
- validator.getSurefireReportsXmlFile( "TEST-TestSuite.xml" )
- .assertContainsText( "<property name=\"forkedProp\" value=\"forkedValue1\"/>" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1367AssumptionLogsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1367AssumptionLogsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1367AssumptionLogsIT.java
deleted file mode 100644
index 48564fb..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1367AssumptionLogsIT.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import static org.fest.assertions.Assertions.assertThat;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1367">SUREFIRE-1367</a>
- * @since 2.20.1
- */
-public class Surefire1367AssumptionLogsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private static final String NL = System.getProperty( "line.separator" );
-
- @Test
- public void shouldSeeLogsParallelForked()
- {
- OutputValidator outputValidator = unpack().setForkJvm()
- .forkMode( "once" )
- .parallelClassesAndMethods()
- .disablePerCoreThreadCount()
- .threadCountClasses( 2 )
- .threadCountMethods( 2 )
- .executeTest()
- .assertTestSuiteResults( 2, 0, 0, 2 );
-
- verifyReportA( outputValidator );
- verifyReportB( outputValidator );
- }
-
- @Test
- public void shouldSeeLogsParallelInPlugin()
- {
- OutputValidator outputValidator = unpack().setForkJvm()
- .forkMode( "never" )
- .parallelClassesAndMethods()
- .disablePerCoreThreadCount()
- .threadCountClasses( 2 )
- .threadCountMethods( 2 )
- .executeTest()
- .assertTestSuiteResults( 2, 0, 0, 2 );
-
- verifyReportA( outputValidator );
- verifyReportB( outputValidator );
- }
-
- @Test
- public void shouldSeeLogsForked()
- {
- OutputValidator outputValidator = unpack().setForkJvm()
- .forkMode( "once" )
- .executeTest()
- .assertTestSuiteResults( 2, 0, 0, 2 );
-
- verifyReportA( outputValidator );
- verifyReportB( outputValidator );
- }
-
- @Test
- public void shouldSeeLogsInPlugin()
- {
- OutputValidator outputValidator = unpack().setForkJvm()
- .forkMode( "never" )
- .executeTest()
- .assertTestSuiteResults( 2, 0, 0, 2 );
-
- verifyReportA( outputValidator );
- verifyReportB( outputValidator );
- }
-
-
- private SurefireLauncher unpack()
- {
- return unpack( "/surefire-1367" );
- }
-
- private void verifyReportA( OutputValidator outputValidator )
- {
- String xmlReport = outputValidator.getSurefireReportsXmlFile( "TEST-ATest.xml" )
- .readFileToString();
-
- String outputCData = "<system-out><![CDATA[Hi" + NL +
- NL +
- "There!" + NL +
- "]]></system-out>" + NL +
- " <system-err><![CDATA[Hello" + NL +
- NL +
- "What's up!" + NL +
- "]]></system-err>";
-
- assertThat( xmlReport )
- .contains( outputCData );
-
-
- String output = outputValidator.getSurefireReportsFile( "ATest-output.txt" )
- .readFileToString();
-
- String outputExpected = "Hi" + NL +
- NL +
- "There!" + NL +
- "Hello" + NL +
- NL +
- "What's up!" + NL;
-
- assertThat( output )
- .isEqualTo( outputExpected );
- }
-
- private void verifyReportB( OutputValidator outputValidator )
- {
- String xmlReport = outputValidator.getSurefireReportsXmlFile( "TEST-BTest.xml" )
- .readFileToString();
-
- String outputCData = "<system-out><![CDATA[Hey" + NL +
- NL +
- "you!" + NL +
- "]]></system-out>";
-
- assertThat( xmlReport )
- .contains( outputCData );
-
-
- String output = outputValidator.getSurefireReportsFile( "BTest-output.txt" )
- .readFileToString();
-
- String outputExpected = "Hey" + NL +
- NL +
- "you!" + NL;
-
- assertThat( output )
- .isEqualTo( outputExpected );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1396CustomProviderClassPathIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1396CustomProviderClassPathIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1396CustomProviderClassPathIT.java
deleted file mode 100644
index 4a27688..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1396CustomProviderClassPathIT.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author Jonathan Bell
- */
-public class Surefire1396CustomProviderClassPathIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @BeforeClass
- public static void installProvider()
- throws VerificationException
- {
- unpack( Surefire1396CustomProviderClassPathIT.class, "surefire-1396-pluggableproviders-classpath-provider", "prov" ).executeInstall();
- }
-
- @Test
- public void pluggableProviderClasspathCorrect()
- throws Exception
- {
- unpack( "surefire-1396-pluggableproviders-classpath" )
- .setForkJvm()
- .maven()
- .showExceptionMessages()
- .debugLogging()
- .executeVerify()
- .verifyErrorFreeLog();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
deleted file mode 100644
index b185217..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierException;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import static org.fest.assertions.Assertions.assertThat;
-
-/**
- * SUREFIRE-613 Asserts proper test counts when running in parallel
- *
- * @author Kristian Rosenvold
- */
-public class Surefire141PluggableProvidersIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @BeforeClass
- public static void installProvider()
- throws VerificationException
- {
- unpack( Surefire141PluggableProvidersIT.class, "surefire-141-pluggableproviders-provider", "prov" )
- .executeInstall();
- }
-
- @Test
- public void pluggableProviderPresent()
- throws Exception
- {
- unpack( "surefire-141-pluggableproviders" )
- .setForkJvm()
- .maven()
- .showExceptionMessages()
- .debugLogging()
- .executeTest()
- .verifyTextInLog( "Using configured provider org.apache.maven.surefire.testprovider.TestProvider" )
- .verifyTextInLog( "Using configured provider org.apache.maven.surefire.junit.JUnit3Provider" )
- .verifyErrorFreeLog();
- }
-
- @Test
- public void invokeRuntimeException()
- throws Exception
- {
- final String errorText = "Let's fail with a runtimeException";
-
- OutputValidator validator = unpack( "surefire-141-pluggableproviders" )
- .setForkJvm()
- .sysProp( "invokeCrash", "runtimeException" )
- .maven()
- .withFailure()
- .executeTest();
-
- assertErrorMessage( validator, errorText );
-
- boolean hasErrorInLog = verifiedErrorInLog( validator, "There was an error in the forked process" );
- boolean verifiedInLog = verifiedErrorInLog( validator, errorText );
- assertThat( hasErrorInLog && verifiedInLog )
- .describedAs( "'" + errorText + "' could not be verified in log.txt nor *.dump file. ("
- + hasErrorInLog + ", " + verifiedInLog + ")" )
- .isTrue();
- }
-
- @Test
- public void invokeReporterException()
- throws Exception
- {
- final String errorText = "Let's fail with a reporterexception";
-
- OutputValidator validator = unpack( "surefire-141-pluggableproviders" )
- .setForkJvm()
- .sysProp( "invokeCrash", "reporterException" )
- .maven()
- .withFailure()
- .executeTest();
-
- assertErrorMessage( validator, errorText );
-
- boolean hasErrorInLog = verifiedErrorInLog( validator, "There was an error in the forked process" );
- boolean verifiedInLog = verifiedErrorInLog( validator, errorText );
- assertThat( hasErrorInLog && verifiedInLog )
- .describedAs( "'" + errorText + "' could not be verified in log.txt nor *.dump file. ("
- + hasErrorInLog + ", " + verifiedInLog + ")" )
- .isTrue();
- }
-
- @Test
- public void constructorRuntimeException()
- throws Exception
- {
- final String errorText = "Let's fail with a runtimeException";
-
- OutputValidator validator = unpack( "surefire-141-pluggableproviders" )
- .setForkJvm()
- .sysProp( "constructorCrash", "runtimeException" )
- .maven()
- .withFailure()
- .executeTest();
-
- assertErrorMessage( validator, errorText );
-
- boolean hasErrorInLog = verifiedErrorInLog( validator, "There was an error in the forked process" );
- boolean verifiedInLog = verifiedErrorInLog( validator, errorText );
- assertThat( hasErrorInLog && verifiedInLog )
- .describedAs( "'" + errorText + "' could not be verified in log.txt nor *.dump file. ("
- + hasErrorInLog + ", " + verifiedInLog + ")" )
- .isTrue();
- }
-
- private static void assertErrorMessage( OutputValidator validator, String message )
- {
- File reportDir = validator.getSurefireReportsDirectory();
- String[] dumpFiles = reportDir.list( new FilenameFilter()
- {
- @Override
- public boolean accept( File dir, String name )
- {
- return name.endsWith( ".dump" );
- }
- });
- assertThat( dumpFiles ).isNotEmpty();
- for ( String dump : dumpFiles )
- {
- validator.getSurefireReportsFile( dump )
- .assertContainsText( message );
- }
- }
-
- private static boolean verifiedErrorInLog( OutputValidator validator, String errorText )
- {
- try
- {
- validator.verifyTextInLog( errorText );
- return true;
- }
- catch ( SurefireVerifierException e )
- {
- return false;
- }
- }
-
- private static boolean verifiedErrorInDump( OutputValidator validator, String errorText )
- {
- try
- {
- assertErrorMessage( validator, errorText );
- return true;
- }
- catch ( AssertionError e )
- {
- return false;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java
deleted file mode 100644
index 7e50f25..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * Test Surefire-146 (forkMode=pertest fails to call setUp)
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class Surefire146ForkPerTestNoSetupIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testForkPerTestNoSetup()
- {
- executeErrorFreeTest( "surefire-146-forkPerTestNoSetup", 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java
deleted file mode 100644
index e13483a..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.io.File;
-
-import org.apache.maven.surefire.its.fixture.*;
-import org.codehaus.plexus.util.FileUtils;
-import org.junit.Test;
-
-/**
- * Test charset provider (SUREFIRE-162)
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class Surefire162CharsetProviderIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @SuppressWarnings( { "ResultOfMethodCallIgnored" } )
- @Test
- public void testCharsetProvider()
- throws Exception
- {
- SurefireLauncher unpack = unpack( "/surefire-162-charsetProvider" );
- MavenLauncher maven = unpack.maven();
- OutputValidator verifier = maven.getValidator();
- File jarFile = maven.getArtifactPath( "jcharset", "jcharset", "1.2.1", "jar" );
- File pomFile = maven.getArtifactPath( "jcharset", "jcharset", "1.2.1", "pom" );
- jarFile.getParentFile().mkdirs();
- FileUtils.copyFile( verifier.getSubFile( "repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar" ), jarFile );
- FileUtils.copyFile( verifier.getSubFile( "repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom" ), pomFile );
- unpack.executeTest().verifyErrorFree( 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java
deleted file mode 100644
index 1bdb3cb..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.plugins.surefire.report.ReportTestCase;
-import org.apache.maven.plugins.surefire.report.ReportTestSuite;
-import org.apache.maven.surefire.its.fixture.HelperAssertions;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Test Surefire-224 (XML test reports are not well-formed when failure message contains quotes)
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class Surefire224WellFormedXmlFailuresIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @SuppressWarnings("ConstantConditions")
- @Test
- public void testWellFormedXmlFailures()
- {
- OutputValidator outputValidator = unpack( "/surefire-224-wellFormedXmlFailures" ).executeTest();
-
- outputValidator.assertTestSuiteResults( 4, 0, 4, 0 );
-
- ReportTestSuite suite = HelperAssertions.extractReports( outputValidator.getBaseDir() ).get( 0 );
- List<org.apache.maven.plugins.surefire.report.ReportTestCase> testCases = suite.getTestCases();
- assertEquals( "Wrong number of test case objects", 4, testCases.size() );
- ReportTestCase testQuote = null, testLower = null, testGreater = null, testU0000 = null;
- for ( ReportTestCase current : testCases )
- {
- if ( "testQuote".equals( current.getName() ) )
- {
- testQuote = current;
- }
- else if ( "testLower".equals( current.getName() ) )
- {
- testLower = current;
- }
- else if ( "testGreater".equals( current.getName() ) )
- {
- testGreater = current;
- }
- else if ( "testU0000".equals( current.getName() ) )
- {
- testU0000 = current;
- }
- }
- assertEquals( "Wrong error message", "\"", testQuote.getFailureMessage() );
- assertEquals( "Wrong error message", "<", testLower.getFailureMessage() );
- assertEquals( "Wrong error message", ">", testGreater.getFailureMessage() );
- // SUREFIRE-456 we have to doubly-escape non-visible control characters like \u0000
- assertEquals( "Wrong error message", "�", testU0000.getFailureMessage() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java
deleted file mode 100644
index 2796b92..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * Test Surefire-257 Verifies that surefire does not re-run tests in site build
- *
- * @author Kristian Rosenvold
- */
-public class Surefire257NotRerunningTestsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void shouldNotRerun()
- throws Exception
- {
- unpack(
- "/surefire-257-rerunningTests" ).addSurefireReportGoal().addSurefireReportGoal().executeCurrentGoals().verifyTextInLog(
- "Skipping execution of surefire because it has already been run for this configuration" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
deleted file mode 100644
index aab3380..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.io.IOException;
-import java.net.URI;
-
-import org.apache.maven.surefire.its.fixture.*;
-
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
-import com.gargoylesoftware.htmlunit.html.HtmlDivision;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test Surefire-570 Multiple report directories
- *
- * @author Kristian Rosenvold
- */
-public class Surefire260TestWithIdenticalNamesIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void testWithIdenticalNames()
- throws IOException
- {
- SurefireLauncher surefireLauncher = unpack( "surefire-260-testWithIdenticalNames" ).failNever();
- surefireLauncher.executeTest();
- surefireLauncher.reset();
- OutputValidator validator = surefireLauncher.addSurefireReportGoal().executeCurrentGoals();
-
- TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
- final URI uri = siteFile.toURI();
-
- final WebClient webClient = new WebClient();
- webClient.setJavaScriptEnabled( true );
- final HtmlPage page = webClient.getPage( uri.toURL() );
-
- final HtmlAnchor a =
- (HtmlAnchor) page.getByXPath( "//a[@href = \"javascript:toggleDisplay('surefire260.TestB.testDup');\"]" )
- .get( 0 );
- final HtmlDivision content = (HtmlDivision) page.getElementById( "surefire260.TestB.testDup-failure" );
- assertNotNull( content );
- assertTrue( content.getAttribute( "style" ).contains( "none" ) );
- a.click();
- assertFalse( content.getAttribute( "style" ).contains( "none" ) );
- webClient.closeAllWindows();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
deleted file mode 100644
index bb80aec..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
- *
- * @author Kristian Rosenvold
- */
-public class Surefire34SecurityManagerIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testSecurityManager()
- {
- SurefireLauncher surefireLauncher = unpack( "surefire-34-securityManager" ).failNever();
- surefireLauncher.executeTest().assertTestSuiteResults( 2, 1, 0, 0 );
- }
-
- @Test
- public void testSecurityManagerSuccessful()
- {
- SurefireLauncher surefireLauncher = unpack( "surefire-34-securityManager-success" );
- surefireLauncher.executeTest().assertTestSuiteResults( 2, 0, 0, 0 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java
deleted file mode 100644
index ebc0e1e..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * Test Surefire-376 (TestNG @AfterSuite failures are ignored)
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class Surefire376TestNgAfterSuiteFailureIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testAfterSuiteFailure()
- {
- unpack( "/testng-afterSuiteFailure" )
- .maven()
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .withFailure()
- .executeTest()
- .assertTestSuiteResults( 2, 0, 1, 0 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java
deleted file mode 100644
index a29d030..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-377 (When JUnit and TestNG tests are in same project, only one set gets run).
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class Surefire377TestNgAndJUnitTogetherIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testTestNgAndJUnitTogether()
- {
- unpack( "/testng-junit-together" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .executeTest()
- .verifyErrorFree( 2 );
- }
-
- @Test
- public void testTestNgAndJUnit4Together()
- {
- unpack( "/testng-junit4-together" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .executeTest()
- .verifyErrorFree( 3 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java
deleted file mode 100644
index 3287ab4..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-613 Asserts proper test counts when running in parallel
- *
- * @author Kristian Rosenvold
- */
-public class Surefire408ManualProviderSelectionIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testParallelBuildResultCount()
- {
- unpack( "/surefire-408-manual-provider-selection" )
- .showErrorStackTraces()
- .debugLogging()
- .executeTest()
- .verifyTextInLog( "Using configured provider org.apache.maven.surefire.junit.JUnit3Provider" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java
deleted file mode 100644
index 00c2aee..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * Test JUnit test that contains inner classes
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class Surefire42NotExtendingTestCaseIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testInnerClass()
- {
- executeErrorFreeTest( "junit-notExtendingTestCase", 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java
deleted file mode 100644
index 928019a..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * Test JUnit test that contains inner classes
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class Surefire44InnerClassTestIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testInnerClass()
- {
- executeErrorFreeTest( "/junit-innerClass", 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java
deleted file mode 100644
index 9356f68..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.apache.maven.surefire.its.fixture.TestFile;
-import org.junit.Test;
-
-/**
- * SUREFIRE-500 Asserts correct error handling for the "odd" surefire-500 (and 625) issues.
- *
- * @author Kristian Rosenvold
- */
-public class Surefire500PuzzlingErrorIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testBuildFailingWhenErrors()
- {
- OutputValidator outputValidator = unpack( "/surefire-500-puzzling-error" ).failNever().executeTest();
- TestFile surefireReportsFile = outputValidator.getSurefireReportsFile( "surefire500.ExplodingTest.txt" );
- surefireReportsFile.assertContainsText( "java.lang.NoClassDefFoundError: whoops!" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java
deleted file mode 100644
index 4e4fd13..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
- *
- * @author Kristian Rosenvold
- */
-public class Surefire510TestClassPathForkModesIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void testForkAlways()
- {
- unpack().forkAlways().executeTest().
- verifyTextInLog( "tcp is set" );
- }
-
- @Test
- public void testForkOnce()
- {
- unpack().forkOnce().executeTest().
- verifyTextInLog( "tcp is set" );
- }
-
- public SurefireLauncher unpack()
- {
- return unpack( "/surefire-510-testClassPath" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java
deleted file mode 100644
index 3e53cca..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire569RunTestFromDependencyJarsIT.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * SUREFIRE-569 Add support for scanning Dependencies for TestClasses
- *
- * @author Aslak Knutsen
- */
-public class Surefire569RunTestFromDependencyJarsIT
- extends SurefireJUnit4IntegrationTestCase {
-
- @Test
- public void shouldScanAndRunTestsInDependencyJars() throws Exception {
- SurefireLauncher launcher = unpack( "surefire-569-RunTestFromDependencyJars" );
- launcher.addGoal("test").addGoal("install");
- launcher.executeCurrentGoals();
-
- OutputValidator module1 = launcher.getSubProjectValidator("module1");
- module1.assertTestSuiteResults(1, 0, 0, 0);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
deleted file mode 100644
index a9b437e..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.*;
-import org.junit.Test;
-
-/**
- * Test Surefire-570 Multiple report directories
- *
- * @author Kristian Rosenvold
- */
-public class Surefire570MultipleReportDirectoriesIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void testReportWithAggregate()
- throws Exception
- {
-
- SurefireLauncher surefireLauncher = unpack().failNever();
- surefireLauncher.executeTest();
- surefireLauncher.addGoal( "-Daggregate=true" );
- OutputValidator validator = surefireLauncher.executeSurefireReport( );
- TestFile siteFile = validator.getSiteFile( "surefire-report.html" );
- siteFile.assertContainsText( "MyModule1ClassTest" );
- siteFile.assertContainsText( "MyModule2ClassTest" );
- siteFile.assertContainsText( "MyDummyClassM1Test" );
- }
-
- @Test
- public void testReportWithoutAggregate()
- throws Exception
- {
- SurefireLauncher surefireLauncher = unpack().failNever();
- surefireLauncher.executeTest();
- surefireLauncher.reset();
- surefireLauncher.executeSurefireReport( );
- OutputValidator module1 = surefireLauncher.getSubProjectValidator( "module1" );
- TestFile siteFile = module1.getSiteFile( "surefire-report.html" );
- siteFile.assertContainsText( "MyModule1ClassTest" );
- siteFile.assertContainsText( "MyDummyClassM1Test" );
- }
-
- public SurefireLauncher unpack()
- {
- return unpack( "/surefire-570-multipleReportDirectories" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java
deleted file mode 100644
index 7b74409..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-613 Asserts proper test counts when running in parallel
- *
- * @author Kristian Rosenvold
- */
-public class Surefire613TestCountInParallelIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testParallelBuildResultCount()
- {
- OutputValidator validator = unpack( "/surefire-613-testCount-in-parallel" ).failNever().executeTest();
-
- validator.verifyTextInLog( "testAllok to stdout" );
- validator.verifyTextInLog( "testAllok to stderr" );
- validator.verifyTextInLog( "testWithException1 to stdout" );
- validator.verifyTextInLog( "testWithException1 to stderr" );
- validator.assertTestSuiteResults( 30, 8, 4, 17 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
deleted file mode 100644
index a47b9d8..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel<br>
- * SUREFIRE-1264 Some tests can be lost when running in parallel with parameterized tests<br>
- * <br>
- * Removed decision making with JUnit3 in {@code TestSet} class during Jira activity of <tt>SUREFIRE-1264</tt>
- * which results in one hot spot where the test class is determined (see JUnitCoreRunListener#fillTestCountMap()).
- *
- * @author Kristian Rosenvold
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- */
-public class Surefire621TestCountingJunit3InParallelIT
- extends SurefireJUnit4IntegrationTestCase
-{
- /**
- * SUREFIRE-1264
- */
- @Test
- public void testJunit3AllParallelBuildResultCount()
- {
- unpack( "surefire-621-testCounting-junit3-in-parallel" )
- .activateProfile( "all-parallel-junit3-testcases" )
- .execute( "integration-test" )
- .assertTestSuiteResults( 6, 0, 0, 0 );
- }
-
- /**
- * SUREFIRE-621
- */
- @Test
- public void testJunit3ParallelBuildResultCount()
- {
- unpack( "surefire-621-testCounting-junit3-in-parallel" )
- .failNever()
- .activateProfile( "parallel-junit3-testcases" )
- .execute( "install" )
- .assertTestSuiteResults( 6, 0, 0, 0 );
- }
-
- /**
- * SUREFIRE-1264
- */
- @Test
- public void testJunit3BuildResultCount()
- {
- unpack( "surefire-621-testCounting-junit3-in-parallel" )
- .activateProfile( "junit3-testcases" )
- .execute( "integration-test" )
- .assertTestSuiteResults( 6, 0, 0, 0 );
- }
-
- /**
- * SUREFIRE-1264
- */
- @Test
- public void testJunit3ParallelSuiteBuildResultCount()
- {
- unpack( "surefire-621-testCounting-junit3-in-parallel" )
- .activateProfile( "parallel-junit3-testsuite" )
- .execute( "integration-test" )
- .assertTestSuiteResults( 6, 0, 0, 0 );
- }
-
- /**
- * SUREFIRE-1264
- */
- @Test
- public void testJunit3SuiteBuildResultCount()
- {
- unpack( "surefire-621-testCounting-junit3-in-parallel" )
- .activateProfile( "junit3-testsuite" )
- .execute( "integration-test" )
- .assertTestSuiteResults( 6, 0, 0, 0 );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
deleted file mode 100644
index 27f9572..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * Asserts that console output always goes somewhere ;)
- *
- * @author Kristian Rosenvold assertContainsText
- */
-public class Surefire628ConsoleOutputBeforeAndAfterClassIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void testJunit3ParallelBuildResultCount()
- {
- OutputValidator validator =
- unpack( "surefire-628-consoleoutputbeforeandafterclass" ).failNever().parallelMethods().executeTest();
-
- validator.verifyTextInLog( "628Test1" );
- validator.verifyTextInLog( "Before628Test1" );
- validator.verifyTextInLog( "After628Test1" );
- validator.verifyTextInLog( "628Test2" );
- validator.verifyTextInLog( "BeforeClass628Test2" );
- validator.verifyTextInLog( "AfterClass628Test2" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java
deleted file mode 100644
index 778e776..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-634 Verifies error message on unsettable system properties
- *
- * @author Kristian Rosenvold
- */
-public class Surefire634UnsettableSystemPropertiesWarningIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testJunit3ParallelBuildResultCount()
- {
- unpack( "/surefire-634-systemPropertiesWarning" ).executeTest().verifyTextInLog(
- "java.library.path cannot be set as system property" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
deleted file mode 100644
index d6f0a0e..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import static org.junit.Assert.fail;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-649">SUREFIRE-649</a>
- * @since 2.18
- */
-public class Surefire649EmptyStringSystemPropertiesIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void systemProperties()
- throws VerificationException
- {
- SurefireLauncher launcher = unpack1();
-
- OutputValidator validator = launcher.executeTest().verifyErrorFree( 1 );
-
- for ( String line : validator.loadLogLines() )
- {
- if ( "emptyProperty=''".equals( line ) )
- {
- return;
- }
- }
- fail("Could not find text in log: emptyProperty=''");
- }
-
- @Test
- public void systemPropertyVariables()
- throws VerificationException
- {
- SurefireLauncher launcher = unpack2();
-
- OutputValidator validator = launcher.executeTest().verifyErrorFree( 1 );
-
- for ( String line : validator.loadLogLines() )
- {
- if ( "emptyProperty=''".equals( line ) )
- {
- return;
- }
- }
- fail("Could not find text in log: emptyProperty=''");
- }
-
- private SurefireLauncher unpack1()
- {
- return unpack( "surefire-649-systemProperties" );
- }
-
- private SurefireLauncher unpack2()
- {
- return unpack( "surefire-649-systemPropertyVariables" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
deleted file mode 100644
index 7f3e2ca..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-673 Asserts that a given mockito build works as it should (classloader problem in 2.7)
- *
- * @author Kristian Rosenvold
- */
-public class Surefire673MockitoIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testBuildFailingWhenErrors()
- {
- unpack( "/surefire-673-mockito" ).executeTest().verifyErrorFreeLog();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java
deleted file mode 100644
index 5aa342f..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-674 Asserts that the build fails when tests have errors
- *
- * @author Kristian Rosenvold
- */
-public class Surefire674BuildFailingWhenErrorsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testBuildFailingWhenErrors()
- {
- unpack( "/surefire-674-buildFailingWhenErrors" ).maven().withFailure().executeTest().verifyTextInLog(
- "BUILD FAILURE" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java
deleted file mode 100644
index 57c8648..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-674 Asserts that the build fails when tests have errors
- *
- * @author Kristian Rosenvold
- */
-public class Surefire674BuildFailingWhenFailsafeErrorsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testBuildFailingWhenErrors()
- {
- unpack( "/failsafe-buildfail" ).maven().withFailure().executeVerify().verifyTextInLog( "BUILD FAILURE" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java
deleted file mode 100644
index 3d7a684..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.maven.surefire.its.jiras;
-
-/*
- * 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;
-
-/**
- * SUREFIRE-685 Asserts that only the specified tests are run with comma separated includes
- *
- * @author Kristian Rosenvold
- */
-public class Surefire685CommaSeparatedIncludesIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testBuildFailingWhenErrors()
- {
- executeErrorFreeTest( "/surefire-685-commaseparatedIncludes", 2 );
- }
-}
[13/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-classpath-order.properties
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-classpath-order.properties b/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-classpath-order.properties
new file mode 100644
index 0000000..10493b4
--- /dev/null
+++ b/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-classpath-order.properties
@@ -0,0 +1,2 @@
+# This file collides with the equally named file from the project's test resources
+Surefire: classes
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-report.properties
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-report.properties b/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-report.properties
new file mode 100644
index 0000000..585dd8b
--- /dev/null
+++ b/surefire-its/src/test/resources/classpath-order/src/main/resources/surefire-report.properties
@@ -0,0 +1,2 @@
+# This file collides with the equally named i18n bundle in the Surefire Report Plugin
+Surefire: classes
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-order/src/test/java/it/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/classpath-order/src/test/java/it/BasicTest.java b/surefire-its/src/test/resources/classpath-order/src/test/java/it/BasicTest.java
new file mode 100644
index 0000000..739e134
--- /dev/null
+++ b/surefire-its/src/test/resources/classpath-order/src/test/java/it/BasicTest.java
@@ -0,0 +1,61 @@
+package it;
+
+/*
+ * 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.io.InputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import junit.framework.TestCase;
+
+public class BasicTest
+ extends TestCase
+{
+
+ public void testTestClassesBeforeMainClasses()
+ {
+ Properties props = getProperties( "/surefire-classpath-order.properties" );
+ assertEquals( "test-classes", props.getProperty( "Surefire" ) );
+ }
+
+ public void testMainClassesBeforeDependencies()
+ {
+ Properties props = getProperties( "/surefire-report.properties" );
+ assertEquals( "classes", props.getProperty( "Surefire" ) );
+ }
+
+ private Properties getProperties(String resource)
+ {
+ InputStream in = getClass().getResourceAsStream( resource );
+ assertNotNull( in );
+ try
+ {
+ Properties props = new Properties();
+ props.load( in );
+ return props;
+ }
+ catch (IOException e)
+ {
+ fail(e.toString());
+ return null;
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-order/src/test/resources/surefire-classpath-order.properties
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/classpath-order/src/test/resources/surefire-classpath-order.properties b/surefire-its/src/test/resources/classpath-order/src/test/resources/surefire-classpath-order.properties
new file mode 100644
index 0000000..246cf2c
--- /dev/null
+++ b/surefire-its/src/test/resources/classpath-order/src/test/resources/surefire-classpath-order.properties
@@ -0,0 +1,2 @@
+# This file collides with the equally named file from the project's main resources
+Surefire: test-classes
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-scope-filtering/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/classpath-scope-filtering/pom.xml b/surefire-its/src/test/resources/classpath-scope-filtering/pom.xml
new file mode 100644
index 0000000..7dcdfa2
--- /dev/null
+++ b/surefire-its/src/test/resources/classpath-scope-filtering/pom.xml
@@ -0,0 +1,63 @@
+<?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/xsd/maven-4.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>classpath-scope-filter</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for classpath scope filter</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <classpathDependencyScopeExclude>compile</classpathDependencyScopeExclude>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-email</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/classpath-scope-filtering/src/test/java/classpathFiltering/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/classpath-scope-filtering/src/test/java/classpathFiltering/BasicTest.java b/surefire-its/src/test/resources/classpath-scope-filtering/src/test/java/classpathFiltering/BasicTest.java
new file mode 100644
index 0000000..5f8b23a
--- /dev/null
+++ b/surefire-its/src/test/resources/classpath-scope-filtering/src/test/java/classpathFiltering/BasicTest.java
@@ -0,0 +1,44 @@
+package classpathFiltering;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class BasicTest
+ extends TestCase
+{
+
+ public void testDependencyFilter() {
+
+ Class testClass = null;
+ String testClassName = "org.apache.commons.mail.Email";
+ try
+ {
+ testClass = Class.forName( testClassName );
+ System.out.println( "Able to load class " + testClass );
+ }
+ catch ( ClassNotFoundException e )
+ {
+ System.out.println( "Couldn't load " + testClassName );
+ }
+ assertNull( testClass );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/consoleOutput/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/consoleOutput/pom.xml b/surefire-its/src/test/resources/consoleOutput/pom.xml
new file mode 100644
index 0000000..407f909
--- /dev/null
+++ b/surefire-its/src/test/resources/consoleOutput/pom.xml
@@ -0,0 +1,46 @@
+<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/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>consoleOutputTest</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>consoleOutputTest</name>
+ <url>http://maven.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <testFailureIgnore>true</testFailureIgnore>
+ <forkMode>${forkMode}</forkMode>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/consoleOutput/src/test/java/consoleOutput/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/consoleOutput/src/test/java/consoleOutput/Test1.java b/surefire-its/src/test/resources/consoleOutput/src/test/java/consoleOutput/Test1.java
new file mode 100644
index 0000000..8994251
--- /dev/null
+++ b/surefire-its/src/test/resources/consoleOutput/src/test/java/consoleOutput/Test1.java
@@ -0,0 +1,81 @@
+package consoleOutput;
+
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.fail;
+
+public class Test1
+{
+ static
+ {
+ System.out.println("Printline in static block");
+ Runtime.getRuntime().addShutdownHook( new Thread( ){
+ @Override
+ public void run()
+ {
+ System.out.println( "Printline in shutdown hook" );
+ }
+ });
+ }
+
+ @Override
+ protected void finalize()
+ throws Throwable
+ {
+ System.out.println( "Printline in finalizer" );
+ }
+
+ public Test1(){
+ System.out.println("In constructor");
+ }
+
+ @Test
+ public void testStdOut()
+ {
+ char c = 'C';
+ System.out.print( "Sout" );
+ System.out.print( "Again" );
+ System.out.print( "\n" );
+ System.out.print( c );
+ System.out.println( "SoutLine" );
+ System.out.println( "äöüß" );
+ System.out.println( "" );
+ System.out.println( "==END==" );
+
+ fail( "failing with ü" );
+ }
+
+ @Test
+ public void testStdErr()
+ {
+ char e = 'E';
+ System.err.print( "Serr" );
+ System.err.print( "\n" );
+ System.err.print( e );
+ System.err.println( "SerrLine" );
+ System.err.println( "äöüß" );
+ System.err.println( "" );
+ System.err.println( "==END==" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/consoleOutputEncoding/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/consoleOutputEncoding/pom.xml b/surefire-its/src/test/resources/consoleOutputEncoding/pom.xml
new file mode 100644
index 0000000..5dec5d8
--- /dev/null
+++ b/surefire-its/src/test/resources/consoleOutputEncoding/pom.xml
@@ -0,0 +1,71 @@
+<?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/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>consoleOutputEncodingsTest</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>consoleOutputTest</name>
+ <url>http://maven.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <printSummary>${printSummary}</printSummary>
+ <reportFormat>${reportFormat}</reportFormat>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <forkMode>once</forkMode>
+ <printSummary>true</printSummary>
+ <reportFormat>brief</reportFormat>
+ </properties>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java b/surefire-its/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java
new file mode 100644
index 0000000..dfcfb97
--- /dev/null
+++ b/surefire-its/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java
@@ -0,0 +1,47 @@
+package consoleOutput;
+
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.charset.Charset;
+
+public class Test1
+{
+ @Test
+ public void testSystemOut()
+ throws IOException
+ {
+ PrintStream out = System.out;
+ out.print( getS( "print" ));
+ out.write( getS( "utf-8" ).getBytes( Charset.forName( "UTF-8" ) ) );
+ out.write( getS( "8859-1" ).getBytes( Charset.forName( "ISO-8859-1" ) ) );
+ out.write( getS( "utf-16" ).getBytes( Charset.forName( "UTF-16" ) ) );
+ }
+
+ private String getS( String s )
+ {
+ return " Hell\u00d8 " + s + "\n";
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/consoleoutput-noisy/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/consoleoutput-noisy/pom.xml b/surefire-its/src/test/resources/consoleoutput-noisy/pom.xml
new file mode 100644
index 0000000..e80b978
--- /dev/null
+++ b/surefire-its/src/test/resources/consoleoutput-noisy/pom.xml
@@ -0,0 +1,63 @@
+<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/xsd/maven-4.0.0.xsd">
+
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-consoleOutput-noisy</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>consoleOutput-noisy</name>
+ <url>http://maven.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <printSummary>${printSummary}</printSummary>
+ <useFile>${useFile}</useFile>
+ <parallel>${parallel}</parallel>
+ <threadCount>${threadCount}</threadCount>
+ <reportFormat>${reportFormat}</reportFormat>
+ <redirectTestOutputToFile>${redirect.to.file}</redirectTestOutputToFile>
+ <trimStackTrace>${trimStackTrace}</trimStackTrace>
+ <!-- argLine>-agentpath:/opt/yjp-9.5.4/bin/linux-x86-64/libyjpagent.so=tracing,monitors,onexit=snapshot</argLine -->
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <properties>
+ <useFile>true</useFile>
+ <junit.version>4.8.1</junit.version>
+ <redirect.to.file>true</redirect.to.file>
+ <forkMode>once</forkMode>
+ <printSummary>true</printSummary>
+ <parallel></parallel>
+ <reportFormat>brief</reportFormat>
+ <trimStackTrace>true</trimStackTrace>
+ <threadCount>4</threadCount>
+ </properties>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java b/surefire-its/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
new file mode 100644
index 0000000..888cd22
--- /dev/null
+++ b/surefire-its/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test1.java
@@ -0,0 +1,85 @@
+package consoleoutput_noisy;
+
+/*
+ * 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.Test;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+public class Test1
+{
+
+ public static final int thousand = Integer.parseInt( System.getProperty( "thousand", "1000" ) );
+
+ @Test
+ public void test1MillionBytes()
+ {
+ for ( int i = 0; i < ( 10 * thousand ); i++ )
+ {
+ System.out.println( "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" );
+ }
+ }
+
+ @Test
+ public void testHundredThousand()
+ {
+ printAlot();
+ }
+
+ private static void printAlot()
+ {
+ for ( int i = 0; i < thousand; i++ )
+ {
+ System.out.println( "AAAAAAAAAABBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJ" );
+ }
+ }
+
+ @Test
+ public void testAnotherHundredThousand()
+ {
+ printAlot();
+ }
+
+ @Before
+ public void before()
+ {
+ printAlot();
+ }
+
+ @BeforeClass
+ public static void beforeClass()
+ {
+ printAlot();
+ }
+
+ @After
+ public void after()
+ {
+ printAlot();
+ }
+
+ @AfterClass
+ public static void afterClass()
+ {
+ printAlot();
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java b/surefire-its/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java
new file mode 100644
index 0000000..10f607f
--- /dev/null
+++ b/surefire-its/src/test/resources/consoleoutput-noisy/src/test/java/consoleoutput_noisy/Test2.java
@@ -0,0 +1,53 @@
+package consoleoutput_noisy;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public class Test2
+ extends TestCase
+{
+ public void test2MillionBytes()
+ {
+ for ( int i = 0; i < 20 * Test1.thousand; i++ )
+ {
+ System.out.println(
+ "0-2-3-6-8-012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" );
+ }
+ }
+
+ public static void testHundredThousand()
+ {
+ for ( int i = 0; i < Test1.thousand; i++ )
+ {
+ System.out.println(
+ "A-A-3-A-A-BBBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJ" );
+ }
+ }
+
+ public static void testAnotherHundredThousand()
+ {
+ for ( int i = 0; i < Test1.thousand; i++ )
+ {
+ System.out.println(
+ "A-A-A-3-3-ABBBBBBBBBCCCCCCCCCCDDDDDDDDDDEEEEEEEEEEFFFFFFFFFFGGGGGGGGGGHHHHHHHHHHIIIIIIIIIIJJJJJJJJJJ" );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/crash-detection/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/crash-detection/pom.xml b/surefire-its/src/test/resources/crash-detection/pom.xml
new file mode 100644
index 0000000..81e9c6a
--- /dev/null
+++ b/surefire-its/src/test/resources/crash-detection/pom.xml
@@ -0,0 +1,58 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>crash-detection</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Tests vm crash</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/crash-detection/src/test/java/junit44/environment/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/crash-detection/src/test/java/junit44/environment/BasicTest.java b/surefire-its/src/test/resources/crash-detection/src/test/java/junit44/environment/BasicTest.java
new file mode 100644
index 0000000..2c97a7f
--- /dev/null
+++ b/surefire-its/src/test/resources/crash-detection/src/test/java/junit44/environment/BasicTest.java
@@ -0,0 +1,46 @@
+package junit44.environment;
+
+/*
+ * 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.AfterClass;
+import org.junit.Test;
+
+
+public class BasicTest
+{
+
+
+ @Test
+ public void testNothing()
+ {
+ }
+
+ @AfterClass
+ public static void killTheVm(){
+ if ( Boolean.getBoolean( "killHard" ))
+ {
+ Runtime.getRuntime().halt( 0 );
+ }
+ else {
+ System.exit( 0 );
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/crash-during-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/crash-during-test/pom.xml b/surefire-its/src/test/resources/crash-during-test/pom.xml
new file mode 100644
index 0000000..0d9e3e7
--- /dev/null
+++ b/surefire-its/src/test/resources/crash-during-test/pom.xml
@@ -0,0 +1,65 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>crash-during-test</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Tests vm crash while a test is in progress</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>uk.me.mjt</groupId>
+ <artifactId>crashjvm</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/BasicTest.java b/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/BasicTest.java
new file mode 100644
index 0000000..57d57bb
--- /dev/null
+++ b/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/BasicTest.java
@@ -0,0 +1,52 @@
+package junit44.environment;
+
+/*
+ * 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 static org.junit.Assert.*;
+import org.junit.Test;
+import uk.me.mjt.CrashJvm;
+
+public class BasicTest
+{
+ @Test
+ public void testCrashJvm()
+ {
+ assertTrue(CrashJvm.loadedOk());
+
+ String crashType = System.getProperty("crashType");
+ assertNotNull(crashType);
+ if ( crashType.equals( "exit" ) )
+ {
+ CrashJvm.exit();
+ }
+ else if ( crashType.equals( "abort" ) )
+ {
+ CrashJvm.abort();
+ }
+ else if (crashType.equals( "segfault" ))
+ {
+ CrashJvm.segfault();
+ }
+ else
+ {
+ fail("Don't recognise crashType " + crashType);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/SomeOtherTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/SomeOtherTest.java b/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/SomeOtherTest.java
new file mode 100644
index 0000000..e10f6aa
--- /dev/null
+++ b/surefire-its/src/test/resources/crash-during-test/src/test/java/junit44/environment/SomeOtherTest.java
@@ -0,0 +1,28 @@
+
+package junit44.environment;
+
+/*
+ * 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.Test;
+
+public class SomeOtherTest {
+ @Test
+ public void nonCrashingTest() {}
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/default-configuration-abstract/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/default-configuration-abstract/pom.xml b/surefire-its/src/test/resources/default-configuration-abstract/pom.xml
new file mode 100644
index 0000000..1bd1f91
--- /dev/null
+++ b/surefire-its/src/test/resources/default-configuration-abstract/pom.xml
@@ -0,0 +1,47 @@
+<?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/xsd/maven-4.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>default-configuration-abstract</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for default configuration with abstract classes</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java b/surefire-its/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java
new file mode 100644
index 0000000..d7a7fa5
--- /dev/null
+++ b/surefire-its/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/AbstractConcreteBasicTest.java
@@ -0,0 +1,87 @@
+package abstractClasses;
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class AbstractConcreteBasicTest // not really abstract!
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public AbstractConcreteBasicTest( String name, String extraName )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ System.out.println( "suite" );
+ TestSuite suite = new TestSuite();
+ Test test = new AbstractConcreteBasicTest( "testSetUp", "dummy" );
+ suite.addTest( test );
+
+ return new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/NonInstantiableTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/NonInstantiableTest.java b/surefire-its/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/NonInstantiableTest.java
new file mode 100644
index 0000000..f08f888
--- /dev/null
+++ b/surefire-its/src/test/resources/default-configuration-abstract/src/test/java/abstractClasses/NonInstantiableTest.java
@@ -0,0 +1,28 @@
+package abstractClasses;
+
+/*
+ * 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 junit.framework.TestCase;
+
+public abstract class NonInstantiableTest
+ extends TestCase
+{
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/default-configuration-classWithNoTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/default-configuration-classWithNoTests/pom.xml b/surefire-its/src/test/resources/default-configuration-classWithNoTests/pom.xml
new file mode 100644
index 0000000..dafe6e5
--- /dev/null
+++ b/surefire-its/src/test/resources/default-configuration-classWithNoTests/pom.xml
@@ -0,0 +1,47 @@
+<?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/xsd/maven-4.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>default-configuration-classWithNoTests</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for class with no tests</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/default-configuration-classWithNoTests/src/test/java/classWithNoTests/NoMethodsTestCase.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/default-configuration-classWithNoTests/src/test/java/classWithNoTests/NoMethodsTestCase.java b/surefire-its/src/test/resources/default-configuration-classWithNoTests/src/test/java/classWithNoTests/NoMethodsTestCase.java
new file mode 100644
index 0000000..217a04f
--- /dev/null
+++ b/surefire-its/src/test/resources/default-configuration-classWithNoTests/src/test/java/classWithNoTests/NoMethodsTestCase.java
@@ -0,0 +1,22 @@
+package classWithNoTests;
+
+/*
+ * 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.
+ */
+
+public class NoMethodsTestCase {}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/default-configuration-noTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/default-configuration-noTests/pom.xml b/surefire-its/src/test/resources/default-configuration-noTests/pom.xml
new file mode 100644
index 0000000..fc77535
--- /dev/null
+++ b/surefire-its/src/test/resources/default-configuration-noTests/pom.xml
@@ -0,0 +1,72 @@
+<?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/xsd/maven-4.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>default-configuration-noTests</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for no test directory</name>
+
+ <properties>
+ <junit.version>3.8.1</junit.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>junit47</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/default-configuration/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/default-configuration/pom.xml b/surefire-its/src/test/resources/default-configuration/pom.xml
new file mode 100644
index 0000000..1d9587a
--- /dev/null
+++ b/surefire-its/src/test/resources/default-configuration/pom.xml
@@ -0,0 +1,47 @@
+<?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/xsd/maven-4.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>default-configuration</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for default configuration</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java b/surefire-its/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java
new file mode 100644
index 0000000..00d4ea2
--- /dev/null
+++ b/surefire-its/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java
@@ -0,0 +1,87 @@
+package defaultConfiguration;
+
+/*
+ * 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 junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public BasicTest( String name, String extraName )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ System.out.println( "suite" );
+ TestSuite suite = new TestSuite();
+ Test test = new BasicTest( "testSetUp", "dummy" );
+ suite.addTest( test );
+
+ return new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/environment-variables/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/environment-variables/pom.xml b/surefire-its/src/test/resources/environment-variables/pom.xml
new file mode 100644
index 0000000..902e97e
--- /dev/null
+++ b/surefire-its/src/test/resources/environment-variables/pom.xml
@@ -0,0 +1,64 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>environment-variables</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for checking environment variables into forks</name>
+
+ <properties>
+ <forkMode>always</forkMode>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <useSystemClassLoader>${useSystemClassLoader}</useSystemClassLoader>
+ <environmentVariables>
+ <DUMMY_ENV_VAR>foo</DUMMY_ENV_VAR>
+ <EMPTY_VAR></EMPTY_VAR>
+ <UNSET_VAR />
+ </environmentVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/environment-variables/src/test/java/environment/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/environment-variables/src/test/java/environment/BasicTest.java b/surefire-its/src/test/resources/environment-variables/src/test/java/environment/BasicTest.java
new file mode 100644
index 0000000..e1a0f79
--- /dev/null
+++ b/surefire-its/src/test/resources/environment-variables/src/test/java/environment/BasicTest.java
@@ -0,0 +1,46 @@
+package environment;
+
+/*
+ * 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.hamcrest.core.IsNull;
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.hamcrest.core.IsNull.nullValue;
+
+
+public class BasicTest
+{
+
+
+ @Test
+ public void testEnvVar()
+ {
+ Assert.assertThat( System.getenv( "PATH" ), notNullValue() );
+ Assert.assertThat( System.getenv( "DUMMY_ENV_VAR" ), is( "foo" ) );
+ Assert.assertThat( System.getenv( "EMPTY_VAR" ), is( "" ) );
+ Assert.assertThat( System.getenv( "UNSET_VAR" ), is( "" ) );
+ Assert.assertThat( System.getenv( "UNDEFINED_VAR" ), nullValue() );
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fail-fast-junit/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fail-fast-junit/pom.xml b/surefire-its/src/test/resources/fail-fast-junit/pom.xml
new file mode 100644
index 0000000..b82448e
--- /dev/null
+++ b/surefire-its/src/test/resources/fail-fast-junit/pom.xml
@@ -0,0 +1,104 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-580-junit</artifactId>
+ <version>1.0</version>
+
+ <properties>
+ <junit>4.0</junit>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <runOrder>alphabetical</runOrder>
+ <forkMode>once</forkMode><!--override to default value in order to enable forkCount-->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>junit4</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit4</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>junit47</id>
+ <properties>
+ <junit>4.7</junit>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java b/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java
new file mode 100644
index 0000000..4d09bab
--- /dev/null
+++ b/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/ATest.java
@@ -0,0 +1,20 @@
+package pkg;
+
+import org.junit.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public class ATest
+{
+
+ @Test
+ public void someMethod()
+ throws Exception
+ {
+ // checking processros # due to very slow Windows Jenkins machines
+ TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3600 : 1500 );
+ throw new RuntimeException( "assert \"foo\" == \"bar\"\n" +
+ " |\n"
+ + " false" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java b/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java
new file mode 100644
index 0000000..1dc76b7
--- /dev/null
+++ b/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/BTest.java
@@ -0,0 +1,18 @@
+package pkg;
+
+import org.junit.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public class BTest
+{
+ @Test
+ public void test()
+ throws InterruptedException
+ {
+ // checking processros # due to very slow Windows Jenkins machines
+ TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
+ throw new RuntimeException();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java b/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java
new file mode 100644
index 0000000..2660779
--- /dev/null
+++ b/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/CTest.java
@@ -0,0 +1,17 @@
+package pkg;
+
+import org.junit.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public class CTest
+{
+ @Test
+ public void test()
+ throws InterruptedException
+ {
+ // checking processros # due to very slow Windows Jenkins machines
+ TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java b/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java
new file mode 100644
index 0000000..12a9bc7
--- /dev/null
+++ b/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/DTest.java
@@ -0,0 +1,17 @@
+package pkg;
+
+import org.junit.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public class DTest
+{
+ @Test
+ public void test()
+ throws InterruptedException
+ {
+ // checking processros # due to very slow Windows Jenkins machines
+ TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/ETest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/ETest.java b/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/ETest.java
new file mode 100644
index 0000000..61c7516
--- /dev/null
+++ b/surefire-its/src/test/resources/fail-fast-junit/src/test/java/pkg/ETest.java
@@ -0,0 +1,12 @@
+package pkg;
+
+import org.junit.Test;
+
+public class ETest
+{
+ @Test
+ public void test()
+ {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fail-fast-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fail-fast-testng/pom.xml b/surefire-its/src/test/resources/fail-fast-testng/pom.xml
new file mode 100644
index 0000000..d52ad12
--- /dev/null
+++ b/surefire-its/src/test/resources/fail-fast-testng/pom.xml
@@ -0,0 +1,59 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-580-testng</artifactId>
+ <version>1.0</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.10</version>
+ <classifier>jdk15</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <runOrder>alphabetical</runOrder>
+ <forkMode>once</forkMode><!--override to default value in order to enable forkCount-->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java b/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java
new file mode 100644
index 0000000..46b9d09
--- /dev/null
+++ b/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/ATest.java
@@ -0,0 +1,19 @@
+package pkg;
+
+import org.testng.annotations.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public class ATest
+{
+ @Test
+ public void someMethod()
+ throws InterruptedException
+ {
+ // checking processros # due to very slow Windows Jenkins machines
+ TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 3600 : 1500 );
+ throw new RuntimeException( "assert \"foo\" == \"bar\"\n"
+ + " |\n"
+ + " false" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java b/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java
new file mode 100644
index 0000000..90e2fdb
--- /dev/null
+++ b/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/BTest.java
@@ -0,0 +1,18 @@
+package pkg;
+
+import org.testng.annotations.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public class BTest
+{
+ @Test
+ public void test()
+ throws InterruptedException
+ {
+ // checking processros # due to very slow Windows Jenkins machines
+ TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
+ throw new RuntimeException();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java b/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java
new file mode 100644
index 0000000..d407aa3
--- /dev/null
+++ b/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/CTest.java
@@ -0,0 +1,17 @@
+package pkg;
+
+import org.testng.annotations.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public class CTest
+{
+ @Test
+ public void test()
+ throws InterruptedException
+ {
+ // checking processros # due to very slow Windows Jenkins machines
+ TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java b/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java
new file mode 100644
index 0000000..a00260f
--- /dev/null
+++ b/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/DTest.java
@@ -0,0 +1,17 @@
+package pkg;
+
+import org.testng.annotations.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public class DTest
+{
+ @Test
+ public void test()
+ throws InterruptedException
+ {
+ // checking processros # due to very slow Windows Jenkins machines
+ TimeUnit.MILLISECONDS.sleep( Runtime.getRuntime().availableProcessors() == 1 ? 9000 : 3750 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/ETest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/ETest.java b/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/ETest.java
new file mode 100644
index 0000000..ff71562
--- /dev/null
+++ b/surefire-its/src/test/resources/fail-fast-testng/src/test/java/pkg/ETest.java
@@ -0,0 +1,12 @@
+package pkg;
+
+import org.testng.annotations.Test;
+
+public class ETest
+{
+ @Test
+ public void test()
+ {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failingBuilds/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failingBuilds/pom.xml b/surefire-its/src/test/resources/failingBuilds/pom.xml
new file mode 100644
index 0000000..8e988ad
--- /dev/null
+++ b/surefire-its/src/test/resources/failingBuilds/pom.xml
@@ -0,0 +1,40 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>failingBuilds-test</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>failingBuilds</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/MySuiteTest1.java</include>
+ <include>**/MySuiteTest2.java</include>
+ <include>**/MySuiteTest3.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <forkMode>once</forkMode>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java b/surefire-its/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java
new file mode 100644
index 0000000..fe47279
--- /dev/null
+++ b/surefire-its/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java
@@ -0,0 +1,38 @@
+package failingbuilds;
+
+/*
+ * 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.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assume.*;
+
+import junit.framework.TestCase;
+
+public class ExceptionsTest
+ extends TestCase
+{
+ public void testWithMultiLineExceptionBeingThrown()
+ {
+ throw new RuntimeException( "A very very long exception message indeed, which is to demonstrate truncation. It will be truncated somewhere\nA cat\nAnd a dog\nTried to make a\nParrot swim" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-buildfail/invoker.properties
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-buildfail/invoker.properties b/surefire-its/src/test/resources/failsafe-buildfail/invoker.properties
new file mode 100644
index 0000000..ab6608f
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-buildfail/invoker.properties
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+invoker.buildResult=failure
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-buildfail/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-buildfail/pom.xml b/surefire-its/src/test/resources/failsafe-buildfail/pom.xml
new file mode 100644
index 0000000..c28972f
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-buildfail/pom.xml
@@ -0,0 +1,83 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>localhost</groupId>
+ <artifactId>working-directory-test</artifactId>
+ <version>1.0</version>
+ <name>Run tests multiple times</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>acceptance-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/AT*.java</include>
+ <include>**/*AT.java</include>
+ <include>**/*ATCase.java</include>
+ </includes>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <summaryFiles>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
+ </summaryFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-buildfail/src/test/java/MyAT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-buildfail/src/test/java/MyAT.java b/surefire-its/src/test/resources/failsafe-buildfail/src/test/java/MyAT.java
new file mode 100644
index 0000000..40a8a34
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-buildfail/src/test/java/MyAT.java
@@ -0,0 +1,25 @@
+/*
+ * 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 junit.framework.TestCase;
+
+public class MyAT extends TestCase {
+ public void testSomething() {
+ assertTrue(false);
+ }
+}
[12/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-buildfail/src/test/java/MyIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-buildfail/src/test/java/MyIT.java b/surefire-its/src/test/resources/failsafe-buildfail/src/test/java/MyIT.java
new file mode 100644
index 0000000..c74feb1
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-buildfail/src/test/java/MyIT.java
@@ -0,0 +1,26 @@
+/*
+ * 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 junit.framework.TestCase;
+
+public class MyIT extends TestCase {
+ public void testSomething() {
+ assertTrue(true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-nofail/invoker.properties
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-nofail/invoker.properties b/surefire-its/src/test/resources/failsafe-nofail/invoker.properties
new file mode 100644
index 0000000..ab6608f
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-nofail/invoker.properties
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+invoker.buildResult=failure
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-nofail/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-nofail/pom.xml b/surefire-its/src/test/resources/failsafe-nofail/pom.xml
new file mode 100644
index 0000000..c28972f
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-nofail/pom.xml
@@ -0,0 +1,83 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>localhost</groupId>
+ <artifactId>working-directory-test</artifactId>
+ <version>1.0</version>
+ <name>Run tests multiple times</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>acceptance-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/AT*.java</include>
+ <include>**/*AT.java</include>
+ <include>**/*ATCase.java</include>
+ </includes>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <summaryFiles>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
+ </summaryFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyAT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyAT.java b/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyAT.java
new file mode 100644
index 0000000..b447e94
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyAT.java
@@ -0,0 +1,25 @@
+/*
+ * 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 junit.framework.TestCase;
+
+public class MyAT extends TestCase {
+ public void testSomething() {
+ assertTrue(true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyIT.java b/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyIT.java
new file mode 100644
index 0000000..c74feb1
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyIT.java
@@ -0,0 +1,26 @@
+/*
+ * 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 junit.framework.TestCase;
+
+public class MyIT extends TestCase {
+ public void testSomething() {
+ assertTrue(true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-notests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-notests/pom.xml b/surefire-its/src/test/resources/failsafe-notests/pom.xml
new file mode 100644
index 0000000..24d1dec
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-notests/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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>localhost</groupId>
+ <artifactId>failsafe-notests</artifactId>
+ <version>1.0</version>
+ <name>failsafe-notests</name>
+
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-notests/src/test/java/AClass.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-notests/src/test/java/AClass.java b/surefire-its/src/test/resources/failsafe-notests/src/test/java/AClass.java
new file mode 100644
index 0000000..268eec5
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-notests/src/test/java/AClass.java
@@ -0,0 +1,25 @@
+/*
+ * 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 junit.framework.TestCase;
+
+public class AClass extends TestCase {
+ public void testSomething() {
+ assertTrue(false);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-regular/invoker.properties
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-regular/invoker.properties b/surefire-its/src/test/resources/failsafe-regular/invoker.properties
new file mode 100644
index 0000000..ab6608f
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-regular/invoker.properties
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+invoker.buildResult=failure
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-regular/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-regular/pom.xml b/surefire-its/src/test/resources/failsafe-regular/pom.xml
new file mode 100644
index 0000000..4755cb4
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-regular/pom.xml
@@ -0,0 +1,83 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>localhost</groupId>
+ <artifactId>working-directory-test</artifactId>
+ <version>1.0</version>
+ <name>Run tests multiple times</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <summaryFile>${project.build.directory}/failsafe-reports/Xfailsafe-summary-1.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>acceptance-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/AT*.java</include>
+ <include>**/*AT.java</include>
+ <include>**/*ATCase.java</include>
+ </includes>
+ <summaryFile>${project.build.directory}/failsafe-reports/Xfailsafe-summary-2.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <summaryFiles>
+ <summaryFile>${project.build.directory}/failsafe-reports/Xfailsafe-summary-1.xml</summaryFile>
+ <summaryFile>${project.build.directory}/failsafe-reports/Xfailsafe-summary-2.xml</summaryFile>
+ </summaryFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyAT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyAT.java b/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyAT.java
new file mode 100644
index 0000000..615ee76
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyAT.java
@@ -0,0 +1,26 @@
+/*
+ * 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 junit.framework.TestCase;
+
+public class MyAT extends TestCase {
+ public void testSomething() {
+ assertTrue(true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyIT.java b/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyIT.java
new file mode 100644
index 0000000..c74feb1
--- /dev/null
+++ b/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyIT.java
@@ -0,0 +1,26 @@
+/*
+ * 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 junit.framework.TestCase;
+
+public class MyIT extends TestCase {
+ public void testSomething() {
+ assertTrue(true);
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failure-result-counting/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failure-result-counting/pom.xml b/surefire-its/src/test/resources/failure-result-counting/pom.xml
new file mode 100644
index 0000000..7d79f29
--- /dev/null
+++ b/surefire-its/src/test/resources/failure-result-counting/pom.xml
@@ -0,0 +1,38 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>maven-surefire</groupId>
+ <artifactId>small-result-counting</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>failure-result-counting</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <junit.version>4.10</junit.version>
+ <forkMode>once</forkMode>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java
new file mode 100644
index 0000000..0e80332
--- /dev/null
+++ b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java
@@ -0,0 +1,43 @@
+package failureresultcounting;
+/*
+ * 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.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class BeforeClassError
+{
+
+ @BeforeClass
+ public static void beforeClassError()
+ {
+ throw new RuntimeException( "Exception in beforeclass" );
+ }
+
+ @Test
+ public void ok()
+ {
+ System.out.println( "beforeClassError run !!" );
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java
new file mode 100644
index 0000000..62d51ac
--- /dev/null
+++ b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java
@@ -0,0 +1,43 @@
+package failureresultcounting;
+/*
+ * 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 junit.framework.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class BeforeClassFailure
+{
+
+ @BeforeClass
+ public static void failInBeforeClass()
+ {
+ Assert.fail( "Failing in @BeforeClass" );
+ }
+
+ @Test
+ public void ok()
+ {
+ System.out.println( "failInBeforeClass run !!");
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java
new file mode 100644
index 0000000..0798c80
--- /dev/null
+++ b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java
@@ -0,0 +1,48 @@
+package failureresultcounting;
+/*
+ * 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.Before;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class BeforeError
+{
+
+ @Before
+ public void exceptionInBefore()
+ {
+ throw new RuntimeException( "Exception in @before" );
+ }
+
+ @Test
+ public void ok()
+ {
+ System.out.println( "exceptionInBefore run!!");
+ }
+
+ /*@Test
+ public void ok2()
+ {
+ System.out.println( "exceptionInBefore2 run!!");
+ } */
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java
new file mode 100644
index 0000000..174a448
--- /dev/null
+++ b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java
@@ -0,0 +1,43 @@
+package failureresultcounting;
+/*
+ * 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 junit.framework.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class BeforeFailure
+{
+
+ @Before
+ public void failInBEfore()
+ {
+ Assert.fail( "Failing in @before" );
+ }
+
+ @Test
+ public void ok()
+ {
+ System.out.println( "failInBEfore run !!");
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java
new file mode 100644
index 0000000..245c9a6
--- /dev/null
+++ b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java
@@ -0,0 +1,43 @@
+package failureresultcounting;
+/*
+ * 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.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class NoErrors
+{
+
+ @Test
+ @Ignore
+ public void allOk1()
+ {
+ }
+
+ @Test
+ @Ignore
+ public void allOk2()
+ {
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java
new file mode 100644
index 0000000..7e6387a
--- /dev/null
+++ b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java
@@ -0,0 +1,42 @@
+package failureresultcounting;
+/*
+ * 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.Assert;
+import org.junit.Test;
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class OrdinaryError
+{
+
+ @Test
+ public void ordinaryEror()
+ {
+ throw new RuntimeException( "Exception in @before" );
+ }
+
+ @Test
+ public void ordinaryFailure()
+ {
+ Assert.fail();
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/RunTests.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/RunTests.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/RunTests.java
new file mode 100644
index 0000000..6dc2f4c
--- /dev/null
+++ b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/RunTests.java
@@ -0,0 +1,33 @@
+package failureresultcounting;
+
+/*
+ * 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.
+ */
+
+public class RunTests
+{
+ public static void main(String args[]) {
+ org.junit.runner.JUnitCore.main(BeforeClassError.class.getName(),
+ BeforeClassFailure.class.getName(),
+ BeforeError.class.getName(),
+ BeforeFailure.class.getName(),
+ OrdinaryError.class.getName(),
+ NoErrors.class.getName()
+ );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failureOutput/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failureOutput/pom.xml b/surefire-its/src/test/resources/failureOutput/pom.xml
new file mode 100644
index 0000000..85c10ee
--- /dev/null
+++ b/surefire-its/src/test/resources/failureOutput/pom.xml
@@ -0,0 +1,50 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>failureOutput</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>failureOutput</name>
+ <url>http://maven.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <printSummary>${printSummary}</printSummary>
+ <useFile>${userFile}</useFile>
+ <reportFormat>${reportFormat}</reportFormat>
+ <redirectTestOutputToFile>${redirect.to.file}</redirectTestOutputToFile>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <redirect.to.file>true</redirect.to.file>
+ <forkMode>once</forkMode>
+ <printSummary>true</printSummary>
+ <useFile>true</useFile>
+ <reportFormat>brief</reportFormat>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java b/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java
new file mode 100644
index 0000000..af92952
--- /dev/null
+++ b/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java
@@ -0,0 +1,85 @@
+package forkConsoleOutput;
+
+/*
+ * 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.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.File;
+
+public class Test1
+{
+ @Test
+ public void test6281() {
+ System.out.println( "Test1 on" + Thread.currentThread().getName());
+ }
+
+ @Test
+ public void nullPointerInLibrary() {
+ new File((String)null);
+ }
+
+ @Test
+ public void failInMethod() {
+ innerFailure();
+ }
+
+ @Test
+ public void failInLibInMethod() {
+ new File((String)null);
+ }
+
+
+ @Test
+ public void failInNestedLibInMethod() {
+ nestedLibFailure();
+ }
+
+ @Test
+ public void assertion1() {
+ Assert.assertEquals("Bending maths", "123", "312");
+ }
+
+ @Test
+ public void assertion2() {
+ Assert.assertFalse("True is false", true);
+ }
+
+ private void innerFailure(){
+ throw new NullPointerException("Fail here");
+ }
+
+ private void nestedLibFailure(){
+ new File((String) null);
+ }
+
+ @BeforeClass
+ public static void testWithFailingAssumption2() {
+ System.out.println( "BeforeTest1 on" + Thread.currentThread().getName());
+ }
+
+ @AfterClass
+ public static void testWithFailingAssumption3() {
+ System.out.println( "AfterTest1 on" + Thread.currentThread().getName());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test2.java b/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test2.java
new file mode 100644
index 0000000..f5c825e
--- /dev/null
+++ b/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test2.java
@@ -0,0 +1,35 @@
+package forkConsoleOutput;
+
+/*
+ * 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.Test;
+
+public class Test2
+{
+ @Test
+ public void test6281()
+ {
+ System.out.println( "sout: I am talking to you" );
+ System.out.println( "sout: Will Fail soon" );
+ System.err.println( "serr: And you too" );
+ System.err.println( "serr: Will Fail now" );
+ throw new RuntimeException( "FailHere" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/failureOutput/test
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/failureOutput/test b/surefire-its/src/test/resources/failureOutput/test
new file mode 100644
index 0000000..873a7bf
--- /dev/null
+++ b/surefire-its/src/test/resources/failureOutput/test
@@ -0,0 +1,15 @@
+[INFO] Scanning for projects...
+[WARNING]
+[WARNING] Some problems were encountered while building the effective model for org.apache.maven.plugins.surefire:failureOutput:jar:1.0-SNAPSHOT
+[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-compiler-plugin is missing. @ line 20, column 17
+[WARNING]
+[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
+[WARNING]
+[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
+[WARNING]
+[INFO]
+[INFO] ------------------------------------------------------------------------
+[INFO] Building failureOutput 1.0-SNAPSHOT
+[INFO] ------------------------------------------------------------------------
+[INFO]
+[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ failureOutput ---
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fixture/testsuitexmlparser/TEST-org.apache.maven.surefire.test.SucceedingTest.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fixture/testsuitexmlparser/TEST-org.apache.maven.surefire.test.SucceedingTest.xml b/surefire-its/src/test/resources/fixture/testsuitexmlparser/TEST-org.apache.maven.surefire.test.SucceedingTest.xml
new file mode 100644
index 0000000..2801bf6
--- /dev/null
+++ b/surefire-its/src/test/resources/fixture/testsuitexmlparser/TEST-org.apache.maven.surefire.test.SucceedingTest.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="0" time="0.008" errors="0" skipped="0" tests="2" name="org.apache.maven.surefire.test.SucceedingTest">
+ <properties>
+ <property name="surefire.version" value="2.13-SNAPSHOT"/>
+ <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+ <property name="sun.boot.library.path" value="c:\java\jdk1.7.0_09\jre\bin"/>
+ <property name="java.vm.version" value="23.5-b02"/>
+ <property name="user.country.format" value="NO"/>
+ <property name="java.vm.vendor" value="Oracle Corporation"/>
+ <property name="java.vendor.url" value="http://java.oracle.com/"/>
+ <property name="path.separator" value=";"/>
+ <property name="guice.disable.misplaced.annotation.check" value="true"/>
+ <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
+ <property name="file.encoding.pkg" value="sun.io"/>
+ <property name="user.script" value=""/>
+ <property name="user.country" value="US"/>
+ <property name="sun.java.launcher" value="SUN_STANDARD"/>
+ <property name="sun.os.patch.level" value="Service Pack 1"/>
+ <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+ <property name="user.dir" value="c:\workspace\maven-surefire\surefire-integration-tests\src\test\resources\surefire-803-multiFailsafeExec-failureInFirst"/>
+ <property name="java.runtime.version" value="1.7.0_09-b05"/>
+ <property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/>
+ <property name="java.endorsed.dirs" value="c:\java\jdk1.7.0_09\jre\lib\endorsed"/>
+ <property name="os.arch" value="amd64"/>
+ <property name="java.io.tmpdir" value="C:\Users\krose\AppData\Local\Temp\"/>
+ <property name="line.separator" value="
+"/>
+ <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
+ <property name="user.variant" value=""/>
+ <property name="os.name" value="Windows 7"/>
+ <property name="classworlds.conf" value="c:/java/apache-maven-3.0.4/bin/m2.conf"/>
+ <property name="sun.jnu.encoding" value="Cp1252"/>
+ <property name="java.library.path" value="c:\java\jdk1.7.0_09\bin;C:\Windows\Sun\Java\bin;C:\Windows\system32;C:\Windows;x:\bin;.;C:\java\Git\local\bin;C:\java\Git\mingw\bin;C:\java\Git\bin;c:\java\jdk1.7.0_09\bin;c:\java\Subversion;c:\Program Files\Common Files\Microsoft Shared\Microsoft Online Services;c:\Program Files (x86)\Common Files\Microsoft Shared\Microsoft Online Services;c:\Windows\system32;c:\Windows;c:\Windows\System32\Wbem;c:\Windows\System32\WindowsPowerShell\v1.0\;c:\java\jdk1.7.0_09\bin;c:\java\Subversion;c:\Program Files\Common Files\Microsoft Shared\Microsoft Online Services;c:\Program Files (x86)\Common Files\Microsoft Shared\Microsoft Online Services;c:\Windows\system32;c:\Windows;c:\Windows\System32\Wbem;c:\Windows\System32\WindowsPowerShell\v1.0\;c:\java\bin;."/>
+ <property name="java.specification.name" value="Java Platform API Specification"/>
+ <property name="java.class.version" value="51.0"/>
+ <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
+ <property name="os.version" value="6.1"/>
+ <property name="user.home" value="C:\Users\krose"/>
+ <property name="user.timezone" value="Europe/Paris"/>
+ <property name="java.awt.printerjob" value="sun.awt.windows.WPrinterJob"/>
+ <property name="java.specification.version" value="1.7"/>
+ <property name="file.encoding" value="Cp1252"/>
+ <property name="user.name" value="krose"/>
+ <property name="java.class.path" value="c:/java/apache-maven-3.0.4/boot/plexus-classworlds-2.4.jar"/>
+ <property name="java.vm.specification.version" value="1.7"/>
+ <property name="sun.arch.data.model" value="64"/>
+ <property name="java.home" value="c:\java\jdk1.7.0_09\jre"/>
+ <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher -Dsurefire.version=2.13-SNAPSHOT clean verify"/>
+ <property name="java.specification.vendor" value="Oracle Corporation"/>
+ <property name="user.language" value="en"/>
+ <property name="user.language.format" value="no"/>
+ <property name="awt.toolkit" value="sun.awt.windows.WToolkit"/>
+ <property name="java.vm.info" value="mixed mode"/>
+ <property name="java.version" value="1.7.0_09"/>
+ <property name="java.ext.dirs" value="c:\java\jdk1.7.0_09\jre\lib\ext;C:\Windows\Sun\Java\lib\ext"/>
+ <property name="sun.boot.class.path" value="c:\java\jdk1.7.0_09\jre\lib\resources.jar;c:\java\jdk1.7.0_09\jre\lib\rt.jar;c:\java\jdk1.7.0_09\jre\lib\sunrsasign.jar;c:\java\jdk1.7.0_09\jre\lib\jsse.jar;c:\java\jdk1.7.0_09\jre\lib\jce.jar;c:\java\jdk1.7.0_09\jre\lib\charsets.jar;c:\java\jdk1.7.0_09\jre\lib\jfr.jar;c:\java\jdk1.7.0_09\jre\classes"/>
+ <property name="java.vendor" value="Oracle Corporation"/>
+ <property name="maven.home" value="c:\java\apache-maven-3.0.4"/>
+ <property name="file.separator" value="\"/>
+ <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
+ <property name="sun.cpu.endian" value="little"/>
+ <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+ <property name="sun.desktop" value="windows"/>
+ <property name="sun.cpu.isalist" value="amd64"/>
+ </properties>
+ <testcase time="0.007" classname="org.apache.maven.surefire.test.SucceedingTest" name="defaultTestValueIs_Value"/>
+ <testcase time="0.001" classname="org.apache.maven.surefire.test.SucceedingTest" name="setTestAndRetrieveValue"/>
+</testsuite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.FailingTest.txt
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.FailingTest.txt b/surefire-its/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.FailingTest.txt
new file mode 100644
index 0000000..38abc1f
--- /dev/null
+++ b/surefire-its/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.FailingTest.txt
@@ -0,0 +1,84 @@
+-------------------------------------------------------------------------------
+Test set: org.apache.maven.surefire.test.FailingTest
+-------------------------------------------------------------------------------
+Tests run: 2, Failures: 2, Errors: 0, Skipped: 0, Time elapsed: 0.046 sec <<< FAILURE!
+defaultTestValueIs_Value(org.apache.maven.surefire.test.FailingTest) Time elapsed: 0.013 sec <<< FAILURE!
+java.lang.AssertionError:
+Expected: "wrong"
+ got: "value"
+
+ at org.junit.Assert.assertThat(Assert.java:778)
+ at org.junit.Assert.assertThat(Assert.java:736)
+ at org.apache.maven.surefire.test.FailingTest.defaultTestValueIs_Value(FailingTest.java:23)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+ at java.lang.reflect.Method.invoke(Method.java:601)
+ at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
+ at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
+ at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
+ at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
+ at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
+ at org.junit.rules.TestWatchman$1.evaluate(TestWatchman.java:48)
+ at org.junit.runners.BlockJUnit4ClassRunner.runNotIgnored(BlockJUnit4ClassRunner.java:79)
+ at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:71)
+ at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:49)
+ at org.junit.runners.ParentRunner$3.run(ParentRunner.java:193)
+ at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:52)
+ at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:191)
+ at org.junit.runners.ParentRunner.access$000(ParentRunner.java:42)
+ at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:184)
+ at org.junit.runners.ParentRunner.run(ParentRunner.java:236)
+ at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:262)
+ at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:151)
+ at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:122)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+ at java.lang.reflect.Method.invoke(Method.java:601)
+ at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
+ at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
+ at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
+ at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:128)
+ at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:88)
+
+setTestAndRetrieveValue(org.apache.maven.surefire.test.FailingTest) Time elapsed: 0.001 sec <<< FAILURE!
+java.lang.AssertionError:
+Expected: "bar"
+ got: "foo"
+
+ at org.junit.Assert.assertThat(Assert.java:778)
+ at org.junit.Assert.assertThat(Assert.java:736)
+ at org.apache.maven.surefire.test.FailingTest.setTestAndRetrieveValue(FailingTest.java:34)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+ at java.lang.reflect.Method.invoke(Method.java:601)
+ at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
+ at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
+ at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
+ at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
+ at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
+ at org.junit.rules.TestWatchman$1.evaluate(TestWatchman.java:48)
+ at org.junit.runners.BlockJUnit4ClassRunner.runNotIgnored(BlockJUnit4ClassRunner.java:79)
+ at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:71)
+ at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:49)
+ at org.junit.runners.ParentRunner$3.run(ParentRunner.java:193)
+ at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:52)
+ at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:191)
+ at org.junit.runners.ParentRunner.access$000(ParentRunner.java:42)
+ at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:184)
+ at org.junit.runners.ParentRunner.run(ParentRunner.java:236)
+ at org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:262)
+ at org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:151)
+ at org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:122)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+ at java.lang.reflect.Method.invoke(Method.java:601)
+ at org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArray(ReflectionUtils.java:189)
+ at org.apache.maven.surefire.booter.ProviderFactory$ProviderProxy.invoke(ProviderFactory.java:165)
+ at org.apache.maven.surefire.booter.ProviderFactory.invokeProvider(ProviderFactory.java:85)
+ at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:128)
+ at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:88)
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.SucceedingTest.txt
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.SucceedingTest.txt b/surefire-its/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.SucceedingTest.txt
new file mode 100644
index 0000000..9433827
--- /dev/null
+++ b/surefire-its/src/test/resources/fixture/testsuitexmlparser/org.apache.maven.surefire.test.SucceedingTest.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.apache.maven.surefire.test.SucceedingTest
+-------------------------------------------------------------------------------
+Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.044 sec
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-consoleOutput/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-consoleOutput/pom.xml b/surefire-its/src/test/resources/fork-consoleOutput/pom.xml
new file mode 100644
index 0000000..407d86b
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-consoleOutput/pom.xml
@@ -0,0 +1,47 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-consoleOutput</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>fork-consoleOutput</name>
+ <url>http://maven.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <printSummary>${printSummary}</printSummary>
+ <useFile>true</useFile>
+ <reportFormat>${reportFormat}</reportFormat>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <forkMode>once</forkMode>
+ <printSummary>true</printSummary>
+ <reportFormat>brief</reportFormat>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java b/surefire-its/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java
new file mode 100644
index 0000000..ad18954
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-consoleOutput/src/test/java/forkConsoleOutput/Test1.java
@@ -0,0 +1,43 @@
+package forkConsoleOutput;
+
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class Test1
+{
+ @Test
+ public void test6281() {
+ System.out.println( "Test1 on" + Thread.currentThread().getName());
+ }
+
+ @BeforeClass
+ public static void testWithFailingAssumption2() {
+ System.out.println( "BeforeTest1 on" + Thread.currentThread().getName());
+ }
+
+ @AfterClass
+ public static void testWithFailingAssumption3() {
+ System.out.println( "AfterTest1 on" + Thread.currentThread().getName());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-consoleOutputWithErrors/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-consoleOutputWithErrors/pom.xml b/surefire-its/src/test/resources/fork-consoleOutputWithErrors/pom.xml
new file mode 100644
index 0000000..9aa5e1b
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-consoleOutputWithErrors/pom.xml
@@ -0,0 +1,50 @@
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-consoleOutput</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>fork-consoleOutput</name>
+ <url>http://maven.apache.org</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>${forkMode}</forkMode>
+ <printSummary>${printSummary}</printSummary>
+ <useFile>${userFile}</useFile>
+ <reportFormat>${reportFormat}</reportFormat>
+ <redirectTestOutputToFile>${redirect.to.file}</redirectTestOutputToFile>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <properties>
+ <junit.version>4.8.1</junit.version>
+ <redirect.to.file>true</redirect.to.file>
+ <forkMode>once</forkMode>
+ <printSummary>true</printSummary>
+ <useFile>true</useFile>
+ <reportFormat>brief</reportFormat>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test1.java b/surefire-its/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test1.java
new file mode 100644
index 0000000..ad18954
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test1.java
@@ -0,0 +1,43 @@
+package forkConsoleOutput;
+
+/*
+ * 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.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class Test1
+{
+ @Test
+ public void test6281() {
+ System.out.println( "Test1 on" + Thread.currentThread().getName());
+ }
+
+ @BeforeClass
+ public static void testWithFailingAssumption2() {
+ System.out.println( "BeforeTest1 on" + Thread.currentThread().getName());
+ }
+
+ @AfterClass
+ public static void testWithFailingAssumption3() {
+ System.out.println( "AfterTest1 on" + Thread.currentThread().getName());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test2.java b/surefire-its/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test2.java
new file mode 100644
index 0000000..f5c825e
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-consoleOutputWithErrors/src/test/java/forkConsoleOutput/Test2.java
@@ -0,0 +1,35 @@
+package forkConsoleOutput;
+
+/*
+ * 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.Test;
+
+public class Test2
+{
+ @Test
+ public void test6281()
+ {
+ System.out.println( "sout: I am talking to you" );
+ System.out.println( "sout: Will Fail soon" );
+ System.err.println( "serr: And you too" );
+ System.err.println( "serr: Will Fail now" );
+ throw new RuntimeException( "FailHere" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-fail/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-fail/pom.xml b/surefire-its/src/test/resources/fork-fail/pom.xml
new file mode 100644
index 0000000..9db6d72
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-fail/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-fail</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for failing fork</name>
+
+ <properties>
+ <argLine>-Xmxxxx712743m</argLine>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ <argLine>${argLine}</argLine>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-fail/src/test/java/forkMode/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-fail/src/test/java/forkMode/Test1.java b/surefire-its/src/test/resources/fork-fail/src/test/java/forkMode/Test1.java
new file mode 100644
index 0000000..8c09af6
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-fail/src/test/java/forkMode/Test1.java
@@ -0,0 +1,58 @@
+package forkMode;
+
+/*
+ * 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.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+
+import junit.framework.TestCase;
+
+public class Test1
+ extends TestCase
+{
+
+ public void test1()
+ throws IOException
+ {
+ dumpPidFile( this );
+ }
+
+ public static void dumpPidFile( TestCase test )
+ throws IOException
+ {
+ String fileName = test.getName() + "-pid";
+ File target = new File( "target" );
+ if ( !( target.exists() && target.isDirectory() ) )
+ {
+ target = new File( "." );
+ }
+ File pidFile = new File( target, fileName );
+ FileWriter fw = new FileWriter( pidFile );
+ // DGF little known trick... this is guaranteed to be unique to the PID
+ // In fact, it usually contains the pid and the local host name!
+ String pid = ManagementFactory.getRuntimeMXBean().getName();
+ fw.write( pid );
+ fw.flush();
+ fw.close();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-fail/src/test/java/forkMode/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-fail/src/test/java/forkMode/Test2.java b/surefire-its/src/test/resources/fork-fail/src/test/java/forkMode/Test2.java
new file mode 100644
index 0000000..33d3cf1
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-fail/src/test/java/forkMode/Test2.java
@@ -0,0 +1,34 @@
+package forkMode;
+
+/*
+ * 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.io.IOException;
+
+import junit.framework.TestCase;
+
+public class Test2
+ extends TestCase
+{
+
+ public void test2() throws IOException {
+ Test1.dumpPidFile(this);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-fail/src/test/java/forkMode/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-fail/src/test/java/forkMode/Test3.java b/surefire-its/src/test/resources/fork-fail/src/test/java/forkMode/Test3.java
new file mode 100644
index 0000000..c8eef74
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-fail/src/test/java/forkMode/Test3.java
@@ -0,0 +1,34 @@
+package forkMode;
+
+/*
+ * 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.io.IOException;
+
+import junit.framework.TestCase;
+
+public class Test3
+ extends TestCase
+{
+
+ public void test3() throws IOException {
+ Test1.dumpPidFile(this);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-multimodule/module-a/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-multimodule/module-a/pom.xml b/surefire-its/src/test/resources/fork-mode-multimodule/module-a/pom.xml
new file mode 100644
index 0000000..9de3941
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-multimodule/module-a/pom.xml
@@ -0,0 +1,36 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-mode-multimodule</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-mode-multimodule.module-a</artifactId>
+ <name>Test for forkMode Module A</name>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test1.java b/surefire-its/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test1.java
new file mode 100644
index 0000000..7497816
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test1.java
@@ -0,0 +1,67 @@
+package forkMode;
+
+/*
+ * 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.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.util.Random;
+
+import junit.framework.TestCase;
+
+public class Test1
+ extends TestCase
+{
+
+ private static final Random RANDOM = new Random();
+
+ public void test1()
+ throws IOException, InterruptedException
+ {
+ int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "1500" ));
+ Thread.sleep(sleepLength);
+ dumpPidFile( this );
+ }
+
+ public static void dumpPidFile( TestCase test )
+ throws IOException
+ {
+ String fileName = test.getName() + "-pid";
+ File target = new File( "target" ).getCanonicalFile(); // getCanonicalFile required for embedded mode
+ if ( !( target.exists() && target.isDirectory() ) )
+ {
+ target = new File( "." );
+ }
+ File pidFile = new File( target, fileName );
+ FileWriter fw = new FileWriter( pidFile );
+ // DGF little known trick... this is guaranteed to be unique to the PID
+ // In fact, it usually contains the pid and the local host name!
+ String pid = ManagementFactory.getRuntimeMXBean().getName();
+ fw.write( pid );
+ fw.write( " " );
+ fw.write( System.getProperty( "testProperty", String.valueOf( RANDOM.nextLong() ) ) );
+ fw.flush();
+ fw.close();
+ System.out.println( "Done Writing pid file" + pidFile.getAbsolutePath() );
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test2.java b/surefire-its/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test2.java
new file mode 100644
index 0000000..e9d0652
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test2.java
@@ -0,0 +1,36 @@
+package forkMode;
+
+/*
+ * 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.io.IOException;
+
+import junit.framework.TestCase;
+
+public class Test2
+ extends TestCase
+{
+
+ public void test2() throws IOException, InterruptedException {
+ int sleepLength = Integer.valueOf( System.getProperty( "sleepLength", "1500" ));
+ Thread.sleep(sleepLength);
+ Test1.dumpPidFile(this);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test3.java b/surefire-its/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test3.java
new file mode 100644
index 0000000..c8eef74
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-multimodule/module-a/src/test/java/forkMode/Test3.java
@@ -0,0 +1,34 @@
+package forkMode;
+
+/*
+ * 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.io.IOException;
+
+import junit.framework.TestCase;
+
+public class Test3
+ extends TestCase
+{
+
+ public void test3() throws IOException {
+ Test1.dumpPidFile(this);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/resources/fork-mode-multimodule/module-b/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/resources/fork-mode-multimodule/module-b/pom.xml b/surefire-its/src/test/resources/fork-mode-multimodule/module-b/pom.xml
new file mode 100644
index 0000000..61fd8a0
--- /dev/null
+++ b/surefire-its/src/test/resources/fork-mode-multimodule/module-b/pom.xml
@@ -0,0 +1,36 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-mode-multimodule</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>fork-mode-multimodule.module-b</artifactId>
+ <name>Test for forkMode Module B</name>
+
+</project>
[19/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
new file mode 100644
index 0000000..7d6f560
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
@@ -0,0 +1,278 @@
+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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * JUnit4 RunListener Integration Test.
+ *
+ * @author <a href="mailto:qingzhouluo@google.com">Qingzhou Luo</a>
+ */
+public class JUnit4RerunFailingTestsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/junit4-rerun-failing-tests" );
+ }
+
+ @Test
+ public void testRerunFailingErrorTestsWithOneRetry()
+ throws Exception
+ {
+ OutputValidator outputValidator =
+ unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=1" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0,
+ 0 );
+ verifyFailuresOneRetryAllClasses( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=1" ).addGoal(
+ "-DforkCount=2" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
+ verifyFailuresOneRetryAllClasses( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=methods" ).addGoal(
+ "-DuseUnlimitedThreads=true" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
+ verifyFailuresOneRetryAllClasses( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=classes" ).addGoal(
+ "-DuseUnlimitedThreads=true" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
+ verifyFailuresOneRetryAllClasses( outputValidator );
+ }
+
+ @Test
+ public void testRerunFailingErrorTestsTwoRetry()
+ throws Exception
+ {
+ // Four flakes, both tests have been re-run twice
+ OutputValidator outputValidator =
+ unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=2" ).executeTest().assertTestSuiteResults( 5, 0, 0, 0, 4 );
+
+ verifyFailuresTwoRetryAllClasses( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=2" ).addGoal( "-DforkCount=3" ).executeTest()
+ .assertTestSuiteResults( 5, 0, 0, 0, 4 );
+
+ verifyFailuresTwoRetryAllClasses( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=2" ).addGoal( "-Dparallel=methods" ).addGoal(
+ "-DuseUnlimitedThreads=true" ).executeTest().assertTestSuiteResults( 5, 0, 0, 0, 4 );
+
+ verifyFailuresTwoRetryAllClasses( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=2" ).addGoal( "-Dparallel=classes" ).addGoal(
+ "-DuseUnlimitedThreads=true" ).executeTest().assertTestSuiteResults( 5, 0, 0, 0, 4 );
+
+ verifyFailuresTwoRetryAllClasses( outputValidator );
+ }
+
+ @Test
+ public void testRerunFailingErrorTestsFalse()
+ throws Exception
+ {
+ OutputValidator outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion(
+ "4.12" ).maven().withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
+
+ verifyFailuresNoRetryAllClasses( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-DforkCount=3" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
+
+ verifyFailuresNoRetryAllClasses( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dparallel=methods" ).addGoal(
+ "-DuseUnlimitedThreads=true" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
+
+ verifyFailuresNoRetryAllClasses( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dparallel=classes" ).addGoal(
+ "-DuseUnlimitedThreads=true" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
+
+ verifyFailuresNoRetryAllClasses( outputValidator );
+ }
+
+ @Test
+ public void testRerunOneTestClass()
+ throws Exception
+ {
+ OutputValidator outputValidator =
+ unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=1" ).addGoal(
+ "-Dtest=FlakyFirstTimeTest" ).withFailure().executeTest().assertTestSuiteResults( 3, 1, 1, 0, 0 );
+
+ verifyFailuresOneRetryOneClass( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-DforkCount=3" ).addGoal(
+ "-Dtest=FlakyFirstTimeTest" ).withFailure().executeTest().assertTestSuiteResults( 3, 1, 1, 0, 0 );
+
+ verifyFailuresOneRetryOneClass( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=methods" ).addGoal(
+ "-DuseUnlimitedThreads=true" ).addGoal(
+ "-Dtest=FlakyFirstTimeTest" ).withFailure().executeTest().assertTestSuiteResults( 3, 1, 1, 0, 0 );
+
+ verifyFailuresOneRetryOneClass( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=classes" ).addGoal(
+ "-DuseUnlimitedThreads=true" ).addGoal(
+ "-Dtest=FlakyFirstTimeTest" ).withFailure().executeTest().assertTestSuiteResults( 3, 1, 1, 0, 0 );
+
+ verifyFailuresOneRetryOneClass( outputValidator );
+ }
+
+ @Test
+ public void testRerunOneTestMethod()
+ throws Exception
+ {
+ OutputValidator outputValidator =
+ unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=1" ).addGoal(
+ "-Dtest=FlakyFirstTimeTest#testFailing*" ).withFailure().executeTest().assertTestSuiteResults( 1, 0, 1,
+ 0, 0 );
+
+ verifyFailuresOneRetryOneMethod( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-DforkCount=3" ).addGoal(
+ "-Dtest=FlakyFirstTimeTest#testFailing*" ).withFailure().executeTest().assertTestSuiteResults( 1, 0, 1, 0,
+ 0 );
+
+ verifyFailuresOneRetryOneMethod( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=methods" ).addGoal(
+ "-DuseUnlimitedThreads=true" ).addGoal(
+ "-Dtest=FlakyFirstTimeTest#testFailing*" ).withFailure().executeTest().assertTestSuiteResults( 1, 0, 1, 0,
+ 0 );
+
+ verifyFailuresOneRetryOneMethod( outputValidator );
+
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.12" ).maven().addGoal(
+ "-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=classes" ).addGoal(
+ "-DuseUnlimitedThreads=true" ).addGoal(
+ "-Dtest=FlakyFirstTimeTest#testFailing*" ).withFailure().executeTest().assertTestSuiteResults( 1, 0, 1, 0,
+ 0 );
+
+ verifyFailuresOneRetryOneMethod( outputValidator );
+ }
+
+ private void verifyFailuresOneRetryAllClasses( OutputValidator outputValidator )
+ {
+ verifyFailuresOneRetry( outputValidator, 5, 1, 1, 0 );
+ }
+
+ private void verifyFailuresTwoRetryAllClasses( OutputValidator outputValidator )
+ {
+ verifyFailuresTwoRetry( outputValidator, 5, 0, 0, 2 );
+ }
+
+ private void verifyFailuresNoRetryAllClasses( OutputValidator outputValidator )
+ {
+ verifyFailuresNoRetry( outputValidator, 5, 1, 1, 0 );
+ }
+
+ private void verifyFailuresOneRetryOneClass( OutputValidator outputValidator )
+ {
+ verifyFailuresOneRetry( outputValidator, 3, 1, 1, 0 );
+ }
+
+ private void verifyFailuresOneRetryOneMethod( OutputValidator outputValidator )
+ {
+ verifyOnlyFailuresOneRetry( outputValidator, 1, 1, 0, 0 );
+ }
+
+ private void verifyFailuresOneRetry( OutputValidator outputValidator, int run, int failures, int errors,
+ int flakes )
+ {
+ outputValidator.verifyTextInLog( "Failures:" );
+ outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testFailingTestOne" );
+ outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testFailingTestOne" );
+
+ outputValidator.verifyTextInLog( "Errors:" );
+ outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testErrorTestOne" );
+ outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testErrorTestOne" );
+
+ verifyStatistics( outputValidator, run, failures, errors, flakes );
+ }
+
+ private void verifyOnlyFailuresOneRetry( OutputValidator outputValidator, int run, int failures, int errors,
+ int flakes )
+ {
+ outputValidator.verifyTextInLog( "Failures:" );
+ outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testFailingTestOne" );
+ outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testFailingTestOne" );
+
+ verifyStatistics( outputValidator, run, failures, errors, flakes );
+ }
+
+ private void verifyFailuresTwoRetry( OutputValidator outputValidator, int run, int failures, int errors,
+ int flakes )
+ {
+ outputValidator.verifyTextInLog( "Flakes:" );
+ outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testFailingTestOne" );
+ outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testFailingTestOne" );
+ outputValidator.verifyTextInLog( "Run 3: PASS" );
+
+ outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testErrorTestOne" );
+ outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testErrorTestOne" );
+
+ verifyStatistics( outputValidator, run, failures, errors, flakes );
+ }
+
+ private void verifyFailuresNoRetry( OutputValidator outputValidator, int run, int failures, int errors, int flakes )
+ {
+ outputValidator.verifyTextInLog( "Failures:" );
+ outputValidator.verifyTextInLog( "testFailingTestOne(junit4.FlakyFirstTimeTest)" );
+ outputValidator.verifyTextInLog( "ERROR" );
+ outputValidator.verifyTextInLog( "testErrorTestOne(junit4.FlakyFirstTimeTest)" );
+
+ verifyStatistics( outputValidator, run, failures, errors, flakes );
+ }
+
+ private void verifyStatistics( OutputValidator outputValidator, int run, int failures, int errors, int flakes )
+ {
+ if ( flakes > 0 )
+ {
+ outputValidator.verifyTextInLog(
+ "Tests run: " + run + ", Failures: " + failures + ", Errors: " + errors + ", Skipped: 0, Flakes: "
+ + flakes );
+ }
+ else
+ {
+ outputValidator.verifyTextInLog(
+ "Tests run: " + run + ", Failures: " + failures + ", Errors: " + errors + ", Skipped: 0" );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
new file mode 100644
index 0000000..433863e
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
@@ -0,0 +1,73 @@
+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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * JUnit4 RunListener Integration Test.
+ *
+ * @author <a href="mailto:matthew.gilliard@gmail.com">Matthew Gilliard</a>
+ */
+public class JUnit4RunListenerIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/junit4-runlistener" );
+ }
+
+ @Test
+ public void testJUnit4RunListener()
+ throws Exception
+ {
+ final OutputValidator outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion(
+ "4.4" ).executeTest().verifyErrorFreeLog();
+ assertResults( outputValidator );
+ outputValidator.verifyTextInLog( "testRunStarted null" );
+ outputValidator.verifyTextInLog( "testFinished simpleTest" );
+ outputValidator.verifyTextInLog( "testRunFinished org.junit.runner.Result" );
+ }
+
+ @Test
+ public void testRunlistenerJunitCoreProvider()
+ throws Exception
+ {
+ final OutputValidator outputValidator =
+ unpack().addGoal( "-Dprovider=surefire-junit47" ).setJUnitVersion( "4.8.1" ).addGoal(
+ "-DjunitVersion=4.8.1" ).executeTest().verifyErrorFreeLog(); // Todo: Fix junitVesion
+ assertResults( outputValidator );
+ outputValidator.verifyTextInLog( "testRunStarted null" );
+ outputValidator.verifyTextInLog( "testFinished simpleTest" );
+ outputValidator.verifyTextInLog( "testRunFinished org.junit.runner.Result" );
+ }
+
+ private void assertResults( OutputValidator outputValidator )
+ {
+ outputValidator.assertTestSuiteResults( 1, 0, 0, 0 );
+ outputValidator.getTargetFile( "runlistener-output-1.txt" ).assertFileExists();
+ outputValidator.getTargetFile( "runlistener-output-2.txt" ).assertFileExists();
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
new file mode 100644
index 0000000..8dd8f0c
--- /dev/null
+++ b/surefire-its/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:dfabulich@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", version );
+ }
+
+ @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/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
new file mode 100644
index 0000000..0757a17
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
@@ -0,0 +1,70 @@
+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 project using JUnit4.4 -dep. junit-dep includes only junit.* classes, and depends explicitly on hamcrest-core
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class JUnitDepIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ public SurefireLauncher unpack()
+ {
+ return unpack( "/junit44-dep" );
+ }
+
+ @Test
+ public void testJUnit44Dep()
+ throws Exception
+ {
+ unpack().debugLogging().sysProp( "junit-dep.version", "4.4" ).executeTest().verifyErrorFree( 1 ).verifyTextInLog(
+ "surefire-junit4" ); // Ahem. Will match on the 4.7 provider too
+ }
+
+ @Test
+ public void testJUnit44DepWithSneaky381()
+ throws Exception
+ {
+ unpack().debugLogging().sysProp( "junit-dep.version", "4.4" ).activateProfile(
+ "provided381" ).executeTest().verifyErrorFree( 1 );
+ }
+
+ @Test
+ public void testJUnit47Dep()
+ throws Exception
+ {
+ unpack().debugLogging().sysProp( "junit-dep.version", "4.7" ).executeTest().verifyErrorFree( 1 ).verifyTextInLog(
+ "surefire-junit47" );
+ }
+
+ @Test
+ public void testJUnit48Dep()
+ throws Exception
+ {
+ unpack().debugLogging().sysProp( "junit-dep.version", "4.8" ).executeTest().verifyErrorFree( 1 ).verifyTextInLog(
+ "surefire-junit47" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
new file mode 100644
index 0000000..165d745
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
@@ -0,0 +1,109 @@
+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.junit.Test;
+
+import java.io.File;
+
+import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME;
+import static org.apache.maven.surefire.its.fixture.SurefireLauncher.EXT_JDK_HOME_KEY;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * Running Surefire on the top of JDK 9 and should be able to load
+ * classes of multiple different Jigsaw modules without error.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.20.1
+ */
+public class Java9FullApiIT
+ extends AbstractJigsawIT
+{
+
+ @Test
+ public void shouldLoadMultipleJavaModules_JavaHome() throws Exception
+ {
+ OutputValidator validator = assumeJigsaw()
+ .setForkJvm()
+ .debugLogging()
+ .execute( "verify" )
+ .verifyErrorFree( 1 );
+
+ validator.verifyTextInLog( "loaded class java.sql.SQLException" )
+ .verifyTextInLog( "loaded class javax.xml.ws.Holder" )
+ .verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
+ .verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
+ .verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
+ .assertThatLogLine( anyOf( is( "java.specification.version=9" ),
+ is( "java.specification.version=10" ) ),
+ greaterThanOrEqualTo( 1 ) );
+ }
+
+ @Test
+ public void shouldLoadMultipleJavaModules_JvmParameter() throws Exception
+ {
+ OutputValidator validator = assumeJava9Property()
+ .setForkJvm()
+ .debugLogging()
+ .sysProp( EXT_JDK_HOME_KEY, new File( EXT_JDK_HOME ).getCanonicalPath() )
+ .execute( "verify" )
+ .verifyErrorFree( 1 );
+
+ validator.verifyTextInLog( "loaded class java.sql.SQLException" )
+ .verifyTextInLog( "loaded class javax.xml.ws.Holder" )
+ .verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
+ .verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
+ .verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
+ .assertThatLogLine( anyOf( is( "java.specification.version=9" ),
+ is( "java.specification.version=10" ) ),
+ greaterThanOrEqualTo( 1 ) );
+ }
+
+ @Test
+ public void shouldLoadMultipleJavaModules_ToolchainsXML() throws Exception
+ {
+ OutputValidator validator = assumeJava9Property()
+ .setForkJvm()
+ .activateProfile( "use-toolchains" )
+ .addGoal( "--toolchains" )
+ .addGoal( System.getProperty( "maven.toolchains.file" ) )
+ .execute( "verify" )
+ .verifyErrorFree( 1 );
+
+ validator.verifyTextInLog( "loaded class java.sql.SQLException" )
+ .verifyTextInLog( "loaded class javax.xml.ws.Holder" )
+ .verifyTextInLog( "loaded class javax.xml.bind.JAXBException" )
+ .verifyTextInLog( "loaded class javax.transaction.TransactionManager" )
+ .verifyTextInLog( "loaded class javax.transaction.InvalidTransactionException" )
+ .assertThatLogLine( anyOf( is( "java.specification.version=9" ),
+ is( "java.specification.version=10" ) ),
+ greaterThanOrEqualTo( 1 ) );
+ }
+
+ @Override
+ protected String getProjectDirectoryName()
+ {
+ return "java9-full-api";
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/LongWindowsPathIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/LongWindowsPathIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/LongWindowsPathIT.java
new file mode 100644
index 0000000..6280835
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/LongWindowsPathIT.java
@@ -0,0 +1,88 @@
+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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS;
+import static org.fest.assertions.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assume.assumeTrue;
+
+/**
+ * Testing long path of base.dir where Windows CLI crashes.
+ * <br>
+ * Integration test for <a href="https://issues.apache.org/jira/browse/SUREFIRE-1400">SUREFIRE-1400</a>.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.20.1
+ */
+public class LongWindowsPathIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private static final String PROJECT_DIR = "long-windows-path";
+ private static final String LONG_PATH = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+
+ // the IT engine crashes using long path
+ private static final String LONG_DIR = LONG_PATH + LONG_PATH + LONG_PATH;
+
+ @Test
+ public void shouldRunInSystemTmp() throws Exception
+ {
+ assumeTrue( IS_OS_WINDOWS );
+
+ OutputValidator validator = unpack().setForkJvm()
+ .showErrorStackTraces()
+ .executeTest()
+ .verifyErrorFreeLog();
+
+ validator.assertThatLogLine( containsString( "SUREFIRE-1400 user.dir=" ), is( 1 ) )
+ .assertThatLogLine( containsString( "SUREFIRE-1400 surefire.real.class.path=" ), is( 1 ) );
+
+ for ( String line : validator.loadLogLines() )
+ {
+ if ( line.contains( "SUREFIRE-1400 user.dir=" ) )
+ {
+ File buildDir = new File( System.getProperty( "user.dir" ), "target" );
+ File itBaseDir = new File( buildDir, "LongWindowsPathIT_shouldRunInSystemTmp" );
+
+ assertThat( line )
+ .contains( itBaseDir.getAbsolutePath() );
+ }
+ else if ( line.contains( "SUREFIRE-1400 surefire.real.class.path=" ) )
+ {
+ assertThat( line )
+ .contains( System.getProperty( "java.io.tmpdir" ) );
+ }
+ }
+ }
+
+ private SurefireLauncher unpack() throws IOException
+ {
+ return unpack( PROJECT_DIR/*, "_" + LONG_DIR*/ );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ModulePathIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ModulePathIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ModulePathIT.java
new file mode 100644
index 0000000..3c3d2c6
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ModulePathIT.java
@@ -0,0 +1,45 @@
+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.junit.Test;
+
+import java.io.IOException;
+
+public class ModulePathIT
+ extends AbstractJigsawIT
+{
+ @Test
+ public void testModulePath()
+ throws IOException
+ {
+ assumeJigsaw()
+ .debugLogging()
+ .executeTest()
+ .verifyErrorFreeLog()
+ .assertTestSuiteResults( 2 );
+ }
+
+ @Override
+ protected String getProjectDirectoryName()
+ {
+ return "modulepath";
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
new file mode 100644
index 0000000..1be88b7
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
@@ -0,0 +1,39 @@
+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;
+
+/**
+ * SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
+ *
+ * @author Kristian Rosenvold
+ */
+public class NoRunnableTestsInClassIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testJunit3ParallelBuildResultCount()
+ {
+ unpack( "norunnableTests" ).failNever().executeTest().verifyTextInLog(
+ "No tests found in junit.norunnabletests.BasicTest" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
new file mode 100644
index 0000000..71bccd6
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
@@ -0,0 +1,38 @@
+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;
+
+/**
+ * Test useManifestOnlyJar option
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class PlainOldJavaClasspathIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testPlainOldJavaClasspath()
+ {
+ executeErrorFreeTest( "plain-old-java-classpath", 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
new file mode 100644
index 0000000..bec3e99
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
@@ -0,0 +1,50 @@
+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 library using a conflicting version of plexus-utils
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class PlexusConflictIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testPlexusConflict()
+ {
+ unpack().executeTest().verifyErrorFree( 1 );
+ }
+
+ @Test
+ public void testPlexusConflictIsolatedClassLoader()
+ {
+ unpack().useSystemClassLoader(false).executeTest().verifyErrorFree( 1 );
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "/plexus-conflict" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
new file mode 100644
index 0000000..03902ef
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
@@ -0,0 +1,38 @@
+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;
+
+/**
+ * Test support for POJO tests.
+ *
+ * @author Benjamin Bentmann
+ */
+public class PojoSimpleIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testit()
+ {
+ unpack( "pojo-simple" ).executeTest().assertTestSuiteResults( 2, 0, 1, 0 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ReporterTime.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ReporterTime.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ReporterTime.java
new file mode 100644
index 0000000..154fb73
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ReporterTime.java
@@ -0,0 +1,26 @@
+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.
+ */
+
+/**
+ * @author Kristian Rosenvold
+ */
+public class ReporterTime
+{
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ReportersIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
new file mode 100644
index 0000000..b1c68f0
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
@@ -0,0 +1,45 @@
+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;
+
+/**
+ * Asserts proper behaviour of console output when forking
+ * SUREFIRE-679
+ *
+ * @author Kristian Rosenvold
+ */
+public class ReportersIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testRedirectOutputTestNg()
+ {
+ OutputValidator reporters = unpack( "reporters" ).redirectToFile( true ).printSummary( true ).executeTest();
+
+ reporters.getSurefireReportsFile( "TestSuite-output.txt" ).assertFileExists();
+ reporters.getSurefireReportsXmlFile( "TEST-TestSuite.xml" ).assertFileExists();
+ reporters.getSurefireReportsFile( "TestSuite.txt" ).assertFileExists();
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
new file mode 100644
index 0000000..714d0c4
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
@@ -0,0 +1,66 @@
+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.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+import java.io.IOException;
+
+/**
+ * Verifies that the providers get the result summary at the bottom of the run correctly, in different forkmodes
+ * SUREFIRE-613 Asserts proper test counts when running in parallel
+ *
+ * @author Kristian Rosenvold
+ */
+public class ResultCountingIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testCountingWithJunit481ForkNever()
+ throws Exception
+ {
+ assertForkMode( "never" );
+ }
+
+ @Test
+ public void testCountingWithJunit481ForkOnce()
+ throws Exception
+ {
+ assertForkMode( "once" );
+ }
+
+ @Test
+ public void testCountingWithJunit481ForkAlways()
+ throws Exception
+ {
+ assertForkMode( "always" );
+ }
+
+ private void assertForkMode( String forkMode )
+ throws IOException, VerificationException
+ {
+ OutputValidator outputValidator = unpack( "result-counting" ).failNever().forkMode( forkMode ).executeTest();
+ outputValidator.assertTestSuiteResults( 36, 23, 4, 2 );
+ outputValidator.verifyTextInLog( "Tests run: 36, Failures: 4, Errors: 23, Skipped: 2" );
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
new file mode 100644
index 0000000..099aa07
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
@@ -0,0 +1,108 @@
+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.io.IOException;
+import java.util.Calendar;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * Verifies the runOrder setting and its effect
+ *
+ * @author Kristian Rosenvold
+ */
+public class RunOrderIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private static final String[] TESTS_IN_ALPHABETICAL_ORDER = { "TA", "TB", "TC" };
+
+ private static final String[] TESTS_IN_REVERSE_ALPHABETICAL_ORDER = { "TC", "TB", "TA" };
+
+ // testing random is left as an exercise to the reader. Patches welcome
+
+ @Test
+ public void testAlphabetical()
+ throws Exception
+ {
+ OutputValidator validator = executeWithRunOrder( "alphabetical" );
+ assertTestnamesAppearInSpecificOrder( validator, TESTS_IN_ALPHABETICAL_ORDER );
+ }
+
+ @Test
+ public void testReverseAlphabetical()
+ throws Exception
+ {
+ OutputValidator validator = executeWithRunOrder( "reversealphabetical" );
+ assertTestnamesAppearInSpecificOrder( validator, TESTS_IN_REVERSE_ALPHABETICAL_ORDER );
+ }
+
+ @Test
+ public void testHourly()
+ throws Exception
+ {
+ int startHour = Calendar.getInstance().get( Calendar.HOUR_OF_DAY );
+ OutputValidator validator = executeWithRunOrder( "hourly" );
+ int endHour = Calendar.getInstance().get( Calendar.HOUR_OF_DAY );
+ if ( startHour != endHour )
+ {
+ return; // Race condition, cannot test when hour changed mid-run
+ }
+
+ String[] testnames =
+ ( ( startHour % 2 ) == 0 ) ? TESTS_IN_ALPHABETICAL_ORDER : TESTS_IN_REVERSE_ALPHABETICAL_ORDER;
+ assertTestnamesAppearInSpecificOrder( validator, testnames );
+ }
+
+ @Test
+ public void testNonExistingRunOrder()
+ throws Exception
+ {
+ unpack().forkMode( getForkMode() ).runOrder( "nonExistingRunOrder" ).maven().withFailure().executeTest().verifyTextInLog(
+ "There's no RunOrder with the name nonExistingRunOrder." );
+ }
+
+ private OutputValidator executeWithRunOrder( String runOrder )
+ {
+ return unpack().forkMode( getForkMode() ).runOrder( runOrder ).executeTest().verifyErrorFree( 3 );
+ }
+
+ protected String getForkMode()
+ {
+ return "once";
+ }
+
+ private SurefireLauncher unpack()
+ {
+ return unpack( "runOrder" );
+ }
+
+ private void assertTestnamesAppearInSpecificOrder( OutputValidator validator, String[] testnames )
+ throws VerificationException
+ {
+ if ( !validator.stringsAppearInSpecificOrderInLog( testnames ) )
+ {
+ throw new VerificationException( "Response does not contain expected item" );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderParallelForksIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderParallelForksIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderParallelForksIT.java
new file mode 100644
index 0000000..72fc428
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/RunOrderParallelForksIT.java
@@ -0,0 +1,31 @@
+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.
+ */
+
+public class RunOrderParallelForksIT
+ extends RunOrderIT
+{
+
+ @Override
+ protected String getForkMode()
+ {
+ return "perthread";
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
new file mode 100644
index 0000000..69c9e4c
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
@@ -0,0 +1,47 @@
+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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * Test aggregator as a sibling to child modules; invokes modules as "../child"
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
+ */
+public class SiblingAggregatorIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void testSiblingAggregator()
+ throws Exception
+ {
+ final SurefireLauncher unpack = unpack( "sibling-aggregator" );
+ SurefireLauncher aggregator = unpack.getSubProjectLauncher( "aggregator" );
+ aggregator.executeTest().verifyErrorFreeLog();
+ OutputValidator child2 = unpack.getSubProjectValidator( "child2" );
+ child2.assertTestSuiteResults( 1, 0, 0, 0 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/SmartStackTraceIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/SmartStackTraceIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/SmartStackTraceIT.java
new file mode 100644
index 0000000..b98155e
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/SmartStackTraceIT.java
@@ -0,0 +1,44 @@
+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;
+
+/**
+ * IT of smart stack trace parser
+ *
+ * @author Kristian Rosenvold
+ */
+public class SmartStackTraceIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void misg()
+ throws Exception
+ {
+ OutputValidator outputValidator = unpack( "/junit48-smartStackTrace" ).maven().withFailure().executeTest();
+ outputValidator.verifyTextInLog( "SmartStackTraceTest.shouldFailInMethodButDoesnt Expected exception: java.lang.RuntimeException" );
+ outputValidator.verifyTextInLog( "SmartStackTraceTest.shortName Expected exception: java.io.IOException" );
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
new file mode 100644
index 0000000..121b8fc
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
@@ -0,0 +1,55 @@
+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 system properties
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ */
+public class SystemPropertiesTestIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void testSystemProperties()
+ {
+ unpack().addGoal( "-DsetOnMavenCommandLine=baz" ).addGoal(
+ "-DsetOnArgLineWorkAround=baz" ).executeTest().verifyErrorFree( 8 );
+ }
+
+ @Test
+ public void testSystemPropertiesNoFork()
+ {
+
+ unpack().forkNever().addGoal( "-DsetOnMavenCommandLine=baz" ).addGoal( "-DsetOnArgLineWorkAround=baz" )
+ // DGF fake the argLine, since we're not forking
+ .addGoal( "-DsetOnArgLine=bar" ).executeTest().verifyErrorFree( 8 );
+ }
+
+ public SurefireLauncher unpack()
+ {
+ return unpack( "/system-properties" );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java
new file mode 100644
index 0000000..447d8f1
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java
@@ -0,0 +1,115 @@
+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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * Test project using -Dtest=mtClass#myMethod
+ *
+ * @author Olivier Lamy
+ */
+public class TestMethodPatternIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private static final String RUNNING_WITH_PROVIDER47 = "parallel='none', perCoreThreadCount=true, threadCount=0";
+
+ public OutputValidator runMethodPattern( String projectName, Map<String, String> props, String... goals )
+ {
+ SurefireLauncher launcher = unpack( projectName );
+ for ( Entry<String, String> entry : props.entrySet() )
+ {
+ launcher.sysProp( entry.getKey(), entry.getValue() );
+ }
+ for ( String goal : goals )
+ {
+ launcher.addGoal( goal );
+ }
+ return launcher.showErrorStackTraces().debugLogging()
+ .executeTest()
+ .assertTestSuiteResults( 2, 0, 0, 0 );
+ }
+
+ @Test
+ public void testJUnit44()
+ {
+ runMethodPattern( "junit44-method-pattern", Collections.<String, String>emptyMap() );
+ }
+
+ @Test
+ public void testJUnit48Provider4()
+ {
+ runMethodPattern( "junit48-method-pattern", Collections.<String, String>emptyMap(), "-P surefire-junit4" );
+ }
+
+ @Test
+ public void testJUnit48Provider47()
+ {
+ runMethodPattern( "junit48-method-pattern", Collections.<String, String>emptyMap(), "-P surefire-junit47" )
+ .verifyTextInLog( RUNNING_WITH_PROVIDER47 );
+ }
+
+ @Test
+ public void testJUnit48WithCategoryFilter()
+ {
+ unpack( "junit48-method-pattern" )
+ .addGoal( "-Dgroups=junit4.SampleCategory" )
+ .executeTest()
+ .assertTestSuiteResults( 1, 0, 0, 0 );
+ }
+
+ @Test
+ public void testTestNgMethodBefore()
+ {
+ Map<String, String> props = new HashMap<String, String>();
+ props.put( "testNgVersion", "5.7" );
+ props.put( "testNgClassifier", "jdk15" );
+ runMethodPattern( "testng-method-pattern-before", props );
+ }
+
+ @Test
+ public void testTestNGMethodPattern()
+ {
+ Map<String, String> props = new HashMap<String, String>();
+ props.put( "testNgVersion", "5.7" );
+ props.put( "testNgClassifier", "jdk15" );
+ runMethodPattern( "/testng-method-pattern", props );
+ }
+
+ @Test
+ public void testMethodPatternAfter()
+ {
+ unpack( "testng-method-pattern-after" )
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .executeTest()
+ .verifyErrorFree( 2 )
+ .verifyTextInLog( "Called tearDown" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java
new file mode 100644
index 0000000..d490ce5
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java
@@ -0,0 +1,67 @@
+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.Settings;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+
+/**
+ * JUnit test project using multiple method patterns, including wildcards in class and method names.
+ */
+@RunWith( Parameterized.class )
+public class TestMultipleMethodPatternsIT
+ extends AbstractTestMultipleMethodPatterns
+{
+ private final Settings settings;
+
+ public TestMultipleMethodPatternsIT( Settings settings )
+ {
+ this.settings = settings;
+ }
+
+ @Parameterized.Parameters
+ public static Iterable<Object[]> data()
+ {
+ return Arrays.asList( new Object[][]{
+ { Settings.JUNIT4_TEST },
+ { Settings.JUNIT47_TEST },
+ { Settings.JUNIT4_INCLUDES },
+ { Settings.JUNIT47_INCLUDES },
+ { Settings.JUNIT4_INCLUDES_EXCLUDES },
+ { Settings.JUNIT47_INCLUDES_EXCLUDES }
+ } );
+ }
+
+ @Override
+ protected Settings getSettings()
+ {
+ return settings;
+ }
+
+ @Override
+ protected SurefireLauncher unpack()
+ {
+ return unpack( "junit48-multiple-method-patterns", "_" + settings.path() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIT.java
new file mode 100644
index 0000000..2de3670
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIT.java
@@ -0,0 +1,64 @@
+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.Settings;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+
+/**
+ * TestNG test project using multiple method patterns, including wildcards in class and method names.
+ */
+@RunWith( Parameterized.class )
+public class TestMultipleMethodPatternsTestNGIT
+ extends AbstractTestMultipleMethodPatterns
+{
+ private final Settings settings;
+
+ public TestMultipleMethodPatternsTestNGIT( Settings settings )
+ {
+ this.settings = settings;
+ }
+
+ @Parameterized.Parameters
+ public static Iterable<Object[]> data()
+ {
+ return Arrays.asList( new Object[][]{
+ { Settings.TestNG_TEST },
+ { Settings.TestNG_INCLUDES },
+ { Settings.TestNG_INCLUDES_EXCLUDES }
+ } );
+ }
+
+ @Override
+ protected Settings getSettings()
+ {
+ return settings;
+ }
+
+ @Override
+ protected SurefireLauncher unpack()
+ {
+ return unpack( "testng-multiple-method-patterns", "_" + settings.path() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodsIT.java
new file mode 100644
index 0000000..cb773cd
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodsIT.java
@@ -0,0 +1,74 @@
+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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+
+/**
+ * Test project using -Dtest=mtClass#myMethod+myMethod2,secondClass#testMethod
+ *
+ * @author <a href="mailto:ytsolar@gmail.com">rainLee</a>
+ */
+public class TestMultipleMethodsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ private static final String RUNNING_WITH_PROVIDER47 = "parallel='none', perCoreThreadCount=true, threadCount=0";
+
+ public OutputValidator multipleMethod( String projectName, String... goals )
+ throws Exception
+ {
+ SurefireLauncher launcher = unpack( projectName );
+ for ( String goal : goals )
+ {
+ launcher.addGoal( goal );
+ }
+ return launcher.showErrorStackTraces().debugLogging()
+ .executeTest()
+ .verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 );
+ }
+
+ @Test
+ public void testJunit44()
+ throws Exception
+ {
+ multipleMethod( "junit44-multiple-methods" );
+ }
+
+ @Test
+ public void testJunit48Provider4()
+ throws Exception
+ {
+ multipleMethod( "junit48-multiple-methods", "-P surefire-junit4" );
+ }
+
+ @Test
+ public void testJunit48Provider47()
+ throws Exception
+ {
+ multipleMethod( "junit48-multiple-methods", "-P surefire-junit47" )
+ .verifyTextInLog( RUNNING_WITH_PROVIDER47 );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
new file mode 100644
index 0000000..74771c8
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
@@ -0,0 +1,69 @@
+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 the group filter for TestNG
+ *
+ */
+public class TestNgGroupsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testExclusion()
+ {
+ unpack().setExcludedGroups( "notincluded" ).executeTest().verifyErrorFree( 5 );
+ }
+
+ @Test
+ public void testOnlyGroups()
+ {
+ unpack().setGroups( "functional" ).executeTest().verifyErrorFree( 2 );
+ }
+
+ @Test
+ public void testGroupsAndExclusion()
+ {
+ unpack().setGroups( "functional" ).setExcludedGroups( "notincluded" ).executeTest().verifyErrorFree( 1 );
+ }
+
+ @Test
+ public void groupsWithDash()
+ {
+ unpack().setGroups( "abc-def" ).executeTest().verifyErrorFree( 1 );
+ }
+
+ @Test
+ public void groupsBySimpleRegex()
+ {
+ unpack().setGroups( "foo\\..*" ).executeTest().verifyErrorFree( 2 );
+ }
+
+ public SurefireLauncher unpack()
+ {
+ return unpack( "/testng-groups" );
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
new file mode 100644
index 0000000..1e6044e
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
@@ -0,0 +1,38 @@
+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;
+
+/**
+ * Test that TestNG's @Test(threadPoolSize = n, invocationCount=n) causes tests to be run in parallel.
+ *
+ * @author <a href="mailto:spam.haikal@gmail.com">Haikal Saadh</a>
+ */
+public class TestNgParallelWithAnnotationsIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ @Test
+ public void testTestNgGroupThreadParallel()
+ {
+ executeErrorFreeTest( "/testng-parallel-with-annotations", 3 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestNgSuccessPercentageIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestNgSuccessPercentageIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestNgSuccessPercentageIT.java
new file mode 100644
index 0000000..3b12e03
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestNgSuccessPercentageIT.java
@@ -0,0 +1,45 @@
+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;
+
+/**
+ * Test that TestNG's @Test(successPercentage = n, invocationCount=n) passes so long as successPercentage tests
+ * have passed.
+ *
+ * @author Jon Todd
+ * @author Andreas Gudian
+ */
+public class TestNgSuccessPercentageIT extends SurefireJUnit4IntegrationTestCase {
+ @Test
+ public void testPassesWhenFailuresLessThanSuccessPercentage()
+ {
+ OutputValidator validator = unpack("/testng-succes-percentage")
+ .sysProp( "testNgVersion", "5.7" )
+ .sysProp( "testNgClassifier", "jdk15" )
+ .mavenTestFailureIgnore( true )
+ .executeTest();
+ validator.assertTestSuiteResults(8, 0, 1, 0);
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
----------------------------------------------------------------------
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
new file mode 100644
index 0000000..53eddce
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
@@ -0,0 +1,141 @@
+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.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Test project using -Dtest=mtClass#myMethod
+ *
+ * @author Olivier Lamy
+ */
+public class TestSingleMethodIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+ private static final String RUNNING_WITH_PROVIDER47 = "parallel='none', perCoreThreadCount=true, threadCount=0";
+
+ public OutputValidator singleMethod( String projectName, Map<String, String> props, String testToRun,
+ String... goals )
+ throws Exception
+ {
+ SurefireLauncher launcher = unpack( projectName );
+ for ( Map.Entry<String, String> entry : props.entrySet() )
+ {
+ launcher.sysProp( entry.getKey(), entry.getValue() );
+ }
+ for ( String goal : goals )
+ {
+ launcher.addGoal( goal );
+ }
+ launcher.showErrorStackTraces().debugLogging();
+ if ( testToRun != null )
+ {
+ launcher.setTestToRun( testToRun );
+ }
+ return launcher.executeTest()
+ .verifyErrorFreeLog()
+ .assertTestSuiteResults( 1, 0, 0, 0 );
+ }
+
+ @Test
+ public void testJunit44()
+ throws Exception
+ {
+ singleMethod( "junit44-single-method", Collections.<String, String>emptyMap(), null );
+ }
+
+ @Test
+ public void testJunit48Provider4()
+ throws Exception
+ {
+ singleMethod( "junit48-single-method", Collections.<String, String>emptyMap(), null, "-P surefire-junit4" );
+ }
+
+ @Test
+ public void testJunit48Provider47()
+ throws Exception
+ {
+ singleMethod( "junit48-single-method", Collections.<String, String>emptyMap(), null, "-P surefire-junit47" )
+ .verifyTextInLog( RUNNING_WITH_PROVIDER47 );
+ }
+
+ @Test
+ public void testJunit48parallel()
+ throws Exception
+ {
+ unpack( "junit48-single-method" )
+ .parallel( "all" )
+ .useUnlimitedThreads()
+ .executeTest()
+ .verifyErrorFreeLog()
+ .assertTestSuiteResults( 1, 0, 0, 0 );
+ }
+
+ @Test
+ public void testTestNg()
+ throws Exception
+ {
+ Map<String, String> props = new HashMap<String, String>();
+ props.put( "testNgVersion", "5.7" );
+ props.put( "testNgClassifier", "jdk15" );
+ singleMethod( "testng-single-method", props, null );
+ }
+
+ @Test
+ public void testTestNg5149()
+ throws Exception
+ {
+ singleMethod( "/testng-single-method-5-14-9", Collections.<String, String>emptyMap(), null );
+ }
+
+ @Test
+ public void fullyQualifiedJunit48Provider4()
+ throws Exception
+ {
+ singleMethod( "junit48-single-method", Collections.<String, String>emptyMap(),
+ "junit4.BasicTest#testSuccessOne", "-P surefire-junit4" );
+ }
+
+ @Test
+ public void fullyQualifiedJunit48Provider47()
+ throws Exception
+ {
+ singleMethod("junit48-single-method", Collections.<String, String>emptyMap(),
+ "junit4.BasicTest#testSuccessOne", "-P surefire-junit47");
+ }
+
+ @Test
+ public void fullyQualifiedTestNg()
+ throws Exception
+ {
+ Map<String, String> props = new HashMap<String, String>();
+ props.put( "testNgVersion", "5.7" );
+ props.put( "testNgClassifier", "jdk15" );
+ singleMethod( "testng-single-method", props, "testng.BasicTest#testSuccessOne" );
+ }
+
+}
[34/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml b/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
deleted file mode 100644
index b12b118..0000000
--- a/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
+++ /dev/null
@@ -1,51 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire.its.sibling-aggregator</groupId>
- <artifactId>aggregator</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for aggregator whose modules are in ../child</name>
- <packaging>pom</packaging>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <modules>
- <module>../child1</module>
- <module>../child2</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml b/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
deleted file mode 100644
index be2f9df..0000000
--- a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
+++ /dev/null
@@ -1,44 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire.its.sibling-aggregator</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for aggregated child1</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java b/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
deleted file mode 100644
index ec5d886..0000000
--- a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/src/main/java/siblingAggregator/FooHolder.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package siblingAggregator;
-
-/*
- * 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.
- */
-
-public class FooHolder {
- public static String getFoo() { return "foo"; }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml b/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
deleted file mode 100644
index b8c21bf..0000000
--- a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
+++ /dev/null
@@ -1,49 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire.its.sibling-aggregator</groupId>
- <artifactId>child2</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for aggregated child2</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.plugins.surefire.its.sibling-aggregator</groupId>
- <artifactId>child1</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/src/test/java/siblingAggregator/FooHolderTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/src/test/java/siblingAggregator/FooHolderTest.java b/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/src/test/java/siblingAggregator/FooHolderTest.java
deleted file mode 100644
index c001619..0000000
--- a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/src/test/java/siblingAggregator/FooHolderTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package siblingAggregator;
-
-/*
- * 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.
- */
-
-public class FooHolderTest extends junit.framework.TestCase {
-
- public void testFoo() {
- FooHolder.getFoo();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml b/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml
deleted file mode 100644
index e06061c..0000000
--- a/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>maven-surefire</groupId>
- <artifactId>small-result-counting</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>small-result-counting</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <junit.version>4.8.1</junit.version>
- <forkMode>once</forkMode>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java b/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java
deleted file mode 100644
index c79f746..0000000
--- a/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package smallresultcounting;
-
-/*
- * 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.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assume.assumeThat;
-
-public class Test1
-{
- @Test
- public void testWithFailingAssumption1()
- {
- assumeThat( 2, is( 3 ) );
- }
-
- @Test
- public void testWithFailingAssumption2()
- {
- try
- {
- Thread.sleep( 150 );
- }
- catch ( InterruptedException ignore )
- {
- }
-
- assumeThat( 2, is( 3 ) );
- }
-
- @Test
- public void testWithFailingAssumption3()
- {
- assumeThat( 2, is( 3 ) );
- }
-
- @Test
- public void testWithFailingAssumption4()
- {
- assumeThat( 2, is( 3 ) );
- }
-
- @Test
- public void testWithFailingAssumption5()
- {
- assumeThat( 2, is( 3 ) );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java b/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java
deleted file mode 100644
index 5b3494f..0000000
--- a/surefire-integration-tests/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package smallresultcounting;
-
-/*
- * 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.Ignore;
-import org.junit.Test;
-
-import static junit.framework.Assert.fail;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Test2
-{
- @Test
- public void testiWithFail1()
- {
- fail( "We excpect this1" );
- }
-
- @Test
- public void testWithException1()
- {
- System.out.println( "testWithException1 to stdout" );
- System.err.println( "testWithException1 to stderr" );
- throw new RuntimeException( "We expect this1-1" );
- }
-
- @Test
- public void testWithException2()
- {
- throw new RuntimeException( "We expect this1-2" );
- }
-
-
- @Ignore( "We do this for a reason1" )
- @Test
- public void testWithIgnore1()
- {
- }
-
- @Ignore( "We do this for a reason2" )
- @Test
- public void testWithIgnore2()
- {
- }
-
- @Ignore
- @Test
- public void testWithIgnore3()
- {
- }
-
- @Test
- public void testAllok1()
- {
- System.out.println( "testAllok1 to stdout" );
- System.err.println( "testAllok1 to stderr" );
- try
- {
- Thread.sleep( 100 );
- }
- catch ( InterruptedException ignore )
- {
- }
- }
-
- @Test
- public void testAllok2()
- {
- }
-
- @Test
- public void testAllok3()
- {
- try
- {
- Thread.sleep( 250 );
- }
- catch ( InterruptedException ignore )
- {
- }
- }
-
- @Test
- public void testAllok4()
- {
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml
deleted file mode 100644
index 5285fb1..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml
+++ /dev/null
@@ -1,79 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-1024</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>jiras-surefire-1024-it</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-1024-testjar</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <phase>verify</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <dependenciesToScan>
- <dependency>org.apache.maven.plugins.surefire:jiras-surefire-1024-testjar</dependency>
- </dependenciesToScan>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
deleted file mode 100644
index 5bf2bad..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
+++ /dev/null
@@ -1,47 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-1024</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>jiras-surefire-1024-testjar</artifactId>
- <version>1.0</version>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/src/main/java/jiras/surefire1024/A1IT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/src/main/java/jiras/surefire1024/A1IT.java b/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/src/main/java/jiras/surefire1024/A1IT.java
deleted file mode 100644
index e5d71a2..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/src/main/java/jiras/surefire1024/A1IT.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package jiras.surefire1024;
-
-import org.junit.Test;
-
-public class A1IT
-{
- @Test
- public void test()
- {
- System.out.println( getClass() + "#test() dependency to scan" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1024/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1024/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1024/pom.xml
deleted file mode 100644
index 340c494..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1024/pom.xml
+++ /dev/null
@@ -1,51 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-1024</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
-
- <modules>
- <module>jiras-surefire-1024-testjar</module>
- <module>jiras-surefire-1024-it</module>
- </modules>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
deleted file mode 100644
index 8598f1e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
+++ /dev/null
@@ -1,53 +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/xsd/maven-4.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>jiras-surefire-1028</artifactId>
- <version>1.0</version>
- <name>jiras-surefire-1028</name>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/src/test/java/jiras/surefire1028/SomeTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/src/test/java/jiras/surefire1028/SomeTest.java b/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/src/test/java/jiras/surefire1028/SomeTest.java
deleted file mode 100644
index 71cc102..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/src/test/java/jiras/surefire1028/SomeTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package jiras.surefire1028;
-
-/*
- * 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.Assert;
-import org.junit.Test;
-
-public class SomeTest {
-
- @Test
- public void test() {
- System.out.println("OK!");
- }
-
- @Test
- public void filteredOutTest() {
- Assert.fail();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
deleted file mode 100644
index 6fefa7d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
+++ /dev/null
@@ -1,69 +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/xsd/maven-4.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>jiras-surefire-1036</artifactId>
- <version>1.0</version>
- <name>jiras-surefire-1036</name>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>1.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <groups>jiras.surefire1036.IntegrationTest</groups>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/IntegrationTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/IntegrationTest.java b/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/IntegrationTest.java
deleted file mode 100644
index e1953e4..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/IntegrationTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package jiras.surefire1036;
-
-/*
- * 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.
- */
-
-public interface IntegrationTest
-{
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeIntegration.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeIntegration.java b/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeIntegration.java
deleted file mode 100644
index 64dc71e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeIntegration.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package jiras.surefire1036;
-
-/*
- * 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 static org.junit.Assert.*;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-@Category( IntegrationTest.class )
-public class TestSomeIntegration
-{
- @Test
- public void thisIsAnIntegrationTest() throws Exception
- {
- String message = "This integration test will always pass";
- System.out.println( message );
- assertTrue( message, true );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeUnit.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeUnit.java b/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeUnit.java
deleted file mode 100644
index 1ea26e8..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomeUnit.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package jiras.surefire1036;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class TestSomeUnit
-{
- @Test
- public void thisIsJustAUnitTest()
- throws Exception
- {
- String message = "This unit test will never pass";
- System.out.println( message );
- fail();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomethingWithMockitoRunner.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomethingWithMockitoRunner.java b/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomethingWithMockitoRunner.java
deleted file mode 100644
index 5122bca..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/TestSomethingWithMockitoRunner.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package jiras.surefire1036;
-
-/*
- * 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.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
-@RunWith( MockitoJUnitRunner.class )
-public class TestSomethingWithMockitoRunner
-{
- @Mock
- private List<Integer> mTestList;
-
- @Before
- public void setUp()
- throws Exception
- {
- when( mTestList.size() ).thenReturn( 5 );
- }
-
- @Test
- public void thisTestUsesMockitoRunnerButIsPrettyUseless()
- throws Exception
- {
- assertEquals( 5, mTestList.size() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
deleted file mode 100644
index efd19e8..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
+++ /dev/null
@@ -1,60 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>surefire-1041</artifactId>
- <name>Tests that test reporter does not fail with NPE when a JUnit-Runner has an error.</name>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <forkCount>1</forkCount>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/AppTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/AppTest.java b/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/AppTest.java
deleted file mode 100644
index 978da1a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/AppTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package test;
-
-/*
- * 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.Test;
-import org.junit.runner.RunWith;
-
-/**
- *
- * @author Dan Fabulich
- *
- */
-@RunWith(BadRunner.class)
-public class AppTest
-{
-
- @Test
- public void testApp()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/BadRunner.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/BadRunner.java b/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/BadRunner.java
deleted file mode 100644
index 759c0f4..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/BadRunner.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package test;
-
-/*
- * 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.runner.notification.RunNotifier;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.InitializationError;
-
-/**
- *
- * @author Dan Fabulich
- *
- */
-public class BadRunner extends BlockJUnit4ClassRunner{
-
- public BadRunner(Class<?> testClass) throws InitializationError {
- super(testClass);
- }
-
- @Override
- public void run(RunNotifier notifier) {
- String x = null;
- if (false) x = "";
- x.toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml
deleted file mode 100644
index 1774dc4..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml
+++ /dev/null
@@ -1,65 +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/xsd/maven-4.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>jiras-surefire-1053</artifactId>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <systemPropertyVariables>
- <myArg>myVal1</myArg>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/src/test/java/jiras/surefire1053/ATest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/src/test/java/jiras/surefire1053/ATest.java b/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/src/test/java/jiras/surefire1053/ATest.java
deleted file mode 100644
index 367adc5..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/src/test/java/jiras/surefire1053/ATest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package jiras.surefire1053;
-
-/*
- * 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.Test;
-
-public final class ATest {
-
- @Test
- public void someMethod() throws InterruptedException {
- System.out.println( "file.encoding=" + System.getProperty( "file.encoding" ) );
- System.out.println( "myArg=" + System.getProperty( "myArg" ) );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
deleted file mode 100644
index 51ef7bc..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--
- ~ 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/xsd/maven-4.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>foo</groupId>
- <artifactId>foo</artifactId>
- <version>1.0</version>
- <packaging>jar</packaging>
-
- <name>foo</name>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <parallel>classesAndMethods</parallel>
- <perCoreThreadCount>false</perCoreThreadCount>
- <useUnlimitedThreads>true</useUnlimitedThreads>
- <threadCountMethods>3</threadCountMethods>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Method1Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Method1Test.java b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Method1Test.java
deleted file mode 100644
index 1ab584a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Method1Test.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package foo;
-
-import org.junit.Test;
-
-public class Method1Test
-{
- @Test
- public void only()
- {
- SleepUtil.sleep();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods2Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods2Test.java b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods2Test.java
deleted file mode 100644
index 36ea93b..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods2Test.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-package foo;
-
-import org.junit.Test;
-
-public class Methods2Test
-{
- @Test
- public void first()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void second()
- {
- SleepUtil.sleep();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods3Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods3Test.java b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods3Test.java
deleted file mode 100644
index c1283b8..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods3Test.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-package foo;
-
-import org.junit.Test;
-
-public class Methods3Test
-{
- @Test
- public void first()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void second()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void third()
- {
- SleepUtil.sleep();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods4Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods4Test.java b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods4Test.java
deleted file mode 100644
index b2415e0..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods4Test.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package foo;
-
-import org.junit.Test;
-
-public class Methods4Test
-{
- @Test
- public void first()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void second()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void third()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void fourth()
- {
- SleepUtil.sleep();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods5Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods5Test.java b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods5Test.java
deleted file mode 100644
index bb47e40..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods5Test.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.
- */
-package foo;
-
-import org.junit.Test;
-
-public class Methods5Test
-{
- @Test
- public void first()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void second()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void third()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void fourth()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void fifth()
- {
- SleepUtil.sleep();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods6Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods6Test.java b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods6Test.java
deleted file mode 100644
index ee1d53c..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/Methods6Test.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package foo;
-
-import org.junit.Test;
-
-public class Methods6Test
-{
- @Test
- public void first()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void second()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void third()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void fourth()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void fifth()
- {
- SleepUtil.sleep();
- }
-
- @Test
- public void sixth()
- {
- SleepUtil.sleep();
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/SleepUtil.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/SleepUtil.java b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/SleepUtil.java
deleted file mode 100644
index c7a188a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/src/test/java/foo/SleepUtil.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-package foo;
-
-public class SleepUtil
-{
- public static void sleep()
- {
- /* a sleep seems to make the issue less likely to occur */
-// try
-// {
-// Thread.sleep(2000);
-// }
-// catch (InterruptedException e)
-// {
-// Thread.currentThread().interrupt();
-// }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
deleted file mode 100644
index 2f24bc4..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
+++ /dev/null
@@ -1,74 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-1080</artifactId>
- <version>1.0</version>
-
- <url>http://maven.apache.org</url>
-
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <contributors>
- <contributor>
- <name>Qingzhou Luo</name>
- </contributor>
- </contributors>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <parallel>classes</parallel>
- <forkCount>2</forkCount>
- <useUnlimitedThreads>true</useUnlimitedThreads>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyCotTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyCotTest.java b/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyCotTest.java
deleted file mode 100644
index 1147ecd..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyCotTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.cal;
-
-/*
- * 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.Test;
-
-public class HelloWorldFlakyCotTest
-{
- @Test
- public void testHelloWorldTextFlaky20()
- {
- }
-
- @Test
- public void testHelloWorldText2Flaky20()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyErrorTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyErrorTest.java b/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyErrorTest.java
deleted file mode 100644
index 9856fc8..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldFlakyErrorTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.cal;
-
-/*
- * 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.Test;
-
-public class HelloWorldFlakyErrorTest
-{
- @Test
- public void testHelloWorldTextFlaky20()
- {
- }
-
- @Test
- public void testHelloWorldText2Flaky20()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldTest.java b/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldTest.java
deleted file mode 100644
index 0bd3aca..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/HelloWorldTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.cal;
-
-/*
- * 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.Test;
-
-public class HelloWorldTest
-{
- @Test
- public void testHelloWorldText()
- {
- }
-
- @Test
- public void testHelloWorldTextFlaky20()
- {
- }
-
- @Test
- public void testHelloWorldText2Flaky20()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/SimpleTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/SimpleTest.java b/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/SimpleTest.java
deleted file mode 100644
index 02cd79b..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/src/test/java/com/cal/SimpleTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.cal;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class SimpleTest
-{
-
- /**
- * Make sure the universe hasn't broken.
- */
- @Test
- public void testAddition()
- {
- assertEquals( 2, 1 + 1 );
- }
-
- /**
- * Now try to break the universe :D
- */
- @Test(expected = ArithmeticException.class)
- public void testDivision()
- {
- int i = 1 / 0;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
deleted file mode 100644
index 4229cc9..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
+++ /dev/null
@@ -1,64 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>jiras-surefire-1082</artifactId>
- <version>1.0</version>
-
- <url>http://maven.apache.org</url>
-
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1082Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1082Test.java b/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1082Test.java
deleted file mode 100644
index e8cef99..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1082Test.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package jiras.surefire1082;
-
-/*
- * 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.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-@RunWith( Parameterized.class )
-public class Jira1082Test
-{
- private final int x;
-
- public Jira1082Test( int x )
- {
- this.x = x;
- }
-
- @Parameterized.Parameters
- public static Iterable<Object[]> data()
- {
- return Arrays.asList( new Object[][]{ { 0 }, { 1 } } );
- }
-
- @Test
- public void a()
- throws InterruptedException
- {
- TimeUnit.MILLISECONDS.sleep( 500 );
- System.out.println( getClass() + " a " + x + " " + Thread.currentThread().getName() );
- }
-
- @Test
- public void b()
- throws InterruptedException
- {
- TimeUnit.MILLISECONDS.sleep( 500 );
- System.out.println( getClass() + " b " + x + " " + Thread.currentThread().getName() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1264Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1264Test.java b/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1264Test.java
deleted file mode 100644
index 56e7644..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/src/test/java/jiras/surefire1082/Jira1264Test.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package jiras.surefire1082;
-
-/*
- * 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.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-@RunWith( Parameterized.class )
-public final class Jira1264Test extends Jira1082Test
-{
- public Jira1264Test( int x )
- {
- super( x );
- }
-}
[47/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
deleted file mode 100644
index 03902ef..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
+++ /dev/null
@@ -1,38 +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;
-
-/**
- * Test support for POJO tests.
- *
- * @author Benjamin Bentmann
- */
-public class PojoSimpleIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testit()
- {
- unpack( "pojo-simple" ).executeTest().assertTestSuiteResults( 2, 0, 1, 0 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReporterTime.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReporterTime.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReporterTime.java
deleted file mode 100644
index 154fb73..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReporterTime.java
+++ /dev/null
@@ -1,26 +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.
- */
-
-/**
- * @author Kristian Rosenvold
- */
-public class ReporterTime
-{
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
deleted file mode 100644
index b1c68f0..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
+++ /dev/null
@@ -1,45 +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;
-
-/**
- * Asserts proper behaviour of console output when forking
- * SUREFIRE-679
- *
- * @author Kristian Rosenvold
- */
-public class ReportersIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testRedirectOutputTestNg()
- {
- OutputValidator reporters = unpack( "reporters" ).redirectToFile( true ).printSummary( true ).executeTest();
-
- reporters.getSurefireReportsFile( "TestSuite-output.txt" ).assertFileExists();
- reporters.getSurefireReportsXmlFile( "TEST-TestSuite.xml" ).assertFileExists();
- reporters.getSurefireReportsFile( "TestSuite.txt" ).assertFileExists();
- }
-}
-
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
deleted file mode 100644
index 714d0c4..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
+++ /dev/null
@@ -1,66 +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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-
-import java.io.IOException;
-
-/**
- * Verifies that the providers get the result summary at the bottom of the run correctly, in different forkmodes
- * SUREFIRE-613 Asserts proper test counts when running in parallel
- *
- * @author Kristian Rosenvold
- */
-public class ResultCountingIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testCountingWithJunit481ForkNever()
- throws Exception
- {
- assertForkMode( "never" );
- }
-
- @Test
- public void testCountingWithJunit481ForkOnce()
- throws Exception
- {
- assertForkMode( "once" );
- }
-
- @Test
- public void testCountingWithJunit481ForkAlways()
- throws Exception
- {
- assertForkMode( "always" );
- }
-
- private void assertForkMode( String forkMode )
- throws IOException, VerificationException
- {
- OutputValidator outputValidator = unpack( "result-counting" ).failNever().forkMode( forkMode ).executeTest();
- outputValidator.assertTestSuiteResults( 36, 23, 4, 2 );
- outputValidator.verifyTextInLog( "Tests run: 36, Failures: 4, Errors: 23, Skipped: 2" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
deleted file mode 100644
index 099aa07..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
+++ /dev/null
@@ -1,108 +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.io.IOException;
-import java.util.Calendar;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * Verifies the runOrder setting and its effect
- *
- * @author Kristian Rosenvold
- */
-public class RunOrderIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private static final String[] TESTS_IN_ALPHABETICAL_ORDER = { "TA", "TB", "TC" };
-
- private static final String[] TESTS_IN_REVERSE_ALPHABETICAL_ORDER = { "TC", "TB", "TA" };
-
- // testing random is left as an exercise to the reader. Patches welcome
-
- @Test
- public void testAlphabetical()
- throws Exception
- {
- OutputValidator validator = executeWithRunOrder( "alphabetical" );
- assertTestnamesAppearInSpecificOrder( validator, TESTS_IN_ALPHABETICAL_ORDER );
- }
-
- @Test
- public void testReverseAlphabetical()
- throws Exception
- {
- OutputValidator validator = executeWithRunOrder( "reversealphabetical" );
- assertTestnamesAppearInSpecificOrder( validator, TESTS_IN_REVERSE_ALPHABETICAL_ORDER );
- }
-
- @Test
- public void testHourly()
- throws Exception
- {
- int startHour = Calendar.getInstance().get( Calendar.HOUR_OF_DAY );
- OutputValidator validator = executeWithRunOrder( "hourly" );
- int endHour = Calendar.getInstance().get( Calendar.HOUR_OF_DAY );
- if ( startHour != endHour )
- {
- return; // Race condition, cannot test when hour changed mid-run
- }
-
- String[] testnames =
- ( ( startHour % 2 ) == 0 ) ? TESTS_IN_ALPHABETICAL_ORDER : TESTS_IN_REVERSE_ALPHABETICAL_ORDER;
- assertTestnamesAppearInSpecificOrder( validator, testnames );
- }
-
- @Test
- public void testNonExistingRunOrder()
- throws Exception
- {
- unpack().forkMode( getForkMode() ).runOrder( "nonExistingRunOrder" ).maven().withFailure().executeTest().verifyTextInLog(
- "There's no RunOrder with the name nonExistingRunOrder." );
- }
-
- private OutputValidator executeWithRunOrder( String runOrder )
- {
- return unpack().forkMode( getForkMode() ).runOrder( runOrder ).executeTest().verifyErrorFree( 3 );
- }
-
- protected String getForkMode()
- {
- return "once";
- }
-
- private SurefireLauncher unpack()
- {
- return unpack( "runOrder" );
- }
-
- private void assertTestnamesAppearInSpecificOrder( OutputValidator validator, String[] testnames )
- throws VerificationException
- {
- if ( !validator.stringsAppearInSpecificOrderInLog( testnames ) )
- {
- throw new VerificationException( "Response does not contain expected item" );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderParallelForksIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderParallelForksIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderParallelForksIT.java
deleted file mode 100644
index 72fc428..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderParallelForksIT.java
+++ /dev/null
@@ -1,31 +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.
- */
-
-public class RunOrderParallelForksIT
- extends RunOrderIT
-{
-
- @Override
- protected String getForkMode()
- {
- return "perthread";
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
deleted file mode 100644
index 69c9e4c..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
+++ /dev/null
@@ -1,47 +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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-/**
- * Test aggregator as a sibling to child modules; invokes modules as "../child"
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class SiblingAggregatorIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void testSiblingAggregator()
- throws Exception
- {
- final SurefireLauncher unpack = unpack( "sibling-aggregator" );
- SurefireLauncher aggregator = unpack.getSubProjectLauncher( "aggregator" );
- aggregator.executeTest().verifyErrorFreeLog();
- OutputValidator child2 = unpack.getSubProjectValidator( "child2" );
- child2.assertTestSuiteResults( 1, 0, 0, 0 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SmartStackTraceIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SmartStackTraceIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SmartStackTraceIT.java
deleted file mode 100644
index b98155e..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SmartStackTraceIT.java
+++ /dev/null
@@ -1,44 +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;
-
-/**
- * IT of smart stack trace parser
- *
- * @author Kristian Rosenvold
- */
-public class SmartStackTraceIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void misg()
- throws Exception
- {
- OutputValidator outputValidator = unpack( "/junit48-smartStackTrace" ).maven().withFailure().executeTest();
- outputValidator.verifyTextInLog( "SmartStackTraceTest.shouldFailInMethodButDoesnt Expected exception: java.lang.RuntimeException" );
- outputValidator.verifyTextInLog( "SmartStackTraceTest.shortName Expected exception: java.io.IOException" );
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
deleted file mode 100644
index 121b8fc..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
+++ /dev/null
@@ -1,55 +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 system properties
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class SystemPropertiesTestIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void testSystemProperties()
- {
- unpack().addGoal( "-DsetOnMavenCommandLine=baz" ).addGoal(
- "-DsetOnArgLineWorkAround=baz" ).executeTest().verifyErrorFree( 8 );
- }
-
- @Test
- public void testSystemPropertiesNoFork()
- {
-
- unpack().forkNever().addGoal( "-DsetOnMavenCommandLine=baz" ).addGoal( "-DsetOnArgLineWorkAround=baz" )
- // DGF fake the argLine, since we're not forking
- .addGoal( "-DsetOnArgLine=bar" ).executeTest().verifyErrorFree( 8 );
- }
-
- public SurefireLauncher unpack()
- {
- return unpack( "/system-properties" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java
deleted file mode 100644
index 447d8f1..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMethodPatternIT.java
+++ /dev/null
@@ -1,115 +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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-/**
- * Test project using -Dtest=mtClass#myMethod
- *
- * @author Olivier Lamy
- */
-public class TestMethodPatternIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private static final String RUNNING_WITH_PROVIDER47 = "parallel='none', perCoreThreadCount=true, threadCount=0";
-
- public OutputValidator runMethodPattern( String projectName, Map<String, String> props, String... goals )
- {
- SurefireLauncher launcher = unpack( projectName );
- for ( Entry<String, String> entry : props.entrySet() )
- {
- launcher.sysProp( entry.getKey(), entry.getValue() );
- }
- for ( String goal : goals )
- {
- launcher.addGoal( goal );
- }
- return launcher.showErrorStackTraces().debugLogging()
- .executeTest()
- .assertTestSuiteResults( 2, 0, 0, 0 );
- }
-
- @Test
- public void testJUnit44()
- {
- runMethodPattern( "junit44-method-pattern", Collections.<String, String>emptyMap() );
- }
-
- @Test
- public void testJUnit48Provider4()
- {
- runMethodPattern( "junit48-method-pattern", Collections.<String, String>emptyMap(), "-P surefire-junit4" );
- }
-
- @Test
- public void testJUnit48Provider47()
- {
- runMethodPattern( "junit48-method-pattern", Collections.<String, String>emptyMap(), "-P surefire-junit47" )
- .verifyTextInLog( RUNNING_WITH_PROVIDER47 );
- }
-
- @Test
- public void testJUnit48WithCategoryFilter()
- {
- unpack( "junit48-method-pattern" )
- .addGoal( "-Dgroups=junit4.SampleCategory" )
- .executeTest()
- .assertTestSuiteResults( 1, 0, 0, 0 );
- }
-
- @Test
- public void testTestNgMethodBefore()
- {
- Map<String, String> props = new HashMap<String, String>();
- props.put( "testNgVersion", "5.7" );
- props.put( "testNgClassifier", "jdk15" );
- runMethodPattern( "testng-method-pattern-before", props );
- }
-
- @Test
- public void testTestNGMethodPattern()
- {
- Map<String, String> props = new HashMap<String, String>();
- props.put( "testNgVersion", "5.7" );
- props.put( "testNgClassifier", "jdk15" );
- runMethodPattern( "/testng-method-pattern", props );
- }
-
- @Test
- public void testMethodPatternAfter()
- {
- unpack( "testng-method-pattern-after" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .executeTest()
- .verifyErrorFree( 2 )
- .verifyTextInLog( "Called tearDown" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java
deleted file mode 100644
index d490ce5..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsIT.java
+++ /dev/null
@@ -1,67 +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.Settings;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-
-/**
- * JUnit test project using multiple method patterns, including wildcards in class and method names.
- */
-@RunWith( Parameterized.class )
-public class TestMultipleMethodPatternsIT
- extends AbstractTestMultipleMethodPatterns
-{
- private final Settings settings;
-
- public TestMultipleMethodPatternsIT( Settings settings )
- {
- this.settings = settings;
- }
-
- @Parameterized.Parameters
- public static Iterable<Object[]> data()
- {
- return Arrays.asList( new Object[][]{
- { Settings.JUNIT4_TEST },
- { Settings.JUNIT47_TEST },
- { Settings.JUNIT4_INCLUDES },
- { Settings.JUNIT47_INCLUDES },
- { Settings.JUNIT4_INCLUDES_EXCLUDES },
- { Settings.JUNIT47_INCLUDES_EXCLUDES }
- } );
- }
-
- @Override
- protected Settings getSettings()
- {
- return settings;
- }
-
- @Override
- protected SurefireLauncher unpack()
- {
- return unpack( "junit48-multiple-method-patterns", "_" + settings.path() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIT.java
deleted file mode 100644
index 2de3670..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodPatternsTestNGIT.java
+++ /dev/null
@@ -1,64 +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.Settings;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-
-/**
- * TestNG test project using multiple method patterns, including wildcards in class and method names.
- */
-@RunWith( Parameterized.class )
-public class TestMultipleMethodPatternsTestNGIT
- extends AbstractTestMultipleMethodPatterns
-{
- private final Settings settings;
-
- public TestMultipleMethodPatternsTestNGIT( Settings settings )
- {
- this.settings = settings;
- }
-
- @Parameterized.Parameters
- public static Iterable<Object[]> data()
- {
- return Arrays.asList( new Object[][]{
- { Settings.TestNG_TEST },
- { Settings.TestNG_INCLUDES },
- { Settings.TestNG_INCLUDES_EXCLUDES }
- } );
- }
-
- @Override
- protected Settings getSettings()
- {
- return settings;
- }
-
- @Override
- protected SurefireLauncher unpack()
- {
- return unpack( "testng-multiple-method-patterns", "_" + settings.path() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodsIT.java
deleted file mode 100644
index cb773cd..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodsIT.java
+++ /dev/null
@@ -1,74 +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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-
-/**
- * Test project using -Dtest=mtClass#myMethod+myMethod2,secondClass#testMethod
- *
- * @author <a href="mailto:ytsolar@gmail.com">rainLee</a>
- */
-public class TestMultipleMethodsIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- private static final String RUNNING_WITH_PROVIDER47 = "parallel='none', perCoreThreadCount=true, threadCount=0";
-
- public OutputValidator multipleMethod( String projectName, String... goals )
- throws Exception
- {
- SurefireLauncher launcher = unpack( projectName );
- for ( String goal : goals )
- {
- launcher.addGoal( goal );
- }
- return launcher.showErrorStackTraces().debugLogging()
- .executeTest()
- .verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 );
- }
-
- @Test
- public void testJunit44()
- throws Exception
- {
- multipleMethod( "junit44-multiple-methods" );
- }
-
- @Test
- public void testJunit48Provider4()
- throws Exception
- {
- multipleMethod( "junit48-multiple-methods", "-P surefire-junit4" );
- }
-
- @Test
- public void testJunit48Provider47()
- throws Exception
- {
- multipleMethod( "junit48-multiple-methods", "-P surefire-junit47" )
- .verifyTextInLog( RUNNING_WITH_PROVIDER47 );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
deleted file mode 100644
index 74771c8..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
+++ /dev/null
@@ -1,69 +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 the group filter for TestNG
- *
- */
-public class TestNgGroupsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testExclusion()
- {
- unpack().setExcludedGroups( "notincluded" ).executeTest().verifyErrorFree( 5 );
- }
-
- @Test
- public void testOnlyGroups()
- {
- unpack().setGroups( "functional" ).executeTest().verifyErrorFree( 2 );
- }
-
- @Test
- public void testGroupsAndExclusion()
- {
- unpack().setGroups( "functional" ).setExcludedGroups( "notincluded" ).executeTest().verifyErrorFree( 1 );
- }
-
- @Test
- public void groupsWithDash()
- {
- unpack().setGroups( "abc-def" ).executeTest().verifyErrorFree( 1 );
- }
-
- @Test
- public void groupsBySimpleRegex()
- {
- unpack().setGroups( "foo\\..*" ).executeTest().verifyErrorFree( 2 );
- }
-
- public SurefireLauncher unpack()
- {
- return unpack( "/testng-groups" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
deleted file mode 100644
index 1e6044e..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
+++ /dev/null
@@ -1,38 +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;
-
-/**
- * Test that TestNG's @Test(threadPoolSize = n, invocationCount=n) causes tests to be run in parallel.
- *
- * @author <a href="mailto:spam.haikal@gmail.com">Haikal Saadh</a>
- */
-public class TestNgParallelWithAnnotationsIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testTestNgGroupThreadParallel()
- {
- executeErrorFreeTest( "/testng-parallel-with-annotations", 3 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuccessPercentageIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuccessPercentageIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuccessPercentageIT.java
deleted file mode 100644
index 3b12e03..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuccessPercentageIT.java
+++ /dev/null
@@ -1,45 +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;
-
-/**
- * Test that TestNG's @Test(successPercentage = n, invocationCount=n) passes so long as successPercentage tests
- * have passed.
- *
- * @author Jon Todd
- * @author Andreas Gudian
- */
-public class TestNgSuccessPercentageIT extends SurefireJUnit4IntegrationTestCase {
- @Test
- public void testPassesWhenFailuresLessThanSuccessPercentage()
- {
- OutputValidator validator = unpack("/testng-succes-percentage")
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .mavenTestFailureIgnore( true )
- .executeTest();
- validator.assertTestSuiteResults(8, 0, 1, 0);
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
deleted file mode 100644
index 53eddce..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
+++ /dev/null
@@ -1,141 +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.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Test project using -Dtest=mtClass#myMethod
- *
- * @author Olivier Lamy
- */
-public class TestSingleMethodIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private static final String RUNNING_WITH_PROVIDER47 = "parallel='none', perCoreThreadCount=true, threadCount=0";
-
- public OutputValidator singleMethod( String projectName, Map<String, String> props, String testToRun,
- String... goals )
- throws Exception
- {
- SurefireLauncher launcher = unpack( projectName );
- for ( Map.Entry<String, String> entry : props.entrySet() )
- {
- launcher.sysProp( entry.getKey(), entry.getValue() );
- }
- for ( String goal : goals )
- {
- launcher.addGoal( goal );
- }
- launcher.showErrorStackTraces().debugLogging();
- if ( testToRun != null )
- {
- launcher.setTestToRun( testToRun );
- }
- return launcher.executeTest()
- .verifyErrorFreeLog()
- .assertTestSuiteResults( 1, 0, 0, 0 );
- }
-
- @Test
- public void testJunit44()
- throws Exception
- {
- singleMethod( "junit44-single-method", Collections.<String, String>emptyMap(), null );
- }
-
- @Test
- public void testJunit48Provider4()
- throws Exception
- {
- singleMethod( "junit48-single-method", Collections.<String, String>emptyMap(), null, "-P surefire-junit4" );
- }
-
- @Test
- public void testJunit48Provider47()
- throws Exception
- {
- singleMethod( "junit48-single-method", Collections.<String, String>emptyMap(), null, "-P surefire-junit47" )
- .verifyTextInLog( RUNNING_WITH_PROVIDER47 );
- }
-
- @Test
- public void testJunit48parallel()
- throws Exception
- {
- unpack( "junit48-single-method" )
- .parallel( "all" )
- .useUnlimitedThreads()
- .executeTest()
- .verifyErrorFreeLog()
- .assertTestSuiteResults( 1, 0, 0, 0 );
- }
-
- @Test
- public void testTestNg()
- throws Exception
- {
- Map<String, String> props = new HashMap<String, String>();
- props.put( "testNgVersion", "5.7" );
- props.put( "testNgClassifier", "jdk15" );
- singleMethod( "testng-single-method", props, null );
- }
-
- @Test
- public void testTestNg5149()
- throws Exception
- {
- singleMethod( "/testng-single-method-5-14-9", Collections.<String, String>emptyMap(), null );
- }
-
- @Test
- public void fullyQualifiedJunit48Provider4()
- throws Exception
- {
- singleMethod( "junit48-single-method", Collections.<String, String>emptyMap(),
- "junit4.BasicTest#testSuccessOne", "-P surefire-junit4" );
- }
-
- @Test
- public void fullyQualifiedJunit48Provider47()
- throws Exception
- {
- singleMethod("junit48-single-method", Collections.<String, String>emptyMap(),
- "junit4.BasicTest#testSuccessOne", "-P surefire-junit47");
- }
-
- @Test
- public void fullyQualifiedTestNg()
- throws Exception
- {
- Map<String, String> props = new HashMap<String, String>();
- props.put( "testNgVersion", "5.7" );
- props.put( "testNgClassifier", "jdk15" );
- singleMethod( "testng-single-method", props, "testng.BasicTest#testSuccessOne" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
deleted file mode 100644
index fdcea20..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
+++ /dev/null
@@ -1,43 +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;
-
-/**
- * Test
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class TimeoutForkedTestIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testTimeoutForked()
- throws Exception
- {
- unpack( "/timeout-forked" ).addGoal( "-DsleepLength=10000" ).addGoal(
- "-DforkTimeout=1" ).maven().withFailure().executeTest();
- // SUREFIRE-468 test that had to be reverted due to SUREFIRE-705
- //assertFalse( getSurefireReportsFile( "TEST-timeoutForked.BasicTest.xml" ).exists() );
- // assertFalse( getSurefireReportsFile( "timeoutForked.BasicTest.txt" ).exists() );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
deleted file mode 100644
index c218769..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
+++ /dev/null
@@ -1,130 +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.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.apache.maven.plugins.surefire.report.ReportTestSuite;
-import org.apache.maven.surefire.its.fixture.*;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-/**
- * Test running two test cases; confirms reporting works correctly
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class TwoTestCasesIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testTwoTestCases()
- throws Exception
- {
- unpack( "junit-twoTestCases" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .executeTest()
- .verifyErrorFreeLog()
- .assertTestSuiteResults( 2, 0, 0, 0 );
- }
-
- /**
- * Runs two tests encapsulated in a suite
- */
- @Test
- public void testTwoTestCaseSuite()
- throws Exception
- {
- final OutputValidator outputValidator = unpack( "junit-twoTestCaseSuite" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .executeTest();
- outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0, 0 );
- List<ReportTestSuite> reports = HelperAssertions.extractReports( outputValidator.getBaseDir() );
- Set<String> classNames = extractClassNames( reports );
- assertContains( classNames, "junit.twoTestCaseSuite.BasicTest" );
- assertContains( classNames, "junit.twoTestCaseSuite.TestTwo" );
- assertEquals( "wrong number of classes", 2, classNames.size() );
- IntegrationTestSuiteResults results = HelperAssertions.parseReportList( reports );
- HelperAssertions.assertTestSuiteResults( 2, 0, 0, 0, results );
- }
-
- private void assertContains( Set<String> set, String expected )
- {
- if ( set.contains( expected ) )
- {
- return;
- }
- fail( "Set didn't contain " + expected );
- }
-
- private Set<String> extractClassNames( List<ReportTestSuite> reports )
- {
- HashSet<String> classNames = new HashSet<String>();
- for ( ReportTestSuite suite : reports )
- {
- classNames.add( suite.getFullClassName() );
- }
- return classNames;
- }
-
- @Test
- public void testJunit4Suite()
- throws Exception
- {
- final OutputValidator outputValidator = unpack( "junit4-twoTestCaseSuite" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .executeTest();
- outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0, 0 );
-
- List<ReportTestSuite> reports =
- HelperAssertions.extractReports( outputValidator.getBaseDir() );
- Set<String> classNames = extractClassNames( reports );
- assertContains( classNames, "twoTestCaseSuite.BasicTest" );
- assertContains( classNames, "twoTestCaseSuite.Junit4TestTwo" );
- assertEquals( "wrong number of classes", 2, classNames.size() );
- IntegrationTestSuiteResults results = HelperAssertions.parseReportList( reports );
- HelperAssertions.assertTestSuiteResults( 2, 0, 0, 0, results );
- }
-
- @Test
- public void testTestNGSuite()
- throws Exception
- {
- final OutputValidator outputValidator = unpack( "testng-twoTestCaseSuite" )
- .sysProp( "testNgVersion", "5.7" )
- .sysProp( "testNgClassifier", "jdk15" )
- .executeTest();
- outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0, 0 );
- List<ReportTestSuite> reports = HelperAssertions.extractReports( outputValidator.getBaseDir() );
- Set<String> classNames = extractClassNames( reports );
- assertContains( classNames, "testng.two.TestNGTestTwo" );
- assertContains( classNames, "testng.two.TestNGSuiteTest" );
- assertEquals( "wrong number of classes", 2, classNames.size() );
- IntegrationTestSuiteResults results = HelperAssertions.parseReportList( reports );
- HelperAssertions.assertTestSuiteResults( 2, 0, 0, 0, results );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
deleted file mode 100644
index 8848dc2..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
+++ /dev/null
@@ -1,64 +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.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.MavenLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Test a directory with an umlaut
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class UmlautDirIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testUmlaut()
- throws Exception
- {
- specialUnpack().executeTest().verifyErrorFreeLog().assertTestSuiteResults( 1, 0, 0, 0 );
- }
-
- @Test
- public void testUmlautIsolatedClassLoader()
- throws Exception
- {
- specialUnpack().useSystemClassLoader( false ).executeTest().assertTestSuiteResults( 1, 0, 0, 0 );
- }
-
- SurefireLauncher specialUnpack()
- throws VerificationException, IOException
- {
- SurefireLauncher unpack = unpack( "junit-pathWithUmlaut" );
- MavenLauncher maven = unpack.maven();
-
- File dest = new File( maven.getUnpackedAt().getParentFile().getPath(), "/junit-pathWith\u00DCmlaut" );
- maven.moveUnpackTo( dest );
- return unpack;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
deleted file mode 100644
index 64db960..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
+++ /dev/null
@@ -1,75 +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 LicenseUni.
- */
-
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.TestFile;
-import org.junit.Test;
-
-import java.io.File;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
-
-/**
- * Verifies unicode filenames pass through correctly.
- */
-public class UnicodeTestNamesIT
- extends SurefireJUnit4IntegrationTestCase
-{
- private static final String TXT_REPORT = "junit.twoTestCases.\u800C\u7D22\u5176\u60C5Test.txt";
- private static final String XML_REPORT = "TEST-junit.twoTestCases.\u800C\u7D22\u5176\u60C5Test.xml";
-
- @Test
- public void checkFileNamesWithUnicode()
- {
- SurefireLauncher unpacked = unpack( "unicode-testnames" );
- File basedir = unpacked.getUnpackedAt();
-
- unpacked.execute( "clean" );
-
- File xxyz = new File( basedir, "src/test/java/junit/twoTestCases/XXYZTest.java" );
- File dest = new File( basedir, "src/test/java/junit/twoTestCases/\u800C\u7D22\u5176\u60C5Test.java" );
-
- //noinspection ResultOfMethodCallIgnored
- dest.delete();
- assertTrue( xxyz.renameTo( dest ) );
-
- assertTrue( dest.exists() );
- assumeFalse( new File( basedir, "src/test/java/junit/twoTestCases/????Test.java" ).exists() );
-
- OutputValidator outputValidator =
- unpacked.executeTest()
- .assertTestSuiteResults( 2, 0, 0, 0 );
-
- TestFile surefireReportFile = outputValidator.getSurefireReportsFile( TXT_REPORT );
- assertTrue( surefireReportFile.exists() );
- surefireReportFile.assertContainsText( "junit.twoTestCases.????Test" );
-
- TestFile surefireXmlReportFile = outputValidator.getSurefireReportsXmlFile( XML_REPORT );
- assertTrue( surefireXmlReportFile.exists() );
- assertFalse( surefireXmlReportFile.readFileToString().isEmpty() );
- surefireXmlReportFile.assertContainsText( "junit.twoTestCases.\u800C\u7D22\u5176\u60C5Test" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java
deleted file mode 100644
index b87f603..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UseIsolatedClassLoaderIT.java
+++ /dev/null
@@ -1,38 +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;
-
-/**
- * Test useSystemClassLoader option
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- */
-public class UseIsolatedClassLoaderIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testUseSystemClassLoader()
- {
- executeErrorFreeTest( "/isolated-classloader", 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
deleted file mode 100644
index 66fa3df..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
+++ /dev/null
@@ -1,134 +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.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Properties;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.*;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test working directory configuration, SUREFIRE-416
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class WorkingDirectoryIT
- extends SurefireJUnit4IntegrationTestCase
-{
-
- @Test
- public void testWorkingDirectory()
- throws Exception
- {
- final SurefireLauncher unpack = getUnpacked();
- final OutputValidator child = getPreparedChild( unpack );
- unpack.executeTest().verifyErrorFreeLog();
- child.assertTestSuiteResults( 1, 0, 0, 0 );
- verifyOutputDirectory( child );
- }
-
- @Test
- public void testWorkingDirectoryNoFork()
- throws Exception
- {
- final SurefireLauncher unpack = getUnpacked();
- final OutputValidator child = getPreparedChild( unpack );
- unpack.forkNever().executeTest().verifyErrorFreeLog();
- child.assertTestSuiteResults( 1, 0, 0, 0 );
- verifyOutputDirectory( child );
- }
-
- @Test
- public void testWorkingDirectoryChildOnly()
- throws Exception
- {
- final SurefireLauncher unpack = getUnpacked();
- final SurefireLauncher child = unpack.getSubProjectLauncher( "child" );
- //child.getTargetFile( "out.txt" ).delete();
- final OutputValidator outputValidator = child.executeTest().assertTestSuiteResults( 1, 0, 0, 0 );
- verifyOutputDirectory( outputValidator );
- }
-
- @Test
- public void testWorkingDirectoryChildOnlyNoFork()
- throws Exception
- {
-
- final SurefireLauncher unpack = getUnpacked();
- final SurefireLauncher child = unpack.getSubProjectLauncher( "child" );
- //child.getTargetFile( "out.txt" ).delete();
- final OutputValidator outputValidator = child.forkNever().executeTest().assertTestSuiteResults( 1, 0, 0, 0 );
- verifyOutputDirectory( outputValidator );
- }
-
- private SurefireLauncher getUnpacked()
- throws VerificationException, IOException
- {
- return unpack( "working-directory" );
- }
-
- private OutputValidator getPreparedChild( SurefireLauncher unpack )
- throws VerificationException
- {
- final OutputValidator child = unpack.getSubProjectValidator( "child" );
- getOutFile( child ).delete();
- return child;
- }
-
-
- private TestFile getOutFile( OutputValidator child )
- {
- return child.getTargetFile( "out.txt" );
- }
-
- public void verifyOutputDirectory( OutputValidator childTestDir )
- throws IOException
- {
- final TestFile outFile = getOutFile( childTestDir );
- assertTrue( "out.txt doesn't exist: " + outFile.getAbsolutePath(), outFile.exists() );
- Properties p = new Properties();
- FileInputStream is = outFile.getFileInputStream();
- p.load( is );
- is.close();
- String userDirPath = p.getProperty( "user.dir" );
- assertNotNull( "user.dir was null in property file", userDirPath );
- File userDir = new File( userDirPath );
- // test if not a symlink
- if ( childTestDir.getBaseDir().getCanonicalFile().equals( childTestDir.getBaseDir().getAbsoluteFile() ) )
- {
- assertTrue( "wrong user.dir ! symlink ",
- childTestDir.getBaseDir().getAbsolutePath().equalsIgnoreCase( userDir.getAbsolutePath() ) );
- }
- else
- {
- assertEquals( "wrong user.dir symlink ", childTestDir.getBaseDir().getCanonicalPath(),
- userDir.getCanonicalPath() );
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java
deleted file mode 100644
index 1415b6e..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java
+++ /dev/null
@@ -1,39 +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;
-
-/**
- * Test when the configured working directory is an invalid property, SUREFIRE-715
- *
- * @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
- */
-public class WorkingDirectoryIsInvalidPropertyIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testWorkingDirectory()
- throws Exception
- {
- unpack( "working-directory-is-invalid-property" ).maven().withFailure().executeTest().verifyTextInLog(
- "workingDirectory cannot be null" );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
deleted file mode 100644
index 5247160..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryMissingIT.java
+++ /dev/null
@@ -1,39 +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;
-
-/**
- * Test when the configured working directory does not exist, SUREFIRE-607
- *
- * @author <a href="mailto:stephenc@apache.org">Stephen Connolly</a>
- */
-public class WorkingDirectoryMissingIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testWorkingDirectory()
- {
- unpack( "working-directory-missing" ).executeTest().verifyErrorFreeLog();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
deleted file mode 100644
index e8ee58b..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
+++ /dev/null
@@ -1,75 +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.plugins.surefire.report.ReportTestSuite;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
-import org.junit.Test;
-
-import static org.apache.maven.surefire.its.fixture.HelperAssertions.extractReports;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.hamcrest.Matchers.lessThan;
-
-/**
- * Test reported runtime
- *
- * @author Kristian Rosenvold
- */
-public class XmlReporterRunTimeIT
- extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void testForkModeAlways()
- throws Exception
- {
- // just generate .surefire-<hash> in order to apply runOrder
- unpack( "/runorder-parallel" )
- .executeTest()
- .verifyErrorFree( 9 );
-
- // now assert test results match expected values
- OutputValidator outputValidator = unpack( "/runorder-parallel" )
- .executeTest()
- .verifyErrorFree( 9 );
-
- for ( ReportTestSuite report : extractReports( outputValidator.getBaseDir() ) )
- {
- if ( "runorder.parallel.Test1".equals( report.getFullClassName() ) )
- {
- // should be 6f but because of having Windows sleep discrepancy it is 5.95f
- assertThat( "runorder.parallel.Test1 report.getTimeElapsed found:" + report.getTimeElapsed(),
- report.getTimeElapsed(), allOf( greaterThanOrEqualTo( 5.95f ), lessThan( 7f ) ) );
- }
- else if ( "runorder.parallel.Test2".equals( report.getFullClassName() ) )
- {
- // should be 5f but because of having Windows sleep discrepancy it is 4.95f
- assertThat( "runorder.parallel.Test2 report.getTimeElapsed found:" + report.getTimeElapsed(),
- report.getTimeElapsed(), allOf( greaterThanOrEqualTo( 4.95f ), lessThan( 6f ) ) );
- }
- else
- {
- System.out.println( "report = " + report );
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/Configuration.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/Configuration.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/Configuration.java
deleted file mode 100644
index dcd8184..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/Configuration.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.
- */
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.19
- */
-public enum Configuration
-{
- TEST, INCLUDES, INCLUDES_FILE, INCLUDES_EXCLUDES, INCLUDES_EXCLUDES_FILE
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
deleted file mode 100644
index b96cf9b..0000000
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/FailsafeOutputValidator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.apache.maven.surefire.its.fixture;
-
-/*
- * 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.it.VerificationException;
-
-public class FailsafeOutputValidator
- extends OutputValidator
-{
- public FailsafeOutputValidator( OutputValidator source )
- {
- super( source.verifier );
- }
-
- @Override
- public OutputValidator verifyErrorFree( int total )
- {
- try
- {
- verifier.verifyErrorFreeLog();
- this.assertIntegrationTestSuiteResults( total, 0, 0, 0 );
- return this;
- }
- catch ( VerificationException e )
- {
- throw new SurefireVerifierException( e );
- }
- }
-
-}
[25/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
deleted file mode 100644
index 53bb0a3..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
+++ /dev/null
@@ -1,61 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>surefire-946</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Tests killing the main maven process when using reusable forks</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>maven-selfdestruct-plugin</artifactId>
- <version>0.1</version>
- <configuration>
- <timeoutInMillis>${selfdestruct.timeoutInMillis}</timeoutInMillis>
- <method>${selfdestruct.method}</method>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic01Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic01Test.java b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic01Test.java
deleted file mode 100644
index 8c52d1b..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic01Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package junit44.environment;
-
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class Basic01Test
-{
-
- @Test
- public void testNothing()
- {
- }
-
- @AfterClass
- public static void waitSomeTimeAround()
- {
- try
- {
- Thread.sleep( Integer.getInteger( "testSleepTime", 2000 ) );
- }
- catch ( InterruptedException ignored )
- {
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic02Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic02Test.java b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic02Test.java
deleted file mode 100644
index 6ef33f9..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic02Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package junit44.environment;
-
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class Basic02Test
-{
-
- @Test
- public void testNothing()
- {
- }
-
- @AfterClass
- public static void waitSomeTimeAround()
- {
- try
- {
- Thread.sleep( Integer.getInteger( "testSleepTime", 2000 ) );
- }
- catch ( InterruptedException ignored )
- {
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic03Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic03Test.java b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic03Test.java
deleted file mode 100644
index b1d7c71..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic03Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package junit44.environment;
-
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class Basic03Test
-{
-
- @Test
- public void testNothing()
- {
- }
-
- @AfterClass
- public static void waitSomeTimeAround()
- {
- try
- {
- Thread.sleep( Integer.getInteger( "testSleepTime", 2000 ) );
- }
- catch ( InterruptedException ignored )
- {
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic04Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic04Test.java b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic04Test.java
deleted file mode 100644
index 6d082cb..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic04Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package junit44.environment;
-
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class Basic04Test
-{
-
- @Test
- public void testNothing()
- {
- }
-
- @AfterClass
- public static void waitSomeTimeAround()
- {
- try
- {
- Thread.sleep( Integer.getInteger( "testSleepTime", 2000 ) );
- }
- catch ( InterruptedException ignored )
- {
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic05Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic05Test.java b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic05Test.java
deleted file mode 100644
index 92f5f15..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic05Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package junit44.environment;
-
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class Basic05Test
-{
-
- @Test
- public void testNothing()
- {
- }
-
- @AfterClass
- public static void waitSomeTimeAround()
- {
- try
- {
- Thread.sleep( Integer.getInteger( "testSleepTime", 2000 ) );
- }
- catch ( InterruptedException ignored )
- {
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic06Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic06Test.java b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic06Test.java
deleted file mode 100644
index 2a44568..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic06Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package junit44.environment;
-
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class Basic06Test
-{
-
- @Test
- public void testNothing()
- {
- }
-
- @AfterClass
- public static void waitSomeTimeAround()
- {
- try
- {
- Thread.sleep( Integer.getInteger( "testSleepTime", 2000 ) );
- }
- catch ( InterruptedException ignored )
- {
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic07Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic07Test.java b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic07Test.java
deleted file mode 100644
index 64f180e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic07Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package junit44.environment;
-
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class Basic07Test
-{
-
- @Test
- public void testNothing()
- {
- }
-
- @AfterClass
- public static void waitSomeTimeAround()
- {
- try
- {
- Thread.sleep( Integer.getInteger( "testSleepTime", 2000 ) );
- }
- catch ( InterruptedException ignored )
- {
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic08Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic08Test.java b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic08Test.java
deleted file mode 100644
index 5a4c382..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic08Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package junit44.environment;
-
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class Basic08Test
-{
-
- @Test
- public void testNothing()
- {
- }
-
- @AfterClass
- public static void waitSomeTimeAround()
- {
- try
- {
- Thread.sleep( Integer.getInteger( "testSleepTime", 2000 ) );
- }
- catch ( InterruptedException ignored )
- {
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic09Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic09Test.java b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic09Test.java
deleted file mode 100644
index 2461d11..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic09Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package junit44.environment;
-
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class Basic09Test
-{
-
- @Test
- public void testNothing()
- {
- }
-
- @AfterClass
- public static void waitSomeTimeAround()
- {
- try
- {
- Thread.sleep( Integer.getInteger( "testSleepTime", 2000 ) );
- }
- catch ( InterruptedException ignored )
- {
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic10Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic10Test.java b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic10Test.java
deleted file mode 100644
index 1e57b13..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/src/test/java/junit44/environment/Basic10Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package junit44.environment;
-
-/*
- * 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.AfterClass;
-import org.junit.Test;
-
-public class Basic10Test
-{
-
- @Test
- public void testNothing()
- {
- }
-
- @AfterClass
- public static void waitSomeTimeAround()
- {
- try
- {
- Thread.sleep( Integer.getInteger( "testSleepTime", 2000 ) );
- }
- catch ( InterruptedException ignored )
- {
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml b/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
deleted file mode 100644
index 811be93..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>maven-selfdestruct-plugin</artifactId>
- <version>0.1</version>
- <packaging>maven-plugin</packaging>
-
- <name>maven-selfdestruct-plugin Maven Plugin</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <goalPrefix>maven-selfdestruct-plugin</goalPrefix>
- </configuration>
- <executions>
- <execution>
- <id>generated-helpmojo</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java b/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java
deleted file mode 100644
index d5f791f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-946-self-destruct-plugin/src/main/java/org/apache/maven/plugins/surefire/selfdestruct/SelfDestructMojo.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.apache.maven.plugins.surefire.selfdestruct;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed 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.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-
-/*
- * 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.
- */
-
-/**
- * Goal which terminates the maven process it is executed in after a timeout.
- *
- * @goal selfdestruct
- * @phase test
- */
-public class SelfDestructMojo
- extends AbstractMojo
-{
- private enum DestructMethod
- {
- exit, halt, interrupt;
- }
-
- /**
- * Timeout in milliseconds
- *
- * @parameter
- */
- private long timeoutInMillis = 0;
-
- /**
- * Method of self-destruction: 'exit' will use System.exit (default), 'halt' will use Runtime.halt, 'interrupt' will
- * try to call 'taskkill' (windows) or 'kill -INT' (others)
- *
- * @parameter
- */
- private String method = "exit";
-
- public void execute()
- throws MojoExecutionException
- {
-
- DestructMethod destructMethod = DestructMethod.valueOf( method );
-
- if ( timeoutInMillis > 0 )
- {
- getLog().warn( "Self-Destruct in " + timeoutInMillis + " ms using " + destructMethod );
- Timer timer = new Timer( "", true );
- timer.schedule( new SelfDestructionTask( destructMethod ), timeoutInMillis );
- }
- else
- {
- new SelfDestructionTask( destructMethod ).run();
- }
- }
-
- private void selfDestruct( DestructMethod destructMethod )
- {
- getLog().warn( "Self-Destructing NOW." );
- switch ( destructMethod )
- {
- case exit:
- System.exit( 1 );
- case halt:
- Runtime.getRuntime().halt( 1 );
- case interrupt:
- String name = ManagementFactory.getRuntimeMXBean().getName();
- int indexOfAt = name.indexOf( '@' );
- if ( indexOfAt > 0 )
- {
- String pid = name.substring( 0, indexOfAt );
- getLog().warn( "Going to kill process with PID " + pid );
-
- List<String> args = new ArrayList<String>();
- if ( System.getProperty( "os.name" ).startsWith( "Windows" ) )
- {
- args.add( "taskkill" );
- args.add( "/PID" );
- }
- else
- {
- args.add( "kill" );
- args.add( "-INT" );
- }
- args.add( pid );
-
- try
- {
- new ProcessBuilder( args ).start();
- }
- catch ( IOException e )
- {
- getLog().error( "Unable to spawn process. Killing with System.exit.", e );
- }
- }
- else
- {
- getLog().warn( "Unable to determine my PID... Using System.exit" );
- }
- }
-
- System.exit( 1 );
- }
-
- private class SelfDestructionTask
- extends TimerTask
- {
-
- private DestructMethod destructMethod;
-
- public SelfDestructionTask( DestructMethod destructMethod )
- {
- this.destructMethod = destructMethod;
- }
-
- @Override
- public void run()
- {
- selfDestruct( destructMethod );
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/pom.xml b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/pom.xml
deleted file mode 100644
index fa075ab..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>class-rule-boom-boom</artifactId>
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>class-rule-boom</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>class-rule</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <forkMode>always</forkMode>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/src/test/java/org/apache/maven/surefire/crb/ClassRuleIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/src/test/java/org/apache/maven/surefire/crb/ClassRuleIT.java b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/src/test/java/org/apache/maven/surefire/crb/ClassRuleIT.java
deleted file mode 100644
index 0d5eab9..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/src/test/java/org/apache/maven/surefire/crb/ClassRuleIT.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.maven.surefire.crb;
-
-/*
- * 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.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-/**
- * Created with IntelliJ IDEA.
- * User: benson
- * Date: 3/16/13
- * Time: 11:00 AM
- * To change this template use File | Settings | File Templates.
- */
-public class ClassRuleIT extends Assert {
-
- @ClassRule
- public static ExampleClassRule rule = new ExampleClassRule(ExampleClassRule.someStaticFunction());
-
- @Test
- public void dummyTest() {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/pom.xml b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/pom.xml
deleted file mode 100644
index 8eaf187..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>class-rule</artifactId>
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>class-rule-boom</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/src/main/java/org.apache.maven.surefire.crb/ExampleClassRule.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/src/main/java/org.apache.maven.surefire.crb/ExampleClassRule.java b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/src/main/java/org.apache.maven.surefire.crb/ExampleClassRule.java
deleted file mode 100644
index 430f7d2..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/src/main/java/org.apache.maven.surefire.crb/ExampleClassRule.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.apache.maven.surefire.crb;
-
-import org.junit.rules.ExternalResource;
-
-/**
- * Created with IntelliJ IDEA.
- * User: benson
- * Date: 3/16/13
- * Time: 10:52 AM
- * To change this template use File | Settings | File Templates.
- */
-public class ExampleClassRule extends ExternalResource {
-
- public ExampleClassRule(String dummy) {
- //
- }
-
- protected void before() throws Throwable {
- System.err.println("ExampleClassRule.before()");
- }
-
- protected void after() {
- System.err.println("ExampleClassRule.after()");
- }
-
- public static String someStaticFunction() {
- throw new RuntimeException("Surprise!");
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
deleted file mode 100644
index 7a2ac4d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>class-rule-boom</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <modules>
- <module>class-rule</module>
- <module>boom</module>
- </modules>
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.14</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml b/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml
deleted file mode 100755
index 49848d6..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>encoding-bug</artifactId>
- <groupId>ru.fors.encoding</groupId>
- <version>1.0-SNAPSHOT</version>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/src/test/java/EncodingInReportTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/src/test/java/EncodingInReportTest.java b/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/src/test/java/EncodingInReportTest.java
deleted file mode 100755
index 7108e4b..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/src/test/java/EncodingInReportTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-import org.junit.Test;
-
-/*
- * 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.
- */
-
-public class EncodingInReportTest {
-
- @Test
- public void test1() {
-
- }
-
- @Test
- public void кириллице() {
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml
deleted file mode 100644
index 79e1c7d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>surefire-979</groupId>
- <artifactId>module1</artifactId>
- <version>1.0</version>
- <name>surefire-979-base</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.2</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/src/main/java/surefire979/TestBase.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/src/main/java/surefire979/TestBase.java b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/src/main/java/surefire979/TestBase.java
deleted file mode 100644
index 442b3c3..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module1/src/main/java/surefire979/TestBase.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package surefire979;
-
-
-/*
- * 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.commons.io.input.AutoCloseInputStream;
-import org.junit.Test;
-
-import java.io.ByteArrayInputStream;
-
-
-public class TestBase
-{
-
- static {
- AutoCloseInputStream directoryWalker = new AutoCloseInputStream(new ByteArrayInputStream(new byte[200]));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml
deleted file mode 100644
index cae9147..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>surefire-979</groupId>
- <artifactId>module2</artifactId>
- <version>1.0</version>
- <name>surefire-979</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>surefire-979</groupId>
- <artifactId>module1</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/src/test/java/surefire979/FailingStaticInitializerTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/src/test/java/surefire979/FailingStaticInitializerTest.java b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/src/test/java/surefire979/FailingStaticInitializerTest.java
deleted file mode 100644
index 3371fbd..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/module2/src/test/java/surefire979/FailingStaticInitializerTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package surefire979;
-
-
-/*
- * 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.Test;
-
-
-public class FailingStaticInitializerTest extends TestBase
-{
-
- @Test
- public void test()
- {
- throw new IllegalStateException("This test will never run");
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml b/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml
deleted file mode 100644
index c9c1f91..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-979-smartStackTrace-wrongClassloader/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>test</groupId>
- <artifactId>surefire-979</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>surefire-979</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>module1</module>
- <module>module2</module>
- </modules>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml
deleted file mode 100644
index 607015e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml
+++ /dev/null
@@ -1,47 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>it-parent</artifactId>
- <version>1.0</version>
- </parent>
-
- <artifactId>surefire-985</artifactId>
- <name>Tests Parameterized runner together with @Categories</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <runOrder>alphabetical</runOrder>
- <groups>sample.CategoryActivated</groups>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/CategoryActivated.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/CategoryActivated.java b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/CategoryActivated.java
deleted file mode 100644
index f89366b..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/CategoryActivated.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package sample;
-
-/*
- * 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.
- */
-
-public interface CategoryActivated
-{
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/CategoryNotSelected.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/CategoryNotSelected.java b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/CategoryNotSelected.java
deleted file mode 100644
index de0d03f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/CategoryNotSelected.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package sample;
-
-/*
- * 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.
- */
-
-public interface CategoryNotSelected
-{
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized01Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized01Test.java b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized01Test.java
deleted file mode 100644
index d1bb29d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized01Test.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package sample.parameterized;
-
-/*
- * 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.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import sample.CategoryNotSelected;
-
-@RunWith( Parameterized.class )
-@Category( CategoryNotSelected.class )
-public class Parameterized01Test
-{
- static
- {
- System.out.println( "Initializing Parameterized01Test" );
- }
-
- @Parameters
- public static Collection<Integer[]> getParams()
- {
- return Arrays.asList( new Integer[] { 1 }, new Integer[] { 2 }, new Integer[] { 3 }, new Integer[] { 4 } );
- }
-
- public Parameterized01Test( Integer param )
- {
- }
-
- @Test
- public void testNothing()
- {
- }
-
- @Test
- public void testNothingEither()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized02Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized02Test.java b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized02Test.java
deleted file mode 100644
index c5ae22f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized02Test.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package sample.parameterized;
-
-/*
- * 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.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import sample.CategoryActivated;
-
-@RunWith( Parameterized.class )
-public class Parameterized02Test
-{
- static
- {
- System.out.println( "Initializing Parameterized02Test" );
- }
-
- @Parameters
- public static Collection<Integer[]> getParams()
- {
- return Arrays.asList( new Integer[] { 1 }, new Integer[] { 2 }, new Integer[] { 3 }, new Integer[] { 4 } );
- }
-
- public Parameterized02Test( Integer param )
- {
- }
-
- @Test
- @Category( CategoryActivated.class )
- public void testNothing()
- {
- }
-
- @Test
- public void testNothingEither()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized03Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized03Test.java b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized03Test.java
deleted file mode 100644
index ac5dfad..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized03Test.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package sample.parameterized;
-
-/*
- * 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.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import sample.CategoryActivated;
-
-@Category( CategoryActivated.class )
-@RunWith( Parameterized.class )
-public class Parameterized03Test
-{
- static
- {
- System.out.println( "Initializing Parameterized03Test" );
- }
-
- @Parameters
- public static Collection<Integer[]> getParams()
- {
- return Arrays.asList( new Integer[] { 1 }, new Integer[] { 2 }, new Integer[] { 3 }, new Integer[] { 4 } );
- }
-
- public Parameterized03Test( Integer param )
- {
- }
-
- @Test
- public void testNothing()
- {
- }
-
- @Test
- public void testNothingEither()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml
deleted file mode 100644
index 4662f24..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml
+++ /dev/null
@@ -1,90 +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/xsd/maven-4.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>jiras-surefire-995</artifactId>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <properties>
- <version.junit>4.12</version.junit>
- </properties>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>positive-tests</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <groups>jiras.surefire955.SomeCategory</groups>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>positive-tests-excluded-categories</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludedGroups>jiras.surefire955.SomeCategory</excludedGroups>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/CategorizedTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/CategorizedTest.java b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/CategorizedTest.java
deleted file mode 100644
index a25b15a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/CategorizedTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package jiras.surefire955;
-
-/*
- * 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.Test;
-import org.junit.experimental.categories.Category;
-
-@Category( SomeCategory.class )
-public class CategorizedTest
-{
-
- @Test
- public void a()
- {
- System.out.println( "CategorizedTest#a" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/NotIncludedTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/NotIncludedTest.java b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/NotIncludedTest.java
deleted file mode 100644
index c52bff0..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/NotIncludedTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package jiras.surefire955;
-
-/*
- * 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.Test;
-
-public class NotIncludedTest
-{
-
- @Test
- public void test()
- {
- System.out.println( "NotIncludedTest#test" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/SomeCategory.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/SomeCategory.java b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/SomeCategory.java
deleted file mode 100644
index d83b4ba..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/SomeCategory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package jiras.surefire955;
-
-/*
- * 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.
- */
-
-public interface SomeCategory
-{
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/SpecialCategorizedTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/SpecialCategorizedTest.java b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/SpecialCategorizedTest.java
deleted file mode 100644
index 8082f43..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/SpecialCategorizedTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package jiras.surefire955;
-
-/*
- * 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.Test;
-
-public final class SpecialCategorizedTest
- extends CategorizedTest
-{
-
- @Test
- public void b()
- {
- System.out.println( "SpecialCategorizedTest#b" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/SpecialNonCategoryTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/SpecialNonCategoryTest.java b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/SpecialNonCategoryTest.java
deleted file mode 100644
index 853ae50..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/SpecialNonCategoryTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package jiras.surefire955;
-
-/*
- * 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.Test;
-
-public class SpecialNonCategoryTest
-{
-
- @Test
- public void test()
- {
- System.out.println( "SpecialNonCategoryTest#test" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/system-properties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/system-properties/pom.xml b/surefire-integration-tests/src/test/resources/system-properties/pom.xml
deleted file mode 100644
index 1d2952d..0000000
--- a/surefire-integration-tests/src/test/resources/system-properties/pom.xml
+++ /dev/null
@@ -1,98 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>system-properties</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for systemProperties</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <configuration>
- <portNames>
- <portName>reservedPort1</portName>
- <portName>reservedPort2</portName>
- <portName>reservedPort3</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <systemProperties>
- <property>
- <name>setInPom</name>
- <value>foo</value>
- </property>
- </systemProperties>
- <systemPropertyVariables>
- <buildDirectory>${project.build.directory}</buildDirectory>
- <reservedPort1>${reservedPort1}</reservedPort1>
- <reservedPort2>${reservedPort2}</reservedPort2>
- <emptyProperty/>
- <blankProperty> </blankProperty>
- <!-- this is a work around for SUREFIRE-121 -->
- <setOnArgLineWorkAround>${setOnArgLineWorkAround}</setOnArgLineWorkAround>
- <overriddenPropertyFomFile>value2</overriddenPropertyFomFile>
- </systemPropertyVariables>
- <systemPropertiesFile>${project.basedir}/src/test/config/propsfile.properties</systemPropertiesFile>
- <argLine>-DsetOnArgLine=bar</argLine>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <setOnArgLineWorkAround>fool</setOnArgLineWorkAround>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/system-properties/src/test/config/propsfile.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/system-properties/src/test/config/propsfile.properties b/surefire-integration-tests/src/test/resources/system-properties/src/test/config/propsfile.properties
deleted file mode 100644
index d8cbbfa..0000000
--- a/surefire-integration-tests/src/test/resources/system-properties/src/test/config/propsfile.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-setInFile = bar
-overriddenPropertyFomFile = value1
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java b/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
deleted file mode 100644
index caf96cb..0000000
--- a/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package systemProperties;
-
-/*
- * 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.io.File;
-
-import junit.framework.TestCase;
-
-public class BasicTest
- extends TestCase
-{
-
-
- public void testSetInPom()
- {
- assertEquals( "property setInPom not set", "foo", System.getProperty( "setInPom" ) );
- }
-
- public void testSetOnArgLine()
- {
- assertEquals( "setOnArgLine property not set", "bar", System.getProperty( "setOnArgLine" ) );
- }
-
-
- public void testSystemPropertyUsingMavenProjectProperties()
- {
- String actualBuildDirectory = new File( System.getProperty( "basedir" ), "target" ).getAbsolutePath();
-
- String buildDirectoryFromPom = new File( System.getProperty( "buildDirectory" ) ).getAbsolutePath();
-
- assertEquals( "Pom property not set.", actualBuildDirectory, buildDirectoryFromPom );
- }
-
- public void testSystemPropertyGenerateByOtherPlugin()
- throws Exception
- {
- int reservedPort1 = Integer.parseInt( System.getProperty( "reservedPort1" ) );
- int reservedPort2 = Integer.parseInt( System.getProperty( "reservedPort2" ) );
- System.out.println( "reservedPort1: " + reservedPort1 );
- System.out.println( "reservedPort2: " + reservedPort2 );
-
- assertTrue( reservedPort1 != reservedPort2 );
- }
-
- public void testEmptySystemProperties()
- {
- assertNull( "Null property is not null", System.getProperty( "nullProperty" ) );
- assertEquals( "Empty property is not empty", "", System.getProperty( "emptyProperty" ) );
- assertNotNull( "Blank property is null", System.getProperty( "blankProperty" ) );
- assertEquals( "Blank property is not trimmed", "", System.getProperty( "blankProperty" ) );
- }
-
- /**
- * work around for SUREFIRE-121
- */
- public void testSetOnArgLineWorkAround()
- {
- assertEquals( "property setOnArgLineWorkAround not set", "baz",
- System.getProperty( "setOnArgLineWorkAround" ) );
- }
-
- public void testSetOnMavenCommandLine()
- {
- assertEquals( "property setOnMavenCommandLine not set", "baz", System.getProperty( "setOnMavenCommandLine" ) );
- }
-
- public void testSetInFile()
- {
- assertEquals( "property setInFile not set", "bar", System.getProperty( "setInFile" ) );
- assertEquals( "property overriddenPropertyFomFile not overridden", "value2",
- System.getProperty( "overriddenPropertyFomFile" ) );
- }
-}
[26/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
deleted file mode 100644
index 18cb679..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
+++ /dev/null
@@ -1,60 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.codehaus.jira</groupId>
- <artifactId>surefire-847</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>3.0</version>
- <classifier>no_aop</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.5.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <trimStackTrace>false</trimStackTrace>
- <workingDirectory>${project.build.directory}/test-classes</workingDirectory>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
- <properties>
- <defaultSuiteFile>${basedir}/src/test/resources/suite.xml</defaultSuiteFile>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java
deleted file mode 100644
index 5e6a3da..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.codehaus;
-
-/*
- * 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.testng.Assert;
-import org.testng.annotations.Test;
-
-@Test
-public class SomeFailedTest {
-
- @Test
- public void failedTest() {
- Assert.assertFalse(true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java
deleted file mode 100644
index 737f070..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.codehaus;
-
-/*
- * 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.testng.Assert;
-import org.testng.annotations.Test;
-
-
-public class SomePassedTest {
-
- @Test
- public void passedTestA(){
- Assert.assertTrue(true);
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/resources/suite.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/resources/suite.xml b/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/resources/suite.xml
deleted file mode 100644
index 56de750..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/resources/suite.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<suite name="BaseSuite" verbose="1" parallel="classes"
- thread-count="2">
- <test name="SUREFIRE-847" preserve-order="false">
- <packages>
- <package name="org.codehaus"/>
- </packages>
- </test>
-</suite>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml
deleted file mode 100644
index e0d4ee2..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml
+++ /dev/null
@@ -1,127 +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/xsd/maven-4.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>jiras-surefire-855-bundle</artifactId>
- <version>1.0</version>
- <packaging>bundle</packaging>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
- <version>2.0M9</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.surefire.its.${project.artifactId}</Bundle-SymbolicName>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <forkMode>always</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/main/java/pkg/AClassInOSGiBundle.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/main/java/pkg/AClassInOSGiBundle.java b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/main/java/pkg/AClassInOSGiBundle.java
deleted file mode 100644
index 48141e6..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/main/java/pkg/AClassInOSGiBundle.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package pkg;
-
-/*
- * 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.
- */
-
-public class AClassInOSGiBundle
-{
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/main/resources/main/surefire855.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/main/resources/main/surefire855.properties b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/main/resources/main/surefire855.properties
deleted file mode 100644
index 690842d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/main/resources/main/surefire855.properties
+++ /dev/null
@@ -1 +0,0 @@
-issue=SUREFIRE-855
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/test/java/jiras/surefre855/bundle/FooIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/test/java/jiras/surefre855/bundle/FooIT.java b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/test/java/jiras/surefre855/bundle/FooIT.java
deleted file mode 100644
index e5cbffa..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/test/java/jiras/surefre855/bundle/FooIT.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package jiras.surefire855.bundle;
-
-/*
- * 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.Test;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.util.Properties;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-import static org.fest.assertions.api.Assertions.assertThat;
-import static org.fest.assertions.api.Assertions.contentOf;
-import static org.hamcrest.Matchers.*;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public final class FooIT
-{
- private static final String ARTIFACT_FILE_NAME = "jiras-surefire-855-bundle-1.0.jar";
-
- private static final String MAIN_RESOURCE = "/main/surefire855.properties";
-
- private static final String TEST_RESOURCE = "/jiras/surefire855/bundle/properties/surefire855.properties";
-
- private static File surefireDir()
- throws IOException
- {
- String bootPath = System.getProperty( "surefire.real.class.path" );
- return bootPath == null ? null : new File( bootPath ).getParentFile();
- }
-
- private static File[] surefireProviderProperties()
- throws IOException
- {
- return surefireDir().listFiles( new FileFilter()
- {
- public boolean accept( File pathname )
- {
- try
- {
- return isSurefireProviderProperties( pathname );
- }
- catch ( IOException e )
- {
- return false;
- }
- }
- } );
- }
-
- /**
- * See BooterSerializer#serialize().
- */
- private static boolean isSurefireProviderProperties( File pathname )
- throws IOException
- {
- pathname = pathname.getCanonicalFile();
- String fileName = pathname.getName();
- return pathname.isFile() && fileName.startsWith( "surefire" ) && !fileName.startsWith( "surefire_" )
- && fileName.endsWith( "tmp" );
- }
-
- private static boolean isSurefireBooter( File pathname )
- throws IOException
- {
- pathname = pathname.getCanonicalFile();
- String fileName = pathname.getName();
- return pathname.isFile() && fileName.startsWith( "surefirebooter" ) && fileName.endsWith( ".jar" );
- }
-
- private static String manifestClassPath( Class clazz )
- throws IOException
- {
- File booter = new File( System.getProperty( "surefire.real.class.path" ) );
- assertThat( booter ).exists();
- assertThat( booter ).isFile();
- JarFile jarFile = new JarFile( booter );
- try
- {
- Manifest manifest = jarFile.getManifest();
- return manifest.getMainAttributes().getValue( "Class-Path" );
- }
- finally
- {
- jarFile.close();
- }
- }
-
- private static Properties loadProperties( Class clazz, String resourcePath )
- throws IOException
- {
- InputStream is = clazz.getResourceAsStream( resourcePath );
- Properties prop = new Properties();
- prop.load( is );
- is.close();
- return prop;
- }
-
- private static Properties loadMainProperties( Class clazz )
- throws IOException
- {
- return loadProperties( clazz, MAIN_RESOURCE );
- }
-
- private static Properties loadTestProperties( Class clazz )
- throws IOException
- {
- return loadProperties( clazz, TEST_RESOURCE );
- }
-
- @Test
- public void test()
- throws IOException
- {
- String classPath = manifestClassPath( getClass() );
- System.out.println( "CLASS PATH:" );
- System.out.println( classPath );
-
- assertThat( classPath, not( containsString( "/target/classes" ) ) );
- assertThat( classPath, containsString( "/target/" + ARTIFACT_FILE_NAME ) );
-
- File[] descriptors = surefireProviderProperties();
- assertThat( descriptors ).hasSize( 1 );
- assertThat( descriptors ).doesNotContainNull();
- assertThat( descriptors[0] ).isFile();
-
- String surefireProperties = contentOf( descriptors[0] );
- Properties properties = new Properties();
- properties.load( new StringReader( surefireProperties ) );
- System.out.println( properties.toString() );
- File actualArtifact = new File( properties.getProperty( "classPathUrl.1" ) ).getCanonicalFile();
- File expectedArtifact = new File( "target/" + ARTIFACT_FILE_NAME ).getCanonicalFile();
- assertThat( actualArtifact ).isFile();
- assertThat( expectedArtifact ).isFile();
- assertThat( actualArtifact ).isEqualTo( expectedArtifact );
- }
-
- @Test
- public void shouldAlwaysHaveResources()
- throws IOException
- {
- assertThat( loadTestProperties( getClass() ).getProperty( "issue" ), is( "SUREFIRE-855" ) );
- assertThat( loadMainProperties( getClass() ).getProperty( "issue" ), is( "SUREFIRE-855" ) );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/test/resources/jiras/surefire855/bundle/properties/surefire855.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/test/resources/jiras/surefire855/bundle/properties/surefire855.properties b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/test/resources/jiras/surefire855/bundle/properties/surefire855.properties
deleted file mode 100644
index 690842d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/src/test/resources/jiras/surefire855/bundle/properties/surefire855.properties
+++ /dev/null
@@ -1 +0,0 @@
-issue=SUREFIRE-855
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml
deleted file mode 100644
index 01dc71e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml
+++ /dev/null
@@ -1,115 +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/xsd/maven-4.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>jiras-surefire-855-jar</artifactId>
- <version>1.0</version>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
- <version>2.0M9</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <forkMode>${forkMode}</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/main/java/pkg/ToRunJavadoc.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/main/java/pkg/ToRunJavadoc.java b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/main/java/pkg/ToRunJavadoc.java
deleted file mode 100644
index 5998fa6..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/main/java/pkg/ToRunJavadoc.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package pkg;
-
-public class ToRunJavadoc
-{
- public void x()
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/main/resources/main/surefire855.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/main/resources/main/surefire855.properties b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/main/resources/main/surefire855.properties
deleted file mode 100644
index 690842d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/main/resources/main/surefire855.properties
+++ /dev/null
@@ -1 +0,0 @@
-issue=SUREFIRE-855
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/test/java/jiras/surefire855/jar/FooIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/test/java/jiras/surefire855/jar/FooIT.java b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/test/java/jiras/surefire855/jar/FooIT.java
deleted file mode 100644
index 39b8749..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/test/java/jiras/surefire855/jar/FooIT.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package jiras.surefire855.jar;
-
-/*
- * 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.Test;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.util.Properties;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-import static org.fest.assertions.api.Assertions.assertThat;
-import static org.fest.assertions.api.Assertions.contentOf;
-import static org.hamcrest.Matchers.*;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assume.assumeThat;
-
-public final class FooIT
-{
- private static final String ARTIFACT_FILE_NAME = "jiras-surefire-855-jar-1.0.jar";
-
- private static final String MAIN_RESOURCE = "/main/surefire855.properties";
-
- private static final String TEST_RESOURCE = "/jiras/surefire855/jar/properties/surefire855.properties";
-
- private static File surefireDir()
- throws IOException
- {
- String bootPath = System.getProperty( "surefire.real.class.path" );
- return bootPath == null ? null : new File( bootPath ).getParentFile();
- }
-
- private static File[] surefireProviderProperties()
- throws IOException
- {
- return surefireDir().listFiles( new FileFilter()
- {
- public boolean accept( File pathname )
- {
- try
- {
- return isSurefireProviderProperties( pathname );
- }
- catch ( IOException e )
- {
- return false;
- }
- }
- } );
- }
-
- /**
- * See BooterSerializer#serialize().
- */
- private static boolean isSurefireProviderProperties( File pathname )
- throws IOException
- {
- pathname = pathname.getCanonicalFile();
- String fileName = pathname.getName();
- return pathname.isFile() && fileName.startsWith( "surefire" ) && !fileName.startsWith( "surefire_" )
- && fileName.endsWith( "tmp" );
- }
-
- private static boolean isSurefireBooter( File pathname )
- throws IOException
- {
- pathname = pathname.getCanonicalFile();
- String fileName = pathname.getName();
- return pathname.isFile() && fileName.startsWith( "surefirebooter" ) && fileName.endsWith( ".jar" );
- }
-
- private static String manifestClassPath( Class clazz )
- throws IOException
- {
- File booter = new File( System.getProperty( "surefire.real.class.path" ) );
- assertThat( booter ).exists();
- assertThat( booter ).isFile();
- JarFile jarFile = new JarFile( booter );
- try
- {
- Manifest manifest = jarFile.getManifest();
- return manifest.getMainAttributes().getValue( "Class-Path" );
- }
- finally
- {
- jarFile.close();
- }
- }
-
- private static Properties loadProperties( Class clazz, String resourcePath )
- throws IOException
- {
- InputStream is = clazz.getResourceAsStream( resourcePath );
- Properties prop = new Properties();
- prop.load( is );
- is.close();
- return prop;
- }
-
- private static Properties loadMainProperties( Class clazz )
- throws IOException
- {
- return loadProperties( clazz, MAIN_RESOURCE );
- }
-
- private static Properties loadTestProperties( Class clazz )
- throws IOException
- {
- return loadProperties( clazz, TEST_RESOURCE );
- }
-
- @Test
- public void shouldBeJarWithForking()
- throws IOException
- {
- assumeThat( System.getProperty( "forkMode" ), is( not( "never" ) ) );
-
- String classPath = manifestClassPath( getClass() );
- System.out.println( "CLASS PATH:" );
- System.out.println( classPath );
-
- assertThat( classPath, not( containsString( "/target/classes" ) ) );
- assertThat( classPath, containsString( "/target/" + ARTIFACT_FILE_NAME ) );
-
- File[] descriptors = surefireProviderProperties();
- assertThat( descriptors ).hasSize( 1 );
- assertThat( descriptors ).doesNotContainNull();
- assertThat( descriptors[0] ).isFile();
-
- String surefireProperties = contentOf( descriptors[0] );
- Properties properties = new Properties();
- properties.load( new StringReader( surefireProperties ) );
- System.out.println( properties.toString() );
- File actualArtifact = new File( properties.getProperty( "classPathUrl.1" ) ).getCanonicalFile();
- File expectedArtifact = new File( "target/" + ARTIFACT_FILE_NAME ).getCanonicalFile();
- assertThat( actualArtifact ).isFile();
- assertThat( expectedArtifact ).isFile();
- assertThat( actualArtifact ).isEqualTo( expectedArtifact );
- }
-
- @Test
- public void jarShouldExistWhenNotForking()
- throws Exception
- {
- assumeThat( System.getProperty( "forkMode" ), is( "never" ) );
-
- assertThat( surefireDir() ).isNull();
- assertThat( new File( "target/" + ARTIFACT_FILE_NAME ).getCanonicalFile() ).isFile();
- }
-
- @Test
- public void shouldAlwaysHaveResources()
- throws IOException
- {
- assertThat( loadTestProperties( getClass() ).getProperty( "issue" ), is( "SUREFIRE-855" ) );
- assertThat( loadMainProperties( getClass() ).getProperty( "issue" ), is( "SUREFIRE-855" ) );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/test/resources/jiras/surefire855/jar/properties/surefire855.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/test/resources/jiras/surefire855/jar/properties/surefire855.properties b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/test/resources/jiras/surefire855/jar/properties/surefire855.properties
deleted file mode 100644
index 690842d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/src/test/resources/jiras/surefire855/jar/properties/surefire855.properties
+++ /dev/null
@@ -1 +0,0 @@
-issue=SUREFIRE-855
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml
deleted file mode 100644
index 2d2cd5d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml
+++ /dev/null
@@ -1,124 +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/xsd/maven-4.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>jiras-surefire-855-war</artifactId>
- <version>1.0</version>
- <packaging>war</packaging>
- <url>http://maven.apache.org</url>
- <developers>
- <developer>
- <id>tibordigana</id>
- <name>Tibor Digaňa (tibor17)</name>
- <email>tibordigana@apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>Europe/Bratislava</timezone>
- </developer>
- </developers>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
- <version>2.0M9</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <forkMode>always</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/main/java/pkg/ToCreateClassesDirectory.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/main/java/pkg/ToCreateClassesDirectory.java b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/main/java/pkg/ToCreateClassesDirectory.java
deleted file mode 100644
index ffe6be9..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/main/java/pkg/ToCreateClassesDirectory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package pkg;
-
-/*
- * 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.
- */
-
-public class ToCreateClassesDirectory
-{
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/main/resources/main/surefire855.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/main/resources/main/surefire855.properties b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/main/resources/main/surefire855.properties
deleted file mode 100644
index 690842d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/main/resources/main/surefire855.properties
+++ /dev/null
@@ -1 +0,0 @@
-issue=SUREFIRE-855
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/test/java/jiras/surefire855/war/FooIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/test/java/jiras/surefire855/war/FooIT.java b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/test/java/jiras/surefire855/war/FooIT.java
deleted file mode 100644
index 95eb8c3..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/test/java/jiras/surefire855/war/FooIT.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package jiras.surefire855.war;
-
-/*
- * 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.Test;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.util.Properties;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-import static org.fest.assertions.api.Assertions.assertThat;
-import static org.fest.assertions.api.Assertions.contentOf;
-import static org.hamcrest.Matchers.*;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public final class FooIT
-{
- private static final String MAIN_RESOURCE = "/main/surefire855.properties";
-
- private static final String TEST_RESOURCE = "/jiras/surefire855/war/properties/surefire855.properties";
-
- private static File surefireDir()
- throws IOException
- {
- String bootPath = System.getProperty( "surefire.real.class.path" );
- return bootPath == null ? null : new File( bootPath ).getParentFile();
- }
-
- private static File[] surefireProviderProperties()
- throws IOException
- {
- return surefireDir().listFiles( new FileFilter()
- {
- public boolean accept( File pathname )
- {
- try
- {
- return isSurefireProviderProperties( pathname );
- }
- catch ( IOException e )
- {
- return false;
- }
- }
- } );
- }
-
- /**
- * See BooterSerializer#serialize().
- */
- private static boolean isSurefireProviderProperties( File pathname )
- throws IOException
- {
- pathname = pathname.getCanonicalFile();
- String fileName = pathname.getName();
- return pathname.isFile() && fileName.startsWith( "surefire" ) && !fileName.startsWith( "surefire_" )
- && fileName.endsWith( "tmp" );
- }
-
- private static boolean isSurefireBooter( File pathname )
- throws IOException
- {
- pathname = pathname.getCanonicalFile();
- String fileName = pathname.getName();
- return pathname.isFile() && fileName.startsWith( "surefirebooter" ) && fileName.endsWith( ".jar" );
- }
-
- private static String manifestClassPath( Class clazz )
- throws IOException
- {
- File booter = new File( System.getProperty( "surefire.real.class.path" ) );
- assertThat( booter ).exists();
- assertThat( booter ).isFile();
- JarFile jarFile = new JarFile( booter );
- try
- {
- Manifest manifest = jarFile.getManifest();
- return manifest.getMainAttributes().getValue( "Class-Path" );
- }
- finally
- {
- jarFile.close();
- }
- }
-
- private static Properties loadProperties( Class clazz, String resourcePath )
- throws IOException
- {
- InputStream is = clazz.getResourceAsStream( resourcePath );
- Properties prop = new Properties();
- prop.load( is );
- is.close();
- return prop;
- }
-
- private static Properties loadMainProperties( Class clazz )
- throws IOException
- {
- return loadProperties( clazz, MAIN_RESOURCE );
- }
-
- private static Properties loadTestProperties( Class clazz )
- throws IOException
- {
- return loadProperties( clazz, TEST_RESOURCE );
- }
-
- @Test
- public void test()
- throws IOException
- {
- String classPath = manifestClassPath( getClass() );
- System.out.println( "CLASS PATH:" );
- System.out.println( classPath );
-
- assertThat( classPath, containsString( "/target/classes" ) );
-
- File[] descriptors = surefireProviderProperties();
- assertThat( descriptors ).hasSize( 1 );
- assertThat( descriptors ).doesNotContainNull();
- assertThat( descriptors[0] ).isFile();
-
- String surefireProperties = contentOf( descriptors[0] );
- Properties properties = new Properties();
- properties.load( new StringReader( surefireProperties ) );
- System.out.println( properties.toString() );
- File actualArtifact = new File( properties.getProperty( "classPathUrl.1" ) ).getCanonicalFile();
- File expectedArtifact = new File( "target/classes" ).getCanonicalFile();
- assertThat( actualArtifact ).isDirectory();
- assertThat( expectedArtifact ).isDirectory();
- assertThat( actualArtifact ).isEqualTo( expectedArtifact );
- }
-
- @Test
- public void shouldAlwaysHaveResources()
- throws IOException
- {
- assertThat( loadTestProperties( getClass() ).getProperty( "issue" ), is( "SUREFIRE-855" ) );
- assertThat( loadMainProperties( getClass() ).getProperty( "issue" ), is( "SUREFIRE-855" ) );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/test/resources/jiras/surefire855/war/properties/surefire855.properties
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/test/resources/jiras/surefire855/war/properties/surefire855.properties b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/test/resources/jiras/surefire855/war/properties/surefire855.properties
deleted file mode 100644
index 690842d..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/src/test/resources/jiras/surefire855/war/properties/surefire855.properties
+++ /dev/null
@@ -1 +0,0 @@
-issue=SUREFIRE-855
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/pom.xml b/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/pom.xml
deleted file mode 100644
index ecafe11..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>groupId</groupId>
- <artifactId>artifactId</artifactId>
- <version>1.0-SNAPSHOT</version>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-testng</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/JUnitTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/JUnitTest.java b/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/JUnitTest.java
deleted file mode 100644
index 39639cf..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/JUnitTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.company;
-
-/*
- * 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.Assert;
-import org.junit.Test;
-
-public class JUnitTest {
- @Test
- public void test() {
- //Assert.assertTrue(true);
- Assert.assertTrue(false);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/TestNGTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/TestNGTest.java b/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/TestNGTest.java
deleted file mode 100644
index 2701cb2..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-926-2-provider-failure/src/test/java/com/company/TestNGTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.company;
-
-/*
- * 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.testng.Assert;
-import org.testng.annotations.Test;
-
-public class TestNGTest {
- @Test
- public void test() {
- Assert.assertTrue(true);
- //Assert.assertTrue(false);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml
deleted file mode 100644
index 8535068..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>failsafe-test</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <name>FailSafe Test</name>
- <description>surefire-930</description>
-
- <properties>
- <surefire.version>2.12.4</surefire.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.basedir}/src/test/resources/testng-integrationTest.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/java/org/apache/maven/plugins/failsafe/ExampleIntegrationTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/java/org/apache/maven/plugins/failsafe/ExampleIntegrationTest.java b/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/java/org/apache/maven/plugins/failsafe/ExampleIntegrationTest.java
deleted file mode 100644
index 3ddc90c..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/java/org/apache/maven/plugins/failsafe/ExampleIntegrationTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.maven.plugins.failsafe;
-
-/*
- * 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.Assert;
-import org.testng.annotations.Test;
-
-@Test(groups = { TestConstants.IntegrationTest })
-public class ExampleIntegrationTest {
-
- public void shouldRun() {
- System.out.println("Hello from Integration-Test");
- Assert.fail("this will not be executed");
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/java/org/apache/maven/plugins/failsafe/ExampleTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/java/org/apache/maven/plugins/failsafe/ExampleTest.java b/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/java/org/apache/maven/plugins/failsafe/ExampleTest.java
deleted file mode 100644
index 19a08d5..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/java/org/apache/maven/plugins/failsafe/ExampleTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.maven.plugins.failsafe;
-
-/*
- * 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.Assert;
-import org.testng.annotations.Test;
-
-@Test(groups = { TestConstants.UnitTest })
-public class ExampleTest {
-
- public void shouldRun() {
- System.out.println("Hello from Unit-Test");
- Assert.assertTrue(true);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/java/org/apache/maven/plugins/failsafe/TestConstants.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/java/org/apache/maven/plugins/failsafe/TestConstants.java b/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/java/org/apache/maven/plugins/failsafe/TestConstants.java
deleted file mode 100644
index 5fb74e2..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/java/org/apache/maven/plugins/failsafe/TestConstants.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.maven.plugins.failsafe;
-
-/*
- * 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.
- */
-
-/**
- * Constants for testing
- *
- * @author mspika
- */
-public final class TestConstants {
-
- public static final String UnitTest = "Unit-Test";
- public static final String IntegrationTest = "Integration-Test";
- public static final String ManualTest = "Manual-Test";
- public static final String BrokenTest = "Broken-Test";
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/resources/testng-integrationTest.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/resources/testng-integrationTest.xml b/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/resources/testng-integrationTest.xml
deleted file mode 100644
index 5db8b24..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/resources/testng-integrationTest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="TNSIntegrationSuite" verbose="1">
- <test name="TNS-Integration">
- <groups>
- <run>
- <include name="Integration-Test" />
- <exclude name="Unit-Test" />
- <exclude name="Broken-Test" />
- <exclude name="Manual-Test" />
- </run>
- </groups>
-
- <packages>
- <package name="org.apache.maven.plugins.failsafe.*" />
- </packages>
- </test>
-</suite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/resources/testng.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/resources/testng.xml b/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/resources/testng.xml
deleted file mode 100644
index a9b8733..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/src/test/resources/testng.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="TNSIntegrationSuite" verbose="1">
- <test name="TNS">
- <groups>
- <run>
- <exclude name="Integration-Test" />
- <exclude name="Broken-Test" />
- <exclude name="Manual-Test" />
- </run>
- </groups>
-
- <packages>
- <package name="org.apache.maven.plugins.failsafe.*" />
- </packages>
- </test>
-</suite>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml b/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml
deleted file mode 100644
index 6232149..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.mycompany</groupId>
- <artifactId>TestFailed</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>TestFailed</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/src/main/java/com/mycompany/testfailed/App.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/src/main/java/com/mycompany/testfailed/App.java b/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/src/main/java/com/mycompany/testfailed/App.java
deleted file mode 100644
index 9a1c710..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/src/main/java/com/mycompany/testfailed/App.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mycompany.testfailed;
-
-/*
- * 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.
- */
-
-/**
- * Hello world!
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println( "Hello World!" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/src/test/java/com/mycompany/testfailed/AppTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/src/test/java/com/mycompany/testfailed/AppTest.java b/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/src/test/java/com/mycompany/testfailed/AppTest.java
deleted file mode 100644
index e760b87..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-931-provider-failure/src/test/java/com/mycompany/testfailed/AppTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.mycompany.testfailed;
-
-/*
- * 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 junit.framework.TestCase;
-import org.testng.annotations.Test;
-
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
- @Test(groups = "deleteLocation", dependsOnGroups =
- {
- "postLocation", "getLocation"
- })
- public void removeNonExistentLocation() {}
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/pom.xml b/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/pom.xml
deleted file mode 100644
index 2a0fac5..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>surefire-testng</groupId>
- <artifactId>surefire-testng</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <properties>
- <surefire.version>2.12.4</surefire.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.14</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>src/test/resources/config.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/java/org/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/java/org/BasicTest.java b/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/java/org/BasicTest.java
deleted file mode 100644
index be0bea0..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/java/org/BasicTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org;
-
-/*
- * 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.testng.annotations.*;
-import org.testng.Assert;
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
-
- @BeforeTest
- public void setUp()
- {
- setUpCalled = true;
- }
-
- @AfterTest
- public void tearDown()
- {
- setUpCalled = false;
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( setUpCalled );
- }
-
- @Test
- public void testSuccessOne()
- {
- Assert.assertTrue( true );
- }
-
- @Test
- public void testSuccessTwo()
- {
- Assert.assertTrue( true );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/resources/config.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/resources/config.xml b/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/resources/config.xml
deleted file mode 100644
index a92872b..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-942-testngSuite/src/test/resources/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<suite name="tests" verbose="0">
- <test name="tests">
- <packages>
- <package name="org.*"/>
- </packages>
- </test>
-</suite>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml b/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml
deleted file mode 100644
index 3b2958f..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-943-report-content/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>dummy</groupId>
- <version>1.0-SNAPSHOT</version>
- <artifactId>dummy</artifactId>
- <name>surefire-943-report-content</name>
-
- <properties>
- <surefire.version>2.13</surefire.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- <version>4.11</version>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My1Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My1Test.java b/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My1Test.java
deleted file mode 100644
index 6512a3a..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My1Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.sample.module;
-
-/*
- * 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 static org.junit.Assert.fail;
-
-import org.junit.Test;
-import org.junit.Ignore;
-
-public class My1Test
-{
- @Test
- public void fails()
- throws Exception
- {
- Thread.sleep( 1000 );
- fail( "Always fails" );
- }
-
- @Test
- public void alwaysSuccessful()
- throws Exception
- {
- Thread.sleep( 1000 );
- }
-
- @Test
- @Ignore( "Ignore-Message" )
- public void alwaysIgnored()
- {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My2Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My2Test.java b/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My2Test.java
deleted file mode 100644
index faea716..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My2Test.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.sample.module;
-
-/*
- * 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 static org.junit.Assert.fail;
-
-import org.junit.Test;
-import org.junit.Ignore;
-
-public class My2Test {
- @Test
- public void fails()
- throws Exception
- {
- Thread.sleep( 1000 );
- fail( "Always fails" );
- }
-
- @Test
- public void alwaysSuccessful()
- throws Exception
- {
- Thread.sleep( 1000 );
- }
-
- @Test
- @Ignore
- public void alwaysIgnored()
- {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My3Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My3Test.java b/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My3Test.java
deleted file mode 100644
index 2d35a99..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My3Test.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.sample.module;
-
-/*
- * 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 static org.junit.Assert.fail;
-
-import org.junit.Test;
-
-public class My3Test {
- @Test
- public void fails()
- throws Exception
- {
- Thread.sleep( 1000 );
- fail( "Always fails" );
- }
-
- @Test
- public void alwaysSuccessful()
- throws Exception
- {
- Thread.sleep( 1000 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My4Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My4Test.java b/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My4Test.java
deleted file mode 100644
index c500c1e..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My4Test.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.sample.module;
-
-/*
- * 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.Test;
-import org.junit.Ignore;
-
-@Ignore( "Ignore-Message" )
-public class My4Test
-{
-
- @Test
- public void alsoIgnored()
- {
-
- }
-
- @Test
- @Ignore
- public void alwaysIgnored()
- {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My5Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My5Test.java b/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My5Test.java
deleted file mode 100644
index 1e30741..0000000
--- a/surefire-integration-tests/src/test/resources/surefire-943-report-content/src/test/java/org/sample/module/My5Test.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.sample.module;
-
-/*
- * 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.BeforeClass;
-import org.junit.Test;
-
-public class My5Test {
-
- @BeforeClass
- public static void failsOnBeforeClass()
- {
- throw new RuntimeException("always fails before class");
- }
-
- @Test
- public void neverExecuted()
- throws Exception
- {
-
- }
-}
[38/52] [abbrv] [partial] maven-surefire git commit: [SUREFIRE-1471]
Too long Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml b/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
deleted file mode 100644
index d9c3817..0000000
--- a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
+++ /dev/null
@@ -1,61 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-ignore</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test of @Ignore annotation</name>
-
- <properties>
- <junit.version>4.4</junit.version>
- <surefire.parallel></surefire.parallel>
- <surefire.threadcount>3</surefire.threadcount>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <parallel>${surefire.parallel}</parallel>
- <perCoreThreadCount>false</perCoreThreadCount>
- <threadCount>${surefire.threadcount}</threadCount>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
deleted file mode 100644
index 66e858e..0000000
--- a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassAndMethodIgnoreNothingToRunTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package junit.ignore;
-
-/*
- * 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.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore( "ignore this test" )
-public class ClassAndMethodIgnoreNothingToRunTest
-{
-
- @Ignore( "ignore this test" )
- @Test
- public void testIgnorable()
- {
- Assert.fail( "you should have ignored me!" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
deleted file mode 100644
index 7012f87..0000000
--- a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore1WithMethodThatIsNormalTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package junit.ignore;
-
-/*
- * 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.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore( "ignore this test" )
-public class ClassLevelIgnore1WithMethodThatIsNormalTest
-{
-
- @Test
- public void testIgnorable()
- {
- Assert.fail( "you should have ignored me!" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2WithMethodThatIsNormalTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2WithMethodThatIsNormalTest.java b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2WithMethodThatIsNormalTest.java
deleted file mode 100644
index ee64317..0000000
--- a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/ClassLevelIgnore2WithMethodThatIsNormalTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package junit.ignore;
-
-/*
- * 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.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore( "ignore this test" )
-public class ClassLevelIgnore2WithMethodThatIsNormalTest
-{
-
- @Test
- public void testIgnorable()
- {
- Assert.fail( "you should have ignored me!" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/NormalClassWithThreeIgnoredMethodsAnd1AssumptionFailureTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/NormalClassWithThreeIgnoredMethodsAnd1AssumptionFailureTest.java b/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/NormalClassWithThreeIgnoredMethodsAnd1AssumptionFailureTest.java
deleted file mode 100644
index cc50d1d..0000000
--- a/surefire-integration-tests/src/test/resources/junit-ignore/src/test/java/junit/ignore/NormalClassWithThreeIgnoredMethodsAnd1AssumptionFailureTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package junit.ignore;
-
-/*
- * 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.Assume;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class NormalClassWithThreeIgnoredMethodsAnd1AssumptionFailureTest
-{
-
- @Ignore
- @Test
- public void testWithIgnore1()
- {
- }
-
- @Ignore("Ignorance is bliss2")
- @Test
- public void testWithIgnore2()
- {
- }
-
- @Ignore("Ignorance \"is\' <>bliss2")
- @Test
- public void testWithQuotesInIgnore()
- {
- }
-
- @Test
- public void testWithAssumptionFailure()
- {
- Assume.assumeNotNull( new Object[]{ null} );
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml b/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml
deleted file mode 100644
index fb1ffd6..0000000
--- a/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml
+++ /dev/null
@@ -1,55 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-innerClass</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test JUnit classes with inner classes</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java b/surefire-integration-tests/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java
deleted file mode 100644
index 81be27e..0000000
--- a/surefire-integration-tests/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package junit.innerClass;
-
-/*
- * 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 junit.framework.TestCase;
-
-public class BasicTest
- extends TestCase
-{
-
- public void testFoo()
- {
- new Foo( "x", "y" );
- }
-
- public class Foo
- {
- public Foo( String x, String y )
- {
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml b/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml
deleted file mode 100644
index 8a95201..0000000
--- a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml
+++ /dev/null
@@ -1,55 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-notExtendingTestCase</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit tests that don't extend TestCase</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/SuiteTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/SuiteTest.java b/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/SuiteTest.java
deleted file mode 100644
index 69fa59a..0000000
--- a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/SuiteTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package junit.notExtendingTestCase;
-
-/*
- * 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 junit.framework.Test;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-
-public class SuiteTest
- extends TestSuite
-{
- public static Test suite() {
- SuiteTest suite = new SuiteTest();
- suite.addTest( new Test() {
-
- public int countTestCases()
- {
- return 1;
- }
-
- public void run( TestResult result )
- {
- result.startTest( this );
- result.endTest( this );
-
- }
-
- } );
- return suite;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/TestHelper.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/TestHelper.java b/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/TestHelper.java
deleted file mode 100644
index 1065dca..0000000
--- a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/src/test/java/junit/notExtendingTestCase/TestHelper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package junit.notExtendingTestCase;
-
-/*
- * 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.
- */
-
-public class TestHelper {
- public TestHelper(String two, String arguments) {}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml b/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml
deleted file mode 100644
index 890839e..0000000
--- a/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml
+++ /dev/null
@@ -1,55 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-path-with-umlaut</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test path with Ãœmlaut</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java b/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java
deleted file mode 100644
index 0c27bb5..0000000
--- a/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package umlautTest;
-
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public BasicTest( String name, String extraName )
- {
- super( name );
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite();
- Test test = new BasicTest( "testSetUp", "dummy" );
- suite.addTest( test );
-
- return new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml b/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml
deleted file mode 100644
index f2075ae..0000000
--- a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml
+++ /dev/null
@@ -1,59 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-twoTestCaseSuite</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for single suite with two test cases</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <includes>
- <include>**/WrapperTestSuite.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java b/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java
deleted file mode 100644
index bc0d2c7..0000000
--- a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package junit.twoTestCaseSuite;
-
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public BasicTest( String name, String extraName )
- {
- super( name );
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite();
- Test test = new BasicTest( "testSetUp", "dummy" );
- suite.addTest( test );
-
- return new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/TestTwo.java b/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/TestTwo.java
deleted file mode 100644
index f403819..0000000
--- a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/TestTwo.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package junit.twoTestCaseSuite;
-
-/*
- * 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 junit.framework.TestCase;
-
-
-public class TestTwo
- extends TestCase
-{
- public void testTwo() {}
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/WrapperTestSuite.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/WrapperTestSuite.java b/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/WrapperTestSuite.java
deleted file mode 100644
index 9bd71b5..0000000
--- a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/WrapperTestSuite.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package junit.twoTestCaseSuite;
-
-
-/*
- * 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 junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class WrapperTestSuite
- extends TestSuite
-{
- public WrapperTestSuite( String name )
- {
- super( name );
- }
-
- public static Test suite() {
- WrapperTestSuite suite = new WrapperTestSuite( "My Acceptance Test Suite" );
- suite.addTestSuite( TestTwo.class );
- suite.addTest( BasicTest.suite() );
- return suite;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml b/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
deleted file mode 100644
index 89684ad..0000000
--- a/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
+++ /dev/null
@@ -1,55 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit-twoTestCases</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for two test cases</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java b/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java
deleted file mode 100644
index 2efc5ed..0000000
--- a/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package junit.twoTestCases;
-
-/*
- * 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 junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public BasicTest( String name )
- {
- super( name );
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite();
- Test test = new BasicTest( "testSetUp" );
- suite.addTest( test );
-
- return new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/TestTwo.java b/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/TestTwo.java
deleted file mode 100644
index 9af4558..0000000
--- a/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/TestTwo.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package junit.twoTestCases;
-
-/*
- * 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 junit.framework.TestCase;
-
-
-public class TestTwo
- extends TestCase
-{
- public void testTwo() {}
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml b/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
deleted file mode 100644
index 4bfc081..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.surefire.test</groupId>
- <artifactId>junit4-forkAlways-staticInit</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <name>JUnit4 ForkAlways StaticInit Pollution</name>
- <description>
- Test that static initializers on classes other than the one being executed in the current test-set will not be run, and cannot pollute the environment.
- </description>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>always</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java b/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java
deleted file mode 100644
index 90f56d4..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package junit4;
-
-/*
- * 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.Properties;
-
-import junit.framework.TestCase;
-
-/**
- * Unit test for simple App.
- */
-public class App2Test
- extends TestCase
-{
-
- static
- {
- System.out.println( "Loading " + App2Test.class.getName() );
-
- Properties p = System.getProperties();
- p.setProperty( "Foo", "Bar2" );
- System.setProperties( p );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- System.out.println( "Expecting: Bar2\nGot: " + System.getProperty( "Foo" ) );
- assertEquals( "Expecting: Bar2\nGot: " + System.getProperty( "Foo" ), "Bar2", System.getProperty( "Foo" ) );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java b/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java
deleted file mode 100644
index 4b2b0d7..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package junit4;
-
-/*
- * 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.Properties;
-
-import junit.framework.TestCase;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
- extends TestCase
-{
-
- static
- {
- System.out.println( "Loading " + AppTest.class.getName() );
-
- Properties p = System.getProperties();
- p.setProperty( "Foo", "Bar" );
- System.setProperties( p );
- }
-
- /**
- * Rigourous Test :-)
- */
- public void testApp()
- {
- System.out.println( "Expecting: Bar\nGot: " + System.getProperty( "Foo" ) );
- assertEquals( "Expecting: Bar\nGot: " + System.getProperty( "Foo" ), "Bar", System.getProperty( "Foo" ) );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml b/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml
deleted file mode 100644
index 9456a29..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml
+++ /dev/null
@@ -1,55 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4-rerun-failing-tests</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for rerun failing tests in JUnit 4</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/FlakyFirstTimeTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/FlakyFirstTimeTest.java b/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/FlakyFirstTimeTest.java
deleted file mode 100644
index 264462c..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/FlakyFirstTimeTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package junit4;
-
-/*
- * 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.Assert;
-import org.junit.Test;
-
-
-public class FlakyFirstTimeTest
-{
- private static int failingCount = 0;
-
- private static int errorCount = 0;
-
-
- @Test
- public void testFailingTestOne()
- {
- System.out.println( "Failing test" );
- // This test will fail with only one retry, but will pass with two
- if ( failingCount < 2 )
- {
- failingCount++;
- Assert.fail( "Failing test" );
- }
- }
-
- @Test
- public void testErrorTestOne() throws Exception
- {
- System.out.println( "Error test" );
- // This test will error out with only one retry, but will pass with two
- if ( errorCount < 2 )
- {
- errorCount++;
- throw new IllegalArgumentException("...");
- }
- }
-
- @Test
- public void testPassingTest() throws Exception
- {
- System.out.println( "Passing test" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/PassingTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/PassingTest.java b/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/PassingTest.java
deleted file mode 100644
index 7cb0b57..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/src/test/java/junit4/PassingTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package junit4;
-
-/*
- * 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.Assert;
-import org.junit.Test;
-
-
-public class PassingTest
-{
- @Test
- public void testPassingTestOne()
- {
- System.out.println( "Passing test one" );
- }
-
- @Test
- public void testPassingTestTwo() throws Exception
- {
- System.out.println( "Passing test two" );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml b/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml
deleted file mode 100644
index d776533..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml
+++ /dev/null
@@ -1,71 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4-runlistener</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>JUnit4 RunListener test</name>
-
- <properties>
- <junitVersion>4.4</junitVersion>
- <provider>surefire-junit4</provider>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <properties>
- <property>
- <name>listener</name>
- <value>runListener.FileWritingRunListener1,runListener.FileWritingRunListener2,runListener.EchoingRunListener</value>
- </property>
- </properties>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>${provider}</artifactId>
- <version>${surefire.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/EchoingRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/EchoingRunListener.java b/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/EchoingRunListener.java
deleted file mode 100644
index 305c656..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/EchoingRunListener.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package runListener;
-
-/*
- * 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.runner.Description;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunListener;
-
-/**
- * {@link org.junit.runner.notification.RunListener} to generate an output file whose existence can be checked by surefire-integration.
- *
- * @author <a href="mailto:matthew.gilliard@gmail.com">Matthew Gilliard</a>
- */
-public class EchoingRunListener
- extends RunListener
-{
-
- @Override
- public void testRunStarted( Description description )
- throws Exception
- {
- System.out.println("testRunStarted " + description);
- }
-
- @Override
- public void testRunFinished( Result result )
- throws Exception
- {
- System.out.println("testRunFinished " + result);
- }
-
- @Override
- public void testStarted( Description description )
- throws Exception
- {
- System.out.println("testStarted " + description);
- }
-
- @Override
- public void testFinished( Description description )
- throws Exception
- {
- System.out.println("testFinished " + description);
- }
-
- @Override
- public void testFailure( Failure failure )
- throws Exception
- {
- System.out.println("testFailure " + failure);
- }
-
- @Override
- public void testIgnored( Description description )
- throws Exception
- {
- System.out.println("testIgnored " + description);
- }
-
- public void testAssumptionFailure( Failure failure )
- {
- System.out.println("testAssumptionFailure " + failure);
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileHelper.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileHelper.java b/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileHelper.java
deleted file mode 100644
index 85d0a5b..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package runListener;
-
-/*
- * 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.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class FileHelper
-{
- public static void writeFile( String fileName, String content )
- {
- try
- {
- File target = new File( "target" ).getAbsoluteFile();
- File listenerOutput = new File( target, fileName );
- FileWriter out = new FileWriter( listenerOutput );
- out.write( content );
- out.flush();
- out.close();
- }
- catch ( IOException e )
- {
- throw new RuntimeException( e );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java b/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java
deleted file mode 100644
index 24f479d..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package runListener;
-
-/*
- * 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.runner.Description;
-import org.junit.runner.notification.RunListener;
-
-/**
- * {@link RunListener} to generate an output file whose existence can be checked by surefire-integration.
- *
- * @author <a href="mailto:matthew.gilliard@gmail.com">Matthew Gilliard</a>
- */
-public class FileWritingRunListener1
- extends RunListener
-{
-
- @Override
- public void testStarted( Description description )
- {
- FileHelper.writeFile( "runlistener-output-1.txt", "This written by RunListener#testStarted()" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java b/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java
deleted file mode 100644
index 49c2824..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package runListener;
-
-/*
- * 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.runner.Description;
-import org.junit.runner.notification.RunListener;
-
-/**
- * {@link RunListener} to generate an output file whose existence can be checked by surefire-integration.
- *
- * @author <a href="mailto:matthew.gilliard@gmail.com">Matthew Gilliard</a>
- */
-public class FileWritingRunListener2
- extends RunListener
-{
-
- @Override
- public void testStarted( Description description )
- {
- FileHelper.writeFile( "runlistener-output-2.txt", "This written by RunListener#testStarted()" );
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/JUnit4RunListenerTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/JUnit4RunListenerTest.java b/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/JUnit4RunListenerTest.java
deleted file mode 100644
index 12c32ac..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/JUnit4RunListenerTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package runListener;
-
-/*
- * 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.Assert;
-import org.junit.Test;
-
-public class JUnit4RunListenerTest {
-
- @Test
- public void simpleTest()
- {
- Assert.assertEquals( 2, 1 + 1 );
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml b/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml
deleted file mode 100644
index 867cd09..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4-twoTestCaseSuite</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit 4 suite with two test cases</name>
-
-
- <properties>
- <junitVersion>4.4</junitVersion>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junitVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <includes>
- <include>**/Junit4TestSuite.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/BasicTest.java b/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/BasicTest.java
deleted file mode 100644
index a793610..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/BasicTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package twoTestCaseSuite;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestSuite.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestSuite.java b/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestSuite.java
deleted file mode 100644
index 011c70e..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestSuite.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package twoTestCaseSuite;
-
-/*
- * 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.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- BasicTest.class,
- Junit4TestTwo.class
-})
-public class Junit4TestSuite
-{
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestTwo.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestTwo.java b/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestTwo.java
deleted file mode 100644
index 849e64b..0000000
--- a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/src/test/java/twoTestCaseSuite/Junit4TestTwo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package twoTestCaseSuite;
-
-/*
- * 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.Test;
-
-public class Junit4TestTwo
-{
- @Test public void secondTest() {}
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4/pom.xml b/surefire-integration-tests/src/test/resources/junit4/pom.xml
deleted file mode 100644
index bba9b00..0000000
--- a/surefire-integration-tests/src/test/resources/junit4/pom.xml
+++ /dev/null
@@ -1,55 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit4</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for JUnit 4</name>
-
- <properties>
- <junitVersion>4.4</junitVersion>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java b/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index e9234f2..0000000
--- a/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package junit4;
-
-/*
- * 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.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- }
-
-
- @AfterClass
- public static void oneTimeTearDown()
- {
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml b/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
deleted file mode 100644
index d26c024..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
+++ /dev/null
@@ -1,71 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.maven.plugins.surefire</groupId>
- <artifactId>junit44-dep</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for junit-dep</name>
-
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- <version>${junit-dep.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>provided381</id>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <parallel>classes</parallel>
- <threadCount>1</threadCount>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4d00932a/surefire-integration-tests/src/test/resources/junit44-dep/src/test/java/junit44Dep/BasicTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-dep/src/test/java/junit44Dep/BasicTest.java b/surefire-integration-tests/src/test/resources/junit44-dep/src/test/java/junit44Dep/BasicTest.java
deleted file mode 100644
index 219b8da..0000000
--- a/surefire-integration-tests/src/test/resources/junit44-dep/src/test/java/junit44Dep/BasicTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package junit44Dep;
-
-/*
- * 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.hamcrest.core.Is;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- @Before
- public void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- @After
- public void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- @Test
- public void testSetUp()
- {
- Assert.assertTrue( "setUp was not called", setUpCalled );
- Assert.assertFalse( "tearDown was called", tearDownCalled );
- Assert.assertThat( true, Is.is( true ) );
- }
-
- @AfterClass
- public static void oneTimeTearDown()
- {
- Assert.assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}