You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by xa...@apache.org on 2007/06/05 12:02:43 UTC

svn commit: r544459 [33/36] - in /incubator/ivy/core/trunk: src/java/org/apache/ivy/ src/java/org/apache/ivy/ant/ src/java/org/apache/ivy/core/ src/java/org/apache/ivy/core/cache/ src/java/org/apache/ivy/core/check/ src/java/org/apache/ivy/core/deliver...

Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java Tue Jun  5 05:02:27 2007
@@ -43,279 +43,351 @@
 import org.apache.ivy.plugins.parser.AbstractModuleDescriptorParserTester;
 import org.apache.ivy.util.XMLHelper;
 
-
 /**
  * 
  */
 public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParserTester {
     // junit test -- DO NOT REMOVE used by ant to know it's a junit test
-    
+
     private IvySettings _settings = new IvySettings();
+
     public void testSimple() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-simple.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-simple.xml"), true);
         assertNotNull(md);
         assertEquals("myorg", md.getModuleRevisionId().getOrganisation());
         assertEquals("mymodule", md.getModuleRevisionId().getName());
         assertEquals(Ivy.getWorkingRevision(), md.getModuleRevisionId().getRevision());
         assertEquals("integration", md.getStatus());
-        
+
         assertNotNull(md.getConfigurations());
-        assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}), Arrays.asList(md.getConfigurations()));
-        
+        assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}), Arrays
+                .asList(md.getConfigurations()));
+
         assertNotNull(md.getArtifacts("default"));
         assertEquals(1, md.getArtifacts("default").length);
         assertEquals("mymodule", md.getArtifacts("default")[0].getName());
         assertEquals("jar", md.getArtifacts("default")[0].getType());
-        
+
         assertNotNull(md.getDependencies());
         assertEquals(0, md.getDependencies().length);
     }
-    
+
     public void testEmptyDependencies() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-empty-dependencies.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-empty-dependencies.xml"), true);
         assertNotNull(md);
         assertEquals("myorg", md.getModuleRevisionId().getOrganisation());
         assertEquals("mymodule", md.getModuleRevisionId().getName());
         assertEquals("myrev", md.getModuleRevisionId().getRevision());
         assertEquals("integration", md.getStatus());
-        
+
         assertNotNull(md.getConfigurations());
-        assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}), Arrays.asList(md.getConfigurations()));
-        
+        assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}), Arrays
+                .asList(md.getConfigurations()));
+
         assertNotNull(md.getArtifacts("default"));
         assertEquals(1, md.getArtifacts("default").length);
         assertEquals("mymodule", md.getArtifacts("default")[0].getName());
         assertEquals("jar", md.getArtifacts("default")[0].getType());
-        
+
         assertNotNull(md.getDependencies());
         assertEquals(0, md.getDependencies().length);
     }
-    
+
     public void testBad() throws IOException {
         try {
-            XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-bad.xml"), true);
+            XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+                getClass().getResource("test-bad.xml"), true);
             fail("bad ivy file raised no error");
         } catch (ParseException ex) {
             if (XMLHelper.canUseSchemaValidation()) {
-                assertTrue("exception message not explicit. It should contain 'modul', but it's:"+ex.getMessage(), ex.getMessage().indexOf("'modul'") != -1);
+                assertTrue("exception message not explicit. It should contain 'modul', but it's:"
+                        + ex.getMessage(), ex.getMessage().indexOf("'modul'") != -1);
             }
         }
     }
 
     public void testBadOrg() throws IOException {
         try {
-            XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-bad-org.xml"), true);
+            XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+                getClass().getResource("test-bad-org.xml"), true);
             if (XMLHelper.canUseSchemaValidation()) {
-            	fail("bad ivy file raised no error");
+                fail("bad ivy file raised no error");
             }
         } catch (ParseException ex) {
             if (XMLHelper.canUseSchemaValidation()) {
-                assertTrue("invalid exception: "+ex.getMessage(), ex.getMessage().indexOf("organization") != -1);
+                assertTrue("invalid exception: " + ex.getMessage(), ex.getMessage().indexOf(
+                    "organization") != -1);
             }
         }
     }
 
     public void testBadConfs() throws IOException {
         try {
-            XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-bad-confs.xml"), true);
+            XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+                getClass().getResource("test-bad-confs.xml"), true);
             fail("bad ivy file raised no error");
         } catch (ParseException ex) {
-            assertTrue("invalid exception: "+ex.getMessage(), ex.getMessage().indexOf("invalidConf") != -1);
+            assertTrue("invalid exception: " + ex.getMessage(), ex.getMessage().indexOf(
+                "invalidConf") != -1);
         }
     }
 
     public void testNoValidate() throws IOException, ParseException {
-        XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-novalidate.xml"), false);
+        XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-novalidate.xml"), false);
     }
 
     public void testBadVersion() throws IOException {
         try {
-            XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-bad-version.xml"), true);
+            XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+                getClass().getResource("test-bad-version.xml"), true);
             fail("bad version ivy file raised no error");
         } catch (ParseException ex) {
             // ok
         }
     }
-    
+
     public void testFull() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test.xml"), true);
         assertNotNull(md);
         assertEquals("myorg", md.getModuleRevisionId().getOrganisation());
         assertEquals("mymodule", md.getModuleRevisionId().getName());
         assertEquals("myrev", md.getModuleRevisionId().getRevision());
-        assertEquals("integration", md.getStatus()); 
+        assertEquals("integration", md.getStatus());
         Date pubdate = new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime();
         assertEquals(pubdate, md.getPublicationDate());
-        
+
         License[] licenses = md.getLicenses();
         assertEquals(1, licenses.length);
         assertEquals("MyLicense", licenses[0].getName());
         assertEquals("http://www.my.org/mymodule/mylicense.html", licenses[0].getUrl());
-        
+
         assertEquals("http://www.my.org/mymodule/", md.getHomePage());
-        
+
         Configuration[] confs = md.getConfigurations();
         assertNotNull(confs);
         assertEquals(5, confs.length);
-        
+
         assertConf(md, "myconf1", "desc 1", Configuration.Visibility.PUBLIC, new String[0]);
         assertConf(md, "myconf2", "desc 2", Configuration.Visibility.PUBLIC, new String[0]);
         assertConf(md, "myconf3", "desc 3", Configuration.Visibility.PRIVATE, new String[0]);
-        assertConf(md, "myconf4", "desc 4", Configuration.Visibility.PUBLIC, new String[] {"myconf1", "myconf2"});
+        assertConf(md, "myconf4", "desc 4", Configuration.Visibility.PUBLIC, new String[] {
+                "myconf1", "myconf2"});
         assertConf(md, "myoldconf", "my old desc", Configuration.Visibility.PUBLIC, new String[0]);
-        
-        assertArtifacts(md.getArtifacts("myconf1"), new String[] {"myartifact1", "myartifact2", "myartifact3", "myartifact4"});
+
+        assertArtifacts(md.getArtifacts("myconf1"), new String[] {"myartifact1", "myartifact2",
+                "myartifact3", "myartifact4"});
         assertArtifacts(md.getArtifacts("myconf2"), new String[] {"myartifact1", "myartifact3"});
-        assertArtifacts(md.getArtifacts("myconf3"), new String[] {"myartifact1", "myartifact3", "myartifact4"});
+        assertArtifacts(md.getArtifacts("myconf3"), new String[] {"myartifact1", "myartifact3",
+                "myartifact4"});
         assertArtifacts(md.getArtifacts("myconf4"), new String[] {"myartifact1"});
-        
+
         DependencyDescriptor[] dependencies = md.getDependencies();
         assertNotNull(dependencies);
         assertEquals(13, dependencies.length);
-        
+
         // no conf def => equivalent to *->*
         DependencyDescriptor dd = getDependency(dependencies, "mymodule2");
         assertNotNull(dd);
         assertEquals("myorg", dd.getDependencyId().getOrganisation());
         assertEquals("2.0", dd.getDependencyRevisionId().getRevision());
         assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getDependencyConfigurations("myconf1")));        
