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 2023/02/25 14:14:15 UTC
[camel] 11/13: CAMEL-15105: fixed tests
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 75f156dd5bcf7c39b62cf8361a4bbb544a6cb33d
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Feb 20 13:35:11 2023 +0100
CAMEL-15105: fixed tests
---
.../org/apache/camel/component/netty/NettyRedeliveryTest.java | 3 ++-
.../main/java/org/apache/camel/test/junit5/CamelTestSupport.java | 1 -
.../java/org/apache/camel/test/main/junit5/CamelMainContext.java | 2 +-
.../component/file/FileConsumerDeleteExchangePooledTest.java | 2 +-
.../java/org/apache/camel/management/ManagedCamelContextTest.java | 8 ++++----
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java
index 2538861e06c..deb348e4b14 100644
--- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyRedeliveryTest.java
@@ -139,7 +139,8 @@ public class NettyRedeliveryTest extends CamelTestSupport {
// Override the error handler executor service such that we can track the tasks created
CamelContext context = new DefaultCamelContext(createCamelRegistry()) {
- public ScheduledExecutorService getErrorHandlerExecutorService() {
+ @Override
+ protected ScheduledExecutorService createErrorHandlerExecutorService() {
return getScheduledExecutorService();
}
};
diff --git a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index 7041588deb6..c83d1c73c0b 100644
--- a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++ b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -27,7 +27,6 @@ import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.Message;
import org.apache.camel.NamedNode;
diff --git a/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainContext.java b/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainContext.java
index 1f010eb8eb6..bc8c4d4f1df 100644
--- a/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainContext.java
+++ b/components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainContext.java
@@ -143,7 +143,7 @@ final class CamelMainContext implements ExtensionContext.Store.CloseableResource
*/
CamelMainContext build() throws Exception {
final ModelCamelContext camelContext = new DefaultCamelContext();
- final ExtendedCamelContext extendedCamelContext = camelContext.getExtension(ExtendedCamelContext.class);
+ final ExtendedCamelContext extendedCamelContext = camelContext.getCamelContextExtension();
mockEndpointsIfNeeded(extendedCamelContext);
configureShutdownTimeout(camelContext);
configureDebuggerIfNeeded(camelContext);
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDeleteExchangePooledTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDeleteExchangePooledTest.java
index 1fdd8cc4808..3b10bb7a0aa 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDeleteExchangePooledTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerDeleteExchangePooledTest.java
@@ -44,7 +44,7 @@ public class FileConsumerDeleteExchangePooledTest extends ContextTestSupport {
extendedCamelContext.getExchangeFactory().setStatisticsEnabled(true);
extendedCamelContext.getProcessorExchangeFactory().setStatisticsEnabled(true);
- return (CamelContext) extendedCamelContext;
+ return context;
}
@Test
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
index e1b581f7fa2..4f1df19ccbe 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
@@ -265,19 +265,19 @@ public class ManagedCamelContextTest extends ManagementTestSupport {
String xml = (String) mbeanServer.invoke(on, "dumpRoutesSourceLocationsAsXml", null, null);
Assertions.assertNotNull(xml);
+ Assertions.assertTrue(xml.contains(
+ "sourceLocation=\"ManagedCamelContextTest.java\" sourceLineNumber=\"288\"/>"));
Assertions.assertTrue(xml.contains(
"sourceLocation=\"ManagedCamelContextTest.java\" sourceLineNumber=\"289\"/>"));
Assertions.assertTrue(xml.contains(
"sourceLocation=\"ManagedCamelContextTest.java\" sourceLineNumber=\"290\"/>"));
- Assertions.assertTrue(xml.contains(
- "sourceLocation=\"ManagedCamelContextTest.java\" sourceLineNumber=\"291\"/>"));
+ Assertions.assertTrue(xml.contains(
+ "sourceLocation=\"ManagedCamelContextTest.java\" sourceLineNumber=\"292\"/>"));
Assertions.assertTrue(xml.contains(
"sourceLocation=\"ManagedCamelContextTest.java\" sourceLineNumber=\"293\"/>"));
Assertions.assertTrue(xml.contains(
"sourceLocation=\"ManagedCamelContextTest.java\" sourceLineNumber=\"294\"/>"));
- Assertions.assertTrue(xml.contains(
- "sourceLocation=\"ManagedCamelContextTest.java\" sourceLineNumber=\"295\"/>"));
}
@Override