Repository: commons-crypto Updated Branches: refs/heads/master 5f1cc557f -> d3e86ff44
Skip tests if JNA cannot be enabled Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/d3e86ff4 Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/d3e86ff4 Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/d3e86ff4 Branch: refs/heads/master Commit: d3e86ff44d2d74fe388e2fd4139fef1c8af1ad2b Parents: 5f1cc55 Author: Sebb <[email protected]> Authored: Thu Jul 7 17:32:10 2016 +0100 Committer: Sebb <[email protected]> Committed: Thu Jul 7 17:32:10 2016 +0100 ---------------------------------------------------------------------- .../commons/crypto/jna/AbstractCipherJnaStreamTest.java | 7 +++++++ .../org/apache/commons/crypto/jna/OpenSslJnaCipherTest.java | 2 ++ .../apache/commons/crypto/jna/OpenSslJnaCryptoRandomTest.java | 7 +++++++ .../crypto/jna/PositionedCryptoInputStreamJnaTest.java | 7 +++++++ 4 files changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/d3e86ff4/src/test/java/org/apache/commons/crypto/jna/AbstractCipherJnaStreamTest.java ---------------------------------------------------------------------- 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 a035b39..e0d4523 100644 --- a/src/test/java/org/apache/commons/crypto/jna/AbstractCipherJnaStreamTest.java +++ b/src/test/java/org/apache/commons/crypto/jna/AbstractCipherJnaStreamTest.java @@ -21,12 +21,19 @@ import java.io.ByteArrayOutputStream; import org.apache.commons.crypto.cipher.AbstractCipherTest; import org.apache.commons.crypto.stream.AbstractCipherStreamTest; +import org.junit.Assume; +import org.junit.Before; import org.junit.Test; public abstract class AbstractCipherJnaStreamTest extends AbstractCipherStreamTest { private static final String CIPHER_OPENSSL_JNA = OpenSslJna.getCipherClass().getName(); + @Before + public void init() { + Assume.assumeTrue(OpenSslJna.isEnabled()); + } + /** Test skip. */ @Test(timeout = 120000) public void testSkip() throws Exception { http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/d3e86ff4/src/test/java/org/apache/commons/crypto/jna/OpenSslJnaCipherTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/crypto/jna/OpenSslJnaCipherTest.java b/src/test/java/org/apache/commons/crypto/jna/OpenSslJnaCipherTest.java index f3a0a9d..a84fb6f 100644 --- a/src/test/java/org/apache/commons/crypto/jna/OpenSslJnaCipherTest.java +++ b/src/test/java/org/apache/commons/crypto/jna/OpenSslJnaCipherTest.java @@ -20,11 +20,13 @@ package org.apache.commons.crypto.jna; import org.apache.commons.crypto.cipher.OpenSslCipherTest; import org.apache.commons.crypto.jna.OpenSslJnaCipher; +import org.junit.Assume; public class OpenSslJnaCipherTest extends OpenSslCipherTest { @Override public void init() { + Assume.assumeTrue(OpenSslJna.isEnabled()); transformations = new String[] { "AES/CBC/NoPadding", "AES/CBC/PKCS5Padding", http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/d3e86ff4/src/test/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandomTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandomTest.java b/src/test/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandomTest.java index 0c0356b..722a210 100644 --- a/src/test/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandomTest.java +++ b/src/test/java/org/apache/commons/crypto/jna/OpenSslJnaCryptoRandomTest.java @@ -24,11 +24,18 @@ import org.apache.commons.crypto.jna.OpenSslJnaCryptoRandom; import org.apache.commons.crypto.random.AbstractRandomTest; import org.apache.commons.crypto.random.CryptoRandom; import org.apache.commons.crypto.random.CryptoRandomFactory; +import org.junit.Assume; +import org.junit.Before; import static org.junit.Assert.fail; public class OpenSslJnaCryptoRandomTest extends AbstractRandomTest { + @Before + public void init() { + Assume.assumeTrue(OpenSslJna.isEnabled()); + } + @Override public CryptoRandom getCryptoRandom() throws GeneralSecurityException { Properties props = new Properties(); http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/d3e86ff4/src/test/java/org/apache/commons/crypto/jna/PositionedCryptoInputStreamJnaTest.java ---------------------------------------------------------------------- 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 f094b5b..12d2408 100644 --- a/src/test/java/org/apache/commons/crypto/jna/PositionedCryptoInputStreamJnaTest.java +++ b/src/test/java/org/apache/commons/crypto/jna/PositionedCryptoInputStreamJnaTest.java @@ -18,6 +18,8 @@ package org.apache.commons.crypto.jna; import org.apache.commons.crypto.stream.PositionedCryptoInputStreamTest; +import org.junit.Assume; +import org.junit.Before; import org.junit.Test; /** @@ -25,6 +27,11 @@ import org.junit.Test; */ public class PositionedCryptoInputStreamJnaTest extends PositionedCryptoInputStreamTest { + @Before + public void init() { + Assume.assumeTrue(OpenSslJna.isEnabled()); + } + @Test public void doTest() throws Exception { testCipher(OpenSslJnaCipher.class.getName());
