xmlunit-commits Mailing List for XML Unit (Page 163)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 209
          http://xmlunit.svn.sourceforge.net/xmlunit/?rev=209&view=rev
Author:   bodewig
Date:     2007-05-16 04:25:23 -0700 (Wed, 16 May 2007)

Log Message:
-----------
Treat xsi:schemaLocation and xsi:noNamespaceSchemaLocation in a special way

Modified Paths:
--------------
    trunk/xmlunit/src/java/org/custommonkey/xmlunit/DifferenceConstants.java
    trunk/xmlunit/src/java/org/custommonkey/xmlunit/DifferenceEngine.java
    trunk/xmlunit/src/java/org/custommonkey/xmlunit/JAXPConstants.java
    trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLConstants.java
    trunk/xmlunit/tests/java/org/custommonkey/xmlunit/test_Diff.java
    trunk/xmlunit/tests/java/org/custommonkey/xmlunit/test_DifferenceEngine.java

Modified: trunk/xmlunit/src/java/org/custommonkey/xmlunit/DifferenceConstants.java
===================================================================

--- trunk/xmlunit/src/java/org/custommonkey/xmlunit/DifferenceConstants.java	2007-05-12 19:54:41 UTC (rev 208)
+++ trunk/xmlunit/src/java/org/custommonkey/xmlunit/DifferenceConstants.java	2007-05-16 11:25:23 UTC (rev 209)
@@ -87,6 +87,16 @@
     /** Comparing 2 nodes and one holds more childnodes than can be
      * matched against child nodes of the other. */
     int CHILD_NODE_NOT_FOUND_ID = 22;
+    /** Comparing 2 nodes with different xsi:schemaLocation
+     * attributes, potentially only one of the two provides such an
+     * attribute at all.
+     */
+    int SCHEMA_LOCATION_ID = 23;
+    /** Comparing 2 nodes with different xsi:noNamespaceSchemaLocation
+     * attributes, potentially only one of the two provides such an
+     * attribute at all.
+     */
+    int NO_NAMESPACE_SCHEMA_LOCATION_ID = 24;
         
     /** Comparing an implied attribute value against an explicit value */
     public static final Difference ATTR_VALUE_EXPLICITLY_SPECIFIED =
@@ -181,4 +191,20 @@
      * matched against child nodes of the other. */
     public static final Difference CHILD_NODE_NOT_FOUND = 
         new Difference(CHILD_NODE_NOT_FOUND_ID, "presence of child node");
+
+    /** Comparing 2 nodes with different xsi:schemaLocation
+     * attributes, potentially only one of the two provides such an
+     * attribute at all.
+     */
+    public static final Difference SCHEMA_LOCATION = 
+        new Difference(SCHEMA_LOCATION_ID, "xsi:schemaLocation attribute",
+                       true);
+    /** Comparing 2 nodes with different xsi:noNamespaceSchemaLocation
+     * attributes, potentially only one of the two provides such an
+     * attribute at all.
+     */
+    public static final Difference NO_NAMESPACE_SCHEMA_LOCATION = 
+        new Difference(NO_NAMESPACE_SCHEMA_LOCATION_ID,
+                       "xsi:noNamespaceSchemaLocation attribute",
+                       true);
 }
\ No newline at end of file

Modified: trunk/xmlunit/src/java/org/custommonkey/xmlunit/DifferenceEngine.java
===================================================================
--- trunk/xmlunit/src/java/org/custommonkey/xmlunit/DifferenceEngine.java	2007-05-12 19:54:41 UTC (rev 208)
+++ trunk/xmlunit/src/java/org/custommonkey/xmlunit/DifferenceEngine.java	2007-05-16 11:25:23 UTC (rev 209)
@@ -453,9 +453,10 @@
                 control, test, listener, ELEMENT_TAG_NAME);
 
         NamedNodeMap controlAttr = control.getAttributes();
-        Integer controlNonXmlnsAttrLength = getNonXmlnsAttrLength(controlAttr);
+        Integer controlNonXmlnsAttrLength =
+            getNonSpecialAttrLength(controlAttr);
         NamedNodeMap testAttr = test.getAttributes();
-        Integer testNonXmlnsAttrLength = getNonXmlnsAttrLength(testAttr);
+        Integer testNonXmlnsAttrLength = getNonSpecialAttrLength(testAttr);
         compare(controlNonXmlnsAttrLength, testNonXmlnsAttrLength,
                 control, test, listener, ELEMENT_NUM_ATTRIBUTES);
 
