You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/04/29 19:08:03 UTC

svn commit: r769833 - in /servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms: pom.xml src/test/java/org/apache/servicemix/jms/DefaultConsumerMarshallerTest.java

Author: gnodet
Date: Wed Apr 29 17:08:02 2009
New Revision: 769833

URL: http://svn.apache.org/viewvc?rev=769833&view=rev
Log:
SMXCOMP-510: JMS component DefaultConsumerMarshaler removes whitespace from valid XML message

Added:
    servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/DefaultConsumerMarshallerTest.java
Modified:
    servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml

Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml?rev=769833&r1=769832&r2=769833&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml Wed Apr 29 17:08:02 2009
@@ -204,6 +204,18 @@
       <version>${jencks-version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.mockrunner</groupId>
+      <artifactId>mockrunner</artifactId>
+      <version>0.3.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

Added: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/DefaultConsumerMarshallerTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/DefaultConsumerMarshallerTest.java?rev=769833&view=auto
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/DefaultConsumerMarshallerTest.java (added)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/DefaultConsumerMarshallerTest.java Wed Apr 29 17:08:02 2009
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.apache.servicemix.jms;
+
+import javax.jbi.messaging.NormalizedMessage;
+import javax.jms.Message;
+
+import junit.framework.TestCase;
+
+import com.mockrunner.mock.jms.MockTextMessage;
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.apache.servicemix.jms.endpoints.DefaultConsumerMarshaler;
+import org.apache.servicemix.tck.mock.MockNormalizedMessage;
+import org.custommonkey.xmlunit.XMLAssert;
+
+public class DefaultConsumerMarshallerTest extends TestCase {
+
+    public void testWhiteSpace() throws Exception {
+        String inputText = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <Test>"
+                               + "<element> </element>"
+                               + "</Test>";
+
+        MockTextMessage mockTextMessage = new MockTextMessage(inputText);
+        MockNormalizedMessage mockNormalizedMessage = new MockNormalizedMessage();
+        MockDefaultConsumerMarshaler defaultConsumerMarshaler = new MockDefaultConsumerMarshaler();
+        defaultConsumerMarshaler.populateMessage(mockTextMessage, mockNormalizedMessage);
+        String result = new SourceTransformer().contentToString(mockNormalizedMessage);
+        XMLAssert.assertXMLEqual(inputText, result);
+    }
+
+    class MockDefaultConsumerMarshaler extends DefaultConsumerMarshaler {
+        @Override
+        public void populateMessage(Message message, NormalizedMessage normalizedMessage) throws Exception {
+            super.populateMessage(message,
+                normalizedMessage);
+        }
+    }
+}