This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 3.27.x-product in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit b955f6388ca45d9c9238f265c374c9ce39e145b0 Author: Peter Palaga <[email protected]> AuthorDate: Mon Dec 15 15:19:18 2025 +0100 Upgrade to cli-assured 0.0.1-alpha8 --- .github/actions/update-versions/pom.xml | 2 +- .../camel/quarkus/test/UpdateVersionsTest.java | 60 +++++++++------------- 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/.github/actions/update-versions/pom.xml b/.github/actions/update-versions/pom.xml index 3ed4f2dc..f3d99203 100644 --- a/.github/actions/update-versions/pom.xml +++ b/.github/actions/update-versions/pom.xml @@ -30,7 +30,7 @@ <properties> <junit.version>6.0.0</junit.version> <assertj.version>3.27.6</assertj.version> - <cli-assert.version>0.0.1-alpha2</cli-assert.version> + <cli-assert.version>0.0.1-alpha8</cli-assert.version> <rest-assured.version>5.5.6</rest-assured.version> <slf4j.version>2.0.17</slf4j.version> <jgit.version>7.3.0.202506031305-r</jgit.version> diff --git a/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/UpdateVersionsTest.java b/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/UpdateVersionsTest.java index 95cacb27..0992f0ac 100644 --- a/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/UpdateVersionsTest.java +++ b/.github/actions/update-versions/src/test/java/com/redhat/camel/quarkus/test/UpdateVersionsTest.java @@ -5,7 +5,6 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.io.Writer; import java.net.URISyntaxException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.time.Duration; @@ -23,7 +22,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import org.assertj.core.api.Assertions; -import org.assertj.core.api.ListAssert; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.ResetCommand.ResetType; import org.eclipse.jgit.api.errors.GitAPIException; @@ -37,9 +35,6 @@ import org.eclipse.jgit.transport.FetchResult; import org.eclipse.jgit.transport.URIish; import org.junit.jupiter.api.Test; import org.l2x6.cli.assured.CliAssured; -import org.l2x6.cli.assured.CommandOutput.Line; -import org.l2x6.cli.assured.CommandOutput.Stream; -import org.l2x6.cli.assured.CommandResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -136,7 +131,7 @@ public class UpdateVersionsTest { */ final Path examplesMvnwPath = checkoutDir.resolve("mvnw"); { - List<Line> lines = CliAssured.command( + CliAssured.command( examplesMvnwPath.toString(), "org.l2x6.cq:cq-prod-maven-plugin:" + cqPluginVersion + ":sync-examples-from-upstream", "-Dcq.quarkus.platform.version=" + platformVersion, @@ -144,14 +139,16 @@ public class UpdateVersionsTest { "-B" ) .cd(checkoutDir) - .start() - .awaitTermination(Duration.ofMinutes(10)) + .then() + .stdout() + .hasLinesContaining("BUILD SUCCESS") + .log() + .stderr() + .doesNotHaveLinesMatching(ERROR_PATTERN) + .log() + .execute(Duration.ofMinutes(10)) .assertSuccess() - .output() - .hasLineContaining("BUILD SUCCESS") - .lines() ; - noErrors(lines); } /* Run tests if there are changes */ @@ -177,26 +174,23 @@ public class UpdateVersionsTest { for (Path exampleDir : exampleDirs) { Path logFile = Path.of("target/" + exampleDir.getFileName() + ".log").toAbsolutePath().normalize(); - CommandResult result = CliAssured.command( - checkoutDir.resolve("mvnw").toString(), - "clean", - "verify", - "-ntp", - "-B" - ) + CliAssured.given() .cd(exampleDir) - .start() - .awaitTermination(Duration.ofMinutes(10)); - Files.write( - logFile, - result.output().lines().stream() - .map(Line::toString) - .collect(Collectors.joining("\n")) - .getBytes(StandardCharsets.UTF_8)); - - result.assertSuccess() - .output() - .hasLineContaining("BUILD SUCCESS"); + .stderrToStdout() + .when() + .command( + checkoutDir.resolve("mvnw").toString(), + "clean", + "verify", + "-ntp", + "-B") + .then() + .stdout() + .hasLinesContaining("BUILD SUCCESS") + .log() + .redirect(logFile) + .execute(Duration.ofMinutes(10)) + .assertSuccess(); } if (!localTest) { @@ -230,10 +224,6 @@ public class UpdateVersionsTest { } } - private ListAssert<Line> noErrors(List<Line> lines) { - return Assertions.assertThat(lines).allMatch(l -> l.stream() == Stream.stderr ? !ERROR_PATTERN.matcher(l.line()).find() : true); - } - static void reportFailure(Exception e, String ghRepository, String issueId, String workflowRunUrl, String ghToken, boolean localTest) { if (localTest) {
