From c73c1a35fa2977f30f6a6417124702fa691845c2 Mon Sep 17 00:00:00 2001 From: Christoph Deppisch Date: Thu, 30 Jan 2025 08:27:12 +0100 Subject: [PATCH] chore: Support test variables in Camel JBang command args --- .../java/org/citrusframework/jbang/actions/JBangAction.java | 2 +- .../camel/actions/CamelRunIntegrationAction.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/connectors/citrus-jbang-connector/src/main/java/org/citrusframework/jbang/actions/JBangAction.java b/connectors/citrus-jbang-connector/src/main/java/org/citrusframework/jbang/actions/JBangAction.java index 4fe19230a1..2c2f601a81 100644 --- a/connectors/citrus-jbang-connector/src/main/java/org/citrusframework/jbang/actions/JBangAction.java +++ b/connectors/citrus-jbang-connector/src/main/java/org/citrusframework/jbang/actions/JBangAction.java @@ -79,7 +79,7 @@ public void doExecute(TestContext context) { ProcessAndOutput result = JBangSupport.jbang() .app(app) - .withSystemProperties(systemProperties) + .withSystemProperties(context.resolveDynamicValuesInMap(systemProperties)) .run(context.replaceDynamicContentInString(scriptOrFile), context.resolveDynamicValuesInList(args)); if (printOutput) { diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CamelRunIntegrationAction.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CamelRunIntegrationAction.java index 9c9f6b4a74..23ac82287b 100644 --- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CamelRunIntegrationAction.java +++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CamelRunIntegrationAction.java @@ -120,7 +120,8 @@ public void doExecute(TestContext context) { camelJBang().camelApp().withSystemProperties(context.resolveDynamicValuesInMap(systemProperties)); camelJBang().camelApp().workingDir(integrationToRun.toAbsolutePath().getParent()); - ProcessAndOutput pao = camelJBang().run(name, integrationToRun.getFileName().toString(), resourceFiles, args.toArray(String[]::new)); + ProcessAndOutput pao = camelJBang().run(name, integrationToRun.getFileName().toString(), resourceFiles, + context.resolveDynamicValuesInList(args).toArray(String[]::new)); verifyProcessIsAlive(pao, name);