Ref #596: adapt library 'camel-test-blueprint-junit5' to camel-karaf #651

jhattab · 2025-10-26T16:34:46Z

fixes #596

Here’s my first Pull Request on GitHub.
I’m open to any feedback that could help improve the code and the way we collaborate on these projects.

All the unit tests should normally be working.

I reintroduced the code and unit tests that were present in version 3.22.4 of camel-karaf, and then took inspiration from the changes made to the Spring tests in the Apache Camel project.

essobedo

Thx for the PR, please avoid huge PR like this one next time as it too long to review. Regarding the PR, could you please remove all tests that seem to test Camel instead of camel-blueprint?

essobedo · 2025-11-13T16:13:50Z

...lueprint-junit5/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java

+     *
+     * @return the name of the path for the .cfg file to load, and the persistence-id of the property placeholder.
+     */
+    protected String[] loadConfigAdminConfigurationFile() {


Maybe you could create a dedicated class to hold the path of the cfg and the persistence id. Using an array of strings is too error-prone

essobedo · 2025-11-13T16:15:52Z

...lueprint-junit5/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java

+        FileWriter writer = new FileWriter(cfg);
+        try {
+            initialConfiguration.store(writer, null);
+        } finally {
+            IOHelper.close(writer);
+        }


You could use try-with-resources statement instead

essobedo · 2025-11-13T16:17:05Z

...-blueprint-junit5/src/test/java/org/apache/camel/test/blueprint/BlueprintPropertiesTest.java

+        camelCore.stop();
+        test.stop();
+
+        Thread.sleep(500);


I'm afraid it will make this test flaky, so either we find a way to avoid this sleep or I rather prefer not having the test at all

This is inherited from the legacy code; I assume it provides some value in terms of non-regression.
https://github.com/apache/camel-karaf/commits/camel-karaf-3.22.4/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/BlueprintPropertiesTest.java

essobedo · 2025-11-13T18:31:41Z

...lueprint-junit5/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java

+                if (mJar instanceof JarFile) {
+                    JarFile jf = (JarFile) mJar;


Can be inlined using pattern matching https://docs.oracle.com/en/java/javase/17/language/pattern-matching-instanceof.html

essobedo · 2025-11-13T18:32:27Z

...lueprint-junit5/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java

+                            + "It's likely that the test is misconfigured!");
+        }
+
+//        doPostTearDown();


essobedo · 2025-11-13T18:33:17Z

...lueprint-junit5/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java

