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/05 22:08:03 UTC
[50/51] [partial] maven-surefire git commit: [SUREFIRE-1471] Too long
Windows path cause CI issues. Renamed surefire-intergation-tests to
surefire-its.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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 );
- }
-}