Restore tests that use map config style configuration

Fixes apache#4011
jamesnetherton · Sep 15, 2022 · 31c29f6 · 31c29f6
1 parent 8f9c8fd
commit 31c29f6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/...on/core-thread-pools/src/test/java/org/apache/camel/quarkus/core/CoreThreadPoolsTest.java b/...on/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 void testDefaultThreadPoolConfiguredByProperties() {
         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
@@ -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
@@ -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