@@ -463,10 +464,16 @@
                                  listener);
     }
 
-    private Integer getNonXmlnsAttrLength(NamedNodeMap attributes) {
+    /**
+     * The number of attributes not related to namespace declarations
+     * and/or Schema location.
+     */
+    private Integer getNonSpecialAttrLength(NamedNodeMap attributes) {
         int length = 0, maxLength = attributes.getLength();
         for (int i = 0; i < maxLength; ++i) {
-            if (!isXMLNSAttribute((Attr) attributes.item(i))) {
+            Attr a = (Attr) attributes.item(i);
+            if (!isXMLNSAttribute(a)
+                && !isRecognizedXMLSchemaInstanceAttribute(a)) {
                 ++length;
             }
         }
@@ -493,8 +500,13 @@
                 } else {
                     compareTo = (Attr) testAttr.getNamedItem(attrName);
                 }
-                            
-                if (compareTo != null) {
+
+                if (isRecognizedXMLSchemaInstanceAttribute(nextAttr)) {
+                    compareRecognizedXMLSchemaInstanceAttribute(nextAttr,
+                                                                compareTo,
+                                                                listener);
+
+                } else if (compareTo != null) {
                     compareAttribute(nextAttr, compareTo, listener);
 
                     if (!XMLUnit.getIgnoreAttributeOrder()) {
@@ -539,12 +551,54 @@
     }
 
     /**
+     * @param attr
+     * @return true if the attribute is an XML Schema Instance
+     * namespace attribute XMLUnit treats in a special way.
+     */
+    private boolean isRecognizedXMLSchemaInstanceAttribute(Attr attr) {
+        return XMLConstants
+            .W3C_XML_SCHEMA_INSTANCE_NS_URI.equals(attr.getNamespaceURI())
+            && (XMLConstants
+                .W3C_XML_SCHEMA_INSTANCE_SCHEMA_LOCATION_ATTR
+                .equals(attr.getLocalName())
+                || XMLConstants
+                .W3C_XML_SCHEMA_INSTANCE_NO_NAMESPACE_SCHEMA_LOCATION_ATTR
+                .equals(attr.getLocalName()));
+    }
+
+    /**
      * Compare two attributes
      * @param control
      * @param test
      * @param listener
      * @throws DifferenceFoundException
      */
+    protected void compareRecognizedXMLSchemaInstanceAttribute(Attr control,
+                                                               Attr test,
+                                                               DifferenceListener listener)
+        throws DifferenceFoundException {
+        Difference d = 
+            XMLConstants.W3C_XML_SCHEMA_INSTANCE_SCHEMA_LOCATION_ATTR
+            .equals(control.getLocalName())
+            ? SCHEMA_LOCATION : NO_NAMESPACE_SCHEMA_LOCATION;
+
+        controlTracker.visited(control);
+        if (test != null) {
+            testTracker.visited(test);
+        }
+        
+        compare(control.getValue(),
+                test != null ? test.getValue() : "[not specified]",
+                control, test, listener, d);
+    }
+
+    /**
+     * Compare two attributes
+     * @param control
+     * @param test
+     * @param listener
+     * @throws DifferenceFoundException
+     */
     protected void compareAttribute(Attr control, Attr test,
                                     DifferenceListener listener) throws DifferenceFoundException {
         controlTracker.visited(control);

Modified: trunk/xmlunit/src/java/org/custommonkey/xmlunit/JAXPConstants.java
===================================================================
--- trunk/xmlunit/src/java/org/custommonkey/xmlunit/JAXPConstants.java	2007-05-12 19:54:41 UTC (rev 208)
+++ trunk/xmlunit/src/java/org/custommonkey/xmlunit/JAXPConstants.java	2007-05-16 11:25:23 UTC (rev 209)
@@ -1,6 +1,6 @@
 /*
  ******************************************************************
- Copyright (c) 200, Jeff Martin, Tim Bacon
+ Copyright (c) 2001-2007, Jeff Martin, Tim Bacon
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

Modified: trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLConstants.java
===================================================================
--- trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLConstants.java	2007-05-12 19:54:41 UTC (rev 208)
+++ trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLConstants.java	2007-05-16 11:25:23 UTC (rev 209)
@@ -1,6 +1,6 @@
 /*
 ******************************************************************
-Copyright (c) 2001, Jeff Martin, Tim Bacon
+Copyright (c) 2001-2007 Jeff Martin, Tim Bacon
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -139,4 +139,22 @@
      */
     public static final String W3C_XML_SCHEMA_NS_URI
         = "http://www.w3.org/2001/XMLSchema";
+
+    /**
+     * http://www.w3.org/2001/XMLSchema-instance
+     */
+    public static final String W3C_XML_SCHEMA_INSTANCE_NS_URI
+        = "http://www.w3.org/2001/XMLSchema-instance";
+
+    /**
+     * "schemaLocation"
+     */
+    public static final String W3C_XML_SCHEMA_INSTANCE_SCHEMA_LOCATION_ATTR
+        = "schemaLocation";
+
+    /**
+     * "noNamespaceSchemaLocation"
+     */
+    String W3C_XML_SCHEMA_INSTANCE_NO_NAMESPACE_SCHEMA_LOCATION_ATTR
+        = "noNamespaceSchemaLocation";
 }

Modified: trunk/xmlunit/tests/java/org/custommonkey/xmlunit/test_Diff.java
===================================================================
--- trunk/xmlunit/tests/java/org/custommonkey/xmlunit/test_Diff.java	2007-05-12 19:54:41 UTC (rev 208)
+++ trunk/xmlunit/tests/java/org/custommonkey/xmlunit/test_Diff.java	2007-05-16 11:25:23 UTC (rev 209)
@@ -683,4 +683,27 @@
         }
     }
 
+    /**
+     * inspired by {@link
+     * http://day-to-day-stuff.blogspot.com/2007/05/comparing-xml-in-junit-test.html
+     * Erik von Oosten's Weblog }, made us implement special handling
+     * of schemaLocation.
+     */
+    public void testNamespacePrefixDiff() throws Exception {
+        String xml1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+            + "<Message xmlns=\"http://www.a.nl/a10.xsd\""
+            + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
+            + " xsi:schemaLocation=\"C:/longpath/a10.xsd\""
+            + ">"
+            + "<MessageHeader/>"
+            + "</Message>";
+        String xml2 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+            + "<a:Message xmlns:a=\"http://www.a.nl/a10.xsd\">"
+            + "<a:MessageHeader/>"
+            + "</a:Message>";
+        Diff d = buildDiff(xml1, xml2);
+        assertFalse(d.toString(), d.identical());
+        assertTrue(d.toString(), d.similar());
+    }
+
 }

Modified: trunk/xmlunit/tests/java/org/custommonkey/xmlunit/test_DifferenceEngine.java
===================================================================
--- trunk/xmlunit/tests/java/org/custommonkey/xmlunit/test_DifferenceEngine.java	2007-05-12 19:54:41 UTC (rev 208)
+++ trunk/xmlunit/tests/java/org/custommonkey/xmlunit/test_DifferenceEngine.java	2007-05-16 11:25:23 UTC (rev 209)
@@ -780,6 +780,57 @@
         assertEquals(expectDifference, listener.different);
     }
 