-        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf2", "myconf3", "myconf4"})));
-        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3", "myconf4"}, new String[0]);
+        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf1")));
+        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd
+                .getDependencyConfigurations(new String[] {"myconf2", "myconf3", "myconf4"})));
+        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
+                "myconf4"}, new String[0]);
         assertFalse(dd.isChanging());
         assertTrue(dd.isTransitive());
-        
+
         // changing = true
         dd = getDependency(dependencies, "mymodule3");
         assertNotNull(dd);
         assertTrue(dd.isChanging());
         assertFalse(dd.isTransitive());
-        
+
         // conf="myconf1" => equivalent to myconf1->myconf1
         dd = getDependency(dependencies, "yourmodule1");
         assertNotNull(dd);
         assertEquals("yourorg", dd.getDependencyId().getOrganisation());
         assertEquals("1.1", dd.getDependencyRevisionId().getRevision());
-        assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(dd.getDependencyConfigurations("myconf1")));        
-        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf2", "myconf3", "myconf4"})));
-        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3", "myconf4"}, new String[0]);
-        
+        assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf1")));
+        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd
+                .getDependencyConfigurations(new String[] {"myconf2", "myconf3", "myconf4"})));
+        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
+                "myconf4"}, new String[0]);
+
         // conf="myconf1->yourconf1"
         dd = getDependency(dependencies, "yourmodule2");
         assertNotNull(dd);
         assertEquals("yourorg", dd.getDependencyId().getOrganisation());
         assertEquals("2+", dd.getDependencyRevisionId().getRevision());
-        assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"yourconf1"}), Arrays.asList(dd.getDependencyConfigurations("myconf1")));        
-        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf2", "myconf3", "myconf4"})));
-        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3", "myconf4"}, new String[0]);
-        
+        assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"yourconf1"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf1")));
+        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd
+                .getDependencyConfigurations(new String[] {"myconf2", "myconf3", "myconf4"})));
+        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
+                "myconf4"}, new String[0]);
+
         // conf="myconf1->yourconf1, yourconf2"
         dd = getDependency(dependencies, "yourmodule3");
         assertNotNull(dd);
         assertEquals("yourorg", dd.getDependencyId().getOrganisation());
         assertEquals("3.1", dd.getDependencyRevisionId().getRevision());
-        assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}), Arrays.asList(dd.getDependencyConfigurations("myconf1")));        
-        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf2", "myconf3", "myconf4"})));
-        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3", "myconf4"}, new String[0]);
-        
+        assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf1")));
+        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd
+                .getDependencyConfigurations(new String[] {"myconf2", "myconf3", "myconf4"})));
+        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
+                "myconf4"}, new String[0]);
+
         // conf="myconf1, myconf2->yourconf1, yourconf2"
         dd = getDependency(dependencies, "yourmodule4");
         assertNotNull(dd);
         assertEquals("yourorg", dd.getDependencyId().getOrganisation());
         assertEquals("4.1", dd.getDependencyRevisionId().getRevision());
-        assertEquals(new HashSet(Arrays.asList(new String[] {"myconf1", "myconf2"})), new HashSet(Arrays.asList(dd.getModuleConfigurations())));
-        assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}), Arrays.asList(dd.getDependencyConfigurations("myconf1")));        
-        assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}), Arrays.asList(dd.getDependencyConfigurations("myconf2")));        
-        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf3", "myconf4"})));
-        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3", "myconf4"}, new String[0]);
-        
+        assertEquals(new HashSet(Arrays.asList(new String[] {"myconf1", "myconf2"})), new HashSet(
+                Arrays.asList(dd.getModuleConfigurations())));
+        assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf1")));
+        assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf2")));
+        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd
+                .getDependencyConfigurations(new String[] {"myconf3", "myconf4"})));
+        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
+                "myconf4"}, new String[0]);
+
         // conf="myconf1->yourconf1;myconf2->yourconf1, yourconf2"
         dd = getDependency(dependencies, "yourmodule5");
         assertNotNull(dd);
         assertEquals("yourorg", dd.getDependencyId().getOrganisation());
         assertEquals("5.1", dd.getDependencyRevisionId().getRevision());
-        assertEquals(new HashSet(Arrays.asList(new String[] {"myconf1", "myconf2"})), new HashSet(Arrays.asList(dd.getModuleConfigurations())));
-        assertEquals(Arrays.asList(new String[] {"yourconf1"}), Arrays.asList(dd.getDependencyConfigurations("myconf1")));        
-        assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}), Arrays.asList(dd.getDependencyConfigurations("myconf2")));        
-        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf3", "myconf4"})));
-        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3", "myconf4"}, new String[0]);
-        
+        assertEquals(new HashSet(Arrays.asList(new String[] {"myconf1", "myconf2"})), new HashSet(
+                Arrays.asList(dd.getModuleConfigurations())));
+        assertEquals(Arrays.asList(new String[] {"yourconf1"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf1")));
+        assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf2")));
+        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd
+                .getDependencyConfigurations(new String[] {"myconf3", "myconf4"})));
+        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
+                "myconf4"}, new String[0]);
+
         // conf="*->@"
         dd = getDependency(dependencies, "yourmodule11");
         assertNotNull(dd);
         assertEquals("yourorg", dd.getDependencyId().getOrganisation());
         assertEquals("11.1", dd.getDependencyRevisionId().getRevision());
