Author: jlaskowski
Date: Fri Dec 25 01:00:50 2009
New Revision: 893829
URL: http://svn.apache.org/viewvc?rev=893829&view=rev
Log:
Don't really know why the changes helped with the XML comparision, but they did
and it works fine now (anybody who's more capable of understanding the code
cares to explain it to me?)
Updated XMLUnit to 1.3 along the way
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
openejb/trunk/openejb3/pom.xml
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java?rev=893829&r1=893828&r2=893829&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java
Fri Dec 25 01:00:50 2009
@@ -67,15 +67,8 @@
String result = JaxbOpenejbJar2.marshal(GeronimoEjbJarType.class,
root);
String expected =
readContent(getInputStream("geronimo-openejb-converted.xml"));
-
- XMLUnit.setIgnoreWhitespace(true);
- try {
- Diff myDiff = new DetailedDiff(new Diff(expected, result));
- assertTrue("Files are not similar " + myDiff, myDiff.similar());
- } catch (AssertionFailedError e) {
- assertEquals(expected, result);
- throw e;
- }
+ Diff myDiff = new DetailedDiff(new Diff(expected, result));
+ assertTrue("Files are not similar " + myDiff, myDiff.similar());
}
private <T> void unmarshalAndMarshal(Class<T> type, java.lang.String
xmlFileName, java.lang.String expectedFile) throws Exception {
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml?rev=893829&r1=893828&r2=893829&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
Fri Dec 25 01:00:50 2009
@@ -19,7 +19,7 @@
<!-- $Rev$ $Date$ -->
-<ns3:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2";
xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2";
xmlns:ns4="http://openejb.apache.org/xml/ns/pkgen-2.1";
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2";
xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0";
xmlns:ns7="http://java.sun.com/xml/ns/persistence";
xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";>
+<ns3:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2";
xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2";
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2";
xmlns:ns4="http://openejb.apache.org/xml/ns/pkgen-2.1";
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2";
xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0";
xmlns:ns7X="http://java.sun.com/xml/ns/persistence";
xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0";>
<environment>
<moduleId>
<groupId>String</groupId>
Modified: openejb/trunk/openejb3/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=893829&r1=893828&r2=893829&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Fri Dec 25 01:00:50 2009
@@ -907,7 +907,7 @@
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
