[java-opensaml] branch main updated: JSPT-103 Review use of Java version helper methods and deprecate

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch main
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=2043178fe25abe58f4792385d22627112dc3d814

The following commit(s) were added to refs/heads/main by this push:
       new  2043178fe JSPT-103 Review use of Java version helper methods and deprecate
2043178fe is described below

commit 2043178fe25abe58f4792385d22627112dc3d814
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Feb 16 13:37:39 2021 +0000

    JSPT-103 Review use of Java version helper methods and deprecate
    
    Remove Java 7-10 tests
    
    https://issues.shibboleth.net/jira/browse/JSPT-103
---
 .../encryption/support/tests/AESGCMTest.java       | 28 +++++++++-------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/AESGCMTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/AESGCMTest.java
index 427850f4d..b1e6d3847 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/AESGCMTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/tests/AESGCMTest.java
@@ -40,11 +40,10 @@ import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import net.shibboleth.utilities.java.support.testing.TestSupport;
-
 /**
  *
  */
+ at SuppressWarnings("javadoc")
 public class AESGCMTest extends XMLObjectBaseTestCase {
     
     private Logger log = LoggerFactory.getLogger(AESGCMTest.class);
@@ -69,27 +68,22 @@ public class AESGCMTest extends XMLObjectBaseTestCase {
         AlgorithmDescriptor aesGCM256 = registry.get(EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES256_GCM);
         
         return new Object[][] {
-                new Object[] {aesGCM128, 7, TestSupport.isJavaV7OrLater(), true},
-                new Object[] {aesGCM192, 8, TestSupport.isJavaV8OrLater(), true},
-                new Object[] {aesGCM256, 8, TestSupport.isJavaV8OrLater(), true},
+                new Object[] {aesGCM128, true},
+                new Object[] {aesGCM192, true},
+                new Object[] {aesGCM256, true},
                 
-                new Object[] {aesGCM128, 8, TestSupport.isJavaV8OrLater(), false},
-                new Object[] {aesGCM192, 8, TestSupport.isJavaV8OrLater(), false},
-                new Object[] {aesGCM256, 8, TestSupport.isJavaV8OrLater(), false},
+                new Object[] {aesGCM128, false},
+                new Object[] {aesGCM192, false},
+                new Object[] {aesGCM256, false},
                 
-                new Object[] {aesGCM128, 8, TestSupport.isJavaV8OrLater(), true},
-                new Object[] {aesGCM192, 8, TestSupport.isJavaV8OrLater(), true},
-                new Object[] {aesGCM256, 8, TestSupport.isJavaV8OrLater(), true},
+                new Object[] {aesGCM128, true},
+                new Object[] {aesGCM192, true},
+                new Object[] {aesGCM256, true},
         };
     }
 
     @Test(dataProvider="testDataAESGCM")
-    public void testEncryptDecrypt(AlgorithmDescriptor descriptor, int minJavaVersion,
-            boolean haveJavaVersion, boolean loadBC) throws Exception {
-        if (!haveJavaVersion) {
-            log.debug("Not Java {}+, skipping test", minJavaVersion);
-            return;
-        }
+    public void testEncryptDecrypt(AlgorithmDescriptor descriptor, boolean loadBC) throws Exception {
         
         int maxKeyLength = Cipher.getMaxAllowedKeyLength(descriptor.getJCAAlgorithmID());
         log.debug("Installed policy indicates max allowed key length for '{}' is: {}", descriptor.getJCAAlgorithmID(), maxKeyLength);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.