[MSHARED-1109] MessageUtilsTest fails on unsupported platforms (e.g.,…

… Apple Silicon or HP-UX/IA64) This closes apache#106
kwin · Jul 25, 2022 · 3f380dd · 3f380dd
1 parent 5b78029
commit 3f380dd
Showing 1 changed file with 38 additions and 6 deletions.
diff --git a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
@@ -23,6 +23,7 @@
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeNoException;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -46,12 +47,24 @@ public void testSystem()
         {
             MessageUtils.systemInstall();
             assertThat( System.out, not( sameInstance( currentOut ) ) );
-            MessageUtils.systemUninstall();
             assertThat( System.out, sameInstance( currentOut ) );
         }
+        catch( LinkageError e )
+        {
+            assumeNoException( "JAnsi not supported for this platform", e );
+        }
         finally
         {
-            System.setOut( currentOut );
+            try
+            {
+                // uninstall is always necessary due to https://github.com/fusesource/jansi/issues/242 
+                // but might throw exceptions
+                MessageUtils.systemUninstall();
+            }
+            catch ( Throwable t )
+            {
+                // ignore any thrown exception like NPE here
+            }
         }
     }
 
@@ -69,9 +82,28 @@ public int getTerminalWidth()
         AnsiOutputStream aos = new AnsiOutputStream( new ByteArrayOutputStream(), width, AnsiMode.Default,
                 null, AnsiType.Emulation, AnsiColors.Colors256, StandardCharsets.UTF_8,
                 null, null, false );
-        AnsiConsole.systemInstall();
-        AnsiConsole.out = new AnsiPrintStream( aos, true );
-        assertEquals( 33, MessageUtils.getTerminalWidth() );
-        AnsiConsole.systemUninstall();
+        try
+        {
+            AnsiConsole.systemInstall();
+            AnsiConsole.out = new AnsiPrintStream( aos, true );
+            assertEquals( 33, MessageUtils.getTerminalWidth() );
+        }
+        catch( LinkageError e )
+        {
+            assumeNoException( "JAnsi not supported for this platform", e );
+        }
+        finally
+        {
+            try
+            {
+                // uninstall is always necessary due to https://github.com/fusesource/jansi/issues/242 
+                // but might throw exceptions
+                MessageUtils.systemUninstall();
+            }
+            catch ( Throwable t )
+            {
+                // ignore any thrown exception like NPE here
+            }
+        }
     }
 }