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/07/19 22:09:36 UTC
svn commit: r678213 [2/2] - in
/maven/sandbox/trunk/shared/maven-shared-model/src:
main/java/org/apache/maven/shared/model/
main/java/org/apache/maven/shared/model/impl/
test/java/org/apache/maven/shared/model/
test/java/org/apache/maven/shared/model/i...
Modified: maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelTransformerContextTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelTransformerContextTest.java?rev=678213&r1=678212&r2=678213&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelTransformerContextTest.java (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/ModelTransformerContextTest.java Sat Jul 19 13:09:35 2008
@@ -7,140 +7,168 @@
import java.util.Arrays;
import java.util.List;
-public class ModelTransformerContextTest {
+public class ModelTransformerContextTest
+{
@Test
- public void sortWithDuplicateProperty1() {
- ModelProperty dup0 = new ModelProperty("http://apache.org/maven/project", null);
- ModelProperty dup1 = new ModelProperty("http://apache.org/maven/project/build", null);
- ModelProperty dup2 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement", null);
- ModelProperty dup3 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection", null);
- ModelProperty dup4 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null);
- ModelProperty dup5 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration", null);
- ModelProperty dup6 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration/tagBase", "tag");
- ModelProperty dup7 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "1.1");
-
- ModelProperty dup10 = new ModelProperty("http://apache.org/maven/project", null);
- ModelProperty dup11 = new ModelProperty("http://apache.org/maven/project/build", null);
- ModelProperty dup12 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement", null);
- ModelProperty dup13 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection", null);
- ModelProperty dup14 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null);
- ModelProperty dup15 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration", null);
- ModelProperty dup16 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration/tagBase", "tag");
- ModelProperty dup17 = new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "1.1");
-
- List<ModelProperty> modelProperties = Arrays.asList(dup0, dup1, dup2, dup3, dup4, dup5, dup6, dup7,
- dup10, dup11, dup12, dup13, dup14, dup15, dup16, dup17);
-
- ModelTransformerContext ctx = new ModelTransformerContext(new ArrayList<ModelContainerFactory>());
- List<ModelProperty> sortedProperties = ctx.sort(modelProperties, "http://apache.org/maven");
- for(ModelProperty mp : sortedProperties) {
- System.out.println(mp);
+ public void sortWithDuplicateProperty1()
+ {
+ ModelProperty dup0 = new ModelProperty( "http://apache.org/maven/project", null );
+ ModelProperty dup1 = new ModelProperty( "http://apache.org/maven/project/build", null );
+ ModelProperty dup2 = new ModelProperty( "http://apache.org/maven/project/build/pluginManagement", null );
+ ModelProperty dup3 =
+ new ModelProperty( "http://apache.org/maven/project/build/pluginManagement/plugins#collection", null );
+ ModelProperty dup4 = new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null );
+ ModelProperty dup5 = new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration", null );
+ ModelProperty dup6 = new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration/tagBase",
+ "tag" );
+ ModelProperty dup7 = new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "1.1" );
+
+ ModelProperty dup10 = new ModelProperty( "http://apache.org/maven/project", null );
+ ModelProperty dup11 = new ModelProperty( "http://apache.org/maven/project/build", null );
+ ModelProperty dup12 = new ModelProperty( "http://apache.org/maven/project/build/pluginManagement", null );
+ ModelProperty dup13 =
+ new ModelProperty( "http://apache.org/maven/project/build/pluginManagement/plugins#collection", null );
+ ModelProperty dup14 = new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null );
+ ModelProperty dup15 = new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration", null );
+ ModelProperty dup16 = new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/configuration/tagBase",
+ "tag" );
+ ModelProperty dup17 = new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "1.1" );
+
+ List<ModelProperty> modelProperties = Arrays.asList( dup0, dup1, dup2, dup3, dup4, dup5, dup6, dup7, dup10,
+ dup11, dup12, dup13, dup14, dup15, dup16, dup17 );
+
+ ModelTransformerContext ctx = new ModelTransformerContext( new ArrayList<ModelContainerFactory>() );
+ List<ModelProperty> sortedProperties = ctx.sort( modelProperties, "http://apache.org/maven" );
+ for ( ModelProperty mp : sortedProperties )
+ {
+ System.out.println( mp );
}
- // assertTrue(sortedProperties.contains(dup0));
- // assertFalse(sortedProperties.contains(dup1));
+ // assertTrue(sortedProperties.contains(dup0));
+ // assertFalse(sortedProperties.contains(dup1));
}
@Test
- public void sortWithDuplicateProperty() {
- ModelProperty dup0 = new ModelProperty("http://apache.org/maven/project/version", "1.1");
- ModelProperty dup1 = new ModelProperty("http://apache.org/maven/project/version", "1.2");
- List<ModelProperty> modelProperties = Arrays.asList(dup0, dup1);
-
- ModelTransformerContext ctx = new ModelTransformerContext(new ArrayList<ModelContainerFactory>());
- List<ModelProperty> sortedProperties = ctx.sort(modelProperties, "http://apache.org/maven");
- assertTrue(sortedProperties.contains(dup0));
- assertFalse(sortedProperties.contains(dup1));
- }
-
- @Test
- public void sortWithDuplicateCollectionProperty() {
- ModelProperty dup0 = new ModelProperty("http://apache.org/maven/project/test#collection/version", "1.1");
- ModelProperty dup1 = new ModelProperty("http://apache.org/maven/project/test#collection/version", "1.2");
- List<ModelProperty> modelProperties = Arrays.asList(dup0, dup1);
-
- ModelTransformerContext ctx = new ModelTransformerContext(new ArrayList<ModelContainerFactory>());
- List<ModelProperty> sortedProperties = ctx.sort(modelProperties, "http://apache.org/maven");
- assertTrue(sortedProperties.contains(dup0));
- assertTrue(sortedProperties.contains(dup1));
- }
-
- @Test
- public void sortCollection() {
- ModelProperty a = new ModelProperty("http://apache.org/maven/project", null);
- ModelProperty b = new ModelProperty("http://apache.org/maven/project/test#collection", null);
- ModelProperty c = new ModelProperty("http://apache.org/maven/project/test#collection/version", "1.1");
- ModelProperty d = new ModelProperty("http://apache.org/maven/project/test#collection/version", "1.2");
- List<ModelProperty> modelProperties = Arrays.asList(a, b, c, d);
-
- ModelTransformerContext ctx = new ModelTransformerContext(new ArrayList<ModelContainerFactory>());
- List<ModelProperty> sortedProperties = ctx.sort(modelProperties, "http://apache.org/maven");
- assertEquals(a, sortedProperties.get(0));
- assertEquals(b, sortedProperties.get(1));
- assertEquals(d, sortedProperties.get(2));
- assertEquals(c, sortedProperties.get(3));
- }
-
- @Test
- public void sortCollectionWithDualBaseUris() {
- ModelProperty a = new ModelProperty("http://apache.org/maven/project", null);
- ModelProperty b = new ModelProperty("http://apache.org/maven/project/test#collection", null);
- ModelProperty c = new ModelProperty("http://apache.org/maven/project/test#collection/version", "1.1");
- ModelProperty d = new ModelProperty("http://apache.org/maven/project", null);
- ModelProperty e = new ModelProperty("http://apache.org/maven/project/test#collection", null);
- ModelProperty f = new ModelProperty("http://apache.org/maven/project/test#collection/version", "1.2");
- List<ModelProperty> modelProperties = Arrays.asList(a, b, c, d, e, f);
-
- ModelTransformerContext ctx = new ModelTransformerContext(new ArrayList<ModelContainerFactory>());
- List<ModelProperty> sortedProperties = ctx.sort(modelProperties, "http://apache.org/maven");
- assertEquals(a, sortedProperties.get(0));
- assertEquals(b, sortedProperties.get(1));
- assertEquals(f, sortedProperties.get(2));
- assertEquals(c, sortedProperties.get(3));
- }
-
- @Test
- public void sortCollectionWithSubcollections() {
- ModelProperty a = new ModelProperty("http://apache.org/maven/project", null);
- ModelProperty b = new ModelProperty("http://apache.org/maven/project/test#collection", null);
- ModelProperty c = new ModelProperty("http://apache.org/maven/project/test#collection/version", "1.1");
- ModelProperty d = new ModelProperty("http://apache.org/maven/project/test#collection/version/test2#collection", null);
- ModelProperty e = new ModelProperty("http://apache.org/maven/project/test#collection/version/test2#collection/a", "a");
- ModelProperty f = new ModelProperty("http://apache.org/maven/project/test#collection/version/test2#collection/b", "b");
-
- ModelProperty g = new ModelProperty("http://apache.org/maven/project/test#collection/version", "1.2");
- ModelProperty h = new ModelProperty("http://apache.org/maven/project/test#collection/version/test2#collection", null);
- ModelProperty i = new ModelProperty("http://apache.org/maven/project/test#collection/version/test2#collection/c", "c");
- ModelProperty j = new ModelProperty("http://apache.org/maven/project/test#collection/version/test2#collection/d", "d");
- List<ModelProperty> modelProperties = Arrays.asList(a, b, c, d, e, f, g, h, i, j);
-
- ModelTransformerContext ctx = new ModelTransformerContext(new ArrayList<ModelContainerFactory>());
- List<ModelProperty> sortedProperties = ctx.sort(modelProperties, "http://apache.org/maven");
-
- assertEquals(a, sortedProperties.get(0));
- assertEquals(b, sortedProperties.get(1));
-
- assertEquals(g, sortedProperties.get(2));
- assertEquals(h, sortedProperties.get(3));
- assertEquals(j, sortedProperties.get(4));
- assertEquals(i, sortedProperties.get(5));
-
- assertEquals(c, sortedProperties.get(6));
- assertEquals(d, sortedProperties.get(7));
- assertEquals(f, sortedProperties.get(8));
- assertEquals(e, sortedProperties.get(9));
+ public void sortWithDuplicateProperty()
+ {
+ ModelProperty dup0 = new ModelProperty( "http://apache.org/maven/project/version", "1.1" );
+ ModelProperty dup1 = new ModelProperty( "http://apache.org/maven/project/version", "1.2" );
+ List<ModelProperty> modelProperties = Arrays.asList( dup0, dup1 );
+
+ ModelTransformerContext ctx = new ModelTransformerContext( new ArrayList<ModelContainerFactory>() );
+ List<ModelProperty> sortedProperties = ctx.sort( modelProperties, "http://apache.org/maven" );
+ assertTrue( sortedProperties.contains( dup0 ) );
+ assertFalse( sortedProperties.contains( dup1 ) );
+ }
+
+ @Test
+ public void sortWithDuplicateCollectionProperty()
+ {
+ ModelProperty dup0 = new ModelProperty( "http://apache.org/maven/project/test#collection/version", "1.1" );
+ ModelProperty dup1 = new ModelProperty( "http://apache.org/maven/project/test#collection/version", "1.2" );
+ List<ModelProperty> modelProperties = Arrays.asList( dup0, dup1 );
+
+ ModelTransformerContext ctx = new ModelTransformerContext( new ArrayList<ModelContainerFactory>() );
+ List<ModelProperty> sortedProperties = ctx.sort( modelProperties, "http://apache.org/maven" );
+ assertTrue( sortedProperties.contains( dup0 ) );
+ assertTrue( sortedProperties.contains( dup1 ) );
+ }
+
+ @Test
+ public void sortCollection()
+ {
+ ModelProperty a = new ModelProperty( "http://apache.org/maven/project", null );
+ ModelProperty b = new ModelProperty( "http://apache.org/maven/project/test#collection", null );
+ ModelProperty c = new ModelProperty( "http://apache.org/maven/project/test#collection/version", "1.1" );
+ ModelProperty d = new ModelProperty( "http://apache.org/maven/project/test#collection/version", "1.2" );
+ List<ModelProperty> modelProperties = Arrays.asList( a, b, c, d );
+
+ ModelTransformerContext ctx = new ModelTransformerContext( new ArrayList<ModelContainerFactory>() );
+ List<ModelProperty> sortedProperties = ctx.sort( modelProperties, "http://apache.org/maven" );
+ assertEquals( a, sortedProperties.get( 0 ) );
+ assertEquals( b, sortedProperties.get( 1 ) );
+ assertEquals( d, sortedProperties.get( 2 ) );
+ assertEquals( c, sortedProperties.get( 3 ) );
+ }
+
+ @Test
+ public void sortCollectionWithDualBaseUris()
+ {
+ ModelProperty a = new ModelProperty( "http://apache.org/maven/project", null );
+ ModelProperty b = new ModelProperty( "http://apache.org/maven/project/test#collection", null );
+ ModelProperty c = new ModelProperty( "http://apache.org/maven/project/test#collection/version", "1.1" );
+ ModelProperty d = new ModelProperty( "http://apache.org/maven/project", null );
+ ModelProperty e = new ModelProperty( "http://apache.org/maven/project/test#collection", null );
+ ModelProperty f = new ModelProperty( "http://apache.org/maven/project/test#collection/version", "1.2" );
+ List<ModelProperty> modelProperties = Arrays.asList( a, b, c, d, e, f );
+
+ ModelTransformerContext ctx = new ModelTransformerContext( new ArrayList<ModelContainerFactory>() );
+ List<ModelProperty> sortedProperties = ctx.sort( modelProperties, "http://apache.org/maven" );
+ assertEquals( a, sortedProperties.get( 0 ) );
+ assertEquals( b, sortedProperties.get( 1 ) );
+ assertEquals( f, sortedProperties.get( 2 ) );
+ assertEquals( c, sortedProperties.get( 3 ) );
+ }
+
+ @Test
+ public void sortCollectionWithSubcollections()
+ {
+ ModelProperty a = new ModelProperty( "http://apache.org/maven/project", null );
+ ModelProperty b = new ModelProperty( "http://apache.org/maven/project/test#collection", null );
+ ModelProperty c = new ModelProperty( "http://apache.org/maven/project/test#collection/version", "1.1" );
+ ModelProperty d =
+ new ModelProperty( "http://apache.org/maven/project/test#collection/version/test2#collection", null );
+ ModelProperty e =
+ new ModelProperty( "http://apache.org/maven/project/test#collection/version/test2#collection/a", "a" );
+ ModelProperty f =
+ new ModelProperty( "http://apache.org/maven/project/test#collection/version/test2#collection/b", "b" );
+
+ ModelProperty g = new ModelProperty( "http://apache.org/maven/project/test#collection/version", "1.2" );
+ ModelProperty h =
+ new ModelProperty( "http://apache.org/maven/project/test#collection/version/test2#collection", null );
+ ModelProperty i =
+ new ModelProperty( "http://apache.org/maven/project/test#collection/version/test2#collection/c", "c" );
+ ModelProperty j =
+ new ModelProperty( "http://apache.org/maven/project/test#collection/version/test2#collection/d", "d" );
+ List<ModelProperty> modelProperties = Arrays.asList( a, b, c, d, e, f, g, h, i, j );
+
+ ModelTransformerContext ctx = new ModelTransformerContext( new ArrayList<ModelContainerFactory>() );
+ List<ModelProperty> sortedProperties = ctx.sort( modelProperties, "http://apache.org/maven" );
+
+ assertEquals( a, sortedProperties.get( 0 ) );
+ assertEquals( b, sortedProperties.get( 1 ) );
+
+ assertEquals( g, sortedProperties.get( 2 ) );
+ assertEquals( h, sortedProperties.get( 3 ) );
+ assertEquals( j, sortedProperties.get( 4 ) );
+ assertEquals( i, sortedProperties.get( 5 ) );
+
+ assertEquals( c, sortedProperties.get( 6 ) );
+ assertEquals( d, sortedProperties.get( 7 ) );
+ assertEquals( f, sortedProperties.get( 8 ) );
+ assertEquals( e, sortedProperties.get( 9 ) );
}
@Test(expected = IllegalArgumentException.class)
- public void sortWithNullProperties() {
- ModelTransformerContext ctx = new ModelTransformerContext(new ArrayList<ModelContainerFactory>());
- ctx.sort(null, "http://apache.org/maven");
+ public void sortWithNullProperties()
+ {
+ ModelTransformerContext ctx = new ModelTransformerContext( new ArrayList<ModelContainerFactory>() );
+ ctx.sort( null, "http://apache.org/maven" );
}
@Test
- public void sortWithEmptyProperties() {
- ModelTransformerContext ctx = new ModelTransformerContext(new ArrayList<ModelContainerFactory>());
- assertEquals(0, ctx.sort(new ArrayList<ModelProperty>(), "http://apache.org/maven").size());
+ public void sortWithEmptyProperties()
+ {
+ ModelTransformerContext ctx = new ModelTransformerContext( new ArrayList<ModelContainerFactory>() );
+ assertEquals( 0, ctx.sort( new ArrayList<ModelProperty>(), "http://apache.org/maven" ).size() );
}
}
Modified: maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java?rev=678213&r1=678212&r2=678213&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java (original)
+++ maven/sandbox/trunk/shared/maven-shared-model/src/test/java/org/apache/maven/shared/model/impl/DefaultModelDataSourceTest.java Sat Jul 19 13:09:35 2008
@@ -10,204 +10,259 @@
import java.util.List;
import java.io.IOException;
-public class DefaultModelDataSourceTest {
+public class DefaultModelDataSourceTest
+{
private static List<ModelContainerFactory> factories = new ArrayList<ModelContainerFactory>();
- static {
- factories.add(new DummyModelContainerFactory());
+ static
+ {
+ factories.add( new DummyModelContainerFactory() );
}
@Test
- public void mergeModelContainersCollectionsOfCollections() throws IOException {
+ public void mergeModelContainersCollectionsOfCollections()
+ throws IOException
+ {
List<ModelProperty> modelProperties = Arrays.asList(
- new ModelProperty("http://apache.org/maven/project", null),
- new ModelProperty("http://apache.org/maven/project/build", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection", null),
-
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "2.0.2"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId", "maven-compiler-plugin"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId", "org.apache.maven.plugins"),
-
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency/groupId", "gid1"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency/artifactId", "art1"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency/version", "2.0"),
-
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "2.0.2"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId", "maven-compiler-plugin"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId", "org.apache.maven.plugins"),
-
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency/groupId", "gid1"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency/artifactId", "art1"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency/version", "1.0")
- );
-
+ new ModelProperty( "http://apache.org/maven/project", null ),
+ new ModelProperty( "http://apache.org/maven/project/build", null ),
+ new ModelProperty( "http://apache.org/maven/project/build/pluginManagement", null ),
+ new ModelProperty( "http://apache.org/maven/project/build/pluginManagement/plugins#collection", null ),
+
+ new ModelProperty( "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin",
+ null ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "2.0.2" ),
+ new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId",
+ "maven-compiler-plugin" ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId",
+ "org.apache.maven.plugins" ),
+
+ new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection",
+ null ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency",
+ null ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency/groupId",
+ "gid1" ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency/artifactId",
+ "art1" ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency/version",
+ "2.0" ),
+
+ new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null ),
+ new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version",
+ "2.0.2" ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId",
+ "maven-compiler-plugin" ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId",
+ "org.apache.maven.plugins" ),
+
+ new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection",
+ null ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency",
+ null ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency/groupId",
+ "gid1" ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency/artifactId",
+ "art1" ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/dependencies#collection/dependency/version",
+ "1.0" ) );
DummyModelContainerFactory factory = new DummyModelContainerFactory();
DefaultModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
+ datasource.init( modelProperties, factories );
List<ModelProperty> mps = datasource.mergeModelContainers(
- factory.create(new ArrayList<ModelProperty>(modelProperties.subList(4, 13))),
- factory.create(new ArrayList<ModelProperty>(modelProperties.subList(13, 21))));
- assertTrue(mps.containsAll(new ArrayList<ModelProperty>(modelProperties.subList(4, 8))));
+ factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 4, 13 ) ) ),
+ factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 13, 21 ) ) ) );
+ assertTrue( mps.containsAll( new ArrayList<ModelProperty>( modelProperties.subList( 4, 8 ) ) ) );
}
@Test
- public void mergeModelContainers() throws IOException {
+ public void mergeModelContainers()
+ throws IOException
+ {
List<ModelProperty> modelProperties = Arrays.asList(
- new ModelProperty("http://apache.org/maven/project", null),
- new ModelProperty("http://apache.org/maven/project/build", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection", null),
-
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "2.0.2"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId", "maven-compiler-plugin"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId", "org.apache.maven.plugins"),
-
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "2.0.2"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId", "maven-compiler-plugin"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId", "org.apache.maven.plugins")
- );
-
+ new ModelProperty( "http://apache.org/maven/project", null ),
+ new ModelProperty( "http://apache.org/maven/project/build", null ),
+ new ModelProperty( "http://apache.org/maven/project/build/pluginManagement", null ),
+ new ModelProperty( "http://apache.org/maven/project/build/pluginManagement/plugins#collection", null ),
+
+ new ModelProperty( "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin",
+ null ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "2.0.2" ),
+ new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId",
+ "maven-compiler-plugin" ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId",
+ "org.apache.maven.plugins" ),
+
+ new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin",
+ null ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "2.0.2" ),
+ new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId",
+ "maven-compiler-plugin" ),
+ new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId",
+ "org.apache.maven.plugins" ) );
DummyModelContainerFactory factory = new DummyModelContainerFactory();
DefaultModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
+ datasource.init( modelProperties, factories );
List<ModelProperty> mps = datasource.mergeModelContainers(
- factory.create(new ArrayList<ModelProperty>(modelProperties.subList(4, 8))),
- factory.create(new ArrayList<ModelProperty>(modelProperties.subList(8, 12))));
- assertTrue(mps.containsAll(new ArrayList<ModelProperty>(modelProperties.subList(4, 8))));
+ factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 4, 8 ) ) ),
+ factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 8, 12 ) ) ) );
+ assertTrue( mps.containsAll( new ArrayList<ModelProperty>( modelProperties.subList( 4, 8 ) ) ) );
}
@Test
- public void join1() throws DataSourceException, IOException {
+ public void join1()
+ throws DataSourceException, IOException
+ {
List<ModelProperty> modelProperties = Arrays.asList(
- new ModelProperty("http://apache.org/maven/project", null),
- new ModelProperty("http://apache.org/maven/project/build", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "2.0.2"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId", "maven-compiler-plugin"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId", "org.apache.maven.plugins"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "2.0.2"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId", "maven-compiler-plugin"),
- new ModelProperty("http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId", "org.apache.maven.plugins"),
- new ModelProperty("http://apache.org/maven/project/version", "2.0.10-SNAPSHOT"),
- new ModelProperty("http://apache.org/maven/project/artifactId", "maven"),
- new ModelProperty("http://apache.org/maven/project/groupId", "org.apache.maven"),
- new ModelProperty("http://apache.org/maven/project/modelVersion", "4.0.0")
- );
-
+ new ModelProperty( "http://apache.org/maven/project", null ),
+ new ModelProperty( "http://apache.org/maven/project/build", null ),
+ new ModelProperty( "http://apache.org/maven/project/build/pluginManagement", null ),
+ new ModelProperty( "http://apache.org/maven/project/build/pluginManagement/plugins#collection", null ),
+ new ModelProperty( "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin",
+ null ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version", "2.0.2" ),
+ new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId",
+ "maven-compiler-plugin" ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId",
+ "org.apache.maven.plugins" ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin", null ),
+ new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/version",
+ "2.0.2" ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/artifactId",
+ "maven-compiler-plugin" ), new ModelProperty(
+ "http://apache.org/maven/project/build/pluginManagement/plugins#collection/plugin/groupId",
+ "org.apache.maven.plugins" ), new ModelProperty( "http://apache.org/maven/project/version",
+ "2.0.10-SNAPSHOT" ),
+ new ModelProperty( "http://apache.org/maven/project/artifactId", "maven" ),
+ new ModelProperty( "http://apache.org/maven/project/groupId",
+ "org.apache.maven" ), new ModelProperty(
+ "http://apache.org/maven/project/modelVersion", "4.0.0" ) );
DummyModelContainerFactory factory = new DummyModelContainerFactory();
ModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
+ datasource.init( modelProperties, factories );
ModelContainer joinedModelContainer = datasource.join(
- factory.create(new ArrayList<ModelProperty>(modelProperties.subList(4, 8))),
- factory.create(new ArrayList<ModelProperty>(modelProperties.subList(8, 12))));
+ factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 4, 8 ) ) ),
+ factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 8, 12 ) ) ) );
- for (ModelProperty mp : joinedModelContainer.getProperties()) {
- System.out.println("-" + mp);
+ for ( ModelProperty mp : joinedModelContainer.getProperties() )
+ {
+ System.out.println( "-" + mp );
}
- if (!datasource.getModelProperties().containsAll(joinedModelContainer.getProperties())) {
+ if ( !datasource.getModelProperties().containsAll( joinedModelContainer.getProperties() ) )
+ {
throw new IOException();
}
- for (ModelProperty mp : datasource.getModelProperties()) {
- System.out.println("+" + mp);
+ for ( ModelProperty mp : datasource.getModelProperties() )
+ {
+ System.out.println( "+" + mp );
}
}
@Test
- public void query() throws DataSourceException {
- ModelProperty mpA = new ModelProperty("container-marker/a", null);
+ public void query()
+ throws DataSourceException
+ {
+ ModelProperty mpA = new ModelProperty( "container-marker/a", null );
List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
- modelProperties.add(new ModelProperty("container-marker", null));
- modelProperties.add(mpA);
+ modelProperties.add( new ModelProperty( "container-marker", null ) );
+ modelProperties.add( mpA );
- modelProperties.add(new ModelProperty("container-marker", null));
- modelProperties.add(new ModelProperty("container-marker/b", null));
+ modelProperties.add( new ModelProperty( "container-marker", null ) );
+ modelProperties.add( new ModelProperty( "container-marker/b", null ) );
ModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
+ datasource.init( modelProperties, factories );
- List<ModelContainer> containers = datasource.queryFor("container-marker");
- assertEquals("Number of containers: ", 2, containers.size());
- assertEquals("Properties for container 'a':", 2, containers.get(0).getProperties().size());
- assertEquals(mpA, containers.get(0).getProperties().get(1));
+ List<ModelContainer> containers = datasource.queryFor( "container-marker" );
+ assertEquals( "Number of containers: ", 2, containers.size() );
+ assertEquals( "Properties for container 'a':", 2, containers.get( 0 ).getProperties().size() );
+ assertEquals( mpA, containers.get( 0 ).getProperties().get( 1 ) );
}
@Test
- public void queryWithOneContainerMarker() throws DataSourceException {
+ public void queryWithOneContainerMarker()
+ throws DataSourceException
+ {
List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
- modelProperties.add(new ModelProperty("container-marker", null));
+ modelProperties.add( new ModelProperty( "container-marker", null ) );
ModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
+ datasource.init( modelProperties, factories );
- List<ModelContainer> containers = datasource.queryFor("container-marker");
- assertEquals("Number of containers: ", 1, containers.size());
- assertEquals("Properties for container 'a':", 1, containers.get(0).getProperties().size());
+ List<ModelContainer> containers = datasource.queryFor( "container-marker" );
+ assertEquals( "Number of containers: ", 1, containers.size() );
+ assertEquals( "Properties for container 'a':", 1, containers.get( 0 ).getProperties().size() );
}
@Test
- public void queryWithMultipleContainerMarkers() throws DataSourceException {
+ public void queryWithMultipleContainerMarkers()
+ throws DataSourceException
+ {
List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
- modelProperties.add(new ModelProperty("container-marker", null));
- modelProperties.add(new ModelProperty("container-marker", null));
- modelProperties.add(new ModelProperty("acontainer-marker-1", null));
- ModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
-
- List<ModelContainer> containers = datasource.queryFor("container-marker");
- assertEquals("Number of containers: ", 2, containers.size());
- assertEquals("Properties for container 'a':", 1, containers.get(0).getProperties().size());
+ modelProperties.add( new ModelProperty( "container-marker", null ) );
+ modelProperties.add( new ModelProperty( "container-marker", null ) );
+ modelProperties.add( new ModelProperty( "acontainer-marker-1", null ) );
+ ModelDataSource datasource = new DefaultModelDataSource();
+ datasource.init( modelProperties, factories );
+
+ List<ModelContainer> containers = datasource.queryFor( "container-marker" );
+ assertEquals( "Number of containers: ", 2, containers.size() );
+ assertEquals( "Properties for container 'a':", 1, containers.get( 0 ).getProperties().size() );
}
@Test(expected = DataSourceException.class)
- public void queryWithUriNotInContainerFactory() throws DataSourceException {
+ public void queryWithUriNotInContainerFactory()
+ throws DataSourceException
+ {
List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
- modelProperties.add(new ModelProperty("a", null));
+ modelProperties.add( new ModelProperty( "a", null ) );
ModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
+ datasource.init( modelProperties, factories );
- datasource.queryFor("bogus");
+ datasource.queryFor( "bogus" );
}
@Test
- public void joinEmptyContainer() throws DataSourceException {
+ public void joinEmptyContainer()
+ throws DataSourceException
+ {
List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
- modelProperties.add(new ModelProperty("a", null));
+ modelProperties.add( new ModelProperty( "a", null ) );
DummyModelContainerFactory factory = new DummyModelContainerFactory();
ModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
+ datasource.init( modelProperties, factories );
- ModelContainer modelContainerA = factory.create(new ArrayList<ModelProperty>(modelProperties));
- ModelContainer modelContainer = datasource.join(
- modelContainerA, factory.create(new ArrayList<ModelProperty>()));
- assertEquals(modelContainer, modelContainerA);
+ ModelContainer modelContainerA = factory.create( new ArrayList<ModelProperty>( modelProperties ) );
+ ModelContainer modelContainer =
+ datasource.join( modelContainerA, factory.create( new ArrayList<ModelProperty>() ) );
+ assertEquals( modelContainer, modelContainerA );
}
/*
@@ -233,111 +288,129 @@
*/
@Test
- public void cannotModifyDataSourceFromInitializedList() {
+ public void cannotModifyDataSourceFromInitializedList()
+ {
List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
- modelProperties.add(new ModelProperty("a", null));
- modelProperties.add(new ModelProperty("b", null));
+ modelProperties.add( new ModelProperty( "a", null ) );
+ modelProperties.add( new ModelProperty( "b", null ) );
ModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
+ datasource.init( modelProperties, factories );
- modelProperties.remove(0);
+ modelProperties.remove( 0 );
- assertEquals(2, datasource.getModelProperties().size());
+ assertEquals( 2, datasource.getModelProperties().size() );
}
@Test
- public void cannotModifyDataSourceFromReturnedList() {
+ public void cannotModifyDataSourceFromReturnedList()
+ {
List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
- modelProperties.add(new ModelProperty("a", null));
- modelProperties.add(new ModelProperty("b", null));
+ modelProperties.add( new ModelProperty( "a", null ) );
+ modelProperties.add( new ModelProperty( "b", null ) );
ModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
+ datasource.init( modelProperties, factories );
- datasource.getModelProperties().remove(0);
+ datasource.getModelProperties().remove( 0 );
- assertEquals(2, datasource.getModelProperties().size());
+ assertEquals( 2, datasource.getModelProperties().size() );
}
@Test
- public void join() throws DataSourceException {
- ModelProperty mpA = new ModelProperty("maven/a", null);
- ModelProperty mpB = new ModelProperty("maven/b", null);
- ModelProperty mpC = new ModelProperty("maven/a", null);
+ public void join()
+ throws DataSourceException
+ {
+ ModelProperty mpA = new ModelProperty( "maven/a", null );
+ ModelProperty mpB = new ModelProperty( "maven/b", null );
+ ModelProperty mpC = new ModelProperty( "maven/a", null );
- List<ModelProperty> modelProperties = Arrays.asList(mpA, mpB, mpC);
+ List<ModelProperty> modelProperties = Arrays.asList( mpA, mpB, mpC );
DummyModelContainerFactory factory = new DummyModelContainerFactory();
ModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
+ datasource.init( modelProperties, factories );
ModelContainer joinedModelContainer = datasource.join(
- factory.create(new ArrayList<ModelProperty>(modelProperties.subList(0, 1))),
- factory.create(new ArrayList<ModelProperty>(modelProperties.subList(1, 3))));
+ factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 0, 1 ) ) ),
+ factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 1, 3 ) ) ) );
- assertEquals(2, joinedModelContainer.getProperties().size());
- assertFalse(joinedModelContainer.getProperties().contains(mpC));
+ assertEquals( 2, joinedModelContainer.getProperties().size() );
+ assertFalse( joinedModelContainer.getProperties().contains( mpC ) );
}
@Test
- public void delete() {
- ModelProperty mpA = new ModelProperty("a", null);
- ModelProperty mpB = new ModelProperty("b", null);
- ModelProperty mpC = new ModelProperty("a", null);
+ public void delete()
+ {
+ ModelProperty mpA = new ModelProperty( "a", null );
+ ModelProperty mpB = new ModelProperty( "b", null );
+ ModelProperty mpC = new ModelProperty( "a", null );
- List<ModelProperty> modelProperties = Arrays.asList(mpA, mpB, mpC);
+ List<ModelProperty> modelProperties = Arrays.asList( mpA, mpB, mpC );
DummyModelContainerFactory factory = new DummyModelContainerFactory();
ModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
- datasource.delete(factory.create(new ArrayList<ModelProperty>(modelProperties.subList(0, 1))));
+ datasource.init( modelProperties, factories );
+ datasource.delete( factory.create( new ArrayList<ModelProperty>( modelProperties.subList( 0, 1 ) ) ) );
- assertEquals(2, datasource.getModelProperties().size());
- assertFalse(datasource.getModelProperties().contains(mpA));
+ assertEquals( 2, datasource.getModelProperties().size() );
+ assertFalse( datasource.getModelProperties().contains( mpA ) );
}
@Test(expected = IllegalArgumentException.class)
- public void deleteNullModelContainer() throws IllegalArgumentException {
+ public void deleteNullModelContainer()
+ throws IllegalArgumentException
+ {
List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
- modelProperties.add(new ModelProperty("a", null));
+ modelProperties.add( new ModelProperty( "a", null ) );
ModelDataSource datasource = new DefaultModelDataSource();
- datasource.init(modelProperties, factories);
- datasource.delete(null);
+ datasource.init( modelProperties, factories );
+ datasource.delete( null );
}
- private static class DummyModelContainerFactory implements ModelContainerFactory {
+ private static class DummyModelContainerFactory
+ implements ModelContainerFactory
+ {
- public Collection<String> getUris() {
- return Arrays.asList("container-marker");
+ public Collection<String> getUris()
+ {
+ return Arrays.asList( "container-marker" );
}
- public ModelContainer create(final List<ModelProperty> modelProperties) {
- return new DummyModelContainer(modelProperties);
+ public ModelContainer create( final List<ModelProperty> modelProperties )
+ {
+ return new DummyModelContainer( modelProperties );
}
- private static class DummyModelContainer implements ModelContainer {
+ private static class DummyModelContainer
+ implements ModelContainer
+ {
private List<ModelProperty> modelProperties;
- private DummyModelContainer(List<ModelProperty> modelProperties) {
- this.modelProperties = new ArrayList<ModelProperty>(modelProperties);
+ private DummyModelContainer( List<ModelProperty> modelProperties )
+ {
+ this.modelProperties = new ArrayList<ModelProperty>( modelProperties );
}
- public List<ModelProperty> getProperties() {
+ public List<ModelProperty> getProperties()
+ {
return modelProperties;
}
- public ModelContainerAction containerAction(ModelContainer modelContainer) {
+ public ModelContainerAction containerAction( ModelContainer modelContainer )
+ {
return ModelContainerAction.NOP;
}
- public ModelContainer createNewInstance(List<ModelProperty> modelProperties) {
- return new DummyModelContainer(modelProperties);
+ public ModelContainer createNewInstance( List<ModelProperty> modelProperties )
+ {
+ return new DummyModelContainer( modelProperties );
}
- public void sort(List<ModelProperty> modelProperties) {
+ public void sort( List<ModelProperty> modelProperties )
+ {
}
}