[Practicalxml-commits] SF.net SVN: practicalxml:[34] trunk/src/test/java/net/sf/practicalxml

[Auto-Generated S. C. M. <pra...@li...>]

Revision: 34
          http://practicalxml.svn.sourceforge.net/practicalxml/?rev=34&view=rev
Author:   kdgregory
Date:     2008-11-25 21:05:33 +0000 (Tue, 25 Nov 2008)

Log Message:
-----------
Add assertMultiline(), so that tests will pass on Windows

Modified Paths:
--------------
    trunk/src/test/java/net/sf/practicalxml/TestDomUtil.java
    trunk/src/test/java/net/sf/practicalxml/TestOutputUtil.java
    trunk/src/test/java/net/sf/practicalxml/TestParseUtil.java
    trunk/src/test/java/net/sf/practicalxml/TestSchemaUtil.java
    trunk/src/test/java/net/sf/practicalxml/TestXmlUtil.java
    trunk/src/test/java/net/sf/practicalxml/builder/TestXmlBuilder.java
    trunk/src/test/java/net/sf/practicalxml/misc/TestNodeListIterable.java

Added Paths:
-----------
    trunk/src/test/java/net/sf/practicalxml/AbstractTestCase.java

Added: trunk/src/test/java/net/sf/practicalxml/AbstractTestCase.java
===================================================================
--- trunk/src/test/java/net/sf/practicalxml/AbstractTestCase.java	                        (rev 0)
+++ trunk/src/test/java/net/sf/practicalxml/AbstractTestCase.java	2008-11-25 21:05:33 UTC (rev 34)
@@ -0,0 +1,44 @@
+package net.sf.practicalxml;
+
+import junit.framework.TestCase;
+
+/**
+ *  Provides common support code (primarily assertions) for all testcases.
+ */
+public abstract class AbstractTestCase
+extends TestCase
+{
+    /**
+     *  Common constructor -- it's my habit to pass the name, even though
+     *  JUnit doesn't require it.
+     */
+    protected AbstractTestCase(String name)
+    {
+        super(name);
+    }
+
+
+    /**
+     *  Default constructor -- because I declare an alternative
+     */
+    protected AbstractTestCase()
+    {
+        super();
+    }
+
+
+    /**
+     *  Asserts a multi-line string, after stripping out any '\r' characters.
+     *  Needed for a cross-platform build.
+     */
+    protected void assertMultiline(String expected, String actual)
+    {
+        StringBuilder buf = new StringBuilder(actual);
+        int idx = 0;
+        while ((idx = buf.indexOf("\r")) >= 0)
+        {
+            buf.deleteCharAt(idx);
+        }
+        assertEquals(expected, buf.toString());
+    }
+}


Property changes on: trunk/src/test/java/net/sf/practicalxml/AbstractTestCase.java
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/src/test/java/net/sf/practicalxml/TestDomUtil.java
===================================================================
--- trunk/src/test/java/net/sf/practicalxml/TestDomUtil.java	2008-11-18 01:59:34 UTC (rev 33)
+++ trunk/src/test/java/net/sf/practicalxml/TestDomUtil.java	2008-11-25 21:05:33 UTC (rev 34)
@@ -6,9 +6,9 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
 
-import junit.framework.TestCase;
 
