You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/08/16 15:23:06 UTC
[camel] 02/02: (chores) camel-test-infra-activemq: rename a few methods to give more clarity
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8bcb2f5f0436a975b6d8250b842aaa4ea12785e3
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Aug 16 15:51:45 2022 +0200
(chores) camel-test-infra-activemq: rename a few methods to give more clarity
---
.../org/apache/camel/component/jms/AbstractJMSTest.java | 2 +-
.../component/jms/JmsProducerWithJMSHeaderTest.java | 2 +-
.../infra/activemq/services/ActiveMQServiceFactory.java | 16 +++++-----------
3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractJMSTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractJMSTest.java
index f99690b72e6..43c7f569e44 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractJMSTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractJMSTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public abstract class AbstractJMSTest extends CamelTestSupport {
@RegisterExtension
- public static ActiveMQService service = ActiveMQServiceFactory.createEmbeddedService();
+ public static ActiveMQService service = ActiveMQServiceFactory.createVMService();
public static String queueNameForClass(String desiredName, Class<?> requestingClass) {
return desiredName + "." + requestingClass.getSimpleName();
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
index bbdb75aad16..b71ebe358dd 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
@@ -46,7 +46,7 @@ public class JmsProducerWithJMSHeaderTest extends CamelTestSupport {
// This one needs a different lifecycle, so we cannot extend AbstractJMSTest
@RegisterExtension
- private ActiveMQService service = ActiveMQServiceFactory.createEmbeddedService();
+ private ActiveMQService service = ActiveMQServiceFactory.createVMService();
@Test
public void testInOnlyJMSPrioritory() throws Exception {
diff --git a/test-infra/camel-test-infra-activemq/src/test/java/org/apache/camel/test/infra/activemq/services/ActiveMQServiceFactory.java b/test-infra/camel-test-infra-activemq/src/test/java/org/apache/camel/test/infra/activemq/services/ActiveMQServiceFactory.java
index 89c898069db..bddb725c436 100644
--- a/test-infra/camel-test-infra-activemq/src/test/java/org/apache/camel/test/infra/activemq/services/ActiveMQServiceFactory.java
+++ b/test-infra/camel-test-infra-activemq/src/test/java/org/apache/camel/test/infra/activemq/services/ActiveMQServiceFactory.java
@@ -81,11 +81,11 @@ public final class ActiveMQServiceFactory {
.build();
}
- public static synchronized ActiveMQService createEmbeddedService() {
- return createSingletonEmbeddedService();
+ public static synchronized ActiveMQService createVMService() {
+ return createSingletonVMService();
}
- public static synchronized ActiveMQService createEmbeddedServiceInstance() {
+ public static synchronized ActiveMQService createVMServiceInstance() {
if (service == null) {
if (instance == null) {
instance = new SimpleTestServiceBuilder<>("activemq");
@@ -97,15 +97,9 @@ public final class ActiveMQServiceFactory {
return instance.build();
}
- public static synchronized ActiveMQService createSingletonEmbeddedService() {
+ public static synchronized ActiveMQService createSingletonVMService() {
if (service == null) {
- if (instance == null) {
- instance = new SimpleTestServiceBuilder<>("activemq");
-
- instance.addLocalMapping(() -> new SingletonActiveMQService(new ActiveMQVMService(), "activemq"));
- }
-
- service = instance.build();
+ service = createVMServiceInstance();
}
return service;