-        assertEquals(new HashSet(Arrays.asList(new String[] {"*"})), new HashSet(Arrays.asList(dd.getModuleConfigurations())));
-        assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(dd.getDependencyConfigurations("myconf1")));        
-        assertEquals(Arrays.asList(new String[] {"myconf2"}), Arrays.asList(dd.getDependencyConfigurations("myconf2")));        
-        assertEquals(Arrays.asList(new String[] {"myconf3"}), Arrays.asList(dd.getDependencyConfigurations("myconf3")));        
-        assertEquals(Arrays.asList(new String[] {"myconf4"}), Arrays.asList(dd.getDependencyConfigurations("myconf4")));        
+        assertEquals(new HashSet(Arrays.asList(new String[] {"*"})), new HashSet(Arrays.asList(dd
+                .getModuleConfigurations())));
+        assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf1")));
+        assertEquals(Arrays.asList(new String[] {"myconf2"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf2")));
+        assertEquals(Arrays.asList(new String[] {"myconf3"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf3")));
+        assertEquals(Arrays.asList(new String[] {"myconf4"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf4")));
 
         dd = getDependency(dependencies, "yourmodule6");
         assertNotNull(dd);
         assertEquals("yourorg", dd.getDependencyId().getOrganisation());
         assertEquals("latest.integration", dd.getDependencyRevisionId().getRevision());
-        assertEquals(new HashSet(Arrays.asList(new String[] {"myconf1", "myconf2"})), new HashSet(Arrays.asList(dd.getModuleConfigurations())));
-        assertEquals(Arrays.asList(new String[] {"yourconf1"}), Arrays.asList(dd.getDependencyConfigurations("myconf1")));        
-        assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}), Arrays.asList(dd.getDependencyConfigurations("myconf2")));        
-        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf3", "myconf4"})));
-        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3", "myconf4"}, new String[0]);
-        
+        assertEquals(new HashSet(Arrays.asList(new String[] {"myconf1", "myconf2"})), new HashSet(
+                Arrays.asList(dd.getModuleConfigurations())));
+        assertEquals(Arrays.asList(new String[] {"yourconf1"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf1")));
+        assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf2")));
+        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd
+                .getDependencyConfigurations(new String[] {"myconf3", "myconf4"})));
+        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
+                "myconf4"}, new String[0]);
+
         dd = getDependency(dependencies, "yourmodule7");
         assertNotNull(dd);
         assertEquals("yourorg", dd.getDependencyId().getOrganisation());
         assertEquals("7.1", dd.getDependencyRevisionId().getRevision());
-        assertEquals(new HashSet(Arrays.asList(new String[] {"myconf1", "myconf2"})), new HashSet(Arrays.asList(dd.getModuleConfigurations())));
-        assertEquals(Arrays.asList(new String[] {"yourconf1"}), Arrays.asList(dd.getDependencyConfigurations("myconf1")));        
-        assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}), Arrays.asList(dd.getDependencyConfigurations("myconf2")));        
-        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd.getDependencyConfigurations(new String[] {"myconf3", "myconf4"})));
-        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3", "myconf4"}, new String[0]);
-        
+        assertEquals(new HashSet(Arrays.asList(new String[] {"myconf1", "myconf2"})), new HashSet(
+                Arrays.asList(dd.getModuleConfigurations())));
+        assertEquals(Arrays.asList(new String[] {"yourconf1"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf1")));
+        assertEquals(Arrays.asList(new String[] {"yourconf1", "yourconf2"}), Arrays.asList(dd
+                .getDependencyConfigurations("myconf2")));
+        assertEquals(Arrays.asList(new String[] {}), Arrays.asList(dd
+                .getDependencyConfigurations(new String[] {"myconf3", "myconf4"})));
+        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1", "myconf2", "myconf3",
+                "myconf4"}, new String[0]);
+
         dd = getDependency(dependencies, "yourmodule8");
         assertNotNull(dd);
         assertEquals("yourorg", dd.getDependencyId().getOrganisation());
         assertEquals("8.1", dd.getDependencyRevisionId().getRevision());
-        assertEquals(new HashSet(Arrays.asList(new String[] {"*"})), new HashSet(Arrays.asList(dd.getModuleConfigurations())));
-        assertDependencyArtifacts(dd, new String[] {"myconf1"}, new String[] {"yourartifact8-1", "yourartifact8-2"});
-        assertDependencyArtifacts(dd, new String[] {"myconf2"}, new String[] {"yourartifact8-1", "yourartifact8-2"});
-        assertDependencyArtifacts(dd, new String[] {"myconf3"}, new String[] {"yourartifact8-1", "yourartifact8-2"});
-        assertDependencyArtifacts(dd, new String[] {"myconf4"}, new String[] {"yourartifact8-1", "yourartifact8-2"});
-        
+        assertEquals(new HashSet(Arrays.asList(new String[] {"*"})), new HashSet(Arrays.asList(dd
+                .getModuleConfigurations())));
+        assertDependencyArtifacts(dd, new String[] {"myconf1"}, new String[] {"yourartifact8-1",
+                "yourartifact8-2"});
+        assertDependencyArtifacts(dd, new String[] {"myconf2"}, new String[] {"yourartifact8-1",
+                "yourartifact8-2"});
+        assertDependencyArtifacts(dd, new String[] {"myconf3"}, new String[] {"yourartifact8-1",
+                "yourartifact8-2"});
+        assertDependencyArtifacts(dd, new String[] {"myconf4"}, new String[] {"yourartifact8-1",
+                "yourartifact8-2"});
+
         dd = getDependency(dependencies, "yourmodule9");
         assertNotNull(dd);
         assertEquals("yourorg", dd.getDependencyId().getOrganisation());
         assertEquals("9.1", dd.getDependencyRevisionId().getRevision());
-        assertEquals(new HashSet(Arrays.asList(new String[] {"myconf1", "myconf2", "myconf3"})), new HashSet(Arrays.asList(dd.getModuleConfigurations())));
+        assertEquals(new HashSet(Arrays.asList(new String[] {"myconf1", "myconf2", "myconf3"})),
+            new HashSet(Arrays.asList(dd.getModuleConfigurations())));
         assertDependencyArtifacts(dd, new String[] {"myconf1"}, new String[] {"yourartifact9-1"});
-        assertDependencyArtifacts(dd, new String[] {"myconf2"}, new String[] {"yourartifact9-1", "yourartifact9-2"});
+        assertDependencyArtifacts(dd, new String[] {"myconf2"}, new String[] {"yourartifact9-1",
+                "yourartifact9-2"});
         assertDependencyArtifacts(dd, new String[] {"myconf3"}, new String[] {"yourartifact9-2"});
         assertDependencyArtifacts(dd, new String[] {"myconf4"}, new String[] {});
         assertDependencyArtifactExcludeRules(dd, new String[] {"myconf1"}, new String[] {});
         assertDependencyArtifactExcludeRules(dd, new String[] {"myconf2"}, new String[] {});
         assertDependencyArtifactExcludeRules(dd, new String[] {"myconf3"}, new String[] {});
         assertDependencyArtifactExcludeRules(dd, new String[] {"myconf4"}, new String[] {});
-        
+
         dd = getDependency(dependencies, "yourmodule10");
         assertNotNull(dd);
         assertEquals("yourorg", dd.getDependencyId().getOrganisation());
         assertEquals("10.1", dd.getDependencyRevisionId().getRevision());
-        assertEquals(new HashSet(Arrays.asList(new String[] {"*"})), new HashSet(Arrays.asList(dd.getModuleConfigurations())));
-        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1"}, new String[] {"your.*", PatternMatcher.ANY_EXPRESSION});
-        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf2"}, new String[] {"your.*", PatternMatcher.ANY_EXPRESSION});
-        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf3"}, new String[] {"your.*", PatternMatcher.ANY_EXPRESSION});
-        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf4"}, new String[] {"your.*", PatternMatcher.ANY_EXPRESSION});
-        assertDependencyArtifactExcludeRules(dd, new String[] {"myconf1"}, new String[] {"toexclude"});
-        assertDependencyArtifactExcludeRules(dd, new String[] {"myconf2"}, new String[] {"toexclude"});
-        assertDependencyArtifactExcludeRules(dd, new String[] {"myconf3"}, new String[] {"toexclude"});
-        assertDependencyArtifactExcludeRules(dd, new String[] {"myconf4"}, new String[] {"toexclude"});
-                
+        assertEquals(new HashSet(Arrays.asList(new String[] {"*"})), new HashSet(Arrays.asList(dd
+                .getModuleConfigurations())));
+        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf1"}, new String[] {"your.*",
+                PatternMatcher.ANY_EXPRESSION});
+        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf2"}, new String[] {"your.*",
+                PatternMatcher.ANY_EXPRESSION});
+        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf3"}, new String[] {"your.*",
+                PatternMatcher.ANY_EXPRESSION});
+        assertDependencyArtifactIncludeRules(dd, new String[] {"myconf4"}, new String[] {"your.*",
+                PatternMatcher.ANY_EXPRESSION});
+        assertDependencyArtifactExcludeRules(dd, new String[] {"myconf1"},
+            new String[] {"toexclude"});
+        assertDependencyArtifactExcludeRules(dd, new String[] {"myconf2"},
+            new String[] {"toexclude"});
+        assertDependencyArtifactExcludeRules(dd, new String[] {"myconf3"},
+            new String[] {"toexclude"});
+        assertDependencyArtifactExcludeRules(dd, new String[] {"myconf4"},
+            new String[] {"toexclude"});
+
         ConflictManager cm = md.getConflictManager(new ModuleId("yourorg", "yourmodule1"));
         assertNotNull(cm);
         assertTrue(cm instanceof NoConflictManager);
-        
+
         cm = md.getConflictManager(new ModuleId("yourorg", "yourmodule2"));
         assertNotNull(cm);
         assertTrue(cm instanceof NoConflictManager);
@@ -323,80 +395,89 @@
         cm = md.getConflictManager(new ModuleId("theirorg", "theirmodule1"));
         assertNotNull(cm);
         assertTrue(cm instanceof FixedConflictManager);
-        FixedConflictManager fcm = (FixedConflictManager)cm;
+        FixedConflictManager fcm = (FixedConflictManager) cm;
         assertEquals(2, fcm.getRevs().size());
         assertTrue(fcm.getRevs().contains("1.0"));
         assertTrue(fcm.getRevs().contains("1.1"));
 
         cm = md.getConflictManager(new ModuleId("theirorg", "theirmodule2"));
         assertNull(cm);
