Author: bvahdat
Date: Sat Aug 18 19:33:37 2012
New Revision: 1374641

URL: http://svn.apache.org/viewvc?rev=1374641&view=rev
Log:
Merged revisions 1374639 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1374639 | bvahdat | 2012-08-18 21:30:19 +0200 (Sa, 18 Aug 2012) | 1 line
  
  CAMEL-5508: Fixed the broken itest in a cleaner way without explicit adding 
of PropertiesComponent into the context as the PropertiesComponent has been 
already defined inside the spring xml, which is the one we should better make 
use of.
........

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1374639

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java?rev=1374641&r1=1374640&r2=1374641&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
 (original)
+++ 
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.java
 Sat Aug 18 19:33:37 2012
@@ -16,12 +16,10 @@
  */
 package org.apache.camel.itest.jms;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.AdviceWithRouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.camel.test.junit4.CamelSpringTestSupport;
 import org.junit.Test;
@@ -51,24 +49,16 @@ public class JMSTransactionIsTransactedR
         return true;
     }
 
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        // as we make use of placeholders for the Jetty port we should add 
PropertiesComponent beforehand
-        // so that the port can properly be resolved
-        CamelContext context = super.createCamelContext();
-        context.addComponent("properties", new PropertiesComponent());
-        return context;
-    }
-
     @Test
     public void testTransactionSuccess() throws Exception {
+        context.start();
+
         context.getRouteDefinitions().get(0).adviceWith(context, new 
AdviceWithRouteBuilder() {
             @Override
             public void configure() throws Exception {
                 onException(AssertionError.class).to("log:error", 
"mock:error");
             }
         });
-        context.start();
 
         // there should be no assertion errors
         MockEndpoint error = getMockEndpoint("mock:error");


Reply via email to