This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 38da0233bfc578005dd125f04df527b83c3fb453 Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Mon May 27 17:17:01 2024 +0200 fixed test-framework/junit5 + generated changes --- .../main/resources/META-INF/quarkus-extension.yaml | 2 +- .../main/resources/META-INF/quarkus-extension.yaml | 1 + .../quarkus/test/common/AbstractCallbacksTest.java | 8 ------ .../test/common/CallbacksPerTestFalse01Test.java | 3 --- .../test/common/CallbacksPerTestTrue01Test.java | 3 --- .../test/junit5/patterns/DebugJUnit5Test.java | 6 +++++ .../patterns/DebugNoLazyTypeConverterTest.java | 6 +++++ .../quarkus/test/junit5/patterns/DebugTest.java | 6 +++++ .../test/junit5/patterns/TestDebugBreakpoint.java | 29 ++++++++++++++++++++++ 9 files changed, 49 insertions(+), 15 deletions(-) diff --git a/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 253ef63aa4..96dbe3295d 100644 --- a/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -22,7 +22,7 @@ # --- name: "Camel ActiveMQ" -description: "Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component" +description: "Send messages to (or consume from) Apache ActiveMQ 5.x. This component extends the Camel JMS component" metadata: icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg" guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/activemq.html" diff --git a/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 6ecbc7bde8..4b4f84c9ba 100644 --- a/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -30,3 +30,4 @@ metadata: - "integration" status: - "stable" + - "deprecated" \ No newline at end of file diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java index 77c6b64c7f..597ccc7df7 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java @@ -39,7 +39,6 @@ import org.apache.camel.quarkus.test.CamelQuarkusTestSupport; import org.apache.camel.util.StopWatch; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { @@ -48,7 +47,6 @@ public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { public enum Callback { postTearDown, - doSetup, preSetup, postSetup, contextCreation, @@ -69,12 +67,6 @@ public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { this.afterClassTestName = afterClassTestName; } - @BeforeEach - protected void createTmpFiles() throws Exception { - createTmpFile(testName, Callback.doSetup); - createTmpFile(afterClassTestName, Callback.doSetup); - } - @Override protected CamelContext createCamelContext() throws Exception { createTmpFile(testName, Callback.contextCreation); diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java index e10d0ce525..591a40eb5c 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java @@ -39,9 +39,6 @@ public class CallbacksPerTestFalse01Test extends AbstractCallbacksTest { protected static BiConsumer<Callback, Long> createAssertionConsumer() { return (callback, count) -> { switch (callback) { - case doSetup: - assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); - break; case contextCreation: assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); break; diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestTrue01Test.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestTrue01Test.java index b765ef6b0d..295a7a166c 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestTrue01Test.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestTrue01Test.java @@ -39,9 +39,6 @@ public class CallbacksPerTestTrue01Test extends AbstractCallbacksTest { protected static BiConsumer<Callback, Long> createAssertionConsumer() { return (callback, count) -> { switch (callback) { - case doSetup: - assertCount(1, count, callback, CallbacksPerTestTrue01Test.class.getSimpleName()); - break; case contextCreation: assertCount(1, count, callback, CallbacksPerTestTrue01Test.class.getSimpleName()); break; diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java index dcad286f19..9fcbdae017 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java @@ -24,6 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.quarkus.test.CamelQuarkusTestSupport; +import org.apache.camel.test.junit5.DebugBreakpoint; import org.jboss.logging.Logger; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; @@ -92,4 +93,9 @@ public class DebugJUnit5Test extends CamelQuarkusTestSupport { }; } // END SNIPPET: e2 + + @Override + protected DebugBreakpoint createBreakpoint() { + return new TestDebugBreakpoint(); + } } diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugNoLazyTypeConverterTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugNoLazyTypeConverterTest.java index f09ae5e24d..4bddefd3c3 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugNoLazyTypeConverterTest.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugNoLazyTypeConverterTest.java @@ -23,6 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.quarkus.test.CamelQuarkusTestSupport; +import org.apache.camel.test.junit5.DebugBreakpoint; import org.jboss.logging.Logger; import org.junit.jupiter.api.Test; @@ -88,4 +89,9 @@ public class DebugNoLazyTypeConverterTest extends CamelQuarkusTestSupport { }; } // END SNIPPET: e2 + + @Override + protected DebugBreakpoint createBreakpoint() { + return new TestDebugBreakpoint(); + } } diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugTest.java index 794b78c4e0..eec6c9af9d 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugTest.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugTest.java @@ -23,6 +23,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.quarkus.test.CamelQuarkusTestSupport; +import org.apache.camel.test.junit5.DebugBreakpoint; import org.jboss.logging.Logger; import org.junit.jupiter.api.Test; @@ -95,4 +96,9 @@ public class DebugTest extends CamelQuarkusTestSupport { }; } // END SNIPPET: e2 + + @Override + protected DebugBreakpoint createBreakpoint() { + return new TestDebugBreakpoint(); + } } diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java new file mode 100644 index 0000000000..6c49499351 --- /dev/null +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java @@ -0,0 +1,29 @@ +package org.apache.camel.quarkus.test.junit5.patterns; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.model.ProcessorDefinition; +import org.apache.camel.test.junit5.DebugBreakpoint; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class TestDebugBreakpoint extends DebugBreakpoint { + private static final Logger LOG = LoggerFactory.getLogger(TestDebugBreakpoint.class); + + @Override + protected void debugBefore( + Exchange exchange, Processor processor, ProcessorDefinition<?> definition, String id, String label) { + // this method is invoked before we are about to enter the given + // processor + // from your Java editor you can add a breakpoint in the code line + // below + LOG.info("Before {} with body {}", definition, exchange.getIn().getBody()); + } + + @Override + protected void debugAfter( + Exchange exchange, Processor processor, ProcessorDefinition<?> definition, String id, String label, + long timeTaken) { + + } +}