You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2010/08/13 22:51:56 UTC
svn commit: r985358 -
/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
Author: hboutemy
Date: Fri Aug 13 20:51:56 2010
New Revision: 985358
URL: http://svn.apache.org/viewvc?rev=985358&view=rev
Log:
avoid more copy/paste
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java?rev=985358&r1=985357&r2=985358&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java Fri Aug 13 20:51:56 2010
@@ -126,13 +126,6 @@ public class DefaultArchetypeGeneratorTe
ArchetypeGenerationRequest request = createArchetypeGenerationRequest( "generate-4", ARCHETYPE_BASIC );
- request.setGroupId( "file-value" );
- request.setArtifactId( "file-value" );
- request.setVersion( "file-value" );
- request.setPackage( "file.value.package" );
-
- request.setProperties( ADDITIONAL_PROPERTIES );
-
File projectDirectory = new File( outputDirectory, "file-value" );
FileUtils.forceDelete( projectDirectory );
@@ -163,11 +156,6 @@ public class DefaultArchetypeGeneratorTe
ArchetypeGenerationRequest request = createArchetypeGenerationRequest( "generate-5", ARCHETYPE_BASIC );
- request.setGroupId( "file-value" );
- request.setArtifactId( "file-value" );
- request.setVersion( "file-value" );
- request.setPackage( "file.value.package" );
-
request.setProperties( ADDITIONAL_PROPERTIES );
File projectFile = getProjectFile();
@@ -202,11 +190,6 @@ public class DefaultArchetypeGeneratorTe
File parentProjectFileSample = getProjectSampleFile();
copy( parentProjectFileSample, parentProjectFile );
- request.setGroupId( "file-value" );
- request.setArtifactId( "file-value" );
- request.setVersion( "file-value" );
- request.setPackage( "file.value.package" );
-
request.setProperties( ADDITIONAL_PROPERTIES );
File projectDirectory = new File( outputDirectory, "file-value" );
@@ -236,11 +219,6 @@ public class DefaultArchetypeGeneratorTe
ArchetypeGenerationRequest request = createArchetypeGenerationRequest( "generate-9", ARCHETYPE_PARTIAL );
- request.setGroupId( "file-value" );
- request.setArtifactId( "file-value" );
- request.setVersion( "file-value" );
- request.setPackage( "file.value.package" );
-
request.setProperties( ADDITIONAL_PROPERTIES );
File projectDirectory = new File( outputDirectory, "file-value" );
@@ -273,11 +251,6 @@ public class DefaultArchetypeGeneratorTe
ArchetypeGenerationRequest request = createArchetypeGenerationRequest( "generate-7", ARCHETYPE_PARTIAL );
- request.setGroupId( "file-value" );
- request.setArtifactId( "file-value" );
- request.setVersion( "file-value" );
- request.setPackage( "file.value.package" );
-
request.setProperties( ADDITIONAL_PROPERTIES );
File projectFile = new File( outputDirectory, "pom.xml" );
@@ -304,11 +277,6 @@ public class DefaultArchetypeGeneratorTe
ArchetypeGenerationRequest request = createArchetypeGenerationRequest( "generate-6", ARCHETYPE_PARTIAL );
- request.setGroupId( "file-value" );
- request.setArtifactId( "file-value" );
- request.setVersion( "file-value" );
- request.setPackage( "file.value.package" );
-
File projectDirectory = new File( outputDirectory, "file-value" );
File projectFile = new File( projectDirectory, "pom.xml" );
@@ -330,11 +298,6 @@ public class DefaultArchetypeGeneratorTe
ArchetypeGenerationRequest request = createArchetypeGenerationRequest( "generate-10", ARCHETYPE_SITE );
- request.setGroupId( "file-value" );
- request.setArtifactId( "file-value" );
- request.setVersion( "file-value" );
- request.setPackage( "file.value.package" );
-
request.setProperties( ADDITIONAL_PROPERTIES );
File projectDirectory = new File( outputDirectory, "file-value" );
@@ -361,11 +324,6 @@ public class DefaultArchetypeGeneratorTe
ArchetypeGenerationRequest request = createArchetypeGenerationRequest( "generate-12", ARCHETYPE_FILESET );
- request.setGroupId( "file-value" );
- request.setArtifactId( "file-value" );
- request.setVersion( "file-value" );
- request.setPackage( "file.value.package" );
-
request.setProperties( ADDITIONAL_PROPERTIES );
File projectDirectory = new File( outputDirectory, "file-value" );
@@ -455,11 +413,6 @@ public class DefaultArchetypeGeneratorTe
ArchetypeGenerationRequest request = createArchetypeGenerationRequest( "generate-11", ARCHETYPE_OLD );
- request.setGroupId( "file-value" );
- request.setArtifactId( "file-value" );
- request.setVersion( "file-value" );
- request.setPackage( "file.value.package" );
-
File projectDirectory = new File( outputDirectory, "file-value" );
File projectFile = new File( projectDirectory, "pom.xml" );
@@ -484,6 +437,8 @@ public class DefaultArchetypeGeneratorTe
System.out.println( "testPropertiesNotDefined" );
ArchetypeGenerationRequest request = createArchetypeGenerationRequest( "generate-3", ARCHETYPE_BASIC );
+
+ request.setProperties( new Properties() );
ArchetypeGenerationResult result = generateProjectFromArchetypeWithFailure( request );
@@ -532,6 +487,13 @@ public class DefaultArchetypeGeneratorTe
request.setArchetypeArtifactId( archetype.artifactId );
request.setArchetypeVersion( archetype.version );
+ request.setGroupId( "file-value" );
+ request.setArtifactId( "file-value" );
+ request.setVersion( "file-value" );
+ request.setPackage( "file.value.package" );
+
+ request.setProperties( ADDITIONAL_PROPERTIES );
+
return request;
}