http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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/09f0eef8/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() - { - - } - -}
