This is an automated email from the ASF dual-hosted git repository. apupier pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7c5a0cd447a5a719e0c7fd19354b4bd04a9ade9b Author: Aurélien Pupier <[email protected]> AuthorDate: Mon Nov 16 17:02:22 2026 +0100 CAMEL-26818: camel-jbang-core - fix the tests broken by the speed-up, review of #30215 Co-authored-by: IBM Bob 2.2.1 Signed-off-by: Aurélien Pupier <[email protected]> --- dsl/camel-jbang/camel-jbang-core/pom.xml | 2 +- .../dsl/jbang/core/commands/CliRunnerTest.java | 2 +- .../jbang/core/commands/DependencyUpdateTest.java | 23 ++++++++++++++- .../dsl/jbang/core/commands/EvalSimpleTest.java | 1 + .../camel/dsl/jbang/core/commands/LoadTest.java | 34 ++++++++++++++++++---- .../core/commands/ai/CatalogDocExamplesTest.java | 17 ++++------- 6 files changed, 59 insertions(+), 20 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml b/dsl/camel-jbang/camel-jbang-core/pom.xml index f0ca1cf09aaa..ee1c840f6b31 100644 --- a/dsl/camel-jbang/camel-jbang-core/pom.xml +++ b/dsl/camel-jbang/camel-jbang-core/pom.xml @@ -48,7 +48,7 @@ <!-- the tests are short and start many CamelContexts: the C1 compiler only and the serial GC cost far less CPU than the defaults (about 30% less in total), which matters as the CI machine runs other modules at the same time --> - <camel.surefire.fork.additional-vmargs>-XX:TieredStopAtLevel=1 -XX:+UseSerialGC -Xss256k</camel.surefire.fork.additional-vmargs> + <camel.surefire.fork.additional-vmargs>-XX:TieredStopAtLevel=1 -XX:+UseSerialGC</camel.surefire.fork.additional-vmargs> </properties> <dependencies> diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/CliRunnerTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/CliRunnerTest.java index 22da8160b275..12a1c31a3877 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/CliRunnerTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/CliRunnerTest.java @@ -214,7 +214,7 @@ class CliRunnerTest { @Override public Integer doCall() { - long end = System.currentTimeMillis() + 500; + long end = System.currentTimeMillis() + 2500; while (System.currentTimeMillis() < end) { try { TimeUnit.MILLISECONDS.sleep(end - System.currentTimeMillis()); diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdateTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdateTest.java index 05b64fe43487..6a3bbc0881f6 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdateTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/DependencyUpdateTest.java @@ -61,7 +61,7 @@ class DependencyUpdateTest extends CamelCommandBaseTestSupport { @ParameterizedTest @MethodSource("exportRuntimeProvider") void shouldDependencyUpdate(RuntimeType rt) throws Exception { - prepareFixtureProject(rt); + prepareMavenProject(rt); checkNoUpdateOnFreshlyGeneratedproject(rt); addArangodbToCamelFile(); checkOneDependencyAddedForArangoDb(rt); @@ -114,6 +114,27 @@ class DependencyUpdateTest extends CamelCommandBaseTestSupport { Assertions.assertEquals("No updates to pom.xml", lines.get(0)); } + private void prepareMavenProject(RuntimeType rt) throws Exception { + StringPrinter initCommandPrinter = new StringPrinter(); + Init initCommand = new Init(new CamelJBangMain().withPrinter(initCommandPrinter)); + String camelFilePath = new File(workingDir, "my.camel.yaml").getAbsolutePath(); + CommandLineTestHelper.parse(initCommand, camelFilePath); + Assertions.assertEquals(0, initCommand.doCall(), initCommandPrinter.getLines().toString()); + + StringPrinter exportCommandPrinter = new StringPrinter(); + Export exportCommand = new Export(new CamelJBangMain().withPrinter(exportCommandPrinter)); + CommandLineTestHelper.parse(exportCommand, + "--gav=examples:route:1.0.0", + "--dir=" + workingDir, + // the directory has the route that camel init created, which the export replaces with the project + "--clean-dir", "--yes", + "--camel-version=4.13.0", + "--runtime=" + rt.runtime(), + CamelCommandBaseTestSupport.quarkusExtRegistry(), + camelFilePath); + Assertions.assertEquals(0, exportCommand.doCall(), exportCommandPrinter.getLines().toString()); + } + // ==================== explicit route file as positional argument ==================== @ParameterizedTest diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/EvalSimpleTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/EvalSimpleTest.java index c01eb95641c8..e62b45a67f85 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/EvalSimpleTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/EvalSimpleTest.java @@ -27,6 +27,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; +@UsesWorkingDirectory @DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Runs only local") class EvalSimpleTest extends CamelCommandBaseTestSupport { diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/LoadTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/LoadTest.java index 0ac1b5c519b3..fde604e4a30d 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/LoadTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/LoadTest.java @@ -21,11 +21,15 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; import org.apache.camel.dsl.jbang.core.commands.action.CamelLoadAction; import org.apache.camel.dsl.jbang.core.common.CommandLineHelper; import org.apache.camel.dsl.jbang.core.common.CommandLineTestHelper; import org.apache.camel.util.FileUtil; +import org.apache.camel.util.HomeHelper; +import org.apache.camel.util.json.JsonObject; +import org.apache.camel.util.json.Jsoner; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -37,38 +41,54 @@ import static org.awaitility.Awaitility.await; class LoadTest extends CamelCommandBaseTestSupport { + // the phase of a started integration in the status file + private static final int PHASE_STARTED = 5; + private File workingDir; + private Path previousHome; @BeforeEach @Override public void setup() throws Exception { super.setup(); - useTestWorkDir(); - useTestHomeDir(); + // the routes run in this JVM, and their CLI connector reads the actions in the user home + previousHome = CommandLineHelper.getHomeDir(); + CommandLineHelper.useHomeDir(HomeHelper.resolveHomeDir()); workingDir = Files.createTempDirectory("camel-load").toFile(); } @AfterEach public void end() throws IOException { + CommandLineHelper.useHomeDir(previousHome.toString()); FileUtil.removeDir(workingDir); } + private static boolean integrationStarted() throws Exception { + Path status = CommandLineHelper.getCamelDir().resolve(getPid() + "-status.json"); + if (!Files.exists(status)) { + return false; + } + JsonObject root = (JsonObject) Jsoner.deserialize(Files.readString(status)); + JsonObject context = root != null ? (JsonObject) root.get("context") : null; + return context != null && context.getInteger("phase") == PHASE_STARTED; + } + @Test public void shouldLoad() throws Exception { Run run = new Run(new CamelJBangMain().withPrinter(printer)); CommandLineTestHelper.parse(run, "src/test/resources/hello.yaml", "--name=myload", "--max-messages=5", "--prop=mydir=" + workingDir.getAbsolutePath()); + AtomicReference<Exception> loadFailure = new AtomicReference<>(); Runnable r = () -> { try { - // wait for the integration status file to be written to the home dir - await().atMost(10, TimeUnit.SECONDS) - .until(() -> Files.exists(CommandLineHelper.getCamelDir().resolve(getPid() + "-status.json"))); + // wait until the integration has started: the status file is in the home dir + await().atMost(10, TimeUnit.SECONDS).until(LoadTest::integrationStarted); CamelLoadAction load = new CamelLoadAction(new CamelJBangMain()); CommandLineTestHelper.parse(load, getPid(), "--source=src/test/resources/load.yaml"); load.doCall(); } catch (Exception e) { - // ignore + loadFailure.set(e); } }; @@ -76,6 +96,8 @@ class LoadTest extends CamelCommandBaseTestSupport { t.start(); int exit = run.doCall(); + t.join(); + assertThat(loadFailure.get()).as("the load action is sent").isNull(); Assertions.assertEquals(0, exit); Path outPath = workingDir.toPath().resolve("load.txt"); diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ai/CatalogDocExamplesTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ai/CatalogDocExamplesTest.java index d9429a0f9f9c..24e48c9a2e93 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ai/CatalogDocExamplesTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ai/CatalogDocExamplesTest.java @@ -83,13 +83,13 @@ class CatalogDocExamplesTest { } private static DocExamples validate(List<String> pages) { - return pages.parallelStream().map(page -> { + int examples = 0; + List<String> failures = new ArrayList<>(); + for (String page : pages) { String doc = catalog.asciiDoc(page); if (doc == null) { - return new DocExamples(0, List.of()); + continue; } - int examples = 0; - List<String> failures = new ArrayList<>(); List<String> blocks = DocBlocks.examples(doc); for (int n = 0; n < blocks.size(); n++) { String yaml = blocks.get(n); @@ -102,12 +102,7 @@ class CatalogDocExamplesTest { failures.add(page + " example " + (n + 1) + ": " + msg); } } - return new DocExamples(examples, failures); - }).reduce(new DocExamples(0, List.of()), (a, b) -> { - List<String> combined = new ArrayList<>(a.failures().size() + b.failures().size()); - combined.addAll(a.failures()); - combined.addAll(b.failures()); - return new DocExamples(a.examples() + b.examples(), combined); - }); + } + return new DocExamples(examples, failures); } }
