camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dval...@apache.org
Subject svn commit: r1295962 - in /camel/trunk/components: camel-test-spring/src/main/java/org/apache/camel/test/spring/ camel-test-spring/src/test/java/org/apache/camel/test/junit4/ camel-testng/src/test/java/org/apache/camel/testng/
Date Thu, 01 Mar 2012 22:52:58 GMT
Author: dvaleri
Date: Thu Mar  1 22:52:57 2012
New Revision: 1295962

URL: http://svn.apache.org/viewvc?rev=1295962&view=rev
Log:
[CAMEL-4987] Minor documentation tweaks and fix of a false positive unit test in Spring Test
support.

Modified:
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ExcludeRoutes.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ProvidesBreakpoint.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseAdviceWith.java
    camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerMockEndpointsTest.java
    camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsMockEndpointsTest.java

Modified: camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ExcludeRoutes.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ExcludeRoutes.java?rev=1295962&r1=1295961&r2=1295962&view=diff
==============================================================================
--- camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ExcludeRoutes.java
(original)
+++ camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ExcludeRoutes.java
Thu Mar  1 22:52:57 2012
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
  * Indicates if certain route builder classes should be excluded from discovery.  
  * Initializes a {@link org.apache.camel.spi.PackageScanClassResolver} to exclude a set of
given
  * classes from being resolved. Typically this is used at test time to exclude certain routes,
- * which might otherwise be just noisy, from being discovered and initialized.
+ * which might otherwise be noisy, from being discovered and initialized.
  */
 @Documented
 @Inherited

Modified: camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ProvidesBreakpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ProvidesBreakpoint.java?rev=1295962&r1=1295961&r2=1295962&view=diff
==============================================================================
--- camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ProvidesBreakpoint.java
(original)
+++ camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ProvidesBreakpoint.java
Thu Mar  1 22:52:57 2012
@@ -22,8 +22,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.apache.camel.spi.Breakpoint;
+
 /**
- * TODO
+ * Indicates that the annotated method returns a {@link Breakpoint} for use in the test.
 Useful for intercepting
+ * traffic to all endpoints or simply for setting a break point in an IDE for debugging.
 The method must
+ * be {@code public}, {@code static}, take no arguments, and return {@link Breakpoint}.
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)

Modified: camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseAdviceWith.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseAdviceWith.java?rev=1295962&r1=1295961&r2=1295962&view=diff
==============================================================================
--- camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseAdviceWith.java
(original)
+++ camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/UseAdviceWith.java
Thu Mar  1 22:52:57 2012
@@ -28,7 +28,7 @@ import org.apache.camel.CamelContext;
 /**
  * Indicates the use of {@code adviceWith()} within the test class.  If a class is annotated
with
  * this annotation and {@link UseAdviceWith#value()} returns true, any 
- * {@code CamelContexts} bootstrapped during the test through the use of Spring Test loaded

+ * {@code CamelContext}s bootstrapped during the test through the use of Spring Test loaded

  * application contexts will not be started automatically.  The test author is responsible
for 
  * injecting the Camel contexts into the test and executing {@link CamelContext#start()}
on them 
  * at the appropriate time after any advice has been applied to the routes in the Camel context(s).


Modified: camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerMockEndpointsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerMockEndpointsTest.java?rev=1295962&r1=1295961&r2=1295962&view=diff
==============================================================================
--- camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerMockEndpointsTest.java
(original)
+++ camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerMockEndpointsTest.java
Thu Mar  1 22:52:57 2012
@@ -31,8 +31,10 @@ public class CamelSpringJUnit4ClassRunne
     @Test
     @Override
     public void testPositive() throws Exception {
-        mockLog.expectedBodiesReceived("Hell David");
+        mockLog.expectedBodiesReceived("Hello David");
         
         super.testPositive();
+        
+        mockLog.assertIsSatisfied();
     }
 }

Modified: camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsMockEndpointsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsMockEndpointsTest.java?rev=1295962&r1=1295961&r2=1295962&view=diff
==============================================================================
--- camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsMockEndpointsTest.java
(original)
+++ camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsMockEndpointsTest.java
Thu Mar  1 22:52:57 2012
@@ -32,8 +32,10 @@ public class AbstractCamelTestNGSpringCo
     @Test
     @Override
     public void testPositive() throws Exception {
-        mockLog.expectedBodiesReceived("Hell David");
+        mockLog.expectedBodiesReceived("Hello David");
         
         super.testPositive();
+        
+        mockLog.assertIsSatisfied();
     }
 }



Mime
View raw message