(no commit message)

[utils] / support / general / src / test / java / org / wamblee / xml / XmlUtils.java

diff --git a/support/general/src/test/java/org/wamblee/xml/XmlUtils.java b/support/general/src/test/java/org/wamblee/xml/XmlUtils.java
index ac0f88df096660ae7f0a2b7b616f062ec3ad4edb..3888e6f77ba2d3cce1652e95e57cf929a9497cc8 100644 (file)
--- a/support/general/src/test/java/org/wamblee/xml/XmlUtils.java
+++ b/support/general/src/test/java/org/wamblee/xml/XmlUtils.java
@@ -12,21 +12,25 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 package org.wamblee.xml;
 
-import junit.framework.TestCase;
-
-import org.dom4j.Attribute;
-import org.dom4j.Document;
-import org.dom4j.Element;
-
+import java.io.Serializable;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import junit.framework.TestCase;
+
+import org.dom4j.Attribute;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.io.DOMReader;
+import org.dom4j.io.DOMWriter;
+
 /**
  * XML test support utilities.
  * 
@@ -52,8 +56,7 @@ public final class XmlUtils {
      */
     public static void assertEquals(String aMsg,
         org.w3c.dom.Document aExpected, org.w3c.dom.Document aActual) {
-        assertEquals(aMsg, DomUtils.convert(aExpected), DomUtils
-            .convert(aActual));
+        assertEquals(aMsg, convert(aExpected), convert(aActual));
     }
 
     /**
@@ -154,7 +157,10 @@ public final class XmlUtils {
      * Comparator which compares attributes by name.
      */
     private static final class AttributeComparator implements
-        Comparator<Attribute> {
+        Comparator<Attribute>, Serializable {
+
+        private static final long serialVersionUID = 7897287273519886301L;
+
         /*
          * (non-Javadoc)
          * 
@@ -164,4 +170,31 @@ public final class XmlUtils {
             return aAttribute1.getName().compareTo(aAttribute2.getName());
         }
     }
+    
+    /**
+     * Converts a dom4j document into a w3c DOM document.
+     * 
+     * @param aDocument
+     *            Document to convert.
+     * 
+     * @return W3C DOM document.
+     * 
+     */
+    public static org.w3c.dom.Document convert(org.dom4j.Document aDocument)
+        throws DocumentException {
+        return new DOMWriter().write(aDocument);
+    } 
+
+    /**
+     * Converts a W3C DOM document into a dom4j document.
+     * 
+     * @param aDocument
+     *            Document to convert.
+     * 
+     * @return Dom4j document.
+     */
+    public static org.dom4j.Document convert(org.w3c.dom.Document aDocument) {
+        return new DOMReader().read(aDocument);
+    }
+    
 }