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 21:00:55 UTC
svn commit: r985322 -
/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/generator/DefaultArchetypeGeneratorTest.java
Author: hboutemy
Date: Fri Aug 13 19:00:55 2010
New Revision: 985322
URL: http://svn.apache.org/viewvc?rev=985322&view=rev
Log:
code simplification
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=985322&r1=985321&r2=985322&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 19:00:55 2010
@@ -49,24 +49,47 @@ public class DefaultArchetypeGeneratorTe
String remoteRepository;
- ArchetypeGenerator instance;
+ ArchetypeGenerator generator;
String outputDirectory;
- public void testArchetypeNotDefined()
+ private void generateProjectFromArchetype( ArchetypeGenerationRequest request )
throws Exception
{
- System.out.println( "testArchetypeNotDefined" );
+ ArchetypeGenerationResult result = new ArchetypeGenerationResult();
- ArchetypeGenerationRequest request = createArchetypeGenerationRequest( "generate-2", "archetypes", null, "1.0" );
+ generator.generateArchetype( request, result );
+
+ if ( result.getCause() != null )
+ {
+ throw result.getCause();
+ }
+ }
+
+ private ArchetypeGenerationResult generateProjectFromArchetypeWithFailure( ArchetypeGenerationRequest request )
+ throws Exception
+ {
ArchetypeGenerationResult result = new ArchetypeGenerationResult();
- instance.generateArchetype( request, result );
+ generator.generateArchetype( request, result );
if ( result.getCause() == null )
{
- fail( "Exception must be thrown" );
+ fail( "Exception must be thrown." );
}
+
+ return result;
+ }
+
+ public void testArchetypeNotDefined()
+ throws Exception
+ {
+ System.out.println( "testArchetypeNotDefined" );
+
+ ArchetypeGenerationRequest request = createArchetypeGenerationRequest( "generate-2", "archetypes", null, "1.0" );
+
+ ArchetypeGenerationResult result = generateProjectFromArchetypeWithFailure( request );
+
assertEquals( "Exception not correct", "The archetype is not defined", result.getCause().getMessage() );
}
@@ -96,15 +119,7 @@ public class DefaultArchetypeGeneratorTe
File projectDirectory = new File( outputDirectory, "file-value" );
assertDeleted( projectDirectory );
- ArchetypeGenerationResult result = new ArchetypeGenerationResult();
-
- instance.generateArchetype( request, result );
-
- if ( result.getCause() != null )
- {
- result.getCause().printStackTrace();
- fail( "No exception may be thrown: " + result.getCause().getMessage() );
- }
+ generateProjectFromArchetype( request );
assertTemplateContent( projectDirectory, "src/main/java/file/value/package/App.java" );
assertTemplateContent( projectDirectory, "src/main/java/file/value/package/inner/package/App2.java" );
@@ -154,13 +169,7 @@ public class DefaultArchetypeGeneratorTe
File projectDirectory = new File( outputDirectory, "file-value" );
assertDeleted( projectDirectory );
- ArchetypeGenerationResult result = new ArchetypeGenerationResult();
-
- instance.generateArchetype( request, result );
- if ( result.getCause() != null )
- {
- fail( "No exception may be thrown: " + result.getCause().getMessage() );
- }
+ generateProjectFromArchetype( request );
Model model = readPom( new File( projectDirectory, "pom.xml" ) );
assertEquals( "org.apache.maven.archetype", model.getParent().getGroupId() );
@@ -208,14 +217,7 @@ public class DefaultArchetypeGeneratorTe
assertDeleted( new File( projectDirectory, "src" ) );
- ArchetypeGenerationResult result = new ArchetypeGenerationResult();
-
- instance.generateArchetype( request, result );
-
- if ( result.getCause() != null )
- {
- fail( "No exception may be thrown: " + result.getCause().getMessage() );
- }
+ generateProjectFromArchetype( request );
Model model = readPom( projectFile );
assertNotNull( model.getParent() );
@@ -258,12 +260,7 @@ public class DefaultArchetypeGeneratorTe
assertDeleted( new File( projectDirectory, "src" ) );
- ArchetypeGenerationResult result = new ArchetypeGenerationResult();
- instance.generateArchetype( request, result );
- if ( result.getCause() != null )
- {
- fail( "No exception may be thrown: " + result.getCause().getMessage() );
- }
+ generateProjectFromArchetype( request );
Model model = readPom( projectFile );
assertNotNull( model.getParent() );
@@ -308,13 +305,7 @@ public class DefaultArchetypeGeneratorTe
assertDeleted( new File( outputDirectory, "src" ) );
- ArchetypeGenerationResult result = new ArchetypeGenerationResult();
-
- instance.generateArchetype( request, result );
- if ( result.getCause() != null )
- {
- fail( "No exception may be thrown: " + result.getCause().getMessage() );
- }
+ generateProjectFromArchetype( request );
Model model = readPom( getProjectFile() );
assertNull( model.getParent() );
@@ -342,13 +333,7 @@ public class DefaultArchetypeGeneratorTe
assertDeleted( projectDirectory );
- ArchetypeGenerationResult result = new ArchetypeGenerationResult();
-
- instance.generateArchetype( request, result );
- if ( result.getCause() != null )
- {
- fail( "No exception may be thrown: " + result.getCause().getMessage() );
- }
+ generateProjectFromArchetype( request );
Model model = readPom( projectFile );
assertNull( model.getParent() );
@@ -385,13 +370,7 @@ public class DefaultArchetypeGeneratorTe
assertDeleted( projectDirectory );
- ArchetypeGenerationResult result = new ArchetypeGenerationResult();
-
- instance.generateArchetype( request, result );
- if ( result.getCause() != null )
- {
- fail( "No exception may be thrown: " + result.getCause().getMessage() );
- }
+ generateProjectFromArchetype( request );
assertTemplateContent( projectDirectory, "src/site/site.xml" );
assertTemplateContent( projectDirectory, "src/site/apt/test.apt" );
@@ -431,14 +410,7 @@ public class DefaultArchetypeGeneratorTe
assertDeleted( projectDirectory );
- ArchetypeGenerationResult result = new ArchetypeGenerationResult();
-
- instance.generateArchetype( request, result );
- if ( result.getCause() != null )
- {
- result.getCause().printStackTrace( System.err );
- fail( "No exception may be thrown: " + result.getCause().getMessage() );
- }
+ generateProjectFromArchetype( request );
assertTemplateContentGeneratedWithFileSetArchetype( projectDirectory,
"src/main/java/file/value/package/App.java", "file-value" );
@@ -530,14 +502,7 @@ public class DefaultArchetypeGeneratorTe
assertDeleted( projectDirectory );
- ArchetypeGenerationResult result = new ArchetypeGenerationResult();
-
- instance.generateArchetype( request, result );
- if ( result.getCause() != null )
- {
- result.getCause().printStackTrace( System.err );
- fail( "No exception may be thrown: " + result.getCause().getMessage() );
- }
+ generateProjectFromArchetype( request );
assertTemplateContentGeneratedWithOldArchetype( projectDirectory, "src/main/java/file/value/package/App.java" );
assertTemplateContentGeneratedWithOldArchetype( projectDirectory, "src/main/resources/App.properties" );
@@ -557,13 +522,7 @@ public class DefaultArchetypeGeneratorTe
ArchetypeGenerationRequest request = createArchetypeGenerationRequest( "generate-3", "archetypes", "basic", "1.0" );
- ArchetypeGenerationResult result = new ArchetypeGenerationResult();
-
- instance.generateArchetype( request, result );
- if ( result.getCause() == null )
- {
- fail( "No exception may be thrown: " + result.getCause().getMessage() );
- }
+ ArchetypeGenerationResult result = generateProjectFromArchetypeWithFailure( request );
assertTrue( "Exception not correct",
result.getCause().getMessage().startsWith( "Archetype archetypes:basic:1.0 is not configured" )
@@ -590,11 +549,11 @@ public class DefaultArchetypeGeneratorTe
remoteRepository = repositories + "/central";
- instance = (ArchetypeGenerator) lookup( ArchetypeGenerator.ROLE );
- assertNotNull( instance );
- assertNotNull( getVariableValueFromObject( instance, "archetypeArtifactManager" ) );
- assertNotNull( getVariableValueFromObject( instance, "oldArchetype" ) );
- assertNotNull( getVariableValueFromObject( instance, "filesetGenerator" ) );
+ generator = (ArchetypeGenerator) lookup( ArchetypeGenerator.ROLE );
+ assertNotNull( generator );
+ assertNotNull( getVariableValueFromObject( generator, "archetypeArtifactManager" ) );
+ assertNotNull( getVariableValueFromObject( generator, "oldArchetype" ) );
+ assertNotNull( getVariableValueFromObject( generator, "filesetGenerator" ) );
}
private ArchetypeGenerationRequest createArchetypeGenerationRequest( String project, String groupId,