You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/06/10 22:27:10 UTC
cvs commit: maven-components/maven-project/src/test/java/org/apache/maven/project DefaultProjectBuilderTest.java
jvanzyl 2004/06/10 13:27:10
Modified: maven-project pom.xml
maven-project/src/main/java/org/apache/maven/project
DefaultMavenProjectBuilder.java
maven-project/src/test/java/org/apache/maven/artifact/collector
DefaultArtifactCollectorTest.java
maven-project/src/test/java/org/apache/maven/artifact/downloader
DefaultArtifactDownloaderTest.java
maven-project/src/test/java/org/apache/maven/project
DefaultProjectBuilderTest.java
Removed: maven-project/src/main/resources/org/apache/maven
defaults.properties
Log:
o what are now provided by properties, say maven.build.dir, will be stated
in the super model with default values.
Revision Changes Path
1.2 +0 -26 maven-components/maven-project/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pom.xml 9 Jun 2004 03:10:50 -0000 1.1
+++ pom.xml 10 Jun 2004 20:27:09 -0000 1.2
@@ -20,35 +20,9 @@
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus</artifactId>
- <version>0.14-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-i18n</artifactId>
- <version>1.0-beta-2-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>maven</groupId>
<artifactId>wagon-api</artifactId>
<version>0.9-SNAPSHOT</version>
- </dependency>
- <!-- Component Testing -->
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>classworlds</groupId>
- <artifactId>classworlds</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.3</version>
</dependency>
</dependencies>
</project>
1.22 +5 -8 maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Index: DefaultMavenProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DefaultMavenProjectBuilder.java 9 Jun 2004 21:56:50 -0000 1.21
+++ DefaultMavenProjectBuilder.java 10 Jun 2004 20:27:10 -0000 1.22
@@ -65,7 +65,6 @@
private WagonManager wagonManager;
- // member variables
private Model superModel;
public void initialize()
@@ -171,17 +170,15 @@
}
else if ( parentModel != null && useParentPom )
{
- if ( isEmpty( parentModel.getArtifactId() ) )
+ if ( isEmpty( parentModel.getGroupId() ) )
{
- throw new ProjectBuildingException( "Missing artifact id element from parent element" );
+ throw new ProjectBuildingException( "Missing groupId element from parent element" );
}
-
- if ( isEmpty( parentModel.getGroupId() ) )
+ else if ( isEmpty( parentModel.getArtifactId() ) )
{
- throw new ProjectBuildingException( "Missing group id element from parent element" );
+ throw new ProjectBuildingException( "Missing artifactId element from parent element" );
}
-
- if ( isEmpty( parentModel.getVersion() ) )
+ else if ( isEmpty( parentModel.getVersion() ) )
{
throw new ProjectBuildingException( "Missing version element from parent element" );
}
1.6 +47 -56 maven-components/maven-project/src/test/java/org/apache/maven/artifact/collector/DefaultArtifactCollectorTest.java
Index: DefaultArtifactCollectorTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/artifact/collector/DefaultArtifactCollectorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultArtifactCollectorTest.java 18 May 2004 20:09:17 -0000 1.5
+++ DefaultArtifactCollectorTest.java 10 Jun 2004 20:27:10 -0000 1.6
@@ -26,46 +26,37 @@
import org.apache.maven.project.MavenProjectBuilder;
/**
- *
- * @author <a href="mailto:mmaczka@interia.pl">Michal Maczka</a>
+ * @author <a href="mailto:mmaczka@interia.pl">Michal Maczka</a>
* @version $Id$
*/
public class DefaultArtifactCollectorTest
extends AbstractProjectTestCase
{
-
-
private ArtifactCollector artifactCollector;
-
+
private MavenProjectBuilder projectBuilder;
-
-
+
public DefaultArtifactCollectorTest( String testName )
{
super( testName );
}
-
-
- public void setUp() throws Exception
+
+ public void setUp()
+ throws Exception
{
super.setUp();
-
- artifactCollector = ( ArtifactCollector ) lookup( ArtifactCollector.ROLE );
-
+
+ artifactCollector = (ArtifactCollector) lookup( ArtifactCollector.ROLE );
+
assertNotNull( "Test artifactCollector can't be null!", artifactCollector );
-
- projectBuilder = ( MavenProjectBuilder ) lookup( MavenProjectBuilder.ROLE );
-
- System.setProperty( "maven.repo.local", getLocalRepository() );
-
-
+
+ projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
+
+ System.setProperty( "maven.repo.local", getLocalRepository() );
}
-
-
- public void testArtifactCollecting( )
+ public void testArtifactCollecting()
{
-
File f = new File( getLocalRepository(), "/maven-test/poms/maven-test-a-1.0.pom" );
assertTrue( "Test file: '" + f.getAbsolutePath() + "' doesn't exist!", f.exists() );
@@ -73,17 +64,17 @@
try
{
MavenProject project = projectBuilder.build( f );
-
+
assertNotNull( "Project is null", project );
-
+
project.setLocalRepository( getLocalRepository() );
-
+
ArtifactCollectionResult result = artifactCollector.collect( project, projectBuilder );
-
+
Map artifacts = result.getArtifacts();
-
+
Map conflicts = result.getConflicts();
-
+
Map artifactsWithoutPoms = result.getArtifactsWithoutPoms();
// [d 1.1]
@@ -92,38 +83,38 @@
// | |
// |---------------------- > [z] (no pom)
- assertTrue( artifacts.containsKey( "maven-test:maven-test-b" ) );
-
- assertTrue( artifacts.containsKey( "maven-test:maven-test-c" ) );
-
- assertTrue( artifacts.containsKey( "maven-test:maven-test-d" ) );
-
- assertTrue( artifacts.containsKey( "maven-test:maven-test-z" ) );
-
- assertTrue( artifactsWithoutPoms.containsKey( "maven-test:maven-test-z" ) );
-
-
+ assertTrue( artifacts.containsKey( "maven-test:maven-test-b" ) );
+
+ assertTrue( artifacts.containsKey( "maven-test:maven-test-c" ) );
+
+ assertTrue( artifacts.containsKey( "maven-test:maven-test-d" ) );
+
+ assertTrue( artifacts.containsKey( "maven-test:maven-test-z" ) );
+
+ assertTrue( artifactsWithoutPoms.containsKey( "maven-test:maven-test-z" ) );
+
+
assertEquals( 1, conflicts.size() );
-
- assertTrue( conflicts.containsKey( "maven-test:maven-test-d" ) );
-
- List conflictsForD = ( List ) conflicts.get( "maven-test:maven-test-d" );
-
- assertEquals( 2,conflictsForD.size() );
-
- MavenArtifact d_1_1 = ( MavenArtifact ) conflictsForD.get( 0 );
-
- MavenArtifact d_1_2 = ( MavenArtifact ) conflictsForD.get( 1 );
-
+
+ assertTrue( conflicts.containsKey( "maven-test:maven-test-d" ) );
+
+ List conflictsForD = (List) conflicts.get( "maven-test:maven-test-d" );
+
+ assertEquals( 2, conflictsForD.size() );
+
+ MavenArtifact d_1_1 = (MavenArtifact) conflictsForD.get( 0 );
+
+ MavenArtifact d_1_2 = (MavenArtifact) conflictsForD.get( 1 );
+
assertEquals( "1.1", d_1_1.getDependency().getVersion() );
-
+
assertEquals( "1.2", d_1_2.getDependency().getVersion() );
}
catch ( Exception e )
{
- e.printStackTrace();
-
- fail( e.getMessage() );
+ e.printStackTrace();
+
+ fail( e.getMessage() );
}
}
}
1.6 +6 -11 maven-components/maven-project/src/test/java/org/apache/maven/artifact/downloader/DefaultArtifactDownloaderTest.java
Index: DefaultArtifactDownloaderTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/artifact/downloader/DefaultArtifactDownloaderTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultArtifactDownloaderTest.java 8 Jun 2004 21:38:44 -0000 1.5
+++ DefaultArtifactDownloaderTest.java 10 Jun 2004 20:27:10 -0000 1.6
@@ -29,9 +29,9 @@
* @author <a href="mailto:mmaczka@interia.pl">Michal Maczka</a>
* @version $Id$
*/
-public class DefaultArtifactDownloaderTest extends AbstractProjectTestCase
+public class DefaultArtifactDownloaderTest
+ extends AbstractProjectTestCase
{
-
private ArtifactDownloader artifactDownloader;
private MavenArtifactFactory artifactFactory;
@@ -48,22 +48,17 @@
artifactDownloader = ( ArtifactDownloader ) lookup( ArtifactDownloader.ROLE );
- assertNotNull( "Test artifactDownloader can't be null!",
- artifactDownloader );
+ assertNotNull( "Test artifactDownloader can't be null!", artifactDownloader );
artifactFactory = ( MavenArtifactFactory ) lookup( MavenArtifactFactory.ROLE );
-
}
public void testArtifactDownloading()
throws Exception
{
+ File f = new File( getLocalRepository(), "/maven-test/poms/maven-test-a-1.0.pom" );
- File f = new File( getLocalRepository(),
- "/maven-test/poms/maven-test-a-1.0.pom" );
-
- assertTrue( "Test file: '" + f.getAbsolutePath() + "' doesn't exist!",
- f.exists() );
+ assertTrue( "Test file: '" + f.getAbsolutePath() + "' doesn't exist!", f.exists() );
initLocalRepository();
1.12 +0 -10 maven-components/maven-project/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java
Index: DefaultProjectBuilderTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultProjectBuilderTest.java 8 Jun 2004 17:13:13 -0000 1.11
+++ DefaultProjectBuilderTest.java 10 Jun 2004 20:27:10 -0000 1.12
@@ -20,16 +20,6 @@
private String dir = "src/test/resources/projects/";
- public void testDefaultsPropertiesExtraction()
- throws Exception
- {
- File f = new File( basedir, dir + "project.xml" );
-
- MavenProject project = projectBuilder.build( f, false, false );
-
- assertNotNull( project.getProperty( "maven.build.dir" ) );
- }
-
public void testModelMapping()
throws Exception
{
Re: cvs commit:
maven-components/maven-project/src/test/java/org/apache/maven/project
DefaultProjectBuilderTest.java
Posted by Jerome Lacoste <je...@coffeebreaks.org>.
On Thu, 2004-06-10 at 22:27, jvanzyl@apache.org wrote:
> jvanzyl 2004/06/10 13:27:10
>
> Modified: maven-project pom.xml
> maven-project/src/main/java/org/apache/maven/project
> DefaultMavenProjectBuilder.java
> maven-project/src/test/java/org/apache/maven/artifact/collector
> DefaultArtifactCollectorTest.java
> maven-project/src/test/java/org/apache/maven/artifact/downloader
> DefaultArtifactDownloaderTest.java
> maven-project/src/test/java/org/apache/maven/project
> DefaultProjectBuilderTest.java
> Removed: maven-project/src/main/resources/org/apache/maven
> defaults.properties
> Log:
> o what are now provided by properties, say maven.build.dir, will be stated
> in the super model with default values.
>
> Revision Changes Path
> 1.2 +0 -26 maven-components/maven-project/pom.xml
>
> Index: pom.xml
> ===================================================================
> RCS file: /home/cvs/maven-components/maven-project/pom.xml,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- pom.xml 9 Jun 2004 03:10:50 -0000 1.1
> +++ pom.xml 10 Jun 2004 20:27:09 -0000 1.2
> @@ -20,35 +20,9 @@
> <version>2.0-SNAPSHOT</version>
> </dependency>
> <dependency>
> - <groupId>plexus</groupId>
> - <artifactId>plexus</artifactId>
> - <version>0.14-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>plexus</groupId>
> - <artifactId>plexus-i18n</artifactId>
> - <version>1.0-beta-2-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> <groupId>maven</groupId>
> <artifactId>wagon-api</artifactId>
> <version>0.9-SNAPSHOT</version>
> - </dependency>
> - <!-- Component Testing -->
> - <dependency>
> - <groupId>xstream</groupId>
> - <artifactId>xstream</artifactId>
> - <version>1.0-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>classworlds</groupId>
> - <artifactId>classworlds</artifactId>
> - <version>1.1-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>xpp3</groupId>
> - <artifactId>xpp3</artifactId>
> - <version>1.1.3.3</version>
> </dependency>
> </dependencies>
> </project>
>
>
>
> 1.22 +5 -8 maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
>
> Index: DefaultMavenProjectBuilder.java
> ===================================================================
> RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
> retrieving revision 1.21
> retrieving revision 1.22
> diff -u -r1.21 -r1.22
> --- DefaultMavenProjectBuilder.java 9 Jun 2004 21:56:50 -0000 1.21
> +++ DefaultMavenProjectBuilder.java 10 Jun 2004 20:27:10 -0000 1.22
> @@ -65,7 +65,6 @@
>
> private WagonManager wagonManager;
>
> - // member variables
> private Model superModel;
>
> public void initialize()
> @@ -171,17 +170,15 @@
> }
> else if ( parentModel != null && useParentPom )
> {
> - if ( isEmpty( parentModel.getArtifactId() ) )
> + if ( isEmpty( parentModel.getGroupId() ) )
> {
> - throw new ProjectBuildingException( "Missing artifact id element from parent element" );
> + throw new ProjectBuildingException( "Missing groupId element from parent element" );
> }
> -
> - if ( isEmpty( parentModel.getGroupId() ) )
> + else if ( isEmpty( parentModel.getArtifactId() ) )
> {
> - throw new ProjectBuildingException( "Missing group id element from parent element" );
> + throw new ProjectBuildingException( "Missing artifactId element from parent element" );
> }
> -
> - if ( isEmpty( parentModel.getVersion() ) )
> + else if ( isEmpty( parentModel.getVersion() ) )
> {
> throw new ProjectBuildingException( "Missing version element from parent element" );
> }
>
>
>
> 1.6 +47 -56 maven-components/maven-project/src/test/java/org/apache/maven/artifact/collector/DefaultArtifactCollectorTest.java
>
> Index: DefaultArtifactCollectorTest.java
> ===================================================================
> RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/artifact/collector/DefaultArtifactCollectorTest.java,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- DefaultArtifactCollectorTest.java 18 May 2004 20:09:17 -0000 1.5
> +++ DefaultArtifactCollectorTest.java 10 Jun 2004 20:27:10 -0000 1.6
> @@ -26,46 +26,37 @@
> import org.apache.maven.project.MavenProjectBuilder;
>
> /**
> - *
> - * @author <a href="mailto:mmaczka@interia.pl">Michal Maczka</a>
> + * @author <a href="mailto:mmaczka@interia.pl">Michal Maczka</a>
> * @version $Id$
> */
> public class DefaultArtifactCollectorTest
> extends AbstractProjectTestCase
> {
> -
> -
> private ArtifactCollector artifactCollector;
> -
> +
> private MavenProjectBuilder projectBuilder;
> -
> -
> +
> public DefaultArtifactCollectorTest( String testName )
> {
> super( testName );
> }
> -
> -
> - public void setUp() throws Exception
> +
> + public void setUp()
> + throws Exception
> {
> super.setUp();
> -
> - artifactCollector = ( ArtifactCollector ) lookup( ArtifactCollector.ROLE );
> -
> +
> + artifactCollector = (ArtifactCollector) lookup( ArtifactCollector.ROLE );
> +
> assertNotNull( "Test artifactCollector can't be null!", artifactCollector );
> -
> - projectBuilder = ( MavenProjectBuilder ) lookup( MavenProjectBuilder.ROLE );
> -
> - System.setProperty( "maven.repo.local", getLocalRepository() );
> -
> -
> +
> + projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
> +
> + System.setProperty( "maven.repo.local", getLocalRepository() );
> }
>
> -
> -
> - public void testArtifactCollecting( )
> + public void testArtifactCollecting()
> {
> -
> File f = new File( getLocalRepository(), "/maven-test/poms/maven-test-a-1.0.pom" );
>
> assertTrue( "Test file: '" + f.getAbsolutePath() + "' doesn't exist!", f.exists() );
> @@ -73,17 +64,17 @@
> try
> {
> MavenProject project = projectBuilder.build( f );
> -
> +
> assertNotNull( "Project is null", project );
> -
> +
> project.setLocalRepository( getLocalRepository() );
> -
> +
> ArtifactCollectionResult result = artifactCollector.collect( project, projectBuilder );
> -
> +
> Map artifacts = result.getArtifacts();
> -
> +
> Map conflicts = result.getConflicts();
> -
> +
> Map artifactsWithoutPoms = result.getArtifactsWithoutPoms();
>
> // [d 1.1]
> @@ -92,38 +83,38 @@
> // | |
> // |---------------------- > [z] (no pom)
>
> - assertTrue( artifacts.containsKey( "maven-test:maven-test-b" ) );
> -
> - assertTrue( artifacts.containsKey( "maven-test:maven-test-c" ) );
> -
> - assertTrue( artifacts.containsKey( "maven-test:maven-test-d" ) );
> -
> - assertTrue( artifacts.containsKey( "maven-test:maven-test-z" ) );
> -
> - assertTrue( artifactsWithoutPoms.containsKey( "maven-test:maven-test-z" ) );
> -
> -
> + assertTrue( artifacts.containsKey( "maven-test:maven-test-b" ) );
> +
> + assertTrue( artifacts.containsKey( "maven-test:maven-test-c" ) );
> +
> + assertTrue( artifacts.containsKey( "maven-test:maven-test-d" ) );
> +
> + assertTrue( artifacts.containsKey( "maven-test:maven-test-z" ) );
> +
> + assertTrue( artifactsWithoutPoms.containsKey( "maven-test:maven-test-z" ) );
> +
> +
> assertEquals( 1, conflicts.size() );
> -
> - assertTrue( conflicts.containsKey( "maven-test:maven-test-d" ) );
> -
> - List conflictsForD = ( List ) conflicts.get( "maven-test:maven-test-d" );
> -
> - assertEquals( 2,conflictsForD.size() );
> -
> - MavenArtifact d_1_1 = ( MavenArtifact ) conflictsForD.get( 0 );
> -
> - MavenArtifact d_1_2 = ( MavenArtifact ) conflictsForD.get( 1 );
> -
> +
> + assertTrue( conflicts.containsKey( "maven-test:maven-test-d" ) );
> +
> + List conflictsForD = (List) conflicts.get( "maven-test:maven-test-d" );
> +
> + assertEquals( 2, conflictsForD.size() );
> +
> + MavenArtifact d_1_1 = (MavenArtifact) conflictsForD.get( 0 );
> +
> + MavenArtifact d_1_2 = (MavenArtifact) conflictsForD.get( 1 );
> +
> assertEquals( "1.1", d_1_1.getDependency().getVersion() );
> -
> +
> assertEquals( "1.2", d_1_2.getDependency().getVersion() );
> }
> catch ( Exception e )
> {
> - e.printStackTrace();
> -
> - fail( e.getMessage() );
> + e.printStackTrace();
> +
> + fail( e.getMessage() );
> }
> }
> }
>
>
>
> 1.6 +6 -11 maven-components/maven-project/src/test/java/org/apache/maven/artifact/downloader/DefaultArtifactDownloaderTest.java
>
> Index: DefaultArtifactDownloaderTest.java
> ===================================================================
> RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/artifact/downloader/DefaultArtifactDownloaderTest.java,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- DefaultArtifactDownloaderTest.java 8 Jun 2004 21:38:44 -0000 1.5
> +++ DefaultArtifactDownloaderTest.java 10 Jun 2004 20:27:10 -0000 1.6
> @@ -29,9 +29,9 @@
> * @author <a href="mailto:mmaczka@interia.pl">Michal Maczka</a>
> * @version $Id$
> */
> -public class DefaultArtifactDownloaderTest extends AbstractProjectTestCase
> +public class DefaultArtifactDownloaderTest
> + extends AbstractProjectTestCase
> {
> -
> private ArtifactDownloader artifactDownloader;
>
> private MavenArtifactFactory artifactFactory;
> @@ -48,22 +48,17 @@
>
> artifactDownloader = ( ArtifactDownloader ) lookup( ArtifactDownloader.ROLE );
Just a question. I see later on that ROLE contains a String, containing
for what I see a class name.
WHat about using context.lookup(Class class) ?
If not all can be switched, maybe a convenience method can be used, so
that the ROLE constants do not need to be?
Did I miss something?
Jerome