-        
+
         ExcludeRule[] rules = md.getAllExcludeRules();
         assertNotNull(rules);
         assertEquals(2, rules.length);
         assertEquals(GlobPatternMatcher.INSTANCE, rules[0].getMatcher());
         assertEquals(ExactPatternMatcher.INSTANCE, rules[1].getMatcher());
-        assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(rules[0].getConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"myconf1", "myconf2", "myconf3", "myconf4","myoldconf"}), Arrays.asList(rules[1].getConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"myconf1"}), Arrays.asList(rules[0]
+                .getConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"myconf1", "myconf2", "myconf3", "myconf4",
+                "myoldconf"}), Arrays.asList(rules[1].getConfigurations()));
     }
 
     public void testBug60() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-bug60.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-bug60.xml"), true);
         assertNotNull(md);
         assertEquals("myorg", md.getModuleRevisionId().getOrganisation());
         assertEquals("mymodule", md.getModuleRevisionId().getName());
         assertEquals("myrev", md.getModuleRevisionId().getRevision());
-        assertEquals("integration", md.getStatus()); 
+        assertEquals("integration", md.getStatus());
         Date pubdate = new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime();
         assertEquals(pubdate, md.getPublicationDate());
-        
-        assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}), Arrays.asList(md.getConfigurations()));
-        
+
+        assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}), Arrays
+                .asList(md.getConfigurations()));
+
         assertArtifacts(md.getArtifacts("default"), new String[] {"myartifact1", "myartifact2"});
     }
 
     public void testNoArtifact() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-noartifact.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-noartifact.xml"), true);
         assertNotNull(md);
         assertEquals("myorg", md.getModuleRevisionId().getOrganisation());
         assertEquals("mymodule", md.getModuleRevisionId().getName());
         assertEquals(Ivy.getWorkingRevision(), md.getModuleRevisionId().getRevision());
         assertEquals("integration", md.getStatus());
-        
+
         assertNotNull(md.getConfigurations());
-        assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}), Arrays.asList(md.getConfigurations()));
-        
+        assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}), Arrays
+                .asList(md.getConfigurations()));
+
         assertNotNull(md.getArtifacts("default"));
         assertEquals(0, md.getArtifacts("default").length);
-        
+
         assertNotNull(md.getDependencies());
         assertEquals(0, md.getDependencies().length);
     }
-    
+
     public void testNoPublication() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-nopublication.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-nopublication.xml"), true);
         assertNotNull(md);
         assertEquals("myorg", md.getModuleRevisionId().getOrganisation());
         assertEquals("mymodule", md.getModuleRevisionId().getName());
         assertEquals("myrev", md.getModuleRevisionId().getRevision());
-        assertEquals("integration", md.getStatus()); 
+        assertEquals("integration", md.getStatus());
         Date pubdate = new GregorianCalendar(2004, 10, 1, 11, 0, 0).getTime();
         assertEquals(pubdate, md.getPublicationDate());
-        
+
         assertNotNull(md.getConfigurations());
-        assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}), Arrays.asList(md.getConfigurations()));
-        
+        assertEquals(Arrays.asList(new Configuration[] {new Configuration("default")}), Arrays
+                .asList(md.getConfigurations()));
+
         assertNotNull(md.getArtifacts("default"));
         assertEquals(1, md.getArtifacts("default").length);
-        
+
         assertNotNull(md.getDependencies());
         assertEquals(1, md.getDependencies().length);
     }
-    
+
     public void testArtifactsDefaults() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-artifacts-defaults.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-artifacts-defaults.xml"), true);
         assertNotNull(md);
-        
+
         Artifact[] artifacts = md.getArtifacts("default");
         assertNotNull(artifacts);
         assertEquals(3, artifacts.length);
@@ -404,26 +485,30 @@
         assertArtifactEquals("myartifact", "jar", "jar", artifacts[1]);
         assertArtifactEquals("mymodule", "dll", "dll", artifacts[2]);
     }
-    
+
     private void assertArtifactEquals(String name, String type, String ext, Artifact artifact) {
-        assertEquals(name+"/"+type+"/"+ext, artifact.getName()+"/"+artifact.getType()+"/"+artifact.getExt());        
+        assertEquals(name + "/" + type + "/" + ext, artifact.getName() + "/" + artifact.getType()
+                + "/" + artifact.getExt());
     }
 
     public void testDefaultConf() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-defaultconf.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-defaultconf.xml"), true);
         assertNotNull(md);
-        
+
         DependencyDescriptor[] dependencies = md.getDependencies();
         assertNotNull(dependencies);
         assertEquals(2, dependencies.length);
-        
+
         // no conf def => defaults to defaultConf: default
         DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
         assertNotNull(dd);
         assertEquals("myorg", dd.getDependencyId().getOrganisation());
         assertEquals("1.0", dd.getDependencyRevisionId().getRevision());
-        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd.getDependencyConfigurations("default")));        
+        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd
+                .getDependencyConfigurations("default")));
 
         // confs def: *->*
         dd = getDependency(dependencies, "mymodule2");
@@ -431,81 +516,93 @@
         assertEquals("myorg", dd.getDependencyId().getOrganisation());
         assertEquals("2.0", dd.getDependencyRevisionId().getRevision());
         assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getDependencyConfigurations("default")));        
+        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd
+                .getDependencyConfigurations("default")));
     }
-    
+
     public void testDefaultConf2() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-defaultconf2.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-defaultconf2.xml"), true);
         assertNotNull(md);
-        
+
         DependencyDescriptor[] dependencies = md.getDependencies();
         assertNotNull(dependencies);
         assertEquals(2, dependencies.length);
-        
+
         // no conf def => defaults to defaultConf: *->default
         DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
         assertNotNull(dd);
         assertEquals("myorg", dd.getDependencyId().getOrganisation());
         assertEquals("1.0", dd.getDependencyRevisionId().getRevision());
         assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd.getDependencyConfigurations("default")));        
-        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd.getDependencyConfigurations("test")));        
+        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd
+                .getDependencyConfigurations("default")));
+        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd
+                .getDependencyConfigurations("test")));
 
-        // confs def: test: should not use default conf for the right side (use of defaultconfmapping is required for that) => test->test
+        // confs def: test: should not use default conf for the right side (use of
+        // defaultconfmapping is required for that) => test->test
         dd = getDependency(dependencies, "mymodule2");
         assertNotNull(dd);
         assertEquals("myorg", dd.getDependencyId().getOrganisation());
         assertEquals("2.0", dd.getDependencyRevisionId().getRevision());
-        assertEquals(Arrays.asList(new String[] {"test"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"test"}), Arrays.asList(dd.getDependencyConfigurations("test")));        
+        assertEquals(Arrays.asList(new String[] {"test"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"test"}), Arrays.asList(dd
+                .getDependencyConfigurations("test")));
     }
-    
+
     public void testDefaultConfMapping() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-defaultconfmapping.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-defaultconfmapping.xml"), true);
         assertNotNull(md);
-        
+
         DependencyDescriptor[] dependencies = md.getDependencies();
         assertNotNull(dependencies);
         assertEquals(2, dependencies.length);
-        
+
         // no conf def => defaults to defaultConf: *->default
         DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
         assertNotNull(dd);
         assertEquals("myorg", dd.getDependencyId().getOrganisation());
         assertEquals("1.0", dd.getDependencyRevisionId().getRevision());
         assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd.getDependencyConfigurations("default")));        
-        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd.getDependencyConfigurations("test")));        
+        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd
+                .getDependencyConfigurations("default")));
+        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd
+                .getDependencyConfigurations("test")));
 
         // confs def: test: should use default conf mapping for the right side => test->default
         dd = getDependency(dependencies, "mymodule2");
         assertNotNull(dd);
         assertEquals("myorg", dd.getDependencyId().getOrganisation());
         assertEquals("2.0", dd.getDependencyRevisionId().getRevision());
