You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/03/03 09:59:45 UTC
svn commit: r1076560 -
/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/
Author: davsclaus
Date: Thu Mar 3 08:59:44 2011
New Revision: 1076560
URL: http://svn.apache.org/viewvc?rev=1076560&view=rev
Log:
Fixed tests.
Modified:
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
Modified: camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java?rev=1076560&r1=1076559&r2=1076560&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java (original)
+++ camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java Thu Mar 3 08:59:44 2011
@@ -28,14 +28,21 @@ import org.junit.Test;
public class HazelcastListConsumerTest extends CamelTestSupport {
+ private List<String> list;
+
+ @Override
+ public void setUp() throws Exception {
+ list = Hazelcast.getList("mm");
+ list.clear();
+
+ super.setUp();
+ }
+
@Test
public void add() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:added");
out.expectedMessageCount(1);
- List<String> list = Hazelcast.getList("mm");
- list.clear();
-
list.add("foo");
assertMockEndpointsSatisfied(2000, TimeUnit.MILLISECONDS);
@@ -46,12 +53,8 @@ public class HazelcastListConsumerTest e
@Test
public void remove() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:removed");
-
out.expectedMessageCount(1);
- List<String> list = Hazelcast.getList("mm");
- list.clear();
-
list.add("foo");
list.remove("foo");
Modified: camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java?rev=1076560&r1=1076559&r2=1076560&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java (original)
+++ camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java Thu Mar 3 08:59:44 2011
@@ -27,6 +27,16 @@ import org.junit.Test;
public class HazelcastListProducerTest extends CamelTestSupport {
+ private List<String> list;
+
+ @Override
+ public void setUp() throws Exception {
+ list = Hazelcast.getList("bar");
+ list.clear();
+
+ super.setUp();
+ }
+
// @Test
public void add() throws InterruptedException {
List<Object> list = Hazelcast.getList("bar");
Modified: camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java?rev=1076560&r1=1076559&r2=1076560&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java (original)
+++ camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java Thu Mar 3 08:59:44 2011
@@ -33,17 +33,10 @@ public class HazelcastMapConsumerTest ex
@Override
public void setUp() throws Exception {
- super.setUp();
-
this.map = Hazelcast.getMap("foo");
this.map.clear();
- }
-
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- this.map.clear();
+ super.setUp();
}
@Test
@@ -107,7 +100,6 @@ public class HazelcastMapConsumerTest ex
.log("...added").to("mock:added").when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ENVICTED)).log("...envicted").to("mock:envicted")
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.UPDATED)).log("...updated").to("mock:updated")
.when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.REMOVED)).log("...removed").to("mock:removed").otherwise().log("fail!");
-
}
};
}
Modified: camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java?rev=1076560&r1=1076559&r2=1076560&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java (original)
+++ camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java Thu Mar 3 08:59:44 2011
@@ -33,17 +33,10 @@ public class HazelcastMapProducerForSpri
@Override
public void setUp() throws Exception {
- super.setUp();
-
this.map = Hazelcast.getMap("foo");
this.map.clear();
- }
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
-
- this.map.clear();
+ super.setUp();
}
@Override
Modified: camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java?rev=1076560&r1=1076559&r2=1076560&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java (original)
+++ camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java Thu Mar 3 08:59:44 2011
@@ -32,17 +32,10 @@ public class HazelcastMapProducerTest ex
@Override
public void setUp() throws Exception {
- super.setUp();
-
this.map = Hazelcast.getMap("foo");
this.map.clear();
- }
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
-
- this.map.clear();
+ super.setUp();
}
@Test
Modified: camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java?rev=1076560&r1=1076559&r2=1076560&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java (original)
+++ camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java Thu Mar 3 08:59:44 2011
@@ -34,17 +34,10 @@ public class HazelcastMultimapConsumerTe
@Override
public void setUp() throws Exception {
- super.setUp();
-
this.map = Hazelcast.getMultiMap("mm");
this.map.clear();
- }
-
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- this.map.clear();
+ super.setUp();
}
@Test
@@ -79,7 +72,6 @@ public class HazelcastMultimapConsumerTe
// assertMockEndpointsSatisfied(30000, TimeUnit.MILLISECONDS);
assertTrue(true);
-
}
@Test
@@ -92,7 +84,6 @@ public class HazelcastMultimapConsumerTe
assertMockEndpointsSatisfied(5000, TimeUnit.MILLISECONDS);
this.checkHeaders(out.getExchanges().get(0).getIn().getHeaders(), HazelcastConstants.REMOVED);
-
}
@Override
Modified: camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java?rev=1076560&r1=1076559&r2=1076560&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java (original)
+++ camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java Thu Mar 3 08:59:44 2011
@@ -32,17 +32,10 @@ public class HazelcastMultimapProducerFo
@Override
public void setUp() throws Exception {
- super.setUp();
-
this.map = Hazelcast.getMultiMap("foo");
this.map.clear();
- }
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
-
- this.map.clear();
+ super.setUp();
}
@Override
Modified: camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java?rev=1076560&r1=1076559&r2=1076560&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java (original)
+++ camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java Thu Mar 3 08:59:44 2011
@@ -31,17 +31,10 @@ public class HazelcastMultimapProducerTe
@Override
public void setUp() throws Exception {
- super.setUp();
-
this.map = Hazelcast.getMultiMap("bar");
this.map.clear();
- }
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
-
- this.map.clear();
+ super.setUp();
}
@Test
Modified: camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java?rev=1076560&r1=1076559&r2=1076560&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java (original)
+++ camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java Thu Mar 3 08:59:44 2011
@@ -21,7 +21,6 @@ import java.util.concurrent.BlockingQueu
import java.util.concurrent.TimeUnit;
import com.hazelcast.core.Hazelcast;
-
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -29,12 +28,21 @@ import org.junit.Test;
public class HazelcastQueueConsumerTest extends CamelTestSupport {
+ private BlockingQueue<String> map;
+
+ @Override
+ public void setUp() throws Exception {
+ this.map = Hazelcast.getQueue("mm");
+ this.map.clear();
+
+ super.setUp();
+ }
+
@Test
public void add() throws InterruptedException {
MockEndpoint out = getMockEndpoint("mock:added");
out.expectedMessageCount(1);
- BlockingQueue<String> map = Hazelcast.getQueue("mm");
map.put("foo");
assertMockEndpointsSatisfied(2000, TimeUnit.MILLISECONDS);
@@ -47,7 +55,7 @@ public class HazelcastQueueConsumerTest
MockEndpoint out = getMockEndpoint("mock:removed");
out.expectedMessageCount(1);
- BlockingQueue<String> map = Hazelcast.getQueue("mm");
+ map.put("foo");
map.remove();
assertMockEndpointsSatisfied(2000, TimeUnit.MILLISECONDS);
@@ -62,7 +70,6 @@ public class HazelcastQueueConsumerTest
from(String.format("hazelcast:%smm", HazelcastConstants.QUEUE_PREFIX)).log("object...").choice().when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED))
.log("...added").to("mock:added").when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.REMOVED)).log("...removed").to("mock:removed").otherwise()
.log("fail!");
-
}
};
}
Modified: camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java?rev=1076560&r1=1076559&r2=1076560&view=diff
==============================================================================
--- camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java (original)
+++ camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java Thu Mar 3 08:59:44 2011
@@ -21,17 +21,25 @@ import java.util.concurrent.BlockingQueu
import com.hazelcast.core.Hazelcast;
+import com.hazelcast.core.MultiMap;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class HazelcastQueueProducerTest extends CamelTestSupport {
- @Test
- public void put() throws InterruptedException {
- Queue<Object> queue = Hazelcast.getQueue("bar");
+ private BlockingQueue<String> queue;
+
+ @Override
+ public void setUp() throws Exception {
+ queue = Hazelcast.getQueue("bar");
queue.clear();
+ super.setUp();
+ }
+
+ @Test
+ public void put() throws InterruptedException {
template.sendBody("direct:put", "foo");
assertTrue(queue.contains("foo"));
@@ -41,9 +49,6 @@ public class HazelcastQueueProducerTest
@Test
public void add() throws InterruptedException {
- Queue<Object> queue = Hazelcast.getQueue("bar");
- queue.clear();
-
template.sendBody("direct:add", "bar");
assertTrue(queue.contains("bar"));
@@ -53,9 +58,6 @@ public class HazelcastQueueProducerTest
@Test
public void offer() throws InterruptedException {
- Queue<Object> queue = Hazelcast.getQueue("bar");
- queue.clear();
-
template.sendBody("direct:offer", "foobar");
assertTrue(queue.contains("foobar"));
@@ -64,9 +66,6 @@ public class HazelcastQueueProducerTest
@Test
public void removeValue() throws InterruptedException {
- BlockingQueue<String> queue = Hazelcast.getQueue("bar");
- queue.clear();
-
queue.put("foo1");
queue.put("foo2");
queue.put("foo3");
@@ -89,9 +88,6 @@ public class HazelcastQueueProducerTest
@Test
public void poll() throws InterruptedException {
- BlockingQueue<String> queue = Hazelcast.getQueue("bar");
- queue.clear();
-
queue.put("foo");
assertEquals(1, queue.size());
@@ -105,9 +101,6 @@ public class HazelcastQueueProducerTest
@Test
public void peek() throws InterruptedException {
- BlockingQueue<String> queue = Hazelcast.getQueue("bar");
- queue.clear();
-
queue.put("foo");
assertEquals(1, queue.size());
@@ -124,7 +117,6 @@ public class HazelcastQueueProducerTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("direct:put").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUT_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX));
from("direct:add").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.ADD_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX));
@@ -137,7 +129,6 @@ public class HazelcastQueueProducerTest
from("direct:removevalue").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.REMOVEVALUE_OPERATION)).to(
String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX));
-
}
};
}