From: <bo...@us...> - 2010-09-13 11:47:10
|
Revision: 471 http://xmlunit.svn.sourceforge.net/xmlunit/?rev=471&view=rev Author: bodewig Date: 2010-09-13 11:47:03 +0000 (Mon, 13 Sep 2010) Log Message: ----------- adapt test to new engine Modified Paths: -------------- trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java Modified: trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java =================================================================== --- trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java 2010-09-13 11:37:08 UTC (rev 470) +++ trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java 2010-09-13 11:47:03 UTC (rev 471) @@ -770,8 +770,8 @@ assertFalse(diff.toString(), diff.identical()); assertFalse(diff.toString(), diff.similar()); } - - public void NOtestMatchTrackerSetViaOverride() throws Exception { + + public void testMatchTrackerSetViaOverride() throws Exception { Diff diff = buildDiff("<foo/>", "<foo/>"); final int[] count = new int[1]; diff.overrideMatchTracker(new MatchTracker() { @@ -780,14 +780,18 @@ } }); assertTrue(diff.identical()); - // NODE_TYPE (not null), NODE_TYPE(Document), NAMESPACE_URI(none), - // NAMESPACE_PREFIX(none), HAS_DOCTYPE_DECLARATION(no), - // HAS_CHILD_NODES(true) + + // uses new engine + + // NODE_TYPE(Document), NAMESPACE_URI(none), + // NAMESPACE_PREFIX(none), NUMBER_OF_CHILDREN(1) + // HAS_DOCTYPE_DECLARATION(no), CHILD_NODE_SEQUENCE(0) // // NODE_TYPE(Element), NAMESPACE_URI(none), - // NAMESPACE_PREFIX(none), ELEMENT_TAG_NAME(foo), - // ELEMENT_NUM_ATTRIBUTE(none), HAS_CHILD_NODES(false) - assertEquals(12, count[0]); + // NAMESPACE_PREFIX(none), HAS_CHILD_NODES(false), + // ELEMENT_TAG_NAME(foo), ELEMENT_NUM_ATTRIBUTE(none), + // SCHEMA_LOCATION(none), NO_NAMESPACE_SCHEMA_LOCATION(none) + assertEquals(14, count[0]); } public void testMatchTrackerSetViaEngine() throws Exception { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2013-02-01 16:39:23
|
Revision: 500 http://xmlunit.svn.sourceforge.net/xmlunit/?rev=500&view=rev Author: bodewig Date: 2013-02-01 16:39:16 +0000 (Fri, 01 Feb 2013) Log Message: ----------- 3602981 doesn't affect the 2.x code base - at least in Java - as the xsi:type attributes are ignored completely. Not good either Modified Paths: -------------- trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java Property Changed: ---------------- trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java Modified: trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java =================================================================== --- trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java 2013-02-01 16:30:03 UTC (rev 499) +++ trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java 2013-02-01 16:39:16 UTC (rev 500) @@ -1,6 +1,6 @@ /* ****************************************************************** -Copyright (c) 2001-2008,2010 Jeff Martin, Tim Bacon +Copyright (c) 2001-2013, Jeff Martin, Tim Bacon All rights reserved. Redistribution and use in source and binary forms, with or without @@ -981,5 +981,35 @@ diff = new Diff(test, control); assertTrue(diff.toString(), diff.identical()); } + + /** + * @see http://sourceforge.net/tracker/?func=detail&atid=377768&aid=3602981&group_id=23187 + */ + public void testXsiTypeSpecialCase() throws Exception { + String test = "<ns1:Square xsi:type=\"ns1:Shape\" " + + "xmlns:ns1=\"http://example.com/\" " + + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>"; + + String control = "<ns2:Square xsi:type=\"ns2:Shape\" " + + "xmlns:ns2=\"http://example.com/\" " + + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>"; + Diff diff = new Diff(control, test); + assertTrue(diff.toString(), diff.similar()); + } + + public void XtestXsiTypeSpecialCaseDoesntIgnorePrefix() throws Exception { + String test = "<ns1:Square xsi:type=\"ns1:Shape\" " + + "xmlns:ns1=\"http://example.com/\" " + + "xmlns:ns2=\"http://example.com/another-uri/\" " + + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>"; + + String control = "<ns1:Square xsi:type=\"ns2:Shape\" " + + "xmlns:ns1=\"http://example.com/\" " + + "xmlns:ns2=\"http://example.com/another-uri/\" " + + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>"; + Diff diff = new Diff(control, test); + assertFalse(diff.toString(), diff.similar()); + } + } Property changes on: trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/xmlunit-1.x/tests/java/org/custommonkey/xmlunit/test_Diff.java:337,346,353,494,499 /branches/xmlunit-1.x/tests/org/custommonkey/xmlunit/test_Diff.java:346 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2013-02-03 10:17:56
|
Revision: 507 http://xmlunit.svn.sourceforge.net/xmlunit/?rev=507&view=rev Author: bodewig Date: 2013-02-03 10:17:50 +0000 (Sun, 03 Feb 2013) Log Message: ----------- xsi:nil test for legacy API Modified Paths: -------------- trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java Modified: trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java =================================================================== --- trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java 2013-02-03 10:14:36 UTC (rev 506) +++ trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java 2013-02-03 10:17:50 UTC (rev 507) @@ -1049,5 +1049,14 @@ assertFalse(diff.toString(), diff.similar()); } + public void testXsiNil() throws Exception { + String test = "<foo xsi:nil=\"true\" " + + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>"; + + String control = "<foo xsi:nil=\"false\" " + + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"/>"; + Diff diff = new Diff(control, test); + assertFalse(diff.toString(), diff.similar()); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |