(commons-crypto) branch master updated: Don't load JNI when testing JNA

[sebb]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e63e2465 Don't load JNI when testing JNA
e63e2465 is described below

commit e63e24652178af1ab08ae224129d63e9c6af81e3
Author: Sebb <s...@apache.org>
AuthorDate: Thu Nov 9 23:20:57 2023 +0000

    Don't load JNI when testing JNA
    
    Temporary work-round for CRYPTO-175
    Ideally need to change AbstractTest classes to be generic.
---
 .../crypto/jna/AbstractCipherJnaStreamTest.java    | 22 ++++++++++++++++++++++
 .../jna/PositionedCryptoInputStreamJnaTest.java    |  5 +++++
 2 files changed, 27 insertions(+)

diff --git 
a/src/test/java/org/apache/commons/crypto/jna/AbstractCipherJnaStreamTest.java 
b/src/test/java/org/apache/commons/crypto/jna/AbstractCipherJnaStreamTest.java
index 255b881b..99e8d5fb 100644
--- 
a/src/test/java/org/apache/commons/crypto/jna/AbstractCipherJnaStreamTest.java
+++ 
b/src/test/java/org/apache/commons/crypto/jna/AbstractCipherJnaStreamTest.java
@@ -82,4 +82,26 @@ public abstract class AbstractCipherJnaStreamTest extends 
AbstractCipherStreamTe
 
         doSkipTest(CIPHER_OPENSSL_JNA, true);
     }
+
+    @Override
+    @Test
+    @Timeout(value = 120000, unit = TimeUnit.MILLISECONDS)
+    public void testExceptions() throws Exception {
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        doExceptionTest(CIPHER_OPENSSL_JNA, baos, false);
+
+        doExceptionTest(CIPHER_OPENSSL_JNA, baos, true);
+    }
+
+    @Override
+    @Test
+    @Timeout(value = 120000, unit = TimeUnit.MILLISECONDS)
+    public void testFieldGetters() throws Exception {
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        doFieldGetterTest(CIPHER_OPENSSL_JNA, baos, false);
+
+        doFieldGetterTest(CIPHER_OPENSSL_JNA, baos, true);
+    }
+
+
 }
diff --git 
a/src/test/java/org/apache/commons/crypto/jna/PositionedCryptoInputStreamJnaTest.java
 
b/src/test/java/org/apache/commons/crypto/jna/PositionedCryptoInputStreamJnaTest.java
index a9dc0246..ab47dd43 100644
--- 
a/src/test/java/org/apache/commons/crypto/jna/PositionedCryptoInputStreamJnaTest.java
+++ 
b/src/test/java/org/apache/commons/crypto/jna/PositionedCryptoInputStreamJnaTest.java
@@ -31,6 +31,11 @@ public class PositionedCryptoInputStreamJnaTest extends 
PositionedCryptoInputStr
         assumeTrue(OpenSslJna.isEnabled());
     }
 
+    @Test
+    @Override // Don't load JNI!
+    public void testJNI() throws Exception {
+    }
+
     @Test
     public void testCipher() throws Exception {
         testCipher(OpenSslJnaCipher.class.getName());