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 990559c66f7fee74ed9c5162ac487f0ecb97018a
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Mon Oct 3 11:41:22 2022 +0200
CAMEL-18575: use JUnit's 5 TempDir annotation camel-activemq
Also removed unused temp directory methods
---
.../java/org/apache/camel/component/activemq/JmsJdbcXATest.java | 9 +++++++--
.../component/activemq/support/ActiveMQSpringTestSupport.java | 7 -------
.../apache/camel/component/activemq/support/ActiveMQSupport.java | 8 --------
.../camel/component/activemq/support/ActiveMQTestSupport.java | 5 -----
4 files changed, 7 insertions(+), 22 deletions(-)
diff --git
a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
index 3bb22c92314..fa93ff51082 100644
---
a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
+++
b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.activemq;
+import java.nio.file.Path;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;
@@ -40,6 +41,7 @@ import
org.apache.camel.component.activemq.support.ActiveMQSpringTestSupport;
import org.apache.camel.test.infra.activemq.services.ActiveMQEmbeddedService;
import
org.apache.camel.test.infra.activemq.services.ActiveMQEmbeddedServiceBuilder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -56,6 +58,9 @@ public class JmsJdbcXATest extends ActiveMQSpringTestSupport {
BrokerService broker;
int messageCount;
+ @TempDir
+ Path dataDirectory;
+
public java.sql.Connection initDb() throws Exception {
String createStatement = "CREATE TABLE SCP_INPUT_MESSAGES (" + "id int
NOT NULL GENERATED ALWAYS AS IDENTITY, "
+ "messageId varchar(96) NOT NULL, " +
"messageCorrelationId varchar(96) NOT NULL, "
@@ -110,7 +115,7 @@ public class JmsJdbcXATest extends
ActiveMQSpringTestSupport {
.defaultBroker()
.withDeleteAllMessagesOnStartup(false)
.withBrokerName(JmsJdbcXATest.class)
- .withDataDirectory(testDirectory().toString())
+ .withDataDirectory(dataDirectory)
.build()
.getBrokerService();
@@ -181,7 +186,7 @@ public class JmsJdbcXATest extends
ActiveMQSpringTestSupport {
.defaultBroker()
.withBrokerName(JmsJdbcXATest.class)
.withTcpTransport()
- .withDataDirectory(testDirectory().toString())
+ .withDataDirectory(dataDirectory)
.build()
.getBrokerService();
diff --git
a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/support/ActiveMQSpringTestSupport.java
b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/support/ActiveMQSpringTestSupport.java
index 823fae8938b..4b16d4ad02c 100644
---
a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/support/ActiveMQSpringTestSupport.java
+++
b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/support/ActiveMQSpringTestSupport.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.activemq.support;
-import java.nio.file.Path;
-
-import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -29,10 +26,6 @@ public abstract class ActiveMQSpringTestSupport extends
CamelSpringTestSupport i
return newAppContext(getClass().getSimpleName() + "-context.xml");
}
- public Path testDirectory() {
- return CamelTestSupport.testDirectory(getClass(), false);
- }
-
protected int getShutdownTimeout() {
return 1;
}
diff --git
a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/support/ActiveMQSupport.java
b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/support/ActiveMQSupport.java
index f2471d456fd..efb2f23a1c5 100644
---
a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/support/ActiveMQSupport.java
+++
b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/support/ActiveMQSupport.java
@@ -16,10 +16,6 @@
*/
package org.apache.camel.component.activemq.support;
-import java.nio.file.Path;
-
-import org.apache.camel.test.junit5.CamelTestSupport;
-
public interface ActiveMQSupport {
default String vmUri() {
@@ -29,8 +25,4 @@ public interface ActiveMQSupport {
default String vmUri(String query) {
return "vm://" + getClass().getSimpleName() + (query.startsWith("?") ?
"" : "-") + query;
}
-
- default Path testDirectory() {
- return CamelTestSupport.testDirectory(getClass(), false);
- }
}
diff --git
a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/support/ActiveMQTestSupport.java
b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/support/ActiveMQTestSupport.java
index 35c03135e0b..be3bac740e1 100644
---
a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/support/ActiveMQTestSupport.java
+++
b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/support/ActiveMQTestSupport.java
@@ -16,13 +16,8 @@
*/
package org.apache.camel.component.activemq.support;
-import java.nio.file.Path;
-
import org.apache.camel.test.junit5.CamelTestSupport;
public class ActiveMQTestSupport extends CamelTestSupport implements
ActiveMQSupport {
- public Path testDirectory() {
- return CamelTestSupport.testDirectory(getClass(), false);
- }
}
