[jsword-svn] r2132 - trunk/jsword/src/test/java/org/crosswire/common/xml

[dmsmith at crosswire.org]

Author: dmsmith
Date: 2011-03-15 14:25:55 -0700 (Tue, 15 Mar 2011)
New Revision: 2132

Modified:
   trunk/jsword/src/test/java/org/crosswire/common/xml/XMLUtilTest.java
Log:
Fix a failing test. The test needed to be updated.

Modified: trunk/jsword/src/test/java/org/crosswire/common/xml/XMLUtilTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/common/xml/XMLUtilTest.java	2011-03-15 21:20:57 UTC (rev 2131)
+++ trunk/jsword/src/test/java/org/crosswire/common/xml/XMLUtilTest.java	2011-03-15 21:25:55 UTC (rev 2132)
@@ -44,11 +44,11 @@
         assertEquals("aa & aa", XMLUtil.cleanAllEntities("aa & aa"));
         assertEquals("aa &amp aa", XMLUtil.cleanAllEntities("aa &amp aa"));
         assertEquals("aa &a-mp aa", XMLUtil.cleanAllEntities("aa &a-mp aa"));
-        assertEquals("aa  aa", XMLUtil.cleanAllEntities("aa &am; aa"));
+        assertEquals("aa   aa", XMLUtil.cleanAllEntities("aa &am; aa"));
         assertEquals("aa &am aa", XMLUtil.cleanAllEntities("aa &am aa"));
         assertEquals("aa &", XMLUtil.cleanAllEntities("aa &"));
         assertEquals("aa &amp", XMLUtil.cleanAllEntities("aa &amp"));
-        assertEquals("aa ", XMLUtil.cleanAllEntities("aa &am;"));
+        assertEquals("aa  ", XMLUtil.cleanAllEntities("aa &am;"));
         assertEquals("aa &am", XMLUtil.cleanAllEntities("aa &am"));
         assertEquals("aa &a", XMLUtil.cleanAllEntities("aa &a"));
         assertEquals("aa &", XMLUtil.cleanAllEntities("aa &"));
@@ -56,7 +56,7 @@
         assertEquals("aa \u00A0 aa", XMLUtil.cleanAllEntities("aa   aa"));
         assertEquals("aa &nbsp aa", XMLUtil.cleanAllEntities("aa &nbsp aa"));
         assertEquals("aa &nb-sp aa", XMLUtil.cleanAllEntities("aa &nb-sp aa"));
-        assertEquals("aa  aa", XMLUtil.cleanAllEntities("aa &nb; aa"));
+        assertEquals("aa   aa", XMLUtil.cleanAllEntities("aa &nb; aa"));
         assertEquals("aa &nb aa", XMLUtil.cleanAllEntities("aa &nb aa"));
 
         assertEquals("-&-\u00A0-<->-"-\u00A3-\u20AC-", XMLUtil.cleanAllEntities("-&- -<->-"-£-€-"));
@@ -69,34 +69,34 @@
         assertEquals("aa", XMLUtil.cleanAllTags("aa"));
         assertEquals("aa & aa", XMLUtil.cleanAllTags("aa & aa"));
 
-        assertEquals("", XMLUtil.cleanAllTags("<a>"));
-        assertEquals("", XMLUtil.cleanAllTags("<aa>"));
-        assertEquals("", XMLUtil.cleanAllTags("</aa>"));
-        assertEquals("", XMLUtil.cleanAllTags("<aa wibble=\"wobble\">"));
-        assertEquals("keep", XMLUtil.cleanAllTags("<aa>keep</aa>"));
-        assertEquals("keep", XMLUtil.cleanAllTags("<aa>keep<aa>"));
-        assertEquals("keep", XMLUtil.cleanAllTags("<aa>ke<aa>ep"));
-        assertEquals("keep", XMLUtil.cleanAllTags("ke<aa><aa>ep"));
-        assertEquals("keep keep", XMLUtil.cleanAllTags("ke<aa><aa>ep<bb> <cc>ke<aa><aa>ep"));
+        assertEquals(" ", XMLUtil.cleanAllTags("<a>"));
+        assertEquals(" ", XMLUtil.cleanAllTags("<aa>"));
+        assertEquals(" ", XMLUtil.cleanAllTags("</aa>"));
+        assertEquals(" ", XMLUtil.cleanAllTags("<aa wibble=\"wobble\">"));
+        assertEquals(" keep ", XMLUtil.cleanAllTags("<aa>keep</aa>"));
+        assertEquals(" keep ", XMLUtil.cleanAllTags("<aa>keep<aa>"));
+        assertEquals(" ke ep", XMLUtil.cleanAllTags("<aa>ke<aa>ep"));
+        assertEquals("ke  ep", XMLUtil.cleanAllTags("ke<aa><aa>ep"));
+        assertEquals("ke  ep   ke  ep", XMLUtil.cleanAllTags("ke<aa><aa>ep<bb> <cc>ke<aa><aa>ep"));
 
