This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 33b2529cc37 camel-jbang - Fix some IT tests and a NPE in camel run
33b2529cc37 is described below
commit 33b2529cc3756c1de3acd151e462c0103128e997
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jul 3 11:29:55 2024 +0200
camel-jbang - Fix some IT tests and a NPE in camel run
---
.../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 6 +++++-
.../src/test/java/org/apache/camel/dsl/jbang/it/DevModeITCase.java | 7 ++++---
.../test/java/org/apache/camel/dsl/jbang/it/RunCommandITCase.java | 4 +---
.../java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java | 2 +-
.../org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java | 2 +-
.../jbang/it/{local.properties => application-test.properties} | 0
.../camel-jbang-it/src/test/resources/jbang/it/helloName.xml | 3 ---
.../camel-jbang-it/src/test/resources/jbang/it/route2.yaml | 3 ---
.../camel/test/infra/cli/services/CliLocalContainerService.java | 4 ++--
.../resources/org/apache/camel/test/infra/cli/services/Dockerfile | 4 ++++
10 files changed, 18 insertions(+), 17 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 11fcceb47c2..21789d01a01 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -1058,7 +1058,11 @@ public class Run extends CamelCommand {
// application-profile.properties should override standard
application.properties
Properties override =
doLoadAndInitProfileProperties(profilePropertiesFile);
if (override != null) {
- answer.putAll(override);
+ if (answer == null) {
+ answer = override;
+ } else {
+ answer.putAll(override);
+ }
}
}
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/DevModeITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/DevModeITCase.java
index 5a798c8d878..4bb852efc2e 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/DevModeITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/DevModeITCase.java
@@ -76,12 +76,13 @@ public class DevModeITCase extends JBangTestSupport {
@Test
public void runUsingProfileTest() throws IOException {
copyResourceInDataFolder(TestResources.HELLO_NAME);
- copyResourceInDataFolder(TestResources.LOCAL_PROP);
- containerService.copyFileInternally(mountPoint() + "/" +
TestResources.LOCAL_PROP.getName(), DEFAULT_ROUTE_FOLDER);
+ copyResourceInDataFolder(TestResources.TEST_PROFILE_PROP);
+ containerService.copyFileInternally(mountPoint() + "/" +
TestResources.TEST_PROFILE_PROP.getName(),
+ DEFAULT_ROUTE_FOLDER);
executeBackground(String.format("run %s/%s", mountPoint(),
TestResources.HELLO_NAME.getName()));
checkLogContains("Hello Camel from John");
execute("stop helloName");
- executeBackground(String.format("run %s/%s --profile=local",
mountPoint(), TestResources.HELLO_NAME.getName()));
+ executeBackground(String.format("run %s/%s --profile=test",
mountPoint(), TestResources.HELLO_NAME.getName()));
checkLogContains("Hello Camel from Jenna");
}
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandITCase.java
index 2b2cbf24347..54253f344a1 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandITCase.java
@@ -83,7 +83,6 @@ public class RunCommandITCase extends JBangTestSupport {
public void runRouteFromInputParameterTest() {
executeBackground("run
--code='from(\"kamelet:beer-source\").to(\"log:beer\")'");
checkLogContains("Started route1 (kamelet://beer-source)");
- checkLogContains("Started beer-source-1 (timer://beer)");
}
@Test
@@ -131,8 +130,7 @@ public class RunCommandITCase extends JBangTestSupport {
public void runDownloadedInDirectoryFromGithubTest() {
execute("init
https://github.com/apache/camel-kamelets-examples/tree/main/jbang/dependency-injection
--directory="
+ mountPoint());
- Assertions.as("custom route directory")
- .assertThat(Paths.get(getDataFolder()).toFile().listFiles())
+ Assertions.assertThat(Paths.get(getDataFolder()).toFile().listFiles())
.extracting("name")
.containsExactlyInAnyOrder("Echo.java", "Hello.java",
"README.adoc", "application.properties");
executeBackground(String.format("run %s/*", mountPoint()));
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java
index 4adbf13ab26..38a3d0d8b4d 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/RunCommandOnMqttITCase.java
@@ -51,7 +51,7 @@ public class RunCommandOnMqttITCase extends JBangTestSupport {
final String pid = executeBackground(String.format("run
--property=brokerUrl=%s %s/%s",
"tcp://" + ipAddr + ":1883",
mountPoint(), TestResources.MQQT_CONSUMER.getName()));
- checkLogContains("Started mqtt5-source");
+ checkLogContains("Started route1 (kamelet://mqtt5-source)");
final String payloadFile = "payload.json";
newFileInDataFolder(payloadFile, "{\"value\": 21}");
sendCmd(String.format("%s/%s", mountPoint(), payloadFile), pid);
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java
index df748fe6e3d..11b5d9e048e 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java
@@ -84,7 +84,7 @@ public abstract class JBangTestSupport {
protected enum TestResources {
ROUTE2("route2.yaml", "/jbang/it/route2.yaml"),
- LOCAL_PROP("local.properties", "/jbang/it/local.properties"),
+ TEST_PROFILE_PROP("application-test.properties",
"/jbang/it/application-test.properties"),
HELLO_NAME("helloName.xml", "/jbang/it/helloName.xml"),
JOKE("joke.yaml", "/jbang/it/joke.yaml"),
MQQT_CONSUMER("mqttConsumer.yaml", "/jbang/it/mqttConsumer.yaml");
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/local.properties
b/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/application-test.properties
similarity index 100%
rename from
dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/local.properties
rename to
dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/application-test.properties
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/helloName.xml
b/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/helloName.xml
index 2fe963e7364..b223903bd5a 100644
--- a/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/helloName.xml
+++ b/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/helloName.xml
@@ -17,15 +17,12 @@
limitations under the License.
-->
-<!-- camel-k: language=xml -->
-
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://camel.apache.org/schema/spring";
xsi:schemaLocation="
http://camel.apache.org/schema/spring
https://camel.apache.org/schema/spring/camel-spring.xsd";>
- <!-- Write your routes here, for example: -->
<route id="xml">
<from uri="timer:xml?period={{time:1000}}"/>
<setBody>
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/route2.yaml
b/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/route2.yaml
index 23c1d12c6d4..7d111b1d090 100644
--- a/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/route2.yaml
+++ b/dsl/camel-jbang/camel-jbang-it/src/test/resources/jbang/it/route2.yaml
@@ -15,9 +15,6 @@
# limitations under the License.
#
-# camel-k: language=yaml
-
-# Write your routes here, for example:
- from:
uri: "timer:yaml"
parameters:
diff --git
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
index c244f4b313f..c7471a215c3 100644
---
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
+++
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
@@ -115,7 +115,7 @@ public class CliLocalContainerService implements
CliService, ContainerService<Cl
@Override
public String executeGenericCommand(String command) {
try {
- LOG.debug("executing {}", command);
+ LOG.debug("Executing command: {}", command);
Container.ExecResult execResult =
container.execInContainer("/bin/bash", "-c", command);
if (execResult.getExitCode() != 0) {
Assertions.fail(String.format("command %s failed with output
%s and error %s", command, execResult.getStdout(),
@@ -127,7 +127,7 @@ public class CliLocalContainerService implements
CliService, ContainerService<Cl
}
return execResult.getStdout();
} catch (Exception e) {
- Assertions.fail(String.format("command %s failed", command), e);
+ LOG.error("ERROR running generic command: {}", command, e);
throw new RuntimeException(e);
}
}
diff --git
a/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile
b/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile
index cd55278fac5..2ecbc46ba0e 100644
---
a/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile
+++
b/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile
@@ -46,6 +46,7 @@ WORKDIR $HOME
ENV JAVA_HOME=/usr/lib/jvm/java
+RUN echo "Installing JBang..."
RUN curl -Ls https://sh.jbang.dev | bash -s - app setup \
&& source ~/.bashrc \
&& jbang version --update \
@@ -67,6 +68,9 @@ RUN echo "jbang:$SSH_PASSWORD" | chpasswd
RUN chown jbang /opt/entrypoint.sh \
&& chmod +x /opt/entrypoint.sh
+RUN echo "Clearing JBang cache"
+RUN jbang cache clear
+
EXPOSE 22
USER jbang
