Fixed the rest of the failing test cases.

remkop · Mar 24, 2023 · 01b06bc · 01b06bc
1 parent 5b036f0
commit 01b06bc
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/picocli-tests-java567/src/test/java/picocli/HelpAnsiHeuristicsTest.java b/picocli-tests-java567/src/test/java/picocli/HelpAnsiHeuristicsTest.java
@@ -360,6 +360,11 @@ public void testAnsiAutoJansiConsoleInstalledOverridesHintDisabled() {
         environmentVariables.clear(ANSI_ENVIRONMENT_VARIABLES);
         environmentVariables.set("CLICOLOR", "0"); // hint disabled
         System.setProperty("os.name", "Windows");
+        // Clear the globally cached jansiConsole value that might
+        // have been set in a previous test to force the
+        // Ansi#isJansiConsoleInstalled method to recalculate
+        // the cached value.
+        Ansi.jansiConsole = null;
         assertTrue(Ansi.isWindows());
         assertFalse(Ansi.isPseudoTTY());
         assertFalse(Ansi.forceDisabled());

diff --git a/picocli-tests-java9plus/src/test/java/picocli/AutoCompleteSystemExitTest.java b/picocli-tests-java9plus/src/test/java/picocli/AutoCompleteSystemExitTest.java
@@ -1,9 +1,11 @@
 package picocli;
 
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
+import picocli.CommandLine.Help.Ansi;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -508,6 +510,15 @@ private String expectedCompletionScriptForNonDefault() {
             CommandLine.VERSION);
     }
 
+    @BeforeAll
+    static void disableAnsi() {
+        // Clear the globally cached jansiConsole value that might
+        // have been set in a previous test to force the
+        // Ansi#isJansiConsoleInstalled method to recalculate
+        // the cached value.
+        Ansi.jansiConsole = null;
+    }
+
     @Test
     @DisabledForJreRange(min = JRE.JAVA_18, max = JRE.JAVA_21, disabledReason = "UnsupportedOperationException in SystemLambda.withSecurityManager")
     public void testAutoCompleteAppHelp() throws Exception {

diff --git a/picocli-tests-java9plus/src/test/java/picocli/HelpAnsiHeuristicsTest.java b/picocli-tests-java9plus/src/test/java/picocli/HelpAnsiHeuristicsTest.java
@@ -612,6 +612,12 @@ public void testAnsiAutoJansiConsoleInstalledOverridesHintDisabled() throws Exce
                     assertFalse(Ansi.hintEnabled());
 
                     assertFalse(Ansi.isJansiConsoleInstalled());
+
+                    // Clear the globally cached jansiConsole value that might
+                    // have been set in a previous test to force the
+                    // Ansi#isJansiConsoleInstalled method to recalculate
+                    // the cached value.
+                    Ansi.jansiConsole = null;
                     AnsiConsole.systemInstall();
                     try {
                         assertTrue(Ansi.isJansiConsoleInstalled());
@@ -628,6 +634,7 @@ public void testAnsiAutoHintDisabledOverridesHintEnabled() throws Exception {
         restoreSystemProperties(() -> {
 
             System.setProperty("os.name", "Windows");
+            Ansi.jansiConsole = null;
             withEnvironmentVariable(ANSI_ENVIRONMENT_VARIABLES[0], null)
                 .and(ANSI_ENVIRONMENT_VARIABLES[1], null)
                 .and(ANSI_ENVIRONMENT_VARIABLES[2], null)
@@ -688,6 +695,7 @@ public void testAnsiAutoDisabledIfNoTty() throws Exception {
                 restoreSystemProperties(() -> {
 
                     System.setProperty("os.name", "Windows");
+                    Ansi.jansiConsole = null;
                     assertTrue(Ansi.isWindows());
                     assertFalse(Ansi.isPseudoTTY());
                     assertFalse(Ansi.isJansiConsoleInstalled());

diff --git a/src/test/java/picocli/Issue1125_1538_OptionNameOrSubcommandAsOptionValue.java b/src/test/java/picocli/Issue1125_1538_OptionNameOrSubcommandAsOptionValue.java
@@ -9,6 +9,7 @@
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.SystemErrRule;
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Help.Ansi;
 import picocli.CommandLine.IParameterPreprocessor;
 import picocli.CommandLine.Model.ArgSpec;
 import picocli.CommandLine.Model.CommandSpec;
@@ -111,6 +112,11 @@ public void testAmbiguousOptionsDefault() {
         //-x -y=123
         MyCommand obj = new MyCommand();
         CommandLine cmdLine = new CommandLine(obj);
+        // Clear the globally cached jansiConsole value that might
+        // have been set in a previous test to force the
+        // Ansi#isJansiConsoleInstalled method to recalculate
+        // the cached value.
+        Ansi.jansiConsole = null;
         int exitCode = cmdLine.execute("-x", "-y=123");
         assertEquals(2, exitCode);
         String expected = String.format("" +