From bc4183a413304d5403f128e33dac45d669d4cf2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?= Date: Tue, 10 Sep 2024 14:58:33 +0200 Subject: [PATCH 1/6] allow setting the Extension Version. --- .../com/draeger/medical/sdccc/TestSuite.java | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java index 83bca2b8..ce3f87c2 100644 --- a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java +++ b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java @@ -721,6 +721,36 @@ public static void runWithArgs( final String[] sdcTestDirectories, @Nullable final AbstractModule overrides) throws IOException { + runWithArgs(cmdLine, + enabledTestConfigClass, + testParameterClass, + defaultConfigModules, + sdcTestDirectories, + overrides, + null); + } + + /** + * Run the test suite with the given already parsed command line arguments and the + * specified enabled test config constants. + * + * @param cmdLine parsed command line arguments + * @param enabledTestConfigClass class containing test identifier constants + * @param testParameterClass class containing test parameter + * @param sdcTestDirectories directories to search for test cases + * @param defaultConfigModules default configuration modules for extended EnabledTestConfig and TestParameterConfig + * @param overrides abstract module to override test run injector + * @param extensionVersion String specifying the extension name and version or null if no extension is used. + */ + public static void runWithArgs( + final CommandLineOptions cmdLine, + final Class enabledTestConfigClass, + final Class testParameterClass, + final List defaultConfigModules, + final String[] sdcTestDirectories, + @Nullable final AbstractModule overrides, + @Nullable final String extensionVersion) + throws IOException { // setup logging final var testRunDir = TestRunConfig.createTestRunDirectory( cmdLine.getTestRunDirectory().orElse(null)); @@ -775,7 +805,11 @@ public static void runWithArgs( } else { versionString = ""; } - LOG.info("Starting SDCcc {}", versionString); + if (extensionVersion != null) { + LOG.info("Starting SDCcc {} with {} Extension", versionString, extensionVersion); + } else { + LOG.info("Starting SDCcc {}", versionString); + } try { From f78ce89ae4e10a1d6e41bf50c7a742f51b1ccaf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?= Date: Tue, 10 Sep 2024 17:15:41 +0200 Subject: [PATCH 2/6] removed superfluous space. --- sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java index ce3f87c2..48a23836 100644 --- a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java +++ b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java @@ -806,9 +806,9 @@ public static void runWithArgs( versionString = ""; } if (extensionVersion != null) { - LOG.info("Starting SDCcc {} with {} Extension", versionString, extensionVersion); + LOG.info("Starting SDCcc{} with {} Extension", versionString, extensionVersion); } else { - LOG.info("Starting SDCcc {}", versionString); + LOG.info("Starting SDCcc{}", versionString); } try { From 2be4688469aeb382ac719fe4357245c8870c895e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?= Date: Wed, 11 Sep 2024 09:56:06 +0200 Subject: [PATCH 3/6] spotless:apply --- sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java index 48a23836..c6588e8f 100644 --- a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java +++ b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java @@ -721,7 +721,8 @@ public static void runWithArgs( final String[] sdcTestDirectories, @Nullable final AbstractModule overrides) throws IOException { - runWithArgs(cmdLine, + runWithArgs( + cmdLine, enabledTestConfigClass, testParameterClass, defaultConfigModules, From 1efca90e0e05e23553f49a449efbd77d855470e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?= Date: Fri, 13 Sep 2024 16:35:33 +0200 Subject: [PATCH 4/6] generalized the solution to give Extensions the opportunity to add arbitrary information to the log during initialization. --- .../java/com/draeger/medical/sdccc/TestSuite.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java index c6588e8f..4f901ed6 100644 --- a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java +++ b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java @@ -59,6 +59,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.concurrent.TimeoutException; +import java.util.function.Consumer; import javax.annotation.Nullable; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -741,7 +742,9 @@ public static void runWithArgs( * @param sdcTestDirectories directories to search for test cases * @param defaultConfigModules default configuration modules for extended EnabledTestConfig and TestParameterConfig * @param overrides abstract module to override test run injector - * @param extensionVersion String specifying the extension name and version or null if no extension is used. + * @param logInitializationInfos Lambda that is called after the logger has been initialized and SDCcc's version + * information has been logged out to give the caller the opportunity to add + * additional information. */ public static void runWithArgs( final CommandLineOptions cmdLine, @@ -750,7 +753,7 @@ public static void runWithArgs( final List defaultConfigModules, final String[] sdcTestDirectories, @Nullable final AbstractModule overrides, - @Nullable final String extensionVersion) + @Nullable final Consumer logInitializationInfos) throws IOException { // setup logging final var testRunDir = TestRunConfig.createTestRunDirectory( @@ -806,10 +809,9 @@ public static void runWithArgs( } else { versionString = ""; } - if (extensionVersion != null) { - LOG.info("Starting SDCcc{} with {} Extension", versionString, extensionVersion); - } else { - LOG.info("Starting SDCcc{}", versionString); + LOG.info("Starting SDCcc{}", versionString); + if (logInitializationInfos != null) { + logInitializationInfos.accept(LOG); } try { From 638f9382ccef9d688defd73f41c1f3d8400b630e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn?= Date: Mon, 16 Sep 2024 15:51:12 +0200 Subject: [PATCH 5/6] Update sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Malte Grebe-Lüth <104556762+belagertem@users.noreply.github.com> --- sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java index 4f901ed6..c1a61d03 100644 --- a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java +++ b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java @@ -742,7 +742,7 @@ public static void runWithArgs( * @param sdcTestDirectories directories to search for test cases * @param defaultConfigModules default configuration modules for extended EnabledTestConfig and TestParameterConfig * @param overrides abstract module to override test run injector - * @param logInitializationInfos Lambda that is called after the logger has been initialized and SDCcc's version + * @param logInitializationInfos lambda that is called after the logger has been initialized and SDCcc's version * information has been logged out to give the caller the opportunity to add * additional information. */ From 502e1a9f4bf129c3fc21aa9a49e214fc32f421c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?= Date: Tue, 17 Sep 2024 09:07:02 +0200 Subject: [PATCH 6/6] Restructured overrides of runWithArgs() method to offer a clear distinction between the method's 2 UseCases. --- .../main/java/com/draeger/medical/sdccc/TestSuite.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java index 4f901ed6..2a544c06 100644 --- a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java +++ b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java @@ -685,8 +685,7 @@ public static void main(final String[] args) throws IOException { EnabledTestConfig.class, TestParameterConfig.class, List.of(), - DefaultTestSuiteConfig.DEFAULT_DIRECTORIES, - null); + DefaultTestSuiteConfig.DEFAULT_DIRECTORIES); } /** @@ -712,15 +711,13 @@ public static CommandLineOptions initialize(final String[] args) { * @param testParameterClass class containing test parameter * @param sdcTestDirectories directories to search for test cases * @param defaultConfigModules default configuration modules for extended EnabledTestConfig and TestParameterConfig - * @param overrides abstract module to override test run injector */ public static void runWithArgs( final CommandLineOptions cmdLine, final Class enabledTestConfigClass, final Class testParameterClass, final List defaultConfigModules, - final String[] sdcTestDirectories, - @Nullable final AbstractModule overrides) + final String[] sdcTestDirectories) throws IOException { runWithArgs( cmdLine, @@ -728,7 +725,7 @@ public static void runWithArgs( testParameterClass, defaultConfigModules, sdcTestDirectories, - overrides, + null, null); }