From 82e929965d6ba32741dca6e88218193c9dfa87cb Mon Sep 17 00:00:00 2001
From: "Textor Andreas (BCI/ESW17)" <Andreas.Textor@de.bosch.com>
Date: Wed, 6 Nov 2024 11:13:05 +0100
Subject: [PATCH 1/4] Fix --version switch

---
 tools/samm-cli/pom.xml                                     | 1 -
 .../src/test/java/org/eclipse/esmf/SammCliTest.java        | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/samm-cli/pom.xml b/tools/samm-cli/pom.xml
index b27aa5c9d..c3ea0271e 100644
--- a/tools/samm-cli/pom.xml
+++ b/tools/samm-cli/pom.xml
@@ -576,7 +576,6 @@
             <packaging-type>native</packaging-type>
             <skip.maven.surefire>true</skip.maven.surefire>
             <skip.maven.failsafe>false</skip.maven.failsafe>
-            <maven.resources.skip>true</maven.resources.skip>
             <maven.source.skip>true</maven.source.skip>
          </properties>
 
diff --git a/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java b/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java
index 1e8d32eaa..26b35d816 100644
--- a/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java
+++ b/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java
@@ -108,6 +108,13 @@ void testNoArgs() {
       assertThat( result.stderr() ).isEmpty();
    }
 
+   @Test
+   void testVersion() {
+      final ExecutionResult result = sammCli.runAndExpectSuccess( "--version" );
+      assertThat( result.stdout() ).contains( "Version:" );
+      assertThat( result.stderr() ).isEmpty();
+   }
+
    @Test
    void testAspectWithoutSubcommand() {
       final ExecutionResult result = sammCli.apply( "--disable-color", "aspect" );

From 604abe108ceda7497d9970619aca14b7691f25b7 Mon Sep 17 00:00:00 2001
From: "Textor Andreas (BCI/ESW17)" <Andreas.Textor@de.bosch.com>
Date: Wed, 6 Nov 2024 15:12:56 +0100
Subject: [PATCH 2/4] Use --disable-color in unit test for --version switch

---
 tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java b/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java
index 26b35d816..bb44d1148 100644
--- a/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java
+++ b/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java
@@ -110,7 +110,7 @@ void testNoArgs() {
 
    @Test
    void testVersion() {
-      final ExecutionResult result = sammCli.runAndExpectSuccess( "--version" );
+       final ExecutionResult result = sammCli.runAndExpectSuccess( "--disable-color", "--version" );
       assertThat( result.stdout() ).contains( "Version:" );
       assertThat( result.stderr() ).isEmpty();
    }

From adaa1c1a52e191703196ea44110fab12a9d34e6c Mon Sep 17 00:00:00 2001
From: "Textor Andreas (BCI/ESW17)" <Andreas.Textor@de.bosch.com>
Date: Wed, 6 Nov 2024 15:53:19 +0100
Subject: [PATCH 3/4] Fix indentation

---
 tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java b/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java
index bb44d1148..b9bbe1a2b 100644
--- a/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java
+++ b/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java
@@ -110,7 +110,7 @@ void testNoArgs() {
 
    @Test
    void testVersion() {
-       final ExecutionResult result = sammCli.runAndExpectSuccess( "--disable-color", "--version" );
+      final ExecutionResult result = sammCli.runAndExpectSuccess( "--disable-color", "--version" );
       assertThat( result.stdout() ).contains( "Version:" );
       assertThat( result.stderr() ).isEmpty();
    }

From 29dd384f611ba8477dc6e1ce549e65aed47c4555 Mon Sep 17 00:00:00 2001
From: "Textor Andreas (BCI/ESW17)" <Andreas.Textor@de.bosch.com>
Date: Thu, 7 Nov 2024 07:38:01 +0100
Subject: [PATCH 4/4] Don't check result code in testVersion()

Due to the test setup with the SecurityManager that captures System.exit(), the
actual result code can not reliably be passed to the test when System.exit() is
called outside a command
---
 tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java b/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java
index b9bbe1a2b..75505a5cb 100644
--- a/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java
+++ b/tools/samm-cli/src/test/java/org/eclipse/esmf/SammCliTest.java
@@ -110,7 +110,7 @@ void testNoArgs() {
 
    @Test
    void testVersion() {
-      final ExecutionResult result = sammCli.runAndExpectSuccess( "--disable-color", "--version" );
+      final ExecutionResult result = sammCli.apply( "--disable-color", "--version" );
       assertThat( result.stdout() ).contains( "Version:" );
       assertThat( result.stderr() ).isEmpty();
    }