+                        if (node instanceof Element) {
+                            Element pp = (Element) node;


Can be inlined using pattern matching

essobedo · 2025-11-13T18:34:59Z

...lueprint-junit5/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java

+        String[][] configAdminPidFiles = new String[0][0];
+        if (file != null) {
+            if (file.length % 2 != 0) {  // This needs to return pairs of filename and pid
+                throw new IllegalArgumentException("The length of the String[] returned from loadConfigAdminConfigurationFile must divisible by 2, was " + file.length);
+            }
+            configAdminPidFiles = new String[file.length / 2][2];
+
+            int pair = 0;
+            for (int i = 0; i < file.length; i += 2) {
+                String fileName = file[i];
+                String pid = file[i + 1];
+                if (!new File(fileName).exists()) {
+                    throw new IllegalArgumentException("The provided file \"" + fileName + "\" from loadConfigAdminConfigurationFile doesn't exist");
+                }
+                configAdminPidFiles[pair][0] = fileName;
+                configAdminPidFiles[pair][1] = pid;
+                pair++;
+            }
+        }


I hope it can be simplified or at least it should be moved to a dedicated method as it is very hard to read

Good idea — I’ve done a small refactoring and adopted your proposal.

essobedo · 2025-11-13T18:36:26Z

...ueprint-junit5/src/test/java/org/apache/camel/test/blueprint/ContextCreationTimeoutTest.java

+    @Test
+    public void testOverrideNormal() {
+        final Long someValue = 60000L;
+        System.clearProperty(CamelBlueprintTestSupport.SPROP_CAMEL_CONTEXT_CREATION_TIMEOUT);


Should not be needed as it is already done by the cleanup method

essobedo · 2025-11-13T18:36:50Z

...ueprint-junit5/src/test/java/org/apache/camel/test/blueprint/ContextCreationTimeoutTest.java

+
+    @Test
+    public void testDefault() {
+        System.clearProperty(CamelBlueprintTestSupport.SPROP_CAMEL_CONTEXT_CREATION_TIMEOUT);


ditto, not needed

essobedo · 2025-11-14T10:57:19Z

components/camel-blueprint-main/pom.xml

+    <artifactId>camel-blueprint-main</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Apache Camel :: Karaf :: Blueprint Main</name>


Suggested change

<name>Apache Camel :: Karaf :: Blueprint Main</name>

<name>Apache Camel :: Karaf :: Components :: Blueprint Main</name>

This is not a bundle or a component; perhaps we should consider moving these dependencies to another directory in the project, for example under tests?

essobedo · 2025-11-14T10:58:18Z

tests/camel-blueprint-main/pom.xml

+    </parent>
+
+    <artifactId>camel-blueprint-main</artifactId>
+    <packaging>jar</packaging>


jar or bundle?

essobedo · 2025-11-14T10:59:53Z

components/camel-test/camel-test-blueprint-junit5/pom.xml

+    <artifactId>camel-test-blueprint-junit5</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Apache Camel :: Karaf :: Test :: Blueprint :: Junit 5 </name>


Suggested change

<name>Apache Camel :: Karaf :: Test :: Blueprint :: Junit 5 </name>

<name>Apache Camel :: Karaf :: Test :: Blueprint :: JUnit 5 </name>

essobedo · 2025-11-14T11:00:04Z

tests/camel-test-blueprint-junit5/pom.xml

+    </parent>
+
+    <artifactId>camel-test-blueprint-junit5</artifactId>
+    <packaging>jar</packaging>


jar or bundle

From my experience, this dependency is only useful when provided as a JAR. It allows unit tests to be executed without requiring a Karaf container.

…nt-junit5 from version 3.22.0-SNAPSHOT

…karaf 4.10.x

jhattab · 2025-12-22T20:17:44Z

Thank you very much for the code review. I have reworked the PR by splitting it into two commits: one containing the code inherited from the Karaf Camel 3.22.0 version, and a second one with the adaptations for version 4.10.8-SNAPSHOT.

I hope this makes the changes easier to review.

Regarding the tests, I believe they are necessary to ensure that the Camel patterns are correctly ported and behave as expected in a Blueprint context, even if they may appear to test Camel itself.

jhattab · 2025-12-23T10:46:31Z

camel-blueprint-main and camel-test-blueprint-junit5 are not bundles or components; perhaps we should consider moving these dependencies to another directory in the project, for example under tests?

essobedo · 2026-01-06T09:57:03Z

camel-blueprint-main and camel-test-blueprint-junit5 are not bundles or components; perhaps we should consider moving these dependencies to another directory in the project, for example under tests?

I agree, if they are not compoments, please move them under tests indeed 👍

…nt-main' to tests subdirectory

jhattab force-pushed the 596 branch 2 times, most recently from a1238cc to 4dac01b Compare October 28, 2025 20:25

essobedo changed the title ~~Ref apache#596: adapt library 'camel-test-blueprint-junit5' to camel-karaf~~ Ref #596: adapt library 'camel-test-blueprint-junit5' to camel-karaf Nov 13, 2025

essobedo reviewed Nov 13, 2025

View reviewed changes

essobedo reviewed Nov 14, 2025

View reviewed changes

Julien Hattab added 2 commits December 22, 2025 16:19

Restore components/camel-blueprint-main components/camel-test-bluepri…

b0872a3

…nt-junit5 from version 3.22.0-SNAPSHOT

Ref apache#596: adapt library 'camel-test-blueprint-junit5' to camel-…

69359ad

…karaf 4.10.x

jhattab force-pushed the 596 branch from 4dac01b to 69359ad Compare December 22, 2025 20:10

Ref apache#596: move 'camel-test-blueprint-junit5' and 'camel-bluepri…

f96f9de

…nt-main' to tests subdirectory

	<name>Apache Camel :: Karaf :: Blueprint Main</name>
	<name>Apache Camel :: Karaf :: Components :: Blueprint Main</name>

	<name>Apache Camel :: Karaf :: Test :: Blueprint :: Junit 5 </name>
	<name>Apache Camel :: Karaf :: Test :: Blueprint :: JUnit 5 </name>

Ref #596: adapt library 'camel-test-blueprint-junit5' to camel-karaf #651

Are you sure you want to change the base?

Ref #596: adapt library 'camel-test-blueprint-junit5' to camel-karaf #651

Uh oh!

Conversation

jhattab commented Oct 26, 2025 • edited by essobedo Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

essobedo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jhattab commented Dec 22, 2025

Uh oh!

jhattab commented Dec 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

essobedo commented Jan 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jhattab commented Oct 26, 2025 •

edited by essobedo

Loading

jhattab commented Dec 23, 2025 •

edited

Loading