svn commit: r671144 - in /archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer: pom.xml src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java

[ev...@apache.org]

Author: evenisse
Date: Tue Jun 24 04:56:58 2008
New Revision: 671144

URL: http://svn.apache.org/viewvc?rev=671144&view=rev
Log:
[MRM-847] Fix build on windows by using xmlunit to test xml output

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
    archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml?rev=671144&r1=671143&r2=671144&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml Tue Jun 24 04:56:58 2008
@@ -39,5 +39,10 @@
       <version>${wagon.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java?rev=671144&r1=671143&r2=671144&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java Tue Jun 24 04:56:58 2008
@@ -22,6 +22,8 @@
 import java.io.File;
 import java.io.IOException;
 
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@@ -30,6 +32,8 @@
 import org.apache.maven.profiles.DefaultProfileManager;
 import org.codehaus.plexus.spring.PlexusContainerAdapter;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+import org.custommonkey.xmlunit.XMLAssert;
+import org.xml.sax.SAXException;
 
 public class DependencyTreeGeneratorConsumerTest
     extends PlexusInSpringTestCase
@@ -65,7 +69,7 @@
     }
 
     public void testGenerateBasicTree()
-        throws IOException, ConsumerException
+        throws IOException, ConsumerException, ParserConfigurationException, SAXException
     {
         consumer.beginScan( repository, null );
 
@@ -73,7 +77,7 @@
         consumer.processFile( path );
 
         File generatedFile = new File( generatedRepositoryLocation, path + ".xml" );
-        assertEquals( IOUtils.toString( getClass().getResourceAsStream( "/test-data/maven-core-2.0-tree.xml" ) ),
+        XMLAssert.assertXMLEqual( IOUtils.toString( getClass().getResourceAsStream( "/test-data/maven-core-2.0-tree.xml" ) ),
                       FileUtils.readFileToString( generatedFile ) );
 
         consumer.completeScan();
@@ -101,7 +105,7 @@
     }
 
     public void testProfiles()
-        throws IOException, ConsumerException
+        throws IOException, ConsumerException, ParserConfigurationException, SAXException
     {
         PlexusContainerAdapter container = new PlexusContainerAdapter();
         container.setApplicationContext( getApplicationContext() );
@@ -114,7 +118,7 @@
         consumer.processFile( path );
 
         File generatedFile = new File( generatedRepositoryLocation, path + ".xml" );
-        assertEquals( IOUtils.toString( getClass().getResourceAsStream( "/test-data/surefire-testng-2.0-tree.xml" ) ),
+        XMLAssert.assertXMLEqual( IOUtils.toString( getClass().getResourceAsStream( "/test-data/surefire-testng-2.0-tree.xml" ) ),
                       FileUtils.readFileToString( generatedFile ) );
 
         consumer.completeScan();