-        assertEquals("", XMLUtil.cleanAllTags("<"));
-        assertEquals("", XMLUtil.cleanAllTags("<a"));
-        assertEquals("", XMLUtil.cleanAllTags("<aa"));
-        assertEquals("", XMLUtil.cleanAllTags("<aa;"));
-        assertEquals("", XMLUtil.cleanAllTags("<\\"));
-        assertEquals("", XMLUtil.cleanAllTags("<\\a"));
-        assertEquals("", XMLUtil.cleanAllTags("<\\aa"));
-        assertEquals("", XMLUtil.cleanAllTags("<\\aa;"));
-        assertEquals("", XMLUtil.cleanAllTags("< "));
-        assertEquals("", XMLUtil.cleanAllTags("< a"));
-        assertEquals("", XMLUtil.cleanAllTags("< aa"));
-        assertEquals("", XMLUtil.cleanAllTags("< aa;"));
-        assertEquals("", XMLUtil.cleanAllTags("< aa>"));
-        assertEquals("keep", XMLUtil.cleanAllTags("keep<"));
-        assertEquals("keep", XMLUtil.cleanAllTags("keep<a"));
-        assertEquals("keep", XMLUtil.cleanAllTags("keep<aa"));
-        assertEquals("keep", XMLUtil.cleanAllTags("keep<aa dont=\"want\""));
-        assertEquals("keep", XMLUtil.cleanAllTags("keep<aa dont=\"want\" keep"));
-        assertEquals("keep", XMLUtil.cleanAllTags("keep<aa dont=\"want\" keep>"));
+        assertEquals(" ", XMLUtil.cleanAllTags("<"));
+        assertEquals(" ", XMLUtil.cleanAllTags("<a"));
+        assertEquals(" ", XMLUtil.cleanAllTags("<aa"));
+        assertEquals(" ", XMLUtil.cleanAllTags("<aa;"));
+        assertEquals(" ", XMLUtil.cleanAllTags("<\\"));
+        assertEquals(" ", XMLUtil.cleanAllTags("<\\a"));
+        assertEquals(" ", XMLUtil.cleanAllTags("<\\aa"));
+        assertEquals(" ", XMLUtil.cleanAllTags("<\\aa;"));
+        assertEquals(" ", XMLUtil.cleanAllTags("< "));
+        assertEquals(" ", XMLUtil.cleanAllTags("< a"));
+        assertEquals(" ", XMLUtil.cleanAllTags("< aa"));
+        assertEquals(" ", XMLUtil.cleanAllTags("< aa;"));
+        assertEquals(" ", XMLUtil.cleanAllTags("< aa>"));
+        assertEquals("keep ", XMLUtil.cleanAllTags("keep<"));
+        assertEquals("keep ", XMLUtil.cleanAllTags("keep<a"));
+        assertEquals("keep ", XMLUtil.cleanAllTags("keep<aa"));
+        assertEquals("keep ", XMLUtil.cleanAllTags("keep<aa dont=\"want\""));
+        assertEquals("keep ", XMLUtil.cleanAllTags("keep<aa dont=\"want\" keep"));
+        assertEquals("keep ", XMLUtil.cleanAllTags("keep<aa dont=\"want\" keep>"));
     }
 }