svn commit: r742906 - in /camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty: JettyContentTypeTest.java JettyImageFileTest.java

[ningjiang]

Author: ningjiang
Date: Tue Feb 10 09:22:13 2009
New Revision: 742906

URL: http://svn.apache.org/viewvc?rev=742906&view=rev
Log:
CAMEL-1327 little refactoring of camel-jetty unit tests

Modified:
    
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
    
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java

Modified: 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java?rev=742906&r1=742905&r2=742906&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
 (original)
+++ 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContentTypeTest.java
 Tue Feb 10 09:22:13 2009
@@ -27,33 +27,28 @@
  * Unit test for content-type
  */
 public class JettyContentTypeTest extends ContextTestSupport {
-
-    public void testSameContentType() throws Exception {
+    protected void sendMessageWithContentType(boolean usingGZip) {
         Endpoint endpoint = 
context.getEndpoint("http://localhost:9080/myapp/myservice";);
         Exchange exchange = endpoint.createExchange();
         exchange.getIn().setBody("<order>123</order>");
         exchange.getIn().setHeader("user", "Claus");
         exchange.getIn().setHeader("content-type", "text/xml");
+        if (usingGZip) {
+            GZIPHelper.setGZIPMessageHeader(exchange.getIn());
+        }
         template.send(endpoint, exchange);
 
         String body = exchange.getOut().getBody(String.class);
         assertEquals("<order>OK</order>", body);
         assertOutMessageHeader(exchange, "content-type", "text/xml");
     }
+
+    public void testSameContentType() throws Exception {
+        sendMessageWithContentType(false);
+    }
     
     public void testContentTypeWithGZip() throws Exception {
-        Endpoint endpoint = 
context.getEndpoint("http://localhost:9080/myapp/myservice";);
-        Exchange exchange = endpoint.createExchange();
-        exchange.getIn().setBody("<order>123</order>");
-        exchange.getIn().setHeader("user", "Claus");
-        exchange.getIn().setHeader("content-type", "text/xml");
-        GZIPHelper.setGZIPMessageHeader(exchange.getIn());
-        template.send(endpoint, exchange);
-
-        String body = exchange.getOut().getBody(String.class);
-        assertEquals("<order>OK</order>", body);
-        assertOutMessageHeader(exchange, "content-type", "text/xml");
-        assertOutMessageHeader(exchange, GZIPHelper.CONTENT_ENCODING, 
GZIPHelper.GZIP);
+        sendMessageWithContentType(true);
     }
 
     public void testMixedContentType() throws Exception {

Modified: 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java?rev=742906&r1=742905&r2=742906&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java
 (original)
+++ 
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyImageFileTest.java
 Tue Feb 10 09:22:13 2009
@@ -29,24 +29,25 @@
  * Unit test for exposing a http server that returns images
  */
 public class JettyImageFileTest extends ContextTestSupport {
-
-    public void testImageContentType() throws Exception {
+    
+    private void sendImageContent(boolean usingGZip) throws Exception {
         Endpoint endpoint = 
context.getEndpoint("http://localhost:9080/myapp/myservice";);
         Exchange exchange = endpoint.createExchange();
+        if (usingGZip) {
+            GZIPHelper.setGZIPMessageHeader(exchange.getIn());
+        }
         template.send(endpoint, exchange);
 
         assertNotNull(exchange.getOut().getBody());
         assertOutMessageHeader(exchange, "Content-Type", "image/jpeg");
     }
-    
-    public void testImageWithGZip() throws Exception {
-        Endpoint endpoint = 
context.getEndpoint("http://localhost:9080/myapp/myservice";);
-        Exchange exchange = endpoint.createExchange();
-        GZIPHelper.setGZIPMessageHeader(exchange.getIn());
-        template.send(endpoint, exchange);
 
-        assertNotNull(exchange.getOut().getBody());
-        assertOutMessageHeader(exchange, "Content-Type", "image/jpeg");
+    public void testImageContentType() throws Exception {
+        sendImageContent(false);
+    }
+    
+    public void testImageContentWithGZip() throws Exception {
+        sendImageContent(true);
     }
 
     @Override