From 284563d3f12b5f15c652851f6c235004e036fc64 Mon Sep 17 00:00:00 2001
From: Brian Stansberry <brian.stansberry@redhat.com>
Date: Tue, 12 Oct 2021 20:14:42 -0500
Subject: [PATCH] [WFCORE-4532] Enable tests on JDK14+ since they  no longer
 fail

Of 3 tests in full WildFly mentioned in the WFCORE-4532 description, two no longer exist and HTTPSWebConnectorTestCase is covered by WFLY-15177
---
 .../java/org/wildfly/extension/elytron/TlsTestCase.java    | 5 -----
 .../elytron/sasl/mgmt/KerberosHttpMgmtSaslTestCase.java    | 7 -------
 .../elytron/sasl/mgmt/KerberosNativeMgmtSaslTestCase.java  | 7 -------
 3 files changed, 19 deletions(-)

diff --git a/elytron/src/test/java/org/wildfly/extension/elytron/TlsTestCase.java b/elytron/src/test/java/org/wildfly/extension/elytron/TlsTestCase.java
index 6dda9d8ae00..5a0c38d2b0e 100644
--- a/elytron/src/test/java/org/wildfly/extension/elytron/TlsTestCase.java
+++ b/elytron/src/test/java/org/wildfly/extension/elytron/TlsTestCase.java
@@ -308,11 +308,6 @@ private static void deleteKeyStoreFiles() {
         }
     }
 
-    @BeforeClass
-    public static void noJDK14Plus() {
-        Assume.assumeFalse("Avoiding JDK 14 due to https://issues.jboss.org/browse/WFCORE-4532", "14".equals(System.getProperty("java.specification.version")));
-    }
-
     private static boolean isJDK14Plus() {
         return "14".equals(System.getProperty("java.specification.version"));
     }
diff --git a/testsuite/elytron/src/test/java/org/wildfly/test/integration/elytron/sasl/mgmt/KerberosHttpMgmtSaslTestCase.java b/testsuite/elytron/src/test/java/org/wildfly/test/integration/elytron/sasl/mgmt/KerberosHttpMgmtSaslTestCase.java
index 9e631d88e32..bb957c8e259 100644
--- a/testsuite/elytron/src/test/java/org/wildfly/test/integration/elytron/sasl/mgmt/KerberosHttpMgmtSaslTestCase.java
+++ b/testsuite/elytron/src/test/java/org/wildfly/test/integration/elytron/sasl/mgmt/KerberosHttpMgmtSaslTestCase.java
@@ -31,8 +31,6 @@
 import org.jboss.as.test.integration.security.common.CoreUtils;
 import org.jboss.as.test.shared.TestSuiteEnvironment;
 import org.jboss.dmr.ModelNode;
-import org.junit.Assume;
-import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.wildfly.core.testrunner.WildflyTestRunner;
 import org.wildfly.security.auth.permission.LoginPermission;
@@ -77,11 +75,6 @@ public class KerberosHttpMgmtSaslTestCase extends AbstractKerberosMgmtSaslTestBa
 
     private static final String NAME = KerberosHttpMgmtSaslTestCase.class.getSimpleName();
 
-    @BeforeClass
-    public static void noJDK14Plus() {
-        Assume.assumeFalse("Avoiding JDK 14 due to https://issues.jboss.org/browse/WFCORE-4532", "14".equals(System.getProperty("java.specification.version")));
-    }
-
     private static final ModelControllerClient client = ModelControllerClient.Factory
             .create(new ModelControllerClientConfiguration.Builder().setHostName(CoreUtils.getDefaultHost(false))
                     .setPort(PORT_NATIVE).setProtocol("remote").setConnectionTimeout(CONNECTION_TIMEOUT_IN_MS).build());
diff --git a/testsuite/elytron/src/test/java/org/wildfly/test/integration/elytron/sasl/mgmt/KerberosNativeMgmtSaslTestCase.java b/testsuite/elytron/src/test/java/org/wildfly/test/integration/elytron/sasl/mgmt/KerberosNativeMgmtSaslTestCase.java
index c8755c50cd7..5ad1eadb257 100644
--- a/testsuite/elytron/src/test/java/org/wildfly/test/integration/elytron/sasl/mgmt/KerberosNativeMgmtSaslTestCase.java
+++ b/testsuite/elytron/src/test/java/org/wildfly/test/integration/elytron/sasl/mgmt/KerberosNativeMgmtSaslTestCase.java
@@ -31,8 +31,6 @@
 import org.jboss.as.test.shared.TestSuiteEnvironment;
 import org.jboss.dmr.ModelNode;
 import org.junit.runner.RunWith;
-import org.junit.Assume;
-import org.junit.BeforeClass;
 import org.wildfly.core.testrunner.WildflyTestRunner;
 import org.wildfly.security.auth.permission.LoginPermission;
 import org.wildfly.test.security.common.TestRunnerConfigSetupTask;
@@ -76,11 +74,6 @@ public class KerberosNativeMgmtSaslTestCase extends AbstractKerberosMgmtSaslTest
 
     private static final String NAME = KerberosNativeMgmtSaslTestCase.class.getSimpleName();
 
-    @BeforeClass
-    public static void noJDK14Plus() {
-        Assume.assumeFalse("Avoiding JDK 14 due to https://issues.jboss.org/browse/WFCORE-4532", "14".equals(System.getProperty("java.specification.version")));
-    }
-
     /**
      * Configures test sasl-server-factory to use given mechanism. It also enables/disables SSL based on provided flag.
      */