[karaf] branch jdk12 updated: [KARAF-6203]ensure karaf can build and run with JDK12-fix Krb5LoginModuleTest

[ff...@apache.org]

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

ffang pushed a commit to branch jdk12
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/jdk12 by this push:
     new 6355199  [KARAF-6203]ensure karaf can build and run with JDK12-fix Krb5LoginModuleTest
6355199 is described below

commit 6355199ee2d7992339552cdf36d5def5b695d61b
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Mar 26 13:33:21 2019 +0800

    [KARAF-6203]ensure karaf can build and run with JDK12-fix Krb5LoginModuleTest
---
 .../apache/karaf/jaas/modules/krb5/Krb5LoginModuleTest.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModuleTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModuleTest.java
index 59293e8..b60df15 100644
--- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModuleTest.java
+++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModuleTest.java
@@ -52,7 +52,6 @@ import org.apache.karaf.jaas.modules.NamePasswordCallbackHandler;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -134,10 +133,11 @@ public class Krb5LoginModuleTest extends KarafKerberosITest {
         super.setUp();
 
         // Set up a partition for EXAMPLE.COM and add user and service principals to test authentication with.
+        setupEnv(TcpTransport.class,
+                 EncryptionType.AES128_CTS_HMAC_SHA1_96, ChecksumType.HMAC_SHA1_96_AES128);
         KerberosTestUtils.fixServicePrincipalName(
                 "ldap/" + KerberosTestUtils.getHostName() + "@EXAMPLE.COM", null, getLdapServer());
-        setupEnv(TcpTransport.class,
-                EncryptionType.AES128_CTS_HMAC_SHA1_96, ChecksumType.HMAC_SHA1_96_AES128);
+        
 
         kdcServer.getConfig().setPaEncTimestampRequired(false);
         // Use our custom configuration to avoid reliance on external config
@@ -149,7 +149,7 @@ public class Krb5LoginModuleTest extends KarafKerberosITest {
         super.tearDown();
     }
 
-    @Ignore
+    @Test
     public void testKeytabSuccess() throws Exception {
         Map<String, Object> props = new HashMap<>();
         props.put("debug", "true");
@@ -202,7 +202,7 @@ public class Krb5LoginModuleTest extends KarafKerberosITest {
 
     }
 
-    @Ignore
+    @Test
     public void testLoginSuccess() throws Exception {
         Subject subject = new Subject();
         Krb5LoginModule module = new Krb5LoginModule();