[commons-crypto] branch sebb-mac-test updated: Still failing main build

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch sebb-mac-test
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git


The following commit(s) were added to refs/heads/sebb-mac-test by this push:
     new b0c547e  Still failing main build
b0c547e is described below

commit b0c547e51983ac7deb42d54505a58d4581e396c0
Author: Sebb <se...@apache.org>
AuthorDate: Sun Jun 26 21:14:46 2022 +0100

    Still failing main build
---
 src/main/java/org/apache/commons/crypto/Crypto.java     | 8 ++++++--
 src/test/java/org/apache/commons/crypto/CryptoTest.java | 8 +-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/commons/crypto/Crypto.java b/src/main/java/org/apache/commons/crypto/Crypto.java
index 3798f6d..aa0edb0 100644
--- a/src/main/java/org/apache/commons/crypto/Crypto.java
+++ b/src/main/java/org/apache/commons/crypto/Crypto.java
@@ -120,6 +120,8 @@ public final class Crypto {
         return NativeCodeLoader.getLoadingError();
     }
 
+    private static boolean quiet = false;
+
     /**
      * Logs info-level messages.
      *
@@ -127,8 +129,9 @@ public final class Crypto {
      * @param args   See {@link String#format(String, Object...)}.
      */
     private static void info(final String format, final Object... args) {
-        // TODO Find a better way to do this later.
-        // System.out.println(String.format(format, args));
+        if (!quiet) { // suppress output for testing
+          System.out.println(String.format(format, args));
+        }
     }
 
     /**
@@ -147,6 +150,7 @@ public final class Crypto {
      * @throws Exception if getCryptoRandom or getCryptoCipher get error.
      */
     public static void main(final String[] args) throws Exception {
+        quiet = (args.length ==1 && args[0].equals("-q"));
         info("%s %s", getComponentName(), getComponentVersion());
         if (isNativeCodeLoaded()) {
             info("Native code loaded OK: %s", OpenSslInfoNative.NativeVersion());
diff --git a/src/test/java/org/apache/commons/crypto/CryptoTest.java b/src/test/java/org/apache/commons/crypto/CryptoTest.java
index 59d1bd6..992e8ee 100644
--- a/src/test/java/org/apache/commons/crypto/CryptoTest.java
+++ b/src/test/java/org/apache/commons/crypto/CryptoTest.java
@@ -49,13 +49,7 @@ public class CryptoTest {
 
 	@Test
 	public void testMain() throws Throwable {
-		try {
-			Crypto.main(new String[0]);
-		} catch (final Throwable e) {
-			final Throwable loadingError = Crypto.getLoadingError();
-			System.err.println("Special case; LoadingError = " + loadingError);
-			throw loadingError != null ? loadingError : e;
-		}
+		Crypto.main(new String[]{"-q"}); // output causes issues for testing
     assertTrue(true, "Completed OK");
 	}