This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 78574b9 [CAMEL-17597]Enable camel-zookeeper-master : GroupTest on mac
(#6890)
78574b9 is described below
commit 78574b9ef181af22482562fcbb540329aaba31e2
Author: Freeman(Yue) Fang <[email protected]>
AuthorDate: Thu Feb 3 16:20:50 2022 -0500
[CAMEL-17597]Enable camel-zookeeper-master : GroupTest on mac (#6890)
---
.../zookeepermaster/MasterEndpointTest.java | 3 +++
.../zookeepermaster/MasterQuartzEndpointTest.java | 3 +++
.../component/zookeepermaster/group/GroupTest.java | 6 ++---
.../ZookeeprContainer.java} | 31 +++++++++-------------
4 files changed, 21 insertions(+), 22 deletions(-)
diff --git
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
index 8c79578..119f73f 100644
---
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
+++
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
@@ -25,9 +25,11 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.Route;
import org.apache.camel.component.file.remote.SftpEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.zookeepermaster.group.ZookeeprContainer;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@@ -35,6 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@CamelSpringTest
@ContextConfiguration
+@ExtendWith(ZookeeprContainer.class)
public class MasterEndpointTest {
@Autowired
protected CamelContext camelContext;
diff --git
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
index bad1df0..6268f11 100644
---
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
+++
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
@@ -19,13 +19,16 @@ package org.apache.camel.component.zookeepermaster;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.zookeepermaster.group.ZookeeprContainer;
import org.apache.camel.test.spring.junit5.CamelSpringTest;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@CamelSpringTest
@ContextConfiguration
+@ExtendWith(ZookeeprContainer.class)
public class MasterQuartzEndpointTest {
@Autowired
protected CamelContext camelContext;
diff --git
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
index 2294137..2150639 100644
---
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
+++
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
@@ -34,8 +34,7 @@ import org.apache.curator.retry.RetryNTimes;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.BindMode;
@@ -46,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@DisabledOnOs(OS.MAC)
+@ExtendWith(ZookeeprContainer.class)
public class GroupTest {
private static final Logger LOGGER =
LoggerFactory.getLogger(GroupTest.class);
@@ -478,4 +477,5 @@ public class GroupTest {
return master.await(time, timeUnit);
}
}
+
}
diff --git
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/ZookeeprContainer.java
similarity index 50%
copy from
components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
copy to
components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/ZookeeprContainer.java
index bad1df0..55296d0 100644
---
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
+++
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/ZookeeprContainer.java
@@ -14,29 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.zookeepermaster;
+package org.apache.camel.component.zookeepermaster.group;
-import org.apache.camel.CamelContext;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.junit5.CamelSpringTest;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
+import org.apache.camel.test.infra.common.services.ContainerService;
+import org.testcontainers.containers.GenericContainer;
-@CamelSpringTest
-@ContextConfiguration
-public class MasterQuartzEndpointTest {
- @Autowired
- protected CamelContext camelContext;
+public class ZookeeprContainer implements ContainerService {
+ //dummy zookeeper container to use ExecutionCondition from ContainerService
+ //to detect if docker env exists or not
- @EndpointInject("mock:results")
- protected MockEndpoint resultEndpoint;
+ public ZookeeprContainer() {
- @Test
- public void testEndpoint() throws Exception {
- resultEndpoint.expectedMinimumMessageCount(2);
+ }
- MockEndpoint.assertIsSatisfied(camelContext);
+ @Override
+ public GenericContainer getContainer() {
+ return null;
}
+
}
