You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/10/07 01:12:59 UTC
svn commit: r582551 - in
/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test:
ArchetypeGenerationTest.java ArchetyperRoundtripTest.java ArchetyperTest.java
Author: jvanzyl
Date: Sat Oct 6 16:12:57 2007
New Revision: 582551
URL: http://svn.apache.org/viewvc?rev=582551&view=rev
Log:
o separating generation test from round trip test
Added:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java
- copied, changed from r582549, maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperTest.java
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java (contents, props changed)
- copied, changed from r582549, maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperTest.java
Removed:
maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperTest.java
Copied: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java (from r582549, maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperTest.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java?p2=maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java&p1=maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperTest.java&r1=582549&r2=582551&rev=582551&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperTest.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetypeGenerationTest.java Sat Oct 6 16:12:57 2007
@@ -13,78 +13,9 @@
import java.util.List;
/** @author Jason van Zyl */
-public class ArchetyperTest
+public class ArchetypeGenerationTest
extends PlexusTestCase
-{
- public void testArchetyper()
- throws Exception
- {
- Archetyper archetype = (Archetyper) lookup( Archetyper.ROLE );
-
- ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) lookup( ArchetypeRegistryManager.ROLE );
-
- MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
-
- ArtifactRepository localRepository = registryManager.createRepository(
- new File( getBasedir(), "target/local-repo" ).toURI().toURL().toExternalForm(), "local-repo" );
-
- // (1) create a project from scratch
- // (2) create an archetype from the project
- // (3) create our own archetype catalog properties in memory
- // (4) create our own archetype catalog describing the archetype we just created
- // (5) deploy the archetype we just created
- // (6) create a project form the archetype we just created
-
- // ------------------------------------------------------------------------
- //
- // ------------------------------------------------------------------------
-
- /*
-
- // (1) create a project from scratch
-
- File sourceProject = new File( getBasedir(), "src/test/projects/test-project" );
-
- File workingProject = new File( getBasedir(), "target/projects/test-project" );
-
- if ( !workingProject.exists() )
- {
- workingProject.mkdirs();
- }
-
- FileUtils.copyDirectoryStructure( sourceProject, workingProject );
-
- // (2) create an archetype from the project
-
- File pom = new File( workingProject, "pom.xml" );
-
- ArtifactRepository localRepository = registryManager.createRepository(
- new File( getBasedir(), "target/local-repo" ).toURI().toURL().toExternalForm(), "local-repo" );
-
- MavenProject project = projectBuilder.build( pom, localRepository, null );
-
- ArchetypeCreationRequest acr = new ArchetypeCreationRequest()
- .setProject( project )
- .setLocalRepository( localRepository );
-
- ArchetypeCreationResult result = archetype.createArchetypeFromProject( acr );
-
- if ( result.getCause() != null )
- {
- fail( result.getCause().getMessage() );
-
- result.getCause().printStackTrace();
- }
-
- */
-
- // (3) create our own archetype catalog properties in memory
- // (4) create our own archetype catalog describing the archetype we just created
- // (5) deploy the archetype we just created
- // (6) create a project form the archetype we just created
-
- }
-
+{
public void testProjectGenerationFromAnArchetype()
throws Exception
{
@@ -114,4 +45,4 @@
fail( result.getCause().getMessage() );
}
}
-}
+}
\ No newline at end of file
Copied: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java (from r582549, maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperTest.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java?p2=maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java&p1=maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperTest.java&r1=582549&r2=582551&rev=582551&view=diff
==============================================================================
--- maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperTest.java (original)
+++ maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java Sat Oct 6 16:12:57 2007
@@ -13,7 +13,7 @@
import java.util.List;
/** @author Jason van Zyl */
-public class ArchetyperTest
+public class ArchetyperRoundtripTest
extends PlexusTestCase
{
public void testArchetyper()
@@ -83,35 +83,5 @@
// (5) deploy the archetype we just created
// (6) create a project form the archetype we just created
- }
-
- public void testProjectGenerationFromAnArchetype()
- throws Exception
- {
- Archetyper archetype = (Archetyper) lookup( Archetyper.ROLE );
-
- ArchetypeRegistryManager registryManager = (ArchetypeRegistryManager) lookup( ArchetypeRegistryManager.ROLE );
-
- ArtifactRepository localRepository = registryManager.createRepository(
- new File( getBasedir(), "target/local-repo" ).toURI().toURL().toExternalForm(), "local-repo" );
-
- List archetypes = archetype.getAvailableArchetypes();
-
- Archetype selection = (Archetype) archetypes.get( 14 );
-
- ArchetypeGenerationRequest agr = new ArchetypeGenerationRequest( selection )
- .setOutputDirectory( new File( getBasedir(), "target/output" ).getAbsolutePath() )
- .setLocalRepository( localRepository )
- .setGroupId( "foo" )
- .setArtifactId( "bar" )
- .setVersion( "1.0.0" )
- .setPackage( "foo" );
-
- ArchetypeGenerationResult result = archetype.generateProjectFromArchetype( agr );
-
- if ( result.getCause() != null )
- {
- fail( result.getCause().getMessage() );
- }
- }
+ }
}
Propchange: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/archetypeng/archetypeng-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision