camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject svn commit: r1441338 - in /camel/branches/camel-2.9.x: ./ camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java
Date Fri, 01 Feb 2013 08:30:41 GMT
Author: bvahdat
Date: Fri Feb  1 08:30:41 2013
New Revision: 1441338

URL: http://svn.apache.org/viewvc?rev=1441338&view=rev
Log:
Merged revisions 1441337 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x

........
  r1441337 | bvahdat | 2013-02-01 09:27:42 +0100 (Fr, 01 Feb 2013) | 1 line
  
  Fixed CS.
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/branches/camel-2.10.x:r1441337

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

Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java?rev=1441338&r1=1441337&r2=1441338&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java
(original)
+++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutTest.java
Fri Feb  1 08:30:41 2013
@@ -29,7 +29,7 @@ import org.apache.camel.processor.aggreg
  */
 public class AggregateTimeoutTest extends ContextTestSupport {
 
-    private final AtomicInteger INVOKED = new AtomicInteger();
+    private final AtomicInteger invoked = new AtomicInteger();
     private volatile Exchange receivedExchange;
     private volatile int receivedIndex;
     private volatile int receivedTotal;
@@ -48,7 +48,7 @@ public class AggregateTimeoutTest extend
         mock.assertIsSatisfied();
 
         // should invoke the timeout method
-        assertEquals(1, INVOKED.get());
+        assertEquals(1, invoked.get());
 
         assertNotNull(receivedExchange);
         assertEquals("AB", receivedExchange.getIn().getBody());
@@ -68,7 +68,7 @@ public class AggregateTimeoutTest extend
         mock.assertIsSatisfied(1500);
 
         // should have not invoked the timeout method anymore
-        assertEquals(1, INVOKED.get());
+        assertEquals(1, invoked.get());
     }
 
     @Override
@@ -90,7 +90,7 @@ public class AggregateTimeoutTest extend
     private class MyAggregationStrategy implements TimeoutAwareAggregationStrategy {
 
         public void timeout(Exchange oldExchange, int index, int total, long timeout) {
-            INVOKED.incrementAndGet();
+            invoked.incrementAndGet();
 
             // we can't assert on the expected values here as the contract of this method
doesn't
             // allow to throw any Throwable (including AssertionFailedError) so that we assert



Mime
View raw message