[jboss-svn-commits] JBL Code SVN: r7804 - labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Nov 24 05:50:56 EST 2006
Author: kevin.conner at jboss.com
Date: 2006-11-24 05:50:54 -0500 (Fri, 24 Nov 2006)
New Revision: 7804
Modified:
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java
Log:
Updated unit tests for JBESB-237
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java 2006-11-24 10:46:48 UTC (rev 7803)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/message/tests/XMLMessageUnitTest.java 2006-11-24 10:50:54 UTC (rev 7804)
@@ -22,6 +22,7 @@
package org.jboss.soa.esb.message.tests;
+import java.io.StringReader;
import java.io.StringWriter;
import javax.xml.parsers.DocumentBuilder;
@@ -35,6 +36,7 @@
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.message.format.MessageType;
import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
@@ -55,30 +57,13 @@
Message msg = MessageFactory.getInstance().getMessage(
MessageType.JBOSS_XML);
- assertEquals((msg != null), true);
+ assertNotNull("created message", msg);
try
{
- DocumentBuilderFactory factory = DocumentBuilderFactory
- .newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- Document doc = builder.newDocument();
- MessageImpl theImpl = (MessageImpl) msg;
+ final String xmlRepresentation = msgToXML((MessageImpl)msg) ;
- doc = theImpl.toXML(doc);
-
- StringWriter sWriter = new StringWriter();
- OutputFormat format = new OutputFormat();
- format.setIndenting(true);
-
- XMLSerializer xmlS = new XMLSerializer(sWriter, format);
-
- xmlS.asDOMSerializer();
- xmlS.serialize(doc);
-
- String documentAsString = sWriter.toString();
-
- System.err.println("Message looks like: " + documentAsString);
+ System.err.println("Message looks like: " + xmlRepresentation);
}
catch (Exception ex)
{
@@ -93,34 +78,25 @@
Message msg = MessageFactory.getInstance().getMessage(
MessageType.JBOSS_XML);
- assertEquals((msg != null), true);
+ assertNotNull("created message", msg);
try
{
- DocumentBuilderFactory factory = DocumentBuilderFactory
- .newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- Document doc = builder.newDocument();
- MessageImpl theImpl = (MessageImpl) msg;
-
- doc = theImpl.toXML(doc);
-
- MessageImpl nImpl = new MessageImpl();
-
- nImpl.fromXML(doc);
+ final String xmlRepresentation = msgToXML((MessageImpl)msg) ;
+ final MessageImpl nImpl = msgFromXML(xmlRepresentation) ;
}
catch (Exception ex)
{
fail(ex.toString());
}
}
-
+
public void testHeader ()
{
Message msg = MessageFactory.getInstance().getMessage(
MessageType.JBOSS_XML);
- assertEquals((msg != null), true);
+ assertNotNull("created message", msg);
Call call = new Call();
@@ -128,7 +104,7 @@
call = msg.getHeader().getCall();
- assertEquals((call != null), true);
+ assertNotNull("message call", call);
try
{
@@ -150,7 +126,7 @@
Message msg = MessageFactory.getInstance().getMessage(
MessageType.JBOSS_XML);
- assertEquals((msg != null), true);
+ assertNotNull("created message", msg);
try
{
@@ -172,7 +148,7 @@
Message msg = MessageFactory.getInstance().getMessage(
MessageType.JBOSS_XML);
- assertEquals((msg != null), true);
+ assertNotNull("created message", msg);
String testString = "test";
@@ -180,31 +156,11 @@
try
{
- DocumentBuilderFactory factory = DocumentBuilderFactory
- .newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- Document doc = builder.newDocument();
- MessageImpl theImpl = (MessageImpl) msg;
-
- doc = theImpl.toXML(doc);
-
- StringWriter sWriter = new StringWriter();
- OutputFormat format = new OutputFormat();
- format.setIndenting(true);
-
- XMLSerializer xmlS = new XMLSerializer(sWriter, format);
-
- xmlS.asDOMSerializer();
- xmlS.serialize(doc);
-
- String documentAsString = sWriter.toString();
+ final String xmlRepresentation = msgToXML((MessageImpl)msg) ;
+ System.err.println("Document is "+xmlRepresentation);
- MessageImpl nImpl = new MessageImpl();
-
- System.err.println("Document is "+documentAsString);
+ final MessageImpl nImpl = msgFromXML(xmlRepresentation) ;
- nImpl.fromXML(doc);
-
String val = new String(nImpl.getBody().getContents());
assertEquals(val, testString);
@@ -220,14 +176,14 @@
Message msg1 = MessageFactory.getInstance().getMessage(
MessageType.JBOSS_XML);
- assertEquals((msg1 != null), true);
+ assertNotNull("created message", msg1);
String foo = "foo";
Message msg2 = MessageFactory.getInstance().getMessage(
MessageType.JBOSS_XML);
- assertEquals((msg2 != null), true);
+ assertNotNull("second created message", msg2);
String bar = "bar";
@@ -238,7 +194,7 @@
String foobar = new String(msg1.getBody().getContents());
- assertEquals(foobar.equals("bar"), true);
+ assertEquals(foobar, "bar");
}
public void testMerge ()
@@ -246,14 +202,14 @@
Message msg1 = MessageFactory.getInstance().getMessage(
MessageType.JBOSS_XML);
- assertEquals((msg1 != null), true);
+ assertNotNull("created message", msg1);
String foo = "foo";
Message msg2 = MessageFactory.getInstance().getMessage(
MessageType.JBOSS_XML);
- assertEquals((msg2 != null), true);
+ assertNotNull("second created message", msg2);
String bar = "bar";
@@ -272,7 +228,7 @@
Message msg = MessageFactory.getInstance().getMessage(
MessageType.JBOSS_XML);
- assertEquals((msg != null), true);
+ assertNotNull("created message", msg);
ExampleObject value = new ExampleObject(1234);
@@ -280,37 +236,19 @@
try
{
- DocumentBuilderFactory factory = DocumentBuilderFactory
- .newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- Document doc = builder.newDocument();
- MessageImpl theImpl = (MessageImpl) msg;
-
- doc = theImpl.toXML(doc);
-
- StringWriter sWriter = new StringWriter();
- OutputFormat format = new OutputFormat();
- format.setIndenting(true);
-
- XMLSerializer xmlS = new XMLSerializer(sWriter, format);
-
- xmlS.asDOMSerializer();
- xmlS.serialize(doc);
-
- String documentAsString = sWriter.toString();
+ final String xmlRepresentation = msgToXML((MessageImpl)msg) ;
+ System.err.println("Document is "+xmlRepresentation);
- MessageImpl nImpl = new MessageImpl();
-
- System.err.println("Document is "+documentAsString);
+ final MessageImpl nImpl = msgFromXML(xmlRepresentation) ;
- nImpl.fromXML(doc);
-
ExampleObject foo = (ExampleObject) nImpl.getBody().get("foo");
+ assertNotNull("deserialised example object", foo) ;
+
assertEquals((foo.getValue() == value.getValue()), true);
}
catch (Exception ex)
- {
+ {
fail(ex.toString());
}
}
@@ -320,7 +258,7 @@
Message msg = MessageFactory.getInstance().getMessage(
MessageType.JBOSS_XML);
- assertEquals((msg != null), true);
+ assertNotNull("created message", msg);
ExampleObject value = new ExampleObject(1234);
@@ -330,34 +268,14 @@
try
{
- DocumentBuilderFactory factory = DocumentBuilderFactory
- .newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- Document doc = builder.newDocument();
- MessageImpl theImpl = (MessageImpl) msg;
-
- doc = theImpl.toXML(doc);
-
- StringWriter sWriter = new StringWriter();
- OutputFormat format = new OutputFormat();
- format.setIndenting(true);
-
- XMLSerializer xmlS = new XMLSerializer(sWriter, format);
-
- xmlS.asDOMSerializer();
- xmlS.serialize(doc);
-
- String documentAsString = sWriter.toString();
+ final String xmlRepresentation = msgToXML((MessageImpl)msg) ;
+ System.err.println("Document is "+xmlRepresentation);
- MessageImpl nImpl = new MessageImpl();
-
- System.err.println("Document is "+documentAsString);
+ final MessageImpl nImpl = msgFromXML(xmlRepresentation) ;
- nImpl.fromXML(doc);
-
ExampleObject foo = (ExampleObject) nImpl.getBody().get("bar");
- assertEquals((foo == null), true);
+ assertNull("deserialised example object", foo);
}
catch (Exception ex)
{
@@ -365,4 +283,39 @@
}
}
+ private String msgToXML(final MessageImpl msg)
+ throws Exception
+ {
+ final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance() ;
+ final DocumentBuilder builder = factory.newDocumentBuilder() ;
+ Document doc = builder.newDocument() ;
+
+ doc = msg.toXML(doc) ;
+
+ final StringWriter sWriter = new StringWriter() ;
+ final OutputFormat format = new OutputFormat() ;
+ format.setIndenting(true) ;
+
+ final XMLSerializer xmlS = new XMLSerializer(sWriter, format) ;
+
+ xmlS.asDOMSerializer() ;
+ xmlS.serialize(doc) ;
+
+ return sWriter.toString() ;
+ }
+
+ private MessageImpl msgFromXML(final String xmlRepresentation)
+ throws Exception
+ {
+ final StringReader stringReader = new StringReader(xmlRepresentation) ;
+ final InputSource inputSource = new InputSource(stringReader) ;
+
+ final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance() ;
+ final DocumentBuilder builder = factory.newDocumentBuilder() ;
+ final Document doc = builder.parse(inputSource) ;
+
+ final MessageImpl message = new MessageImpl() ;
+ message.fromXML(doc) ;
+ return message ;
+ }
}
More information about the jboss-svn-commits
mailing list