-        assertEquals(Arrays.asList(new String[] {"test"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd.getDependencyConfigurations("test")));        
+        assertEquals(Arrays.asList(new String[] {"test"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"default"}), Arrays.asList(dd
+                .getDependencyConfigurations("test")));
     }
-    
+
     public void testExtraAttributes() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-extra-attributes.xml"), false);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-extra-attributes.xml"), false);
         assertNotNull(md);
 
         assertEquals("infoextravalue", md.getAttribute("infoextra"));
         assertEquals("infoextravalue", md.getModuleRevisionId().getAttribute("infoextra"));
 
         assertEquals("confextravalue", md.getConfiguration("default").getAttribute("confextra"));
-        
+
         Artifact[] artifacts = md.getArtifacts("default");
         assertEquals(1, artifacts.length);
         Artifact art = artifacts[0];
         assertEquals("art1", art.getName());
         assertEquals("artextravalue", art.getAttribute("artextra"));
-        
-        
+
         DependencyDescriptor[] dependencies = md.getDependencies();
         assertNotNull(dependencies);
         assertEquals(1, dependencies.length);
-        
+
         DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
         assertNotNull(dd);
         assertEquals("myorg", dd.getDependencyId().getOrganisation());
@@ -513,215 +610,252 @@
         assertEquals("depextravalue", dd.getAttribute("depextra"));
         assertEquals("depextravalue", dd.getDependencyRevisionId().getAttribute("depextra"));
     }
-    
+
     public void testImportConfigurations1() throws Exception {
         // import configurations
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-configurations-import1.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-configurations-import1.xml"), true);
         assertNotNull(md);
-        
+
         // should have imported configurations
         assertNotNull(md.getConfigurations());
         assertEquals(Arrays.asList(new Configuration[] {
                 new Configuration("conf1", Visibility.PUBLIC, "", new String[0]),
-                new Configuration("conf2", Visibility.PRIVATE, "", new String[0])
-                }), Arrays.asList(md.getConfigurations()));
+                new Configuration("conf2", Visibility.PRIVATE, "", new String[0])}), Arrays
+                .asList(md.getConfigurations()));
 
         DependencyDescriptor[] dependencies = md.getDependencies();
         assertNotNull(dependencies);
         assertEquals(2, dependencies.length);
-        
+
         // no conf def => defaults to defaultConf: *->*
         DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
         assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getDependencyConfigurations("conf1")));        
+        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd
+                .getDependencyConfigurations("conf1")));
 
         // confs def: conf1->*
         dd = getDependency(dependencies, "mymodule2");
-        assertEquals(Arrays.asList(new String[] {"conf1"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getDependencyConfigurations("conf1")));        
+        assertEquals(Arrays.asList(new String[] {"conf1"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd
+                .getDependencyConfigurations("conf1")));
     }
-    
+
     public void testImportConfigurations2() throws Exception {
         // import configurations and add another one
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-configurations-import2.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-configurations-import2.xml"), true);
         assertNotNull(md);
-        
+
         // should have imported configurations and added the one defined in the file itself
         assertNotNull(md.getConfigurations());
         assertEquals(Arrays.asList(new Configuration[] {
                 new Configuration("conf1", Visibility.PUBLIC, "", new String[0]),
                 new Configuration("conf2", Visibility.PRIVATE, "", new String[0]),
-                new Configuration("conf3", Visibility.PUBLIC, "", new String[0])
-                }), Arrays.asList(md.getConfigurations()));
+                new Configuration("conf3", Visibility.PUBLIC, "", new String[0])}), Arrays
+                .asList(md.getConfigurations()));
 
         DependencyDescriptor[] dependencies = md.getDependencies();
         assertNotNull(dependencies);
         assertEquals(2, dependencies.length);
-        
+
         // no conf def => defaults to defaultConf: *->*
         DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
         assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getDependencyConfigurations("conf1")));        
+        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd
+                .getDependencyConfigurations("conf1")));
 
         // confs def: conf2,conf3->*
         dd = getDependency(dependencies, "mymodule2");
-        assertEquals(new HashSet(Arrays.asList(new String[] {"conf2", "conf3"})), new HashSet(Arrays.asList(dd.getModuleConfigurations())));
-        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getDependencyConfigurations("conf2")));        
-        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getDependencyConfigurations("conf3")));        
+        assertEquals(new HashSet(Arrays.asList(new String[] {"conf2", "conf3"})), new HashSet(
+                Arrays.asList(dd.getModuleConfigurations())));
+        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd
+                .getDependencyConfigurations("conf2")));
+        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd
+                .getDependencyConfigurations("conf3")));
     }
-    
+
     public void testImportConfigurations3() throws Exception {
         // import configurations and default mapping
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-configurations-import3.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-configurations-import3.xml"), true);
         assertNotNull(md);
-        
+
         // should have imported configurations
         assertNotNull(md.getConfigurations());
         assertEquals(Arrays.asList(new Configuration[] {
                 new Configuration("conf1", Visibility.PUBLIC, "", new String[0]),
-                new Configuration("conf2", Visibility.PRIVATE, "", new String[0])
-                }), Arrays.asList(md.getConfigurations()));
+                new Configuration("conf2", Visibility.PRIVATE, "", new String[0])}), Arrays
+                .asList(md.getConfigurations()));
 
         DependencyDescriptor[] dependencies = md.getDependencies();
         assertNotNull(dependencies);
         assertEquals(2, dependencies.length);
-        
+
         // no conf def => defaults to defaultConf defined in imported file: *->@
         DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
         assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"conf1"}), Arrays.asList(dd.getDependencyConfigurations("conf1")));        
-        assertEquals(Arrays.asList(new String[] {"conf2"}), Arrays.asList(dd.getDependencyConfigurations("conf2")));        
+        assertEquals(Arrays.asList(new String[] {"conf1"}), Arrays.asList(dd
+                .getDependencyConfigurations("conf1")));
+        assertEquals(Arrays.asList(new String[] {"conf2"}), Arrays.asList(dd
+                .getDependencyConfigurations("conf2")));
 
         // confs def: conf1->*
         dd = getDependency(dependencies, "mymodule2");