-public class TestDomUtil extends TestCase
+public class TestDomUtil
+extends AbstractTestCase
 {
     public void testNewDocument() throws Exception
     {

Modified: trunk/src/test/java/net/sf/practicalxml/TestOutputUtil.java
===================================================================
--- trunk/src/test/java/net/sf/practicalxml/TestOutputUtil.java	2008-11-18 01:59:34 UTC (rev 33)
+++ trunk/src/test/java/net/sf/practicalxml/TestOutputUtil.java	2008-11-25 21:05:33 UTC (rev 34)
@@ -2,10 +2,10 @@
 
 import java.io.ByteArrayOutputStream;
 import org.w3c.dom.Element;
-import junit.framework.TestCase;
 
 
-public class TestOutputUtil extends TestCase
+public class TestOutputUtil
+extends AbstractTestCase
 {
     public TestOutputUtil(String name)
     {
@@ -71,9 +71,9 @@
         DomUtil.setText(child, SOME_TEXT);
 
         String s = OutputUtil.indentedString(root.getOwnerDocument(), 4);
-        assertEquals(EL_ROOT_START +
-                     "\n    " + EL_CHILD_START + SOME_TEXT + EL_CHILD_END +
-                     "\n" + EL_ROOT_END + "\n", s);
+        assertMultiline(EL_ROOT_START
+                        + "\n    " + EL_CHILD_START + SOME_TEXT + EL_CHILD_END
+                        + "\n" + EL_ROOT_END + "\n", s);
     }
 
 

Modified: trunk/src/test/java/net/sf/practicalxml/TestParseUtil.java
===================================================================
--- trunk/src/test/java/net/sf/practicalxml/TestParseUtil.java	2008-11-18 01:59:34 UTC (rev 33)
+++ trunk/src/test/java/net/sf/practicalxml/TestParseUtil.java	2008-11-25 21:05:33 UTC (rev 34)
@@ -19,9 +19,9 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
-import junit.framework.TestCase;
 
-public class TestParseUtil extends TestCase
+public class TestParseUtil
+extends AbstractTestCase
 {
 //----------------------------------------------------------------------------
 //  Support Code

Modified: trunk/src/test/java/net/sf/practicalxml/TestSchemaUtil.java
===================================================================
--- trunk/src/test/java/net/sf/practicalxml/TestSchemaUtil.java	2008-11-18 01:59:34 UTC (rev 33)
+++ trunk/src/test/java/net/sf/practicalxml/TestSchemaUtil.java	2008-11-25 21:05:33 UTC (rev 34)
@@ -11,10 +11,9 @@
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;
 
-import junit.framework.TestCase;
 
-
-public class TestSchemaUtil extends TestCase
+public class TestSchemaUtil
+extends AbstractTestCase
 {
 //----------------------------------------------------------------------------
 //  Definitions for newSchema() testing

Modified: trunk/src/test/java/net/sf/practicalxml/TestXmlUtil.java
===================================================================
--- trunk/src/test/java/net/sf/practicalxml/TestXmlUtil.java	2008-11-18 01:59:34 UTC (rev 33)
+++ trunk/src/test/java/net/sf/practicalxml/TestXmlUtil.java	2008-11-25 21:05:33 UTC (rev 34)
@@ -4,9 +4,9 @@
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
-import junit.framework.TestCase;
 
-public class TestXmlUtil extends TestCase
+public class TestXmlUtil
+extends AbstractTestCase
 {
     public void testIsLegal() throws Exception
     {

Modified: trunk/src/test/java/net/sf/practicalxml/builder/TestXmlBuilder.java
===================================================================
--- trunk/src/test/java/net/sf/practicalxml/builder/TestXmlBuilder.java	2008-11-18 01:59:34 UTC (rev 33)
+++ trunk/src/test/java/net/sf/practicalxml/builder/TestXmlBuilder.java	2008-11-25 21:05:33 UTC (rev 34)
@@ -6,14 +6,13 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import junit.framework.TestCase;
-
+import net.sf.practicalxml.AbstractTestCase;
 import net.sf.practicalxml.DomUtil;
 import static net.sf.practicalxml.builder.XmlBuilder.*;
 
 
 public class TestXmlBuilder
-extends TestCase
+extends AbstractTestCase
 {
     public void testSingleElement() throws Exception
     {
@@ -126,7 +125,7 @@
     {
         String s = element("foo", element("bar", text("baz")))
                    .toString(3);
-        assertEquals("<foo>\n   <bar>baz</bar>\n</foo>\n", s);
+        assertMultiline("<foo>\n   <bar>baz</bar>\n</foo>\n", s);
     }
 
 

Modified: trunk/src/test/java/net/sf/practicalxml/misc/TestNodeListIterable.java
===================================================================
--- trunk/src/test/java/net/sf/practicalxml/misc/TestNodeListIterable.java	2008-11-18 01:59:34 UTC (rev 33)
+++ trunk/src/test/java/net/sf/practicalxml/misc/TestNodeListIterable.java	2008-11-25 21:05:33 UTC (rev 34)
@@ -3,6 +3,7 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
+import net.sf.practicalxml.AbstractTestCase;
 import net.sf.practicalxml.DomUtil;
 import net.sf.practicalxml.misc.NodeListIterable;
 
@@ -10,10 +11,9 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.Text;
 
-import junit.framework.TestCase;
 
-
-public class TestNodeListIterable extends TestCase
+public class TestNodeListIterable
+extends AbstractTestCase
 {
     public void testOperation() throws Exception
     {


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