[Practicalxml-commits] SF.net SVN: practicalxml:[146] branches/dev-1.1/src/test/java/net/sf/ practicalxml/converter

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

Revision: 146
          http://practicalxml.svn.sourceforge.net/practicalxml/?rev=146&view=rev
Author:   kdgregory
Date:     2009-09-22 19:21:25 +0000 (Tue, 22 Sep 2009)

Log Message:
-----------
testcase refactoring

Modified Paths:
--------------
    branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/AbstractConversionTestCase.java
    branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/AbstractBeanConverterTestCase.java
    branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestXml2BeanConverter.java

Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/AbstractConversionTestCase.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/AbstractConversionTestCase.java	2009-09-22 19:06:46 UTC (rev 145)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/AbstractConversionTestCase.java	2009-09-22 19:21:25 UTC (rev 146)
@@ -14,6 +14,12 @@
 
 package net.sf.practicalxml.converter;
 
+import static net.sf.practicalxml.builder.XmlBuilder.attribute;
+
+import javax.xml.XMLConstants;
+
+import org.w3c.dom.Element;
+
 import net.sf.practicalxml.AbstractTestCase;
 
 
@@ -32,8 +38,45 @@
 //  Support Code
 //----------------------------------------------------------------------------
 
+    protected static net.sf.practicalxml.builder.Node xsiType(String typeName)
+    {
+        return attribute(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI,
+                         "type",
+                         typeName);
+    }
 
+
+    protected static net.sf.practicalxml.builder.Node xsiNil(boolean isNil)
+    {
+        return attribute(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI,
+                         "nil",
+                         isNil ? "true" : "false");
+    }
+
+
 //----------------------------------------------------------------------------
 //  Assertions
 //----------------------------------------------------------------------------
+
+    protected void assertXsiType(String message, Element elem, String expectedType)
+    {
+        String attr = elem.getAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "type");
+        assertEquals(message, expectedType, attr);
+    }
+
+
+    protected void assertXsiNil(Element elem, boolean expected)
+    {
+        String attr = elem.getAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "nil");
+        boolean isNil = attr.equals("true");
+        assertEquals("xsi:nil (\"" + attr + "\")", expected, isNil);
+    }
+
+
+    protected void assertXsiNil(String message, Element elem, boolean expected)
+    {
+        String attr = elem.getAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "nil");
+        boolean isNil = attr.equals("true");
+        assertEquals(message, expected, isNil);
+    }
 }

Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/AbstractBeanConverterTestCase.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/AbstractBeanConverterTestCase.java	2009-09-22 19:06:46 UTC (rev 145)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/AbstractBeanConverterTestCase.java	2009-09-22 19:21:25 UTC (rev 146)
@@ -20,8 +20,6 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.xml.XMLConstants;
-
 import org.w3c.dom.Element;
 
 import junit.framework.Assert;
@@ -222,27 +220,4 @@
     {
         assertEquals(message, expectedValue, DomUtil.getText(elem));
     }
-
-
-    protected void assertXsiType(String message, Element elem, String expectedType)
-    {
-        String attr = elem.getAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "type");
-        assertEquals(message, expectedType, attr);
-    }
-
-
-    protected void assertXsiNil(Element elem, boolean expected)
-    {
-        String attr = elem.getAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "nil");
-        boolean isNil = attr.equals("true");
-        assertEquals("xsi:nil (\"" + attr + "\")", expected, isNil);
-    }
-
-
-    protected void assertXsiNil(String message, Element elem, boolean expected)
-    {
-        String attr = elem.getAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "nil");
-        boolean isNil = attr.equals("true");
-        assertEquals(message, expected, isNil);
-    }
 }

Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestXml2BeanConverter.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestXml2BeanConverter.java	2009-09-22 19:06:46 UTC (rev 145)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestXml2BeanConverter.java	2009-09-22 19:21:25 UTC (rev 146)
@@ -24,7 +24,6 @@
 import java.util.SortedMap;
 import java.util.SortedSet;
 
-import javax.xml.XMLConstants;
 import org.w3c.dom.Element;
 
 import net.sf.practicalxml.converter.ConversionException;
@@ -55,22 +54,6 @@
     }
 
 
-    private static net.sf.practicalxml.builder.Node xsiType(String typeName)
-    {
-        return attribute(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI,
-                         "type",
-                         typeName);
-    }
-
-
-    private static net.sf.practicalxml.builder.Node xsiNil(boolean isNil)
-    {
-        return attribute(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI,
-                         "nil",
-                         isNil ? "true" : "false");
-    }
-
-
     private static void assertConversionFailure(
             String message, Xml2BeanConverter driver, Element elem, Class<?> klass)
     {


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