-        assertEquals(Arrays.asList(new String[] {"conf1"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getDependencyConfigurations("conf1")));        
+        assertEquals(Arrays.asList(new String[] {"conf1"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd
+                .getDependencyConfigurations("conf1")));
     }
-    
+
     public void testExtendOtherConfigs() throws Exception {
         // import configurations and default mapping
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-configextendsothers1.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-configextendsothers1.xml"), true);
         assertNotNull(md);
-        
+
         // has an 'all-public' configuration
         Configuration allPublic = md.getConfiguration("all-public");
         assertNotNull(allPublic);
-        
+
         // 'all-public' extends all other public configurations
         String[] allPublicExt = allPublic.getExtends();
         assertEquals(Arrays.asList(new String[] {"default", "test"}), Arrays.asList(allPublicExt));
     }
-    
+
     public void testImportConfigurationsWithExtendOtherConfigs() throws Exception {
         // import configurations and default mapping
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-configextendsothers2.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-configextendsothers2.xml"), true);
         assertNotNull(md);
-        
+
         // has an 'all-public' configuration
         Configuration allPublic = md.getConfiguration("all-public");
         assertNotNull(allPublic);
-        
+
         // 'all-public' extends all other public configurations
         String[] allPublicExt = allPublic.getExtends();
-        assertEquals(Arrays.asList(new String[] {"default", "test", "extra"}), Arrays.asList(allPublicExt));
+        assertEquals(Arrays.asList(new String[] {"default", "test", "extra"}), Arrays
+                .asList(allPublicExt));
     }
-    
+
     public void testImportConfigurationsWithMappingOverride() throws Exception {
         // import configurations and default mapping
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-configurations-import4.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-configurations-import4.xml"), true);
         assertNotNull(md);
-        
+
         // has 2 dependencies
         DependencyDescriptor[] dependencies = md.getDependencies();
         assertNotNull(dependencies);
         assertEquals(2, dependencies.length);
-        
+
         // confs dep1: conf1->A;conf2->B (mappingoverride = true)
         DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
-        assertEquals(Arrays.asList(new String[] {"conf1", "conf2"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"A"}), Arrays.asList(dd.getDependencyConfigurations("conf1"))); 
-        assertEquals(Arrays.asList(new String[] {"B"}), Arrays.asList(dd.getDependencyConfigurations("conf2")));  
-        
+        assertEquals(Arrays.asList(new String[] {"conf1", "conf2"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"A"}), Arrays.asList(dd
+                .getDependencyConfigurations("conf1")));
+        assertEquals(Arrays.asList(new String[] {"B"}), Arrays.asList(dd
+                .getDependencyConfigurations("conf2")));
+
         // confs dep2: conf2->B
         dd = getDependency(dependencies, "mymodule2");
-        assertEquals(Arrays.asList(new String[] {"conf2"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"B"}), Arrays.asList(dd.getDependencyConfigurations("conf2")));  
+        assertEquals(Arrays.asList(new String[] {"conf2"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"B"}), Arrays.asList(dd
+                .getDependencyConfigurations("conf2")));
     }
-    
+
     public void testImportConfigurationsWithWildcardAndMappingOverride() throws Exception {
         // import configurations and default mapping
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-configextendsothers3.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-configextendsothers3.xml"), true);
         assertNotNull(md);
-        
+
         // has 2 dependencies
         DependencyDescriptor[] dependencies = md.getDependencies();
         assertNotNull(dependencies);
         assertEquals(2, dependencies.length);
-        
+
         // confs dep1: all-public->all-public (mappingoverride = true)
         DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
-        assertEquals(Arrays.asList(new String[] {"all-public"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"all-public"}), Arrays.asList(dd.getDependencyConfigurations("all-public"))); 
-        
+        assertEquals(Arrays.asList(new String[] {"all-public"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"all-public"}), Arrays.asList(dd
+                .getDependencyConfigurations("all-public")));
+
         // confs dep2: extra->extra;all-public->all-public (mappingoverride = true)
         dd = getDependency(dependencies, "mymodule2");
-        assertEquals(Arrays.asList(new String[] {"extra", "all-public"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"extra"}), Arrays.asList(dd.getDependencyConfigurations("extra")));  
-        assertEquals(Arrays.asList(new String[] {"all-public"}), Arrays.asList(dd.getDependencyConfigurations("all-public")));  
+        assertEquals(Arrays.asList(new String[] {"extra", "all-public"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"extra"}), Arrays.asList(dd
+                .getDependencyConfigurations("extra")));
+        assertEquals(Arrays.asList(new String[] {"all-public"}), Arrays.asList(dd
+                .getDependencyConfigurations("all-public")));
     }
 
     public void testDefaultConfMappingWithSelectors() throws Exception {
         // import configurations and default mapping
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-defaultconfmapping-withselectors.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+            getClass().getResource("test-defaultconfmapping-withselectors.xml"), true);
         assertNotNull(md);
-        
+
         // has 3 dependencies
         DependencyDescriptor[] dependencies = md.getDependencies();
         assertNotNull(dependencies);
         assertEquals(3, dependencies.length);
-        
+
         // confs dep1: *->default1,default3
         DependencyDescriptor dd = getDependency(dependencies, "mymodule1");
         assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"default1", "default3"}), Arrays.asList(dd.getDependencyConfigurations("default"))); 
-        
+        assertEquals(Arrays.asList(new String[] {"default1", "default3"}), Arrays.asList(dd
+                .getDependencyConfigurations("default")));
+
         // confs dep2: test->default2,default3
         dd = getDependency(dependencies, "mymodule2");
-        assertEquals(Arrays.asList(new String[] {"test"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"default2", "default3"}), Arrays.asList(dd.getDependencyConfigurations("test")));  
-        
+        assertEquals(Arrays.asList(new String[] {"test"}), Arrays.asList(dd
+                .getModuleConfigurations()));
+        assertEquals(Arrays.asList(new String[] {"default2", "default3"}), Arrays.asList(dd
+                .getDependencyConfigurations("test")));
+
         // confs dep3: *->default4
         dd = getDependency(dependencies, "mymodule3");
         assertEquals(Arrays.asList(new String[] {"*"}), Arrays.asList(dd.getModuleConfigurations()));
-        assertEquals(Arrays.asList(new String[] {"default4"}), Arrays.asList(dd.getDependencyConfigurations("bla")));  
+        assertEquals(Arrays.asList(new String[] {"default4"}), Arrays.asList(dd
+                .getDependencyConfigurations("bla")));
     }
-    
+
     public void testWithNonExistingConfigInDependency() throws Exception {
-    	// IVY-442
-    	try {
-    		XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-incorrectconf1.xml"), true);
-    		fail("ParseException hasn't been thrown");
-    	} catch (ParseException e) {
-    		// expected
-    	}
+        // IVY-442
+        try {
+            XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+                getClass().getResource("test-incorrectconf1.xml"), true);
+            fail("ParseException hasn't been thrown");
+        } catch (ParseException e) {
+            // expected
+        }
     }
-    
+
     public void testWithNonExistingConfigInPublications() throws Exception {
-    	try {
-    		XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-incorrectconf2.xml"), true);
-    		fail("ParseException hasn't been thrown");
-    	} catch (ParseException e) {
-    		// expected
-    	}
+        try {
+            XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+                getClass().getResource("test-incorrectconf2.xml"), true);
+            fail("ParseException hasn't been thrown");
+        } catch (ParseException e) {
+            // expected
+        }
     }
-    
+
     public void testWithExistingConfigsInPublicationsSeparatedBySemiColon() throws Exception {
-    	// IVY-441
-    	try {
-    		XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, getClass().getResource("test-incorrectconf3.xml"), true);
-    		fail("ParseException hasn't been thrown");
-    	} catch (ParseException e) {
-    		// expected
-    	}
+        // IVY-441
+        try {
+            XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings,
+                getClass().getResource("test-incorrectconf3.xml"), true);
+            fail("ParseException hasn't been thrown");
+        } catch (ParseException e) {
+            // expected
+        }
     }
 }

Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java Tue Jun  5 05:02:27 2007
@@ -35,51 +35,63 @@
 public class XmlModuleDescriptorWriterTest extends TestCase {
     private static String LICENSE;
     static {
-    	try {
-			LICENSE = FileUtil.readEntirely(new BufferedReader(new InputStreamReader(XmlModuleDescriptorWriterTest.class.getResourceAsStream("license.xml"))));
-		} catch (IOException e) {
-			e.printStackTrace();
-		} 
+        try {
+            LICENSE = FileUtil.readEntirely(new BufferedReader(new InputStreamReader(
+                    XmlModuleDescriptorWriterTest.class.getResourceAsStream("license.xml"))));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
+
     private File _dest = new File("build/test/test-write.xml");
 
     public void testSimple() throws Exception {
-        DefaultModuleDescriptor md = (DefaultModuleDescriptor)XmlModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), XmlModuleDescriptorWriterTest.class.getResource("test-simple.xml"), true);
+        DefaultModuleDescriptor md = (DefaultModuleDescriptor) XmlModuleDescriptorParser
+                .getInstance().parseDescriptor(new IvySettings(),
+                    XmlModuleDescriptorWriterTest.class.getResource("test-simple.xml"), true);
         md.setResolvedPublicationDate(new GregorianCalendar(2005, 4, 1, 11, 0, 0).getTime());
-        md.setResolvedModuleRevisionId(new ModuleRevisionId(md.getModuleRevisionId().getModuleId(), "NONE"));
+        md.setResolvedModuleRevisionId(new ModuleRevisionId(md.getModuleRevisionId().getModuleId(),
+                "NONE"));
         XmlModuleDescriptorWriter.write(md, LICENSE, _dest);
-        
+
         assertTrue(_dest.exists());
-        String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll("\r\n", "\n").replace('\r', '\n');
-        String expected = readEntirely("test-write-simple.xml").replaceAll("\r\n", "\n").replace('\r', '\n');
+        String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
+            "\r\n", "\n").replace('\r', '\n');
+        String expected = readEntirely("test-write-simple.xml").replaceAll("\r\n", "\n").replace(
+            '\r', '\n');
         assertEquals(expected, wrote);
     }
