You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2012/02/19 14:03:30 UTC

svn commit: r1290995 - /camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatTest.java

Author: cmueller
Date: Sun Feb 19 13:03:30 2012
New Revision: 1290995

URL: http://svn.apache.org/viewvc?rev=1290995&view=rev
Log:
improved the ZipDataFormatTest

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatTest.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatTest.java?rev=1290995&r1=1290994&r2=1290995&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatTest.java Sun Feb 19 13:03:30 2012
@@ -22,7 +22,6 @@ import java.util.zip.Inflater;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
-import org.apache.camel.Message;
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -63,33 +62,25 @@ public class ZipDataFormatTest extends C
         }
     }
 
-    private void sendText() throws Exception {
-        template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                // Set the property of the charset encoding
-                exchange.setProperty(Exchange.CHARSET_NAME, "UTF-8");
-                Message in = exchange.getIn();
-                in.setBody(TEXT);
-            }
-            
-        });       
-    }
-
     public void testMarshalTextToZipBestCompression() throws Exception {
         context.addRoutes(new RouteBuilder() {
             public void configure() {
-                from("direct:start").marshal().zip(Deflater.BEST_COMPRESSION).process(new ZippedMessageProcessor());
+                from("direct:start")
+                    .marshal().zip(Deflater.BEST_COMPRESSION)
+                    .process(new ZippedMessageProcessor());
             }
         });
         context.start();
 
         sendText();
     }
-    
+
     public void testMarshalTextToZipBestSpeed() throws Exception {
         context.addRoutes(new RouteBuilder() {
             public void configure() {
-                from("direct:start").marshal().zip(Deflater.BEST_SPEED).process(new ZippedMessageProcessor());
+                from("direct:start")
+                    .marshal().zip(Deflater.BEST_SPEED)
+                    .process(new ZippedMessageProcessor());
             }
         });
         context.start();
@@ -101,18 +92,23 @@ public class ZipDataFormatTest extends C
     public void testMarshalTextToZipDefaultCompression() throws Exception {
         context.addRoutes(new RouteBuilder() {
             public void configure() {
-                from("direct:start").marshal().zip(Deflater.DEFAULT_COMPRESSION).process(new ZippedMessageProcessor());
+                from("direct:start")
+                    .marshal().zip(Deflater.DEFAULT_COMPRESSION)
+                    .process(new ZippedMessageProcessor());
             }
         });
         context.start();
 
         sendText();
     }
-    
+
     public void testUnMarshalTextToZip() throws Exception {
         context.addRoutes(new RouteBuilder() {
             public void configure() {
-                from("direct:start").marshal().zip().unmarshal().zip().to("mock:result");
+                from("direct:start")
+                    .marshal().zip()
+                    .unmarshal().zip()
+                    .to("mock:result");
             }
         });
         context.start();
@@ -121,8 +117,12 @@ public class ZipDataFormatTest extends C
         result.expectedBodiesReceived(TEXT);
         sendText();
         result.assertIsSatisfied();
-    }    
-    
+    }
+
+    private void sendText() throws Exception {
+        template.sendBodyAndProperty("direct:start", TEXT, Exchange.CHARSET_NAME, "UTF-8");
+    }
+
     private static class ZippedMessageProcessor implements Processor {
 
         public void process(Exchange exchange) throws Exception {
@@ -147,5 +147,4 @@ public class ZipDataFormatTest extends C
             assertEquals(TEXT, result);
         }
     }    
-  
 }