You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/06/20 08:21:50 UTC
[camel] branch master updated: CAMEL-13666: Fixed the
JGroupsRaftClusteredRoutePolicyTest by explicit setting autoStartup(false)
on routes
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 2d1e208 CAMEL-13666: Fixed the JGroupsRaftClusteredRoutePolicyTest by explicit setting autoStartup(false) on routes
2d1e208 is described below
commit 2d1e2088882c3d99d760f7e3763b8d3e97ad6a74
Author: aldettinger <al...@gmail.com>
AuthorDate: Thu Jun 20 10:17:42 2019 +0200
CAMEL-13666: Fixed the JGroupsRaftClusteredRoutePolicyTest by explicit setting autoStartup(false) on routes
---
.../camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc | 2 +-
.../camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java | 1 -
.../apache/camel/component/jgroups/raft/JGroupsRaftProducerTest.java | 2 --
...ftClusterAbastractTest.java => JGroupsRaftClusterAbstractTest.java} | 2 +-
.../jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java | 3 ++-
.../camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java | 2 +-
6 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/components/camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc b/components/camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc
index a650ad7..fa5fab7 100644
--- a/components/camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc
+++ b/components/camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc
@@ -157,7 +157,7 @@ The component supports 12 options, which are listed below.
### Usage
Using `jgroups-raft` component with `enableRoleChangeEvents=true` on the consumer side of the route will capture
-change in JGrups-raft role and forward them to the Camel route.
+change in JGroups-raft role and forward them to the Camel route.
JGroups-raft consumer processes incoming messages
http://camel.apache.org/asynchronous-routing-engine.html[asynchronously].
diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java
index e2c8982..0a4a577 100644
--- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java
+++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftComponentDefaultTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.jgroups.raft;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jgroups.raft.utils.NopStateMachine;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
import org.junit.Test;
public class JGroupsRaftComponentDefaultTest extends CamelTestSupport {
diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftProducerTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftProducerTest.java
index 50d512b..bb4f184 100644
--- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftProducerTest.java
+++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/JGroupsRaftProducerTest.java
@@ -20,8 +20,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class JGroupsRaftProducerTest extends JGroupsRaftAbstractTest {
private static final String CLUSTER_NAME = "JGroupsRaftProducerTest";
diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusterAbastractTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusterAbstractTest.java
similarity index 96%
rename from components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusterAbastractTest.java
rename to components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusterAbstractTest.java
index ad5f5f1..6f10c78 100644
--- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusterAbastractTest.java
+++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusterAbstractTest.java
@@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit;
import org.jgroups.raft.RaftHandle;
-public abstract class JGroupsRaftClusterAbastractTest {
+public abstract class JGroupsRaftClusterAbstractTest {
protected void waitForLeader(int attempts, RaftHandle rh, RaftHandle rh2, RaftHandle rh3) throws InterruptedException {
boolean thereIsLeader = rh.isLeader() || rh2.isLeader() || rh3.isLeader();
while (!thereIsLeader && attempts > 0) {
diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
index 4928ba1..2cbcf3d 100644
--- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
+++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals;
-public class JGroupsRaftClusteredRoutePolicyTest extends JGroupsRaftClusterAbastractTest {
+public class JGroupsRaftClusteredRoutePolicyTest extends JGroupsRaftClusterAbstractTest {
private static final Logger LOG = LoggerFactory.getLogger(JGroupsRaftClusteredRoutePolicyTest.class);
private ArrayList<CamelContext> lcc = new ArrayList<>();
@@ -94,6 +94,7 @@ public class JGroupsRaftClusteredRoutePolicyTest extends JGroupsRaftClusterAbast
public void configure() throws Exception {
from("timer:master?delay=1s&period=1s")
.routeId("route-" + id)
+ .autoStartup(false)
.routePolicy(ClusteredRoutePolicy.forNamespace("jgr"))
.log("From ${routeId}");
}
diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java
index b21ea16..dd9cd89 100644
--- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java
+++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals;
-public class JGroupsRaftMasterTest extends JGroupsRaftClusterAbastractTest {
+public class JGroupsRaftMasterTest extends JGroupsRaftClusterAbstractTest {
private static final Logger LOG = LoggerFactory.getLogger(JGroupsRaftMasterTest.class);
private ArrayList<CamelContext> lcc = new ArrayList<>();