+    public void testMissingSchemaLocation() throws Exception {
+        testMissingXSIAttribute(XMLConstants
+                                .W3C_XML_SCHEMA_INSTANCE_SCHEMA_LOCATION_ATTR,
+                                DifferenceConstants.SCHEMA_LOCATION_ID);
+    }
+
+    public void testMissingNoNamespaceSchemaLocation() throws Exception {
+        testMissingXSIAttribute(XMLConstants
+                                .W3C_XML_SCHEMA_INSTANCE_NO_NAMESPACE_SCHEMA_LOCATION_ATTR,
+                                DifferenceConstants.NO_NAMESPACE_SCHEMA_LOCATION_ID);
+    }
+
+    private void testMissingXSIAttribute(String attrName,
+                                         int expectedDifference)
+        throws Exception {
+        Element control = document.createElement("foo");
+        control.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI,
+                               attrName, "bar");
+        Element test = document.createElement("foo");
+        engine.compare(control, test, listener, null);
+        assertEquals(expectedDifference, listener.comparingWhat);
+        //resetListener();
+        //engine.compare(test, control, listener, null);
+        //assertEquals(expectedDifference, listener.comparingWhat);
+    }
+
+    public void testDifferentSchemaLocation() throws Exception {
+        testDifferentXSIAttribute(XMLConstants
+                                  .W3C_XML_SCHEMA_INSTANCE_SCHEMA_LOCATION_ATTR,
+                                  DifferenceConstants.SCHEMA_LOCATION_ID);
+    }
+
+    public void testDifferentNoNamespaceSchemaLocation() throws Exception {
+        testDifferentXSIAttribute(XMLConstants
+                                  .W3C_XML_SCHEMA_INSTANCE_NO_NAMESPACE_SCHEMA_LOCATION_ATTR,
+                                  DifferenceConstants.NO_NAMESPACE_SCHEMA_LOCATION_ID);
+    }
+
+    private void testDifferentXSIAttribute(String attrName,
+                                           int expectedDifference)
+        throws Exception {
+        Element control = document.createElement("foo");
+        control.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI,
+                               attrName, "bar");
+        Element test = document.createElement("foo");
+        test.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI,
+                            attrName, "baz");
+        engine.compare(control, test, listener, null);
+        assertEquals(expectedDifference, listener.comparingWhat);
+    }
+
     private void listenToDifferences(String control, String test)
         throws SAXException, IOException {
         Document controlDoc = XMLUnit.buildControlDocument(control);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan	Feb (3)	Mar (18)	Apr (39)	May (15)	Jun (12)	Jul (3)	Aug (23)	Sep	Oct (1)	Nov (1)	Dec (3)
2008	Jan (21)	Feb (23)	Mar (33)	Apr (8)	May (1)	Jun (22)	Jul	Aug (1)	Sep (1)	Oct (6)	Nov	Dec (11)
2009	Jan (5)	Feb	Mar (2)	Apr (24)	May (36)	Jun (18)	Jul (2)	Aug (3)	Sep (9)	Oct (3)	Nov (1)	Dec
2010	Jan (5)	Feb (3)	Mar	Apr (15)	May (24)	Jun (11)	Jul (8)	Aug (34)	Sep (42)	Oct	Nov	Dec
2011	Jan (13)	Feb (32)	Mar (35)	Apr (31)	May (33)	Jun (30)	Jul (32)	Aug (31)	Sep (30)	Oct (31)	Nov (32)	Dec (31)
2012	Jan (35)	Feb (31)	Mar (31)	Apr (30)	May (31)	Jun (34)	Jul (23)	Aug (30)	Sep (30)	Oct (29)	Nov (30)	Dec (32)
2013	Jan (25)	Feb (39)	Mar (1)	Apr (18)	May (1)	Jun	Jul (1)	Aug (20)	Sep (41)	Oct (32)	Nov (9)	Dec (31)
2014	Jan (31)	Feb (30)	Mar (34)	Apr (60)	May (31)	Jun (28)	Jul (32)	Aug (28)	Sep (26)	Oct (32)	Nov (43)	Dec (115)
2015	Jan (106)	Feb (101)	Mar (51)	Apr (32)	May (63)	Jun (18)	Jul	Aug (18)	Sep	Oct (1)	Nov (84)	Dec (63)
2016	Jan (26)	Feb (17)	Mar (104)	Apr (30)	May (6)	Jun (30)	Jul	Aug	Sep	Oct (3)	Nov (48)	Dec (22)
2017	Jan (15)	Feb (29)	Mar (43)	Apr (29)	May (25)	Jun (28)	Jul (62)	Aug (35)	Sep (35)	Oct (72)	Nov (10)	Dec (4)
2018	Jan (7)	Feb (4)	Mar	Apr (46)	May (20)	Jun (12)	Jul (9)	Aug (42)	Sep (4)	Oct (17)	Nov (32)	Dec (31)
2019	Jan (21)	Feb (14)	Mar	Apr (74)	May (25)	Jun (43)	Jul (2)	Aug (1)	Sep	Oct (2)	Nov	Dec (10)
2020	Jan (1)	Feb	Mar (26)	Apr (8)	May (62)	Jun (4)	Jul (25)	Aug	Sep (21)	Oct (24)	Nov (26)	Dec (9)
2021	Jan	Feb (4)	Mar	Apr	May	Jun	Jul (1)	Aug (1)	Sep (1)	Oct (11)	Nov (1)	Dec (12)
2022	Jan (47)	Feb	Mar (2)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (14)
2023	Jan (3)	Feb	Mar (60)	Apr (9)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2024	Jan (5)	Feb	Mar	Apr (10)	May (1)	Jun	Jul	Aug (17)	Sep (2)	Oct	Nov	Dec (1)
2025	Jan	Feb	Mar (88)	Apr (64)	May (47)	Jun (20)	Jul	Aug	Sep	Oct	Nov	Dec

xmlunit-commits Mailing List for XML Unit (Page 163)

XMLUnit provides assertions that help testing code that produces XML.

xmlunit-commits — receives commit mails