You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/11/27 08:25:44 UTC
svn commit: r721109 - in /maven/components/trunk/maven-project-builder/src:
main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
test/java/org/apache/maven/project/builder/EnforcerPomTest.java
Author: sisbell
Date: Wed Nov 26 23:25:44 2008
New Revision: 721109
URL: http://svn.apache.org/viewvc?rev=721109&view=rev
Log:
Updated unit test to test for contents of two containers.
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java
Modified: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java?rev=721109&r1=721108&r2=721109&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java Wed Nov 26 23:25:44 2008
@@ -73,6 +73,8 @@
private String scope;
+ private String classifier;
+
private List<ModelProperty> properties;
private static String findBaseUriFrom( List<ModelProperty> modelProperties )
@@ -112,6 +114,10 @@
{
this.scope = mp.getResolvedValue();
}
+ else if ( classifier == null && mp.getUri().equals( uri + "/classifier" ) )
+ {
+ this.classifier = mp.getResolvedValue();
+ }
else if ( type == null && mp.getUri().equals( ProjectUri.Dependencies.Dependency.type )
|| mp.getUri().equals(ProjectUri.DependencyManagement.Dependencies.Dependency.type)
|| mp.getUri().equals(ProjectUri.Build.PluginManagement.Plugins.Plugin.Dependencies.Dependency.type)
@@ -159,6 +165,11 @@
type = "jar";
}
+ if ( classifier == null )
+ {
+ classifier = "";
+ }
+
if ( scope == null || scope.equals("provided"))
{
scope = "compile";
@@ -178,7 +189,8 @@
}
ArtifactModelContainer c = (ArtifactModelContainer) modelContainer;
- if ( c.groupId.equals( groupId ) && c.artifactId.equals( artifactId ) && c.type.equals( type ) )
+ if ( c.groupId.equals( groupId ) && c.artifactId.equals( artifactId ) && c.type.equals( type )
+ && c.classifier.equals( classifier ))
{
if ( c.version.equals( version ) )
{
Modified: maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java?rev=721109&r1=721108&r2=721109&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java (original)
+++ maven/components/trunk/maven-project-builder/src/test/java/org/apache/maven/project/builder/EnforcerPomTest.java Wed Nov 26 23:25:44 2008
@@ -53,8 +53,15 @@
DefaultModelDataSource source = new DefaultModelDataSource();
source.init(domainModel.getModelProperties(), Arrays.asList(new ArtifactModelContainerFactory(), new IdModelContainerFactory()));
List<ModelContainer> containers = source.queryFor(ProjectUri.Dependencies.Dependency.xUri);
- assertTrue(containers.size() == 1 );
- assertTrue(contains(ProjectUri.Dependencies.Dependency.version, "v1", containers.get(0)));
+ assertTrue(containers.size() == 2 );
+
+ ModelContainer mc0 = containers.get(0);
+ assertTrue(contains(ProjectUri.Dependencies.Dependency.version, "v1", mc0));
+ assertFalse(contains(ProjectUri.Dependencies.Dependency.classifier, "tests", mc0));
+
+ ModelContainer mc1 = containers.get(1);
+ assertTrue(contains(ProjectUri.Dependencies.Dependency.version, "v1", mc1));
+ assertTrue(contains(ProjectUri.Dependencies.Dependency.classifier, "tests", mc1));
}
private boolean contains(String name, String value, ModelContainer modelContainer) {