You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2013/12/17 19:00:23 UTC
svn commit: r1551642 - in
/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2:
dataretrieval/ description/ description/java2wsdl/
Author: veithen
Date: Tue Dec 17 18:00:23 2013
New Revision: 1551642
URL: http://svn.apache.org/r1551642
Log:
AXIS2-5239:
* Ignore whitespace when comparing schemas.
* In assertions, use the correct order for expected/actual values. Otherwise test failure messages are misleading.
Modified:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/dataretrieval/SchemaDataLocatorTest.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/AxisService2WSDLTest.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/AxisServiceTest.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/XMLSchemaTest.java
Modified: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/dataretrieval/SchemaDataLocatorTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/dataretrieval/SchemaDataLocatorTest.java?rev=1551642&r1=1551641&r2=1551642&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/dataretrieval/SchemaDataLocatorTest.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/dataretrieval/SchemaDataLocatorTest.java Tue Dec 17 18:00:23 2013
@@ -76,7 +76,7 @@ public class SchemaDataLocatorTest exten
+ "SchemaDataLocatorTest.xml");
assertNotNull(data);
assertEquals(data.length, 1);
- assertSimilarXML(s, expected);
+ assertSimilarXML(expected, s);
}
Modified: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/AxisService2WSDLTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/AxisService2WSDLTest.java?rev=1551642&r1=1551641&r2=1551642&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/AxisService2WSDLTest.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/AxisService2WSDLTest.java Tue Dec 17 18:00:23 2013
@@ -59,8 +59,8 @@ public class AxisService2WSDLTest extend
// + "testGenerateInterfaceOperationElement_WSDL.wsdl",
// element.toString());
XMLPrettyPrinter.prettify(element, stream);
- assertSimilarXML(stream.toString(), readWSDLFromFile("test-resources" + File.separator
- + "wsdl" + File.separator + "testGenerateInterfaceOperationElement_WSDL.wsdl"));
+ assertSimilarXML(readWSDLFromFile("test-resources" + File.separator
+ + "wsdl" + File.separator + "testGenerateInterfaceOperationElement_WSDL.wsdl"), stream.toString());
}
@@ -75,8 +75,8 @@ public class AxisService2WSDLTest extend
// +
// "testGenerateInterfaceOperationElement11_WSDL.wsdl",element.toString());
XMLPrettyPrinter.prettify(element, stream);
- assertSimilarXML(stream.toString(), readWSDLFromFile("test-resources" + File.separator
- + "wsdl" + File.separator + "testGenerateInterfaceOperationElement11_WSDL.wsdl"));
+ assertSimilarXML(readWSDLFromFile("test-resources" + File.separator
+ + "wsdl" + File.separator + "testGenerateInterfaceOperationElement11_WSDL.wsdl"), stream.toString());
}
Modified: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/AxisServiceTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/AxisServiceTest.java?rev=1551642&r1=1551641&r2=1551642&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/AxisServiceTest.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/AxisServiceTest.java Tue Dec 17 18:00:23 2013
@@ -263,8 +263,8 @@ public class AxisServiceTest extends XML
service.printXSD(stream, "");
// service has a single schema and it is printed. The it is compared
// with the saved file
- assertSimilarXML(stream.toString(), readXMLfromSchemaFile(SampleSchemasDirectory
- + "printXSDReference.xsd"));
+ assertSimilarXML(readXMLfromSchemaFile(SampleSchemasDirectory
+ + "printXSDReference.xsd"), stream.toString());
}
public void testPrintWSDL() throws Exception {
@@ -274,7 +274,7 @@ public class AxisServiceTest extends XML
String s = readWSDLFromFile("test-resources" + File.separator + "wsdl" + File.separator
+ "printWSDLreference.wsdl");
- assertSimilarXML(stream.toString(), s);
+ assertSimilarXML(s, stream.toString());
}
public String convertXMLFileToString(String fileName) {
Modified: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java?rev=1551642&r1=1551641&r2=1551642&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java Tue Dec 17 18:00:23 2013
@@ -112,8 +112,7 @@ public class DefaultSchemaGeneratorTest
String XML1 = byteArrayOutputStream.toString();
String XML2 = readSchema(c, i);
- assertSimilarXML(XML1, XML2);
- assertIdenticalXML(XML1, XML2);
+ assertSimilarXML(XML2, XML1);
}
}
@@ -131,8 +130,7 @@ public class DefaultSchemaGeneratorTest
xmlSchema.write(byteArrayOutputStream);
String XML1 = byteArrayOutputStream.toString();
String XML2 = readSchemaWithCustomSchema(c, i);
- assertSimilarXML(XML1, XML2);
- assertIdenticalXML(XML1, XML2);
+ assertSimilarXML(XML2, XML1);
}
}
@@ -151,8 +149,7 @@ public class DefaultSchemaGeneratorTest
String XML1 = byteArrayOutputStream.toString();
String XML2 = readSchemaWithMappingSchema(c, i);
XML1 = prepareForMapping(XML1);
- assertSimilarXML(XML1, XML2);
- assertIdenticalXML(XML1, XML2);
+ assertSimilarXML(XML2, XML1);
}
}
@@ -224,8 +221,7 @@ public class DefaultSchemaGeneratorTest
String XML1 = byteArrayOutputStream.toString();
XML1 = prepareForDOM(XML1);
String XML2 = readSchema(c, i);
- assertSimilarXML(XML1, XML2);
- assertIdenticalXML(XML1, XML2);
+ assertSimilarXML(XML2, XML1);
}
}
@@ -262,8 +258,7 @@ public class DefaultSchemaGeneratorTest
XML1 = prepareForMap(XML1);
}
String XML2 = readSchema(c, i);
- assertSimilarXML(XML1, XML2);
- assertIdenticalXML(XML1, XML2);
+ assertSimilarXML(XML2, XML1);
}
}
@@ -315,8 +310,7 @@ public class DefaultSchemaGeneratorTest
XML1 = prepareForPOJO(XML1);
}
String XML2 = readSchema(c, i);
- assertSimilarXML(XML1, XML2);
- assertIdenticalXML(XML1, XML2);
+ assertSimilarXML(XML2, XML1);
}
}
@@ -358,8 +352,7 @@ public class DefaultSchemaGeneratorTest
XML1 = prepareForExc(XML1);
}
String XML2 = readSchema(c, i);
- assertSimilarXML(XML1, XML2);
- assertIdenticalXML(XML1, XML2);
+ assertSimilarXML(XML2, XML1);
}
}
@@ -404,8 +397,7 @@ public class DefaultSchemaGeneratorTest
}
XML1 = prepareForEnum(XML1);
String XML2 = readSchema(c, i);
- assertSimilarXML(XML1, XML2);
- assertIdenticalXML(XML1, XML2);
+ assertSimilarXML(XML2, XML1);
}
}
Modified: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/XMLSchemaTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/XMLSchemaTest.java?rev=1551642&r1=1551641&r2=1551642&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/XMLSchemaTest.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/XMLSchemaTest.java Tue Dec 17 18:00:23 2013
@@ -20,12 +20,15 @@
package org.apache.axis2.description.java2wsdl;
import junit.framework.TestCase;
+
import org.apache.axis2.util.XMLPrettyPrinter;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.custommonkey.xmlunit.Diff;
+import org.custommonkey.xmlunit.XMLUnit;
import javax.xml.transform.stream.StreamSource;
+
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -55,16 +58,15 @@ public abstract class XMLSchemaTest exte
+ "schemas" + File.separator + "mapping_files" + File.separator
+ "mapping1.txt";
- public void assertSimilarXML(String XML1, String XML2) throws Exception {
- Diff myDiff = new Diff(XML1, XML2);
- assertTrue("XML similar " + myDiff.toString(), myDiff.similar());
-
- }
-
- public void assertIdenticalXML(String XML1, String XML2) throws Exception {
- Diff myDiff = new Diff(XML1, XML2);
- assertTrue("XML similar " + myDiff.toString(), myDiff.identical());
-
+ public void assertSimilarXML(String expected, String actual) throws Exception {
+ boolean ignoreWhitespace = XMLUnit.getIgnoreWhitespace();
+ XMLUnit.setIgnoreWhitespace(true);
+ try {
+ Diff myDiff = new Diff(expected, actual);
+ assertTrue("XML similar " + myDiff.toString(), myDiff.similar());
+ } finally {
+ XMLUnit.setIgnoreWhitespace(ignoreWhitespace);
+ }
}
public void loadSampleSchemaFile(ArrayList<XmlSchema> schemas) throws Exception{