From 394f6de30b0f0fa16855435ec1c18832465bc5cd Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sun, 26 Oct 2008 15:12:45 +0000 Subject: [PATCH] o Updated IT archetype git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@708003 13f79535-47bb-0310-9956-ffa450edef68 --- .../resources/META-INF/maven/archetype.xml | 21 ++++++++-------- ...avenITmngXXXXDescriptionOfProblemTest.java | 25 ++++++++++++------- .../checkstyle-assembly/pom.xml | 0 .../src/main/resources/rule_set.xml | 0 .../src/main/resources/stc_checks.xml | 0 .../checkstyle-test/pom.xml | 0 .../checkstyle-test/src/main/java/Class.java | 0 .../pom.xml | 0 .../readme.txt | 0 9 files changed, 27 insertions(+), 19 deletions(-) rename its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/{mng-xxxx-descriptionOfProblem => mng-xxxx}/checkstyle-assembly/pom.xml (100%) rename its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/{mng-xxxx-descriptionOfProblem => mng-xxxx}/checkstyle-assembly/src/main/resources/rule_set.xml (100%) rename its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/{mng-xxxx-descriptionOfProblem => mng-xxxx}/checkstyle-assembly/src/main/resources/stc_checks.xml (100%) rename its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/{mng-xxxx-descriptionOfProblem => mng-xxxx}/checkstyle-test/pom.xml (100%) rename its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/{mng-xxxx-descriptionOfProblem => mng-xxxx}/checkstyle-test/src/main/java/Class.java (100%) rename its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/{mng-xxxx-descriptionOfProblem => mng-xxxx}/pom.xml (100%) rename its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/{mng-xxxx-descriptionOfProblem => mng-xxxx}/readme.txt (100%) diff --git a/its/core-it-support/maven-it-archetype/src/main/resources/META-INF/maven/archetype.xml b/its/core-it-support/maven-it-archetype/src/main/resources/META-INF/maven/archetype.xml index 1ec1f67b7c..aec5a34927 100644 --- a/its/core-it-support/maven-it-archetype/src/main/resources/META-INF/maven/archetype.xml +++ b/its/core-it-support/maven-it-archetype/src/main/resources/META-INF/maven/archetype.xml @@ -1,7 +1,8 @@ - + + maven-integration-test-sample-archetype - src\test\java\org\apache\maven\itSample\MavenITmngXXXXDescriptionOfProblemTest.java + src\test\java\org\apache\maven\it\MavenITmngXXXXDescriptionOfProblemTest.java .classpath @@ -9,12 +10,12 @@ out.txt - src\test\resources\mng-xxxx-descriptionOfProblem\checkstyle-assembly\pom.xml - src\test\resources\mng-xxxx-descriptionOfProblem\checkstyle-assembly\src\main\resources\rule_set.xml - src\test\resources\mng-xxxx-descriptionOfProblem\checkstyle-assembly\src\main\resources\stc_checks.xml - src\test\resources\mng-xxxx-descriptionOfProblem\checkstyle-test\pom.xml - src\test\resources\mng-xxxx-descriptionOfProblem\checkstyle-test\src\main\java\Class.java - src\test\resources\mng-xxxx-descriptionOfProblem\pom.xml - src\test\resources\mng-xxxx-descriptionOfProblem\readme.txt + src\test\resources\mng-xxxx\checkstyle-assembly\pom.xml + src\test\resources\mng-xxxx\checkstyle-assembly\src\main\resources\rule_set.xml + src\test\resources\mng-xxxx\checkstyle-assembly\src\main\resources\stc_checks.xml + src\test\resources\mng-xxxx\checkstyle-test\pom.xml + src\test\resources\mng-xxxx\checkstyle-test\src\main\java\Class.java + src\test\resources\mng-xxxx\pom.xml + src\test\resources\mng-xxxx\readme.txt - \ No newline at end of file + diff --git a/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java b/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java index 01174929cb..420ce00514 100644 --- a/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java +++ b/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java @@ -1,4 +1,4 @@ -package ${package}; +package org.apache.maven.it; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -9,7 +9,7 @@ package ${package}; * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -23,7 +23,6 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.maven.it.AbstractMavenIntegrationTestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; @@ -38,22 +37,29 @@ import org.apache.maven.it.util.ResourceExtractor; * phases. See more information inline in the code. * * @author Brian Fox - * + * @version $Id$ */ public class MavenITmngXXXXDescriptionOfProblemTest extends AbstractMavenIntegrationTestCase { + + // TODO: RENAME THIS TEST TO SUIT YOUR SCENARIO. + // Usign the Jira issue id this reproduces is a good + // start, along with a description: + // ie MavenITmngXXXXHoustonWeHaveAProblemTest (must end in test) + public MavenITmngXXXXDescriptionOfProblemTest() + { + super( "(2.0.8,)" ); // only test in 2.0.9+ + } + public void testitMNGxxxx () throws Exception { - // TODO: RENAME THIS TEST TO SUIT YOUR SCENARIO. - // Usign the Jira issue id this reproduces is a good - // start, along with a description: - // ie MNG-13x-HoustonWeHaveAProblemTest (must end in test) // The testdir is computed from the location of this // file. - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-xxxx-descriptionOfProblem" ); + // TODO: RENAME THIS PATH TO MATCH YOUR ISSUE ID. + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-xxxx" ); Verifier verifier; @@ -79,6 +85,7 @@ public class MavenITmngXXXXDescriptionOfProblemTest */ List cliOptions = new ArrayList(); cliOptions.add( "-N" ); + verifier.setCliOptions( cliOptions ); verifier.executeGoal( "install" ); /* diff --git a/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/checkstyle-assembly/pom.xml b/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/pom.xml similarity index 100% rename from its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/checkstyle-assembly/pom.xml rename to its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/pom.xml diff --git a/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/checkstyle-assembly/src/main/resources/rule_set.xml b/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/rule_set.xml similarity index 100% rename from its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/checkstyle-assembly/src/main/resources/rule_set.xml rename to its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/rule_set.xml diff --git a/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/checkstyle-assembly/src/main/resources/stc_checks.xml b/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/stc_checks.xml similarity index 100% rename from its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/checkstyle-assembly/src/main/resources/stc_checks.xml rename to its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/stc_checks.xml diff --git a/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/checkstyle-test/pom.xml b/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-test/pom.xml similarity index 100% rename from its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/checkstyle-test/pom.xml rename to its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-test/pom.xml diff --git a/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/checkstyle-test/src/main/java/Class.java b/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-test/src/main/java/Class.java similarity index 100% rename from its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/checkstyle-test/src/main/java/Class.java rename to its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-test/src/main/java/Class.java diff --git a/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/pom.xml b/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/pom.xml similarity index 100% rename from its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/pom.xml rename to its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/pom.xml diff --git a/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/readme.txt b/its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/readme.txt similarity index 100% rename from its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx-descriptionOfProblem/readme.txt rename to its/core-it-support/maven-it-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/readme.txt