This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 63b3109954f412b64da3ee32a572c385671494ed Author: Claus Ibsen <[email protected]> AuthorDate: Thu Mar 18 08:51:50 2021 +0100 CAMEL-16369: camel-endpointdsl and camel-componentdsl - Test without JMX enabled --- core/camel-endpointdsl/pom.xml | 6 -- .../builder/endpoint/AwsS3PollEnrichTest.java | 3 +- ...ollEnrichTest.java => BaseEndpointDslTest.java} | 27 ++--- .../camel/builder/endpoint/CustomSedaTest.java | 3 +- .../camel/builder/endpoint/EndpointInjectTest.java | 3 +- .../builder/endpoint/EndpointQueryParamTest.java | 3 +- .../endpoint/FileAbsolutePathIssueTest.java | 3 +- .../endpoint/FileBatchConsumerMemoryLeakTest.java | 5 +- .../builder/endpoint/FileConsumeCharsetTest.java | 9 +- .../camel/builder/endpoint/FileDelayTest.java | 5 +- .../builder/endpoint/FtpRawParameterTest.java | 3 +- .../camel/builder/endpoint/HttpsBasicAuthTest.java | 6 +- .../endpoint/LanguageEndpointScriptRouteTest.java | 3 +- .../endpoint/LanguageEndpointStaticTest.java | 3 +- .../builder/endpoint/LanguageHeaderRouteTest.java | 3 +- .../camel/builder/endpoint/LogAdvancedTest.java | 3 +- .../camel/builder/endpoint/LogToDAdvancedTest.java | 3 +- .../endpoint/ManagedEnricherEndpointDslTest.java | 115 --------------------- .../NormalizedUriPropertyPlaceholderTest.java | 3 +- .../camel/builder/endpoint/NormalizedUriTest.java | 3 +- .../endpoint/OptionalPropertyPlaceholderTest.java | 3 +- .../apache/camel/builder/endpoint/PahoTest.java | 4 +- .../endpoint/ProcessorDefinitionDslTest.java | 3 +- .../apache/camel/builder/endpoint/QuartzTest.java | 4 +- .../builder/endpoint/RabbitMQMultiValueTest.java | 4 +- .../endpoint/SedaEnrichSimpleExpressionTest.java | 3 +- .../SedaPollEnrichSimpleExpressionTest.java | 3 +- .../builder/endpoint/SedaSimpleExpressionTest.java | 3 +- .../endpoint/SedaToDSimpleExpressionTest.java | 3 +- .../org/apache/camel/builder/endpoint/SqlTest.java | 4 +- .../camel/builder/endpoint/TimerAdvancedTest.java | 3 +- .../builder/endpoint/TimerNegativeDelayTest.java | 3 +- 32 files changed, 51 insertions(+), 201 deletions(-) diff --git a/core/camel-endpointdsl/pom.xml b/core/camel-endpointdsl/pom.xml index 798c73e..279bedf 100644 --- a/core/camel-endpointdsl/pom.xml +++ b/core/camel-endpointdsl/pom.xml @@ -92,12 +92,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/AwsS3PollEnrichTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/AwsS3PollEnrichTest.java index f944893..1b56321 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/AwsS3PollEnrichTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/AwsS3PollEnrichTest.java @@ -16,10 +16,9 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; -public class AwsS3PollEnrichTest extends CamelTestSupport { +public class AwsS3PollEnrichTest extends BaseEndpointDslTest { @Override public boolean isUseRouteBuilder() { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/AwsS3PollEnrichTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/BaseEndpointDslTest.java similarity index 61% copy from core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/AwsS3PollEnrichTest.java copy to core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/BaseEndpointDslTest.java index f944893..09ffe16 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/AwsS3PollEnrichTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/BaseEndpointDslTest.java @@ -16,29 +16,16 @@ */ package org.apache.camel.builder.endpoint; +import org.apache.camel.CamelContext; import org.apache.camel.test.junit5.CamelTestSupport; -import org.junit.jupiter.api.Test; -public class AwsS3PollEnrichTest extends CamelTestSupport { +public abstract class BaseEndpointDslTest extends CamelTestSupport { @Override - public boolean isUseRouteBuilder() { - return false; - } - - @Test - public void test() throws Exception { - context.addRoutes(new EndpointRouteBuilder() { - @Override - public void configure() throws Exception { - from("direct:start") - .pollEnrich(aws2S3("test-bucket").fileName("${body}")) - .to("mock:result"); - - } - }); - context.start(); - - context.stop(); + protected CamelContext createCamelContext() throws Exception { + CamelContext context = super.createCamelContext(); + // do not use JMX while testing + context.disableJMX(); + return context; } } diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/CustomSedaTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/CustomSedaTest.java index e86e155..dc60773 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/CustomSedaTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/CustomSedaTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.seda.SedaComponent; @@ -24,7 +23,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class CustomSedaTest extends ContextTestSupport { +public class CustomSedaTest extends BaseEndpointDslTest { @Test public void testCustomSeda() throws Exception { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointInjectTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointInjectTest.java index f7fd0b9..be48cda 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointInjectTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointInjectTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.ContextTestSupport; import org.apache.camel.FluentProducerTemplate; import org.apache.camel.builder.EndpointProducerBuilder; import org.apache.camel.builder.RouteBuilder; @@ -28,7 +27,7 @@ import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.mock; /** * Its not exactly @EndpointInject but we can simulate it via endpoint builders */ -public class EndpointInjectTest extends ContextTestSupport { +public class EndpointInjectTest extends BaseEndpointDslTest { private final EndpointProducerBuilder foo = mock("result").expectedCount(3); diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointQueryParamTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointQueryParamTest.java index 74a09a9..2bf9fd6 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointQueryParamTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointQueryParamTest.java @@ -18,10 +18,9 @@ package org.apache.camel.builder.endpoint; import org.apache.camel.RoutesBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; -public class EndpointQueryParamTest extends CamelTestSupport { +public class EndpointQueryParamTest extends BaseEndpointDslTest { @Override protected RoutesBuilder createRouteBuilder() throws Exception { return new EndpointRouteBuilder() { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileAbsolutePathIssueTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileAbsolutePathIssueTest.java index 4bd0293..02fcf14 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileAbsolutePathIssueTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileAbsolutePathIssueTest.java @@ -16,13 +16,12 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -public class FileAbsolutePathIssueTest extends ContextTestSupport { +public class FileAbsolutePathIssueTest extends BaseEndpointDslTest { private String start = testDirectory("issue").toAbsolutePath().toString(); private String done = testDirectory("done").toAbsolutePath().toString(); diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileBatchConsumerMemoryLeakTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileBatchConsumerMemoryLeakTest.java index ffafee3..82d3b75 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileBatchConsumerMemoryLeakTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileBatchConsumerMemoryLeakTest.java @@ -16,18 +16,19 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; + /** * Unit test to test CAMEL-1652 */ @Disabled("Manual test") -public class FileBatchConsumerMemoryLeakTest extends ContextTestSupport { +public class FileBatchConsumerMemoryLeakTest extends BaseEndpointDslTest { private String fileUrl = "target/data/filesorter/"; diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java index 1ac6b23..f8b7768 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java @@ -18,10 +18,11 @@ package org.apache.camel.builder.endpoint; import java.io.File; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; +import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit5.TestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -30,12 +31,12 @@ import static org.junit.jupiter.api.Assertions.assertFalse; /** * */ -public class FileConsumeCharsetTest extends ContextTestSupport { +public class FileConsumeCharsetTest extends BaseEndpointDslTest { @Override @BeforeEach public void setUp() throws Exception { - deleteDirectory("target/data/files"); + TestSupport.deleteDirectory("target/data/files"); super.setUp(); template.sendBodyAndHeader("file://target/data/files?charset=UTF-8", "Hello World \u4f60\u597d", Exchange.FILE_NAME, "report.txt"); @@ -43,6 +44,8 @@ public class FileConsumeCharsetTest extends ContextTestSupport { @Test public void testConsumeAndDelete() throws Exception { + NotifyBuilder oneExchangeDone = new NotifyBuilder(context).whenDone(1).create(); + MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello World \u4f60\u597d"); diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java index c78f181..47377e4 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java @@ -18,14 +18,15 @@ package org.apache.camel.builder.endpoint; import java.util.concurrent.TimeUnit; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class FileDelayTest extends ContextTestSupport { +import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; + +public class FileDelayTest extends BaseEndpointDslTest { @Override @BeforeEach diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java index 638ab90..52eed94 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.file.remote.FtpEndpoint; import org.junit.jupiter.api.Test; @@ -25,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -public class FtpRawParameterTest extends ContextTestSupport { +public class FtpRawParameterTest extends BaseEndpointDslTest { @Test public void testRaw() throws Exception { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/HttpsBasicAuthTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/HttpsBasicAuthTest.java index 6d82ba7..137b933 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/HttpsBasicAuthTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/HttpsBasicAuthTest.java @@ -18,16 +18,16 @@ package org.apache.camel.builder.endpoint; import java.util.Properties; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Endpoint; import org.apache.camel.builder.endpoint.dsl.HttpEndpointBuilderFactory; import org.apache.camel.component.http.HttpEndpoint; +import org.apache.camel.test.junit5.TestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class HttpsBasicAuthTest extends ContextTestSupport { +public class HttpsBasicAuthTest extends BaseEndpointDslTest { @Override public boolean isUseRouteBuilder() { @@ -52,7 +52,7 @@ public class HttpsBasicAuthTest extends ContextTestSupport { Endpoint endpoint = builder.resolve(context); assertNotNull(endpoint); - HttpEndpoint he = assertIsInstanceOf(HttpEndpoint.class, endpoint); + HttpEndpoint he = TestSupport.assertIsInstanceOf(HttpEndpoint.class, endpoint); assertEquals("scott", he.getAuthUsername()); assertEquals("tiger", he.getAuthPassword()); } diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointScriptRouteTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointScriptRouteTest.java index 5e0b9b7..a35223d 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointScriptRouteTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointScriptRouteTest.java @@ -16,14 +16,13 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Endpoint; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.direct; -public class LanguageEndpointScriptRouteTest extends ContextTestSupport { +public class LanguageEndpointScriptRouteTest extends BaseEndpointDslTest { @Test public void testLanguage() throws Exception { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointStaticTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointStaticTest.java index 1db047b..b8a1b69 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointStaticTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointStaticTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; @@ -24,7 +23,7 @@ import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.direct; import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.language; import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.mock; -public class LanguageEndpointStaticTest extends ContextTestSupport { +public class LanguageEndpointStaticTest extends BaseEndpointDslTest { @Test public void testLanguage() throws Exception { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageHeaderRouteTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageHeaderRouteTest.java index fa90e1a..2ca9568 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageHeaderRouteTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageHeaderRouteTest.java @@ -16,11 +16,10 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -public class LanguageHeaderRouteTest extends ContextTestSupport { +public class LanguageHeaderRouteTest extends BaseEndpointDslTest { @Test public void testLanguage() throws Exception { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java index c9460f7..3576b69 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java @@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; @@ -28,7 +27,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; -public class LogAdvancedTest extends ContextTestSupport { +public class LogAdvancedTest extends BaseEndpointDslTest { private final AtomicBoolean handled = new AtomicBoolean(); diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java index 0e7ddfa..8937f78 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java @@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; @@ -28,7 +27,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; -public class LogToDAdvancedTest extends ContextTestSupport { +public class LogToDAdvancedTest extends BaseEndpointDslTest { private final AtomicBoolean handled = new AtomicBoolean(); diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ManagedEnricherEndpointDslTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ManagedEnricherEndpointDslTest.java deleted file mode 100644 index c728840..0000000 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ManagedEnricherEndpointDslTest.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.builder.endpoint; - -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.management.openmbean.TabularData; - -import org.apache.camel.CamelContext; -import org.apache.camel.ManagementStatisticsLevel; -import org.apache.camel.ServiceStatus; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.Isolated; - -import static org.apache.camel.test.junit5.TestSupport.isPlatform; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - -@Isolated -public class ManagedEnricherEndpointDslTest extends CamelTestSupport { - - @Override - protected boolean useJmx() { - return true; - } - - protected MBeanServer getMBeanServer() { - return context.getManagementStrategy().getManagementAgent().getMBeanServer(); - } - - @Override - protected CamelContext createCamelContext() throws Exception { - CamelContext context = super.createCamelContext(); - context.getManagementStrategy().getManagementAgent().setStatisticsLevel(ManagementStatisticsLevel.Extended); - return context; - } - - @Test - public void testManageEnricher() throws Exception { - // JMX tests dont work well on AIX CI servers (hangs them) - if (isPlatform("aix")) { - return; - } - - MockEndpoint foo = getMockEndpoint("mock:foo"); - foo.expectedMessageCount(2); - - MockEndpoint bar = getMockEndpoint("mock:bar"); - bar.expectedMessageCount(1); - - template.sendBodyAndHeader("direct:start", "Hello World", "whereto", "foo"); - template.sendBodyAndHeader("direct:start", "Bye World", "whereto", "foo"); - template.sendBodyAndHeader("direct:start", "Hi World", "whereto", "bar"); - - assertMockEndpointsSatisfied(); - - // get the stats for the route - MBeanServer mbeanServer = getMBeanServer(); - - // get the object name for the enricher - String id = context.getManagementName(); - ObjectName on = ObjectName.getInstance("org.apache.camel:context=" + id + ",type=processors,name=\"mysend\""); - - // should be on route1 - String routeId = (String) mbeanServer.getAttribute(on, "RouteId"); - assertEquals("myroute", routeId); - - String camelId = (String) mbeanServer.getAttribute(on, "CamelId"); - assertEquals(id, camelId); - - String state = (String) mbeanServer.getAttribute(on, "State"); - assertEquals(ServiceStatus.Started.name(), state); - - String lan = (String) mbeanServer.getAttribute(on, "ExpressionLanguage"); - assertEquals("simple", lan); - - String uri = (String) mbeanServer.getAttribute(on, "Expression"); - assertEquals("direct://${header.whereto}?failIfNoConsumers=false", uri); - - TabularData data = (TabularData) mbeanServer.invoke(on, "extendedInformation", null, null); - assertNotNull(data); - assertEquals(2, data.size()); - } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new EndpointRouteBuilder() { - @Override - public void configure() throws Exception { - from("direct:start").routeId("myroute") - .enrich(direct("${header.whereto}").failIfNoConsumers(false)).id("mysend"); - - from(direct("foo")).to(mock("foo")); - from(direct("bar")).to(mock("bar")); - } - }; - } -} diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriPropertyPlaceholderTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriPropertyPlaceholderTest.java index 83e862f..fab3441 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriPropertyPlaceholderTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriPropertyPlaceholderTest.java @@ -22,12 +22,11 @@ import org.apache.camel.CamelContext; import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertSame; -public class NormalizedUriPropertyPlaceholderTest extends CamelTestSupport { +public class NormalizedUriPropertyPlaceholderTest extends BaseEndpointDslTest { @EndpointInject(value = "mock:result?failFast=false") private MockEndpoint result; diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java index 5a60922..1529ed8 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java @@ -19,12 +19,11 @@ package org.apache.camel.builder.endpoint; import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertSame; -public class NormalizedUriTest extends CamelTestSupport { +public class NormalizedUriTest extends BaseEndpointDslTest { @EndpointInject(value = "mock:result") private MockEndpoint result; diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/OptionalPropertyPlaceholderTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/OptionalPropertyPlaceholderTest.java index 08de571..9b53b62 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/OptionalPropertyPlaceholderTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/OptionalPropertyPlaceholderTest.java @@ -18,12 +18,11 @@ package org.apache.camel.builder.endpoint; import java.util.Properties; -import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -public class OptionalPropertyPlaceholderTest extends CamelTestSupport { +public class OptionalPropertyPlaceholderTest extends BaseEndpointDslTest { @Override public boolean isUseRouteBuilder() { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java index bb722cf..ae6fc1a 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java @@ -16,16 +16,16 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Endpoint; import org.apache.camel.builder.endpoint.dsl.PahoEndpointBuilderFactory; import org.apache.camel.component.paho.PahoEndpoint; import org.junit.jupiter.api.Test; +import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class PahoTest extends ContextTestSupport { +public class PahoTest extends BaseEndpointDslTest { @Override public boolean isUseRouteBuilder() { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ProcessorDefinitionDslTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ProcessorDefinitionDslTest.java index 511f11d..54dd961 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ProcessorDefinitionDslTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ProcessorDefinitionDslTest.java @@ -16,12 +16,11 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -public class ProcessorDefinitionDslTest extends ContextTestSupport { +public class ProcessorDefinitionDslTest extends BaseEndpointDslTest { @Test public void testFlow() throws Exception { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java index c403e96..52b5f67 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/QuartzTest.java @@ -16,16 +16,16 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Endpoint; import org.apache.camel.builder.endpoint.dsl.QuartzEndpointBuilderFactory; import org.apache.camel.component.quartz.QuartzEndpoint; import org.junit.jupiter.api.Test; +import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class QuartzTest extends ContextTestSupport { +public class QuartzTest extends BaseEndpointDslTest { @Override public boolean isUseRouteBuilder() { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java index 746cbcd..c6bbb35 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java @@ -19,16 +19,16 @@ package org.apache.camel.builder.endpoint; import java.util.HashMap; import java.util.Map; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Endpoint; import org.apache.camel.builder.endpoint.dsl.RabbitMQEndpointBuilderFactory; import org.apache.camel.component.rabbitmq.RabbitMQEndpoint; import org.junit.jupiter.api.Test; +import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class RabbitMQMultiValueTest extends ContextTestSupport { +public class RabbitMQMultiValueTest extends BaseEndpointDslTest { @Override public boolean isUseRouteBuilder() { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaEnrichSimpleExpressionTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaEnrichSimpleExpressionTest.java index 964bbfe..9c50c5d 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaEnrichSimpleExpressionTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaEnrichSimpleExpressionTest.java @@ -18,10 +18,9 @@ package org.apache.camel.builder.endpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; -public class SedaEnrichSimpleExpressionTest extends CamelTestSupport { +public class SedaEnrichSimpleExpressionTest extends BaseEndpointDslTest { @Override protected RouteBuilder createRouteBuilder() throws Exception { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaPollEnrichSimpleExpressionTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaPollEnrichSimpleExpressionTest.java index beaefb8..f4a5f32 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaPollEnrichSimpleExpressionTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaPollEnrichSimpleExpressionTest.java @@ -18,10 +18,9 @@ package org.apache.camel.builder.endpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; -public class SedaPollEnrichSimpleExpressionTest extends CamelTestSupport { +public class SedaPollEnrichSimpleExpressionTest extends BaseEndpointDslTest { @Override protected RouteBuilder createRouteBuilder() throws Exception { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaSimpleExpressionTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaSimpleExpressionTest.java index 08fedb6..b8cb31e 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaSimpleExpressionTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaSimpleExpressionTest.java @@ -19,12 +19,11 @@ package org.apache.camel.builder.endpoint; import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertSame; -public class SedaSimpleExpressionTest extends CamelTestSupport { +public class SedaSimpleExpressionTest extends BaseEndpointDslTest { @EndpointInject(value = "mock:result") private MockEndpoint result; diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaToDSimpleExpressionTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaToDSimpleExpressionTest.java index 9b61ed8..0f7da3e 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaToDSimpleExpressionTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SedaToDSimpleExpressionTest.java @@ -19,10 +19,9 @@ package org.apache.camel.builder.endpoint; import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; -public class SedaToDSimpleExpressionTest extends CamelTestSupport { +public class SedaToDSimpleExpressionTest extends BaseEndpointDslTest { @EndpointInject(value = "mock:result") private MockEndpoint result; diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SqlTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SqlTest.java index 8587834..2b68d10 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SqlTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/SqlTest.java @@ -18,16 +18,16 @@ package org.apache.camel.builder.endpoint; import javax.sql.DataSource; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Endpoint; import org.apache.camel.builder.endpoint.dsl.SqlEndpointBuilderFactory; import org.apache.camel.component.sql.SqlEndpoint; import org.junit.jupiter.api.Test; import org.springframework.jdbc.datasource.SimpleDriverDataSource; +import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; import static org.junit.jupiter.api.Assertions.*; -public class SqlTest extends ContextTestSupport { +public class SqlTest extends BaseEndpointDslTest { @Override public boolean isUseRouteBuilder() { diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java index 101fa36..ac9173f 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java @@ -18,7 +18,6 @@ package org.apache.camel.builder.endpoint; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; @@ -27,7 +26,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; -public class TimerAdvancedTest extends ContextTestSupport { +public class TimerAdvancedTest extends BaseEndpointDslTest { private final AtomicBoolean handled = new AtomicBoolean(); diff --git a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerNegativeDelayTest.java b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerNegativeDelayTest.java index 7a00078..6da7255 100644 --- a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerNegativeDelayTest.java +++ b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerNegativeDelayTest.java @@ -16,12 +16,11 @@ */ package org.apache.camel.builder.endpoint; -import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.Test; -public class TimerNegativeDelayTest extends ContextTestSupport { +public class TimerNegativeDelayTest extends BaseEndpointDslTest { @Test public void testNegativeDelay() throws Exception {