-    
+
     public void testDependencies() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), XmlModuleDescriptorWriterTest.class.getResource("test-dependencies.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(
+            new IvySettings(),
+            XmlModuleDescriptorWriterTest.class.getResource("test-dependencies.xml"), true);
         XmlModuleDescriptorWriter.write(md, LICENSE, _dest);
-        
+
         assertTrue(_dest.exists());
-        String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll("\r\n", "\n").replace('\r', '\n');
-        String expected = readEntirely("test-write-dependencies.xml").replaceAll("\r\n", "\n").replace('\r', '\n');
+        String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
+            "\r\n", "\n").replace('\r', '\n');
+        String expected = readEntirely("test-write-dependencies.xml").replaceAll("\r\n", "\n")
+                .replace('\r', '\n');
         assertEquals(expected, wrote);
     }
-    
-    
+
     public void testFull() throws Exception {
-        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(new IvySettings(), XmlModuleDescriptorWriterTest.class.getResource("test.xml"), true);
+        ModuleDescriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(
+            new IvySettings(), XmlModuleDescriptorWriterTest.class.getResource("test.xml"), true);
         XmlModuleDescriptorWriter.write(md, LICENSE, _dest);
-        
+
         assertTrue(_dest.exists());
-        String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll("\r\n", "\n").replace('\r', '\n');
-        String expected = readEntirely("test-write-full.xml").replaceAll("\r\n", "\n").replace('\r', '\n');
+        String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(_dest))).replaceAll(
+            "\r\n", "\n").replace('\r', '\n');
+        String expected = readEntirely("test-write-full.xml").replaceAll("\r\n", "\n").replace(
+            '\r', '\n');
         assertEquals(expected, wrote);
     }
-    
-    
 
     private String readEntirely(String resource) throws IOException {
-        return FileUtil.readEntirely(new BufferedReader(new InputStreamReader(XmlModuleDescriptorWriterTest.class.getResource(resource).openStream())));
+        return FileUtil.readEntirely(new BufferedReader(new InputStreamReader(
+                XmlModuleDescriptorWriterTest.class.getResource(resource).openStream())));
     }
 
     public void setUp() {
@@ -90,7 +102,7 @@
             _dest.getParentFile().mkdirs();
         }
     }
