This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 31c95a42c012b23baa8eab84fa01784eb701ee38 Author: James Netherton <[email protected]> AuthorDate: Thu Sep 15 07:29:44 2022 +0100 Restore tests that use map config style configuration Fixes #4011 --- .../java/org/apache/camel/quarkus/core/CoreThreadPoolsTest.java | 2 -- .../java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java | 8 -------- integration-tests/jq/src/main/resources/application.properties | 5 ++--- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/integration-test-groups/foundation/core-thread-pools/src/test/java/org/apache/camel/quarkus/core/CoreThreadPoolsTest.java b/integration-test-groups/foundation/core-thread-pools/src/test/java/org/apache/camel/quarkus/core/CoreThreadPoolsTest.java index 3375f166fb..959bf9fd5e 100644 --- a/integration-test-groups/foundation/core-thread-pools/src/test/java/org/apache/camel/quarkus/core/CoreThreadPoolsTest.java +++ b/integration-test-groups/foundation/core-thread-pools/src/test/java/org/apache/camel/quarkus/core/CoreThreadPoolsTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.quarkus.core; -import io.quarkus.test.junit.DisabledOnIntegrationTest; import io.quarkus.test.junit.QuarkusTest; import org.junit.jupiter.api.Test; @@ -31,7 +30,6 @@ public class CoreThreadPoolsTest { get("/core/thread-pools/default").then().body(is("default|true|5|10|20|DiscardOldest")); } - @DisabledOnIntegrationTest("https://github.com/apache/camel-quarkus/issues/4011";) @Test public void testCustomThreadPoolsConfiguredByProperties() { get("/core/thread-pools/customPool").then().body(is("customPool|false|1|10|20|Abort")); diff --git a/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java b/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java index 2fa69f5961..18589c84f8 100644 --- a/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java +++ b/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java @@ -16,20 +16,12 @@ */ package org.apache.camel.quarkus.component.jq.it; -import java.util.Map; - import org.apache.camel.builder.RouteBuilder; public class JqRoutes extends RouteBuilder { @Override public void configure() throws Exception { - // TODO: Revert back to using config properties - // https://github.com/apache/camel-quarkus/issues/4011 - Map<String, String> globalOptions = getContext().getGlobalOptions(); - globalOptions.put("CamelJacksonEnableTypeConverter", "true"); - globalOptions.put("CamelJacksonTypeConverterToPojo", "true"); - from("direct:expression") .transform().jq(".foo") .to("mock:expression"); diff --git a/integration-tests/jq/src/main/resources/application.properties b/integration-tests/jq/src/main/resources/application.properties index 98686c9447..be6c9cc535 100644 --- a/integration-tests/jq/src/main/resources/application.properties +++ b/integration-tests/jq/src/main/resources/application.properties @@ -15,6 +15,5 @@ ## limitations under the License. ## --------------------------------------------------------------------------- -# https://github.com/apache/camel-quarkus/issues/4011 -#camel.context.global-options[CamelJacksonEnableTypeConverter] = true -#camel.context.global-options[CamelJacksonTypeConverterToPojo] = true +camel.context.global-options[CamelJacksonEnableTypeConverter] = true +camel.context.global-options[CamelJacksonTypeConverterToPojo] = true
