MNG-6540: renamed resources and test methods To better reflect what they actually do
Signed-off-by: Jason van Zyl <ja...@tesla.io> Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/d58940e5 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/d58940e5 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/d58940e5 Branch: refs/heads/master Commit: d58940e5ef3b450b9c93549eb30a067622923441 Parents: 33a43e6 Author: Tamas Cservenak <ta...@cservenak.net> Authored: Tue Jun 3 10:36:10 2014 +0200 Committer: Jason van Zyl <ja...@tesla.io> Committed: Tue Jun 10 07:21:25 2014 -0400 ---------------------------------------------------------------------- ...5640LifecycleParticipantAfterSessionEnd.java | 20 +++---- .../builderror-mojoex/pom.xml | 63 ++++++++++++++++++++ .../builderror-rt/pom.xml | 63 -------------------- .../builderror-runtimeex/pom.xml | 63 ++++++++++++++++++++ .../builderror/pom.xml | 63 -------------------- .../buildfailure-utfail/pom.xml | 48 +++++++++++++++ .../apache/maven/its/mng5640/FailingTest.java | 18 ++++++ .../buildfailure/pom.xml | 48 --------------- .../apache/maven/its/mng5640/FailingTest.java | 18 ------ 9 files changed, 202 insertions(+), 202 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d58940e5/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java index fdbd2a7..c253fc2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java @@ -24,8 +24,8 @@ import java.io.File; import org.apache.maven.it.util.ResourceExtractor; /** - * IT that verifies that lifecycle participant afterSessionEnd - * method is invoked even with build failure. + * IT that verifies that lifecycle participant + * methods are invoked even with various build failures/errors. */ public class MavenITmng5640LifecycleParticipantAfterSessionEnd extends AbstractMavenIntegrationTestCase @@ -36,15 +36,15 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd } /** - * IT executing a Maven build that has UT failure. Asserts that afterSessionEnd is still executed. + * IT executing a Maven build that has UT failure. */ - public void testBuildFailure() + public void testBuildFailureUTFail() throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5640-lifecycleParticipant-afterSession" ); File extensionDir = new File( testDir, "extension" ); - File projectDir = new File( testDir, "buildfailure" ); + File projectDir = new File( testDir, "buildfailure-utfail" ); Verifier verifier; @@ -75,7 +75,7 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd } /** - * IT executing a Maven build that has missing dependency. Asserts that afterSessionEnd is still executed. + * IT executing a Maven build that has missing dependency. */ public void testBuildFailureMissingDependency() throws Exception @@ -113,7 +113,7 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd } /** - * IT executing a Maven build that has failing Maven plugin. Asserts that afterSessionEnd is still executed. + * IT executing a Maven build that has failing Maven plugin. */ public void testBuildError() throws Exception @@ -122,7 +122,7 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd ResourceExtractor.simpleExtractResources( getClass(), "/mng-5640-lifecycleParticipant-afterSession" ); File extensionDir = new File( testDir, "extension" ); File pluginDir = new File( testDir, "badplugin" ); - File projectDir = new File( testDir, "builderror" ); + File projectDir = new File( testDir, "builderror-mojoex" ); Verifier verifier; @@ -158,7 +158,7 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd } /** - * IT executing a Maven build that has failing Maven plugin throwing RuntimeException. Asserts that afterSessionEnd is still executed. + * IT executing a Maven build that has failing Maven plugin throwing RuntimeException. */ public void testBuildErrorRt() throws Exception @@ -167,7 +167,7 @@ public class MavenITmng5640LifecycleParticipantAfterSessionEnd ResourceExtractor.simpleExtractResources( getClass(), "/mng-5640-lifecycleParticipant-afterSession" ); File extensionDir = new File( testDir, "extension" ); File pluginDir = new File( testDir, "badplugin" ); - File projectDir = new File( testDir, "builderror-rt" ); + File projectDir = new File( testDir, "builderror-runtimeex" ); Verifier verifier; http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d58940e5/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror-mojoex/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror-mojoex/pom.xml b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror-mojoex/pom.xml new file mode 100644 index 0000000..458672b --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror-mojoex/pom.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> + <artifactId>mng-5640-lifecycleParticipant-afterSession-buildError</artifactId> + <version>0.1</version> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <extensions> + <extension> + <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> + <artifactId>mng-5640-lifecycleParticipant-afterSession-extension</artifactId> + <version>0.1</version> + </extension> + </extensions> + <plugins> + <plugin> + <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> + <artifactId>mng-5640-lifecycleParticipant-afterSession-badplugin</artifactId> + <version>0.1</version> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>bad</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d58940e5/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror-rt/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror-rt/pom.xml b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror-rt/pom.xml deleted file mode 100644 index e4448b5..0000000 --- a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror-rt/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> - <artifactId>mng-5640-lifecycleParticipant-afterSession-buildError-rt</artifactId> - <version>0.1</version> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <extensions> - <extension> - <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> - <artifactId>mng-5640-lifecycleParticipant-afterSession-extension</artifactId> - <version>0.1</version> - </extension> - </extensions> - <plugins> - <plugin> - <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> - <artifactId>mng-5640-lifecycleParticipant-afterSession-badplugin</artifactId> - <version>0.1</version> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>badrt</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d58940e5/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror-runtimeex/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror-runtimeex/pom.xml b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror-runtimeex/pom.xml new file mode 100644 index 0000000..e4448b5 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror-runtimeex/pom.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> + <artifactId>mng-5640-lifecycleParticipant-afterSession-buildError-rt</artifactId> + <version>0.1</version> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <extensions> + <extension> + <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> + <artifactId>mng-5640-lifecycleParticipant-afterSession-extension</artifactId> + <version>0.1</version> + </extension> + </extensions> + <plugins> + <plugin> + <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> + <artifactId>mng-5640-lifecycleParticipant-afterSession-badplugin</artifactId> + <version>0.1</version> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>badrt</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d58940e5/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror/pom.xml b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror/pom.xml deleted file mode 100644 index 458672b..0000000 --- a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/builderror/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> - <artifactId>mng-5640-lifecycleParticipant-afterSession-buildError</artifactId> - <version>0.1</version> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <extensions> - <extension> - <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> - <artifactId>mng-5640-lifecycleParticipant-afterSession-extension</artifactId> - <version>0.1</version> - </extension> - </extensions> - <plugins> - <plugin> - <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> - <artifactId>mng-5640-lifecycleParticipant-afterSession-badplugin</artifactId> - <version>0.1</version> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>bad</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d58940e5/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-utfail/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-utfail/pom.xml b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-utfail/pom.xml new file mode 100644 index 0000000..121b920 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-utfail/pom.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> + <artifactId>mng-5640-lifecycleParticipant-afterSession-buildFailure</artifactId> + <version>0.1</version> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <extensions> + <extension> + <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> + <artifactId>mng-5640-lifecycleParticipant-afterSession-extension</artifactId> + <version>0.1</version> + </extension> + </extensions> + </build> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d58940e5/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-utfail/src/test/java/org/apache/maven/its/mng5640/FailingTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-utfail/src/test/java/org/apache/maven/its/mng5640/FailingTest.java b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-utfail/src/test/java/org/apache/maven/its/mng5640/FailingTest.java new file mode 100644 index 0000000..3f2dd98 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure-utfail/src/test/java/org/apache/maven/its/mng5640/FailingTest.java @@ -0,0 +1,18 @@ +package org.apache.maven.its.mng5640; + +import junit.framework.TestCase; + +/** + * Always failing UT. + */ +public class FailingTest + extends TestCase +{ + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( false ); + } +} http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d58940e5/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure/pom.xml b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure/pom.xml deleted file mode 100644 index 121b920..0000000 --- a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> - <artifactId>mng-5640-lifecycleParticipant-afterSession-buildFailure</artifactId> - <version>0.1</version> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <extensions> - <extension> - <groupId>org.apache.maven.its.mng5640.lifecycleParticipantAfterSession</groupId> - <artifactId>mng-5640-lifecycleParticipant-afterSession-extension</artifactId> - <version>0.1</version> - </extension> - </extensions> - </build> -</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d58940e5/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure/src/test/java/org/apache/maven/its/mng5640/FailingTest.java ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure/src/test/java/org/apache/maven/its/mng5640/FailingTest.java b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure/src/test/java/org/apache/maven/its/mng5640/FailingTest.java deleted file mode 100644 index 3f2dd98..0000000 --- a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/buildfailure/src/test/java/org/apache/maven/its/mng5640/FailingTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.apache.maven.its.mng5640; - -import junit.framework.TestCase; - -/** - * Always failing UT. - */ -public class FailingTest - extends TestCase -{ - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( false ); - } -}