-    
+
     protected void tearDown() throws Exception {
         if (_dest.exists()) {
             _dest.delete();

Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java?view=diff&rev=544459&r1=544458&r2=544459
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java Tue Jun  5 05:02:27 2007
@@ -23,7 +23,6 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.InputStreamReader;
-import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -45,58 +44,61 @@
 import org.xml.sax.SAXParseException;
 
 public class XmlModuleUpdaterTest extends TestCase {
-    
+
     public void testUpdate() throws Exception {
         /*
-         * For updated file to be equals to updated.xml,
-         * we have to fix the line separator to the one used
-         * in updated.xml, in order for this test to works in
-         * all platforms (default line separator used in 
-         * updater being platform dependent 
+         * For updated file to be equals to updated.xml, we have to fix the line separator to the
+         * one used in updated.xml, in order for this test to works in all platforms (default line
+         * separator used in updater being platform dependent
          */
         XmlModuleDescriptorUpdater.LINE_SEPARATOR = "\n";
         File dest = new File("build/updated-test.xml");
         dest.deleteOnExit();
         Map resolvedRevisions = new HashMap();
         resolvedRevisions.put(ModuleRevisionId.newInstance("yourorg", "yourmodule2", "2+"), "2.5");
-        resolvedRevisions.put(ModuleRevisionId.newInstance("yourorg", "yourmodule6", "latest.integration"), "6.3");
-        
+        resolvedRevisions.put(ModuleRevisionId.newInstance("yourorg", "yourmodule6",
+            "latest.integration"), "6.3");
+
         GregorianCalendar cal = new GregorianCalendar();
         cal.set(2005, 2, 22, 14, 32, 54);
-        
+
         Ivy ivy = Ivy.newInstance();
         ivy.setVariable("myvar", "myconf1");
-        XmlModuleDescriptorUpdater.update(ivy.getSettings(), 
-                XmlModuleUpdaterTest.class.getResource("test-update.xml"), 
-                dest, resolvedRevisions, "release", "mynewrev", cal.getTime(), null, true, null);
-        
+        XmlModuleDescriptorUpdater.update(ivy.getSettings(), XmlModuleUpdaterTest.class
+                .getResource("test-update.xml"), dest, resolvedRevisions, "release", "mynewrev",
+            cal.getTime(), null, true, null);
+
         assertTrue(dest.exists());
-        String expected = FileUtil.readEntirely(new BufferedReader(new InputStreamReader(XmlModuleUpdaterTest.class.getResourceAsStream("updated.xml"))));
+        String expected = FileUtil.readEntirely(new BufferedReader(new InputStreamReader(
+                XmlModuleUpdaterTest.class.getResourceAsStream("updated.xml"))));
         String updated = FileUtil.readEntirely(new BufferedReader(new FileReader(dest)));
         assertEquals(expected, updated);
     }
-    
+
     public void testUpdateWithImportedMappingOverride() throws Exception {
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        XmlModuleDescriptorUpdater.update(new IvySettings(), 
-                XmlModuleUpdaterTest.class.getResourceAsStream("test-configurations-import4.xml"), 
-                buffer, new HashMap(), "release", "mynewrev", new Date(), null, true);
-       
+        XmlModuleDescriptorUpdater.update(new IvySettings(), XmlModuleUpdaterTest.class
+                .getResourceAsStream("test-configurations-import4.xml"), buffer, new HashMap(),
+            "release", "mynewrev", new Date(), null, true);
+
         String updatedXml = buffer.toString();
-        
+
         // just make sure that 'confmappingoverride="true"' is declared somewhere in the XML.
-        assertTrue("Updated XML doesn't define the confmappingoverride attribute", updatedXml.indexOf("confmappingoverride=\"true\"") != -1);
+        assertTrue("Updated XML doesn't define the confmappingoverride attribute", updatedXml
+                .indexOf("confmappingoverride=\"true\"") != -1);
     }
-    
+
     public void testUpdateWithExcludeConfigurations1() throws Exception {
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        XmlModuleDescriptorUpdater.update(new IvySettings(), 
-                XmlModuleUpdaterTest.class.getResourceAsStream("test-update-excludedconfs1.xml"), 
-                buffer, new HashMap(), "release", "mynewrev", new Date(), null, true, new String[] {"myconf2"});
-       
+        XmlModuleDescriptorUpdater.update(new IvySettings(), XmlModuleUpdaterTest.class
+                .getResourceAsStream("test-update-excludedconfs1.xml"), buffer, new HashMap(),
+            "release", "mynewrev", new Date(), null, true, new String[] {"myconf2"});
+
         XmlModuleDescriptorParser parser = XmlModuleDescriptorParser.getInstance();
-        ModuleDescriptor updatedMd = parser.parseDescriptor(new IvySettings(), new ByteArrayInputStream(buffer.toByteArray()), new BasicResource("test", false, 0, 0, false), true);
-        
+        ModuleDescriptor updatedMd = parser.parseDescriptor(new IvySettings(),
+            new ByteArrayInputStream(buffer.toByteArray()), new BasicResource("test", false, 0, 0,
+                    false), true);
+
         // test the number of configurations
         Configuration[] configs = updatedMd.getConfigurations();
         assertNotNull("Configurations shouldn't be null", configs);
@@ -104,36 +106,38 @@
 
         // test that the correct configuration has been removed
         assertNull("myconf2 hasn't been removed", updatedMd.getConfiguration("myconf2"));
-        
+
         // test that the other configurations aren't removed
         assertNotNull("myconf1 has been removed", updatedMd.getConfiguration("myconf1"));
         assertNotNull("myconf3 has been removed", updatedMd.getConfiguration("myconf3"));
         assertNotNull("myconf4 has been removed", updatedMd.getConfiguration("myconf4"));
     }
-    
+
     public void testUpdateWithExcludeConfigurations2() throws Exception {
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         try {
-	        XmlModuleDescriptorUpdater.update(new IvySettings(), 
-	                XmlModuleUpdaterTest.class.getResourceAsStream("test-update-excludedconfs2.xml"), 
-	                buffer, new HashMap(), "release", "mynewrev", new Date(), null, true, new String[] {"myconf2"});
-	        fail("IllegalArgumentException hasn't been thrown");
+            XmlModuleDescriptorUpdater.update(new IvySettings(), XmlModuleUpdaterTest.class
+                    .getResourceAsStream("test-update-excludedconfs2.xml"), buffer, new HashMap(),
+                "release", "mynewrev", new Date(), null, true, new String[] {"myconf2"});
+            fail("IllegalArgumentException hasn't been thrown");
         } catch (IllegalArgumentException e) {
-        	// this is ok
+            // this is ok
         } catch (SAXParseException e) {
-        	// this is ok too
+            // this is ok too
         }
     }
-    
+
     public void testUpdateWithExcludeConfigurations3() throws Exception {
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        XmlModuleDescriptorUpdater.update(new IvySettings(), 
-                XmlModuleUpdaterTest.class.getResourceAsStream("test-update-excludedconfs3.xml"), 
-                buffer, new HashMap(), "release", "mynewrev", new Date(), null, true, new String[] {"myconf2", "conf2"});
-       
+        XmlModuleDescriptorUpdater.update(new IvySettings(), XmlModuleUpdaterTest.class
+                .getResourceAsStream("test-update-excludedconfs3.xml"), buffer, new HashMap(),
+            "release", "mynewrev", new Date(), null, true, new String[] {"myconf2", "conf2"});
+
         XmlModuleDescriptorParser parser = XmlModuleDescriptorParser.getInstance();
-        ModuleDescriptor updatedMd = parser.parseDescriptor(new IvySettings(), new ByteArrayInputStream(buffer.toByteArray()), new BasicResource("test", false, 0, 0, false), true);
-        
+        ModuleDescriptor updatedMd = parser.parseDescriptor(new IvySettings(),
+            new ByteArrayInputStream(buffer.toByteArray()), new BasicResource("test", false, 0, 0,
+                    false), true);
+
         // test the number of configurations
         Configuration[] configs = updatedMd.getConfigurations();
         assertNotNull("Configurations shouldn't be null", configs);
@@ -142,23 +146,25 @@
         // test that the correct configuration has been removed
         assertNull("myconf2 hasn't been removed", updatedMd.getConfiguration("myconf2"));
         assertNull("conf2 hasn't been removed", updatedMd.getConfiguration("conf2"));
-        
+
         // test that the other configurations aren't removed
         assertNotNull("conf1 has been removed", updatedMd.getConfiguration("conf1"));
         assertNotNull("myconf1 has been removed", updatedMd.getConfiguration("myconf1"));
         assertNotNull("myconf3 has been removed", updatedMd.getConfiguration("myconf3"));
         assertNotNull("myconf4 has been removed", updatedMd.getConfiguration("myconf4"));
     }
-    
+
     public void testUpdateWithExcludeConfigurations4() throws Exception {
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        XmlModuleDescriptorUpdater.update(new IvySettings(), 
-                XmlModuleUpdaterTest.class.getResourceAsStream("test-update-excludedconfs4.xml"), 
-                buffer, new HashMap(), "release", "mynewrev", new Date(), null, true, new String[] {"myconf2"});
-       
+        XmlModuleDescriptorUpdater.update(new IvySettings(), XmlModuleUpdaterTest.class
+                .getResourceAsStream("test-update-excludedconfs4.xml"), buffer, new HashMap(),
+            "release", "mynewrev", new Date(), null, true, new String[] {"myconf2"});
+
         XmlModuleDescriptorParser parser = XmlModuleDescriptorParser.getInstance();
-        ModuleDescriptor updatedMd = parser.parseDescriptor(new IvySettings(), new ByteArrayInputStream(buffer.toByteArray()), new BasicResource("test", false, 0, 0, false), true);
-        
+        ModuleDescriptor updatedMd = parser.parseDescriptor(new IvySettings(),
+            new ByteArrayInputStream(buffer.toByteArray()), new BasicResource("test", false, 0, 0,
+                    false), true);
+
         // test the number of configurations
         Artifact[] artifacts = updatedMd.getAllArtifacts();
         assertNotNull("Published artifacts shouldn't be null", artifacts);
@@ -166,32 +172,36 @@
 
         // test that the correct configuration has been removed
         for (int i = 0; i < artifacts.length; i++) {
-        	Artifact current = artifacts[i];
-        	List currentConfs = Arrays.asList(current.getConfigurations());
-        	assertTrue("myconf2 hasn't been removed for artifact " + current.getName(), !currentConfs.contains("myconf2"));
+            Artifact current = artifacts[i];
+            List currentConfs = Arrays.asList(current.getConfigurations());
+            assertTrue("myconf2 hasn't been removed for artifact " + current.getName(),
+                !currentConfs.contains("myconf2"));
         }
     }
-    
+
     public void testUpdateWithExcludeConfigurations5() throws Exception {
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        XmlModuleDescriptorUpdater.update(new IvySettings(), 
-                XmlModuleUpdaterTest.class.getResourceAsStream("test-update-excludedconfs5.xml"), 
-                buffer, new HashMap(), "release", "mynewrev", new Date(), null, true, new String[] {"myconf2"});
-       
+        XmlModuleDescriptorUpdater.update(new IvySettings(), XmlModuleUpdaterTest.class
+                .getResourceAsStream("test-update-excludedconfs5.xml"), buffer, new HashMap(),
+            "release", "mynewrev", new Date(), null, true, new String[] {"myconf2"});
+
         XmlModuleDescriptorParser parser = XmlModuleDescriptorParser.getInstance();
-        ModuleDescriptor updatedMd = parser.parseDescriptor(new IvySettings(), new ByteArrayInputStream(buffer.toByteArray()), new BasicResource("test", false, 0, 0, false), true);
+        ModuleDescriptor updatedMd = parser.parseDescriptor(new IvySettings(),
+            new ByteArrayInputStream(buffer.toByteArray()), new BasicResource("test", false, 0, 0,
+                    false), true);
 
         DependencyDescriptor[] deps = updatedMd.getDependencies();
         assertNotNull("Dependencies shouldn't be null", deps);
         assertEquals("Number of dependencies is incorrect", 8, deps.length);
-        
+
         // check that none of the dependencies contains myconf2
         for (int i = 0; i < deps.length; i++) {
-        	String name = deps[i].getDependencyId().getName();
-        	assertFalse("Dependency " + name + " shouldn't have myconf2 as module configuration",
-        			Arrays.asList(deps[i].getModuleConfigurations()).contains("myconf2"));
-        	assertEquals("Dependency " + name + " shouldn't have a dependency artifact for configuration myconf2",
-        			0, deps[i].getDependencyArtifacts("myconf2").length);
+            String name = deps[i].getDependencyId().getName();
+            assertFalse("Dependency " + name + " shouldn't have myconf2 as module configuration",
+                Arrays.asList(deps[i].getModuleConfigurations()).contains("myconf2"));
+            assertEquals("Dependency " + name
+                    + " shouldn't have a dependency artifact for configuration myconf2", 0, deps[i]
+                    .getDependencyArtifacts("myconf2").length);
         }
     }
 }