This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f164b2481729bd47562cc0351c78a6b84b4bf8ad
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Jun 11 17:18:34 2020 +0200
[CAMEL-11807] Upgrade camel-hystrix to junit5
---
components/camel-hystrix/pom.xml | 2 +-
.../processor/HystrixBadRequestExceptionTest.java | 7 +++++--
.../hystrix/processor/HystrixCircuitOpenTest.java | 4 ++--
.../processor/HystrixHierarchicalConfigTest.java | 23 +++++++++++-----------
.../processor/HystrixInheritErrorHandlerTest.java | 4 ++--
.../hystrix/processor/HystrixManagementTest.java | 14 +++++++++----
.../HystrixRouteConfigMaximumSizeTest.java | 6 ++++--
.../hystrix/processor/HystrixRouteConfigTest.java | 6 ++++--
.../processor/HystrixRouteFallbackTest.java | 4 ++--
.../HystrixRouteFallbackViaNetworkTest.java | 4 ++--
.../hystrix/processor/HystrixRouteOkTest.java | 6 ++++--
.../hystrix/processor/HystrixTimeoutTest.java | 14 ++++++++++---
.../processor/HystrixTimeoutWithFallbackTest.java | 6 ++++--
.../SpringHystrixRouteConfigMaximumSizeTest.java | 4 ++--
.../processor/SpringHystrixRouteConfigRefTest.java | 4 ++--
.../processor/SpringHystrixRouteConfigTest.java | 4 ++--
.../processor/SpringHystrixRouteFallbackTest.java | 4 ++--
.../SpringHystrixRouteHierarchicalConfigTest.java | 16 ++++++++-------
.../processor/SpringHystrixRouteOkTest.java | 4 ++--
19 files changed, 82 insertions(+), 54 deletions(-)
diff --git a/components/camel-hystrix/pom.xml b/components/camel-hystrix/pom.xml
index 0117a4e..9bc7599 100644
--- a/components/camel-hystrix/pom.xml
+++ b/components/camel-hystrix/pom.xml
@@ -67,7 +67,7 @@
<!-- for testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixBadRequestExceptionTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixBadRequestExceptionTest.java
index fb37a4b..904971f 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixBadRequestExceptionTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixBadRequestExceptionTest.java
@@ -20,8 +20,11 @@ import
com.netflix.hystrix.exception.HystrixBadRequestException;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class HystrixBadRequestExceptionTest extends CamelTestSupport {
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixCircuitOpenTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixCircuitOpenTest.java
index 2b793cc..bf02539 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixCircuitOpenTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixCircuitOpenTest.java
@@ -24,8 +24,8 @@ import org.apache.camel.Processor;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigTest.java
index b3940da..7af9ad8 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigTest.java
@@ -24,8 +24,9 @@ import org.apache.camel.model.CircuitBreakerDefinition;
import org.apache.camel.model.HystrixConfigurationDefinition;
import org.apache.camel.model.Model;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class HystrixHierarchicalConfigTest {
@@ -57,9 +58,9 @@ public class HystrixHierarchicalConfigTest {
);
final HystrixConfigurationDefinition config =
reifier.buildHystrixConfiguration();
- Assert.assertEquals("local-conf-group-key", config.getGroupKey());
- Assert.assertEquals("global-thread-key", config.getThreadPoolKey());
- Assert.assertEquals(Integer.toString(5), config.getCorePoolSize());
+ assertEquals("local-conf-group-key", config.getGroupKey());
+ assertEquals("global-thread-key", config.getThreadPoolKey());
+ assertEquals(Integer.toString(5), config.getCorePoolSize());
}
@Test
@@ -89,9 +90,9 @@ public class HystrixHierarchicalConfigTest {
);
final HystrixConfigurationDefinition config =
reifier.buildHystrixConfiguration();
- Assert.assertEquals("local-conf-group-key", config.getGroupKey());
- Assert.assertEquals("global-thread-key", config.getThreadPoolKey());
- Assert.assertEquals(Integer.toString(5), config.getCorePoolSize());
+ assertEquals("local-conf-group-key", config.getGroupKey());
+ assertEquals("global-thread-key", config.getThreadPoolKey());
+ assertEquals(Integer.toString(5), config.getCorePoolSize());
}
@Test
@@ -130,8 +131,8 @@ public class HystrixHierarchicalConfigTest {
);
final HystrixConfigurationDefinition config =
reifier.buildHystrixConfiguration();
- Assert.assertEquals("local-conf-group-key", config.getGroupKey());
- Assert.assertEquals("global-thread-key", config.getThreadPoolKey());
- Assert.assertEquals(Integer.toString(5), config.getCorePoolSize());
+ assertEquals("local-conf-group-key", config.getGroupKey());
+ assertEquals("global-thread-key", config.getThreadPoolKey());
+ assertEquals(Integer.toString(5), config.getCorePoolSize());
}
}
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixInheritErrorHandlerTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixInheritErrorHandlerTest.java
index f67de0b..b236e88 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixInheritErrorHandlerTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixInheritErrorHandlerTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.hystrix.processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class HystrixInheritErrorHandlerTest extends CamelTestSupport {
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixManagementTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixManagementTest.java
index fc1c257..c5e7685 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixManagementTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixManagementTest.java
@@ -23,11 +23,17 @@ import javax.management.ObjectName;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.hystrix.metrics.HystrixEventStreamService;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class HystrixManagementTest extends CamelTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(HystrixManagementTest.class);
+
private HystrixEventStreamService stream = new HystrixEventStreamService();
@Override
@@ -84,11 +90,11 @@ public class HystrixManagementTest extends CamelTestSupport
{
Thread.sleep(1000);
String latest = stream.oldestMetricsAsJSon();
- log.info("Oldest json stream: {}", latest);
+ LOG.info("Oldest json stream: {}", latest);
Stream<String> jsons = stream.streamMetrics();
jsons.forEach(s -> {
- log.info("JSon: {}", s);
+ LOG.info("JSon: {}", s);
});
}
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigMaximumSizeTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigMaximumSizeTest.java
index b02bb7f..8f80dfa 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigMaximumSizeTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigMaximumSizeTest.java
@@ -20,8 +20,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.CircuitBreakerDefinition;
import org.apache.camel.model.HystrixConfigurationDefinition;
import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class HystrixRouteConfigMaximumSizeTest extends CamelTestSupport {
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigTest.java
index c4652e3..f37e2ff 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteConfigTest.java
@@ -20,8 +20,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.CircuitBreakerDefinition;
import org.apache.camel.model.HystrixConfigurationDefinition;
import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class HystrixRouteConfigTest extends CamelTestSupport {
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteFallbackTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteFallbackTest.java
index 04fcb0b..4af2b44 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteFallbackTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteFallbackTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.hystrix.processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class HystrixRouteFallbackTest extends CamelTestSupport {
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteFallbackViaNetworkTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteFallbackViaNetworkTest.java
index 7040ce4..0b7fc22 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteFallbackViaNetworkTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteFallbackViaNetworkTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.hystrix.processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class HystrixRouteFallbackViaNetworkTest extends CamelTestSupport {
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteOkTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteOkTest.java
index 162677d..1b28518 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteOkTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixRouteOkTest.java
@@ -22,8 +22,10 @@ import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class HystrixRouteOkTest extends CamelTestSupport {
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java
index ef73ffb..dbef905 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutTest.java
@@ -20,14 +20,22 @@ import java.util.concurrent.TimeoutException;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Hystrix using timeout with Java DSL
*/
public class HystrixTimeoutTest extends CamelTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(HystrixManagementTest.class);
+
@Test
public void testFast() throws Exception {
// this calls the fast route and therefore we get a response
@@ -52,7 +60,7 @@ public class HystrixTimeoutTest extends CamelTestSupport {
// this calls the slow route and therefore causes a timeout which
triggers an exception
for (int i = 0; i < 10; i++) {
try {
- log.info(">>> test run " + i + " <<<");
+ LOG.info(">>> test run " + i + " <<<");
template.requestBody("direct:start", "slow");
fail("Should fail due to timeout");
} catch (Exception e) {
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java
index 7eabc78..b81e3e7 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixTimeoutWithFallbackTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.hystrix.processor;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Hystrix using timeout and fallback with Java DSL
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigMaximumSizeTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigMaximumSizeTest.java
index 24f6874..02a32a4 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigMaximumSizeTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigMaximumSizeTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.hystrix.processor;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigRefTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigRefTest.java
index 6b6ea03..f4fc9e6 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigRefTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigRefTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.hystrix.processor;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigTest.java
index 4a8da72..0790dec 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteConfigTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.hystrix.processor;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteFallbackTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteFallbackTest.java
index 93346ef..1f17755 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteFallbackTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteFallbackTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.hystrix.processor;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.java
index 854792b..d16f0c1 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteHierarchicalConfigTest.java
@@ -22,13 +22,15 @@ import org.apache.camel.impl.engine.DefaultRoute;
import org.apache.camel.model.CircuitBreakerDefinition;
import org.apache.camel.model.HystrixConfigurationDefinition;
import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
@DirtiesContext
public class SpringHystrixRouteHierarchicalConfigTest extends
CamelSpringTestSupport {
@Override
@@ -43,14 +45,14 @@ public class SpringHystrixRouteHierarchicalConfigTest
extends CamelSpringTestSup
routeDefinition.idOrCreate(context.adapt(ExtendedCamelContext.class).getNodeIdFactory()),
null, null);
CircuitBreakerDefinition hystrixDefinition =
findCircuitBreakerDefinition(routeDefinition);
- Assert.assertNotNull(hystrixDefinition);
+ assertNotNull(hystrixDefinition);
HystrixReifier reifier = new HystrixReifier(route, hystrixDefinition);
HystrixConfigurationDefinition config =
reifier.buildHystrixConfiguration();
- Assert.assertEquals("local-conf-group-key", config.getGroupKey());
- Assert.assertEquals("global-thread-key", config.getThreadPoolKey());
- Assert.assertEquals(Integer.toString(5), config.getCorePoolSize());
+ assertEquals("local-conf-group-key", config.getGroupKey());
+ assertEquals("global-thread-key", config.getThreadPoolKey());
+ assertEquals(Integer.toString(5), config.getCorePoolSize());
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
diff --git
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteOkTest.java
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteOkTest.java
index c685dcf..04b0a62 100644
---
a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteOkTest.java
+++
b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/SpringHystrixRouteOkTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.hystrix.processor;
import org.apache.camel.spi.CircuitBreakerConstants;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
