svn commit: r769806 - in /servicemix/components/bindings/servicemix-jms/trunk: pom.xml src/test/java/org/apache/servicemix/jms/DefaultConsumerMarshallerTest.java

[gn...@apache.org]

Author: gnodet
Date: Wed Apr 29 16:05:28 2009
New Revision: 769806

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

Added:
    servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/DefaultConsumerMarshallerTest.java
Modified:
    servicemix/components/bindings/servicemix-jms/trunk/pom.xml

Modified: servicemix/components/bindings/servicemix-jms/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/pom.xml?rev=769806&r1=769805&r2=769806&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/pom.xml Wed Apr 29 16:05:28 2009
@@ -42,7 +42,7 @@
     <previous.releases>3.1.2,3.2,3.2.1,3.2.2,3.2.3,2008.01</previous.releases>
     <!-- Due to the use of: JBIContainer.setUseNewTransactionModel(boolean) -->
     <servicemix-version>3.3</servicemix-version>
-    <servicemix-shared-version>2009.01</servicemix-shared-version>
+    <servicemix-shared-version>2009.02-SNAPSHOT</servicemix-shared-version>
     <activemq-version>5.2.0</activemq-version>
     <jencks-version>2.1</jencks-version>
 
@@ -296,6 +296,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/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/DefaultConsumerMarshallerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/DefaultConsumerMarshallerTest.java?rev=769806&view=auto
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/DefaultConsumerMarshallerTest.java (added)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/DefaultConsumerMarshallerTest.java Wed Apr 29 16:05:28 2009
@@ -0,0 +1,51 @@
+/*
+ * 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 com.mockrunner.mock.jms.MockTextMessage;
+import org.apache.servicemix.jms.endpoints.DefaultConsumerMarshaler;
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.apache.servicemix.tck.mock.MockNormalizedMessage;
+import junit.framework.TestCase;
+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);
+      }
+   }
+}