svn commit: r1579702 - /jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapDefaultLoginModuleTest.java

[angela]

Author: angela
Date: Thu Mar 20 18:28:37 2014
New Revision: 1579702

URL: http://svn.apache.org/r1579702
Log:
OAK-1588 : adding test with reverse lm order (external before repo-user)

Added:
    
jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapDefaultLoginModuleTest.java
      - copied, changed from r1578955, 
jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/DefaultLdapLoginModuleTest.java

Copied: 
jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapDefaultLoginModuleTest.java
 (from r1578955, 
jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/DefaultLdapLoginModuleTest.java)
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapDefaultLoginModuleTest.java?p2=jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapDefaultLoginModuleTest.java&p1=jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/DefaultLdapLoginModuleTest.java&r1=1578955&r2=1579702&rev=1579702&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/DefaultLdapLoginModuleTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapDefaultLoginModuleTest.java
 Thu Mar 20 18:28:37 2014
@@ -29,7 +29,19 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class DefaultLdapLoginModuleTest extends LdapLoginTestBase {
+/**
+ * LDAP Login should not only work in the default jaas configuration
+ *
+ * LoginModuleImpl SUFFICIENT
+ * ExternalLoginModule REQUIRED
+ *
+ * but also with the jaas configuration specifying the external login module
+ * first:
+ *
+ * ExternalLoginModule SUFFICIENT
+ * LoginModuleImpl REQUIRED
+ */
+public class LdapDefaultLoginModuleTest extends LdapLoginTestBase {
 
     @Override
     protected Configuration getConfiguration() {
@@ -38,13 +50,13 @@ public class DefaultLdapLoginModuleTest 
             public AppConfigurationEntry[] getAppConfigurationEntry(String s) {
                 return new AppConfigurationEntry[]{
                         new AppConfigurationEntry(
-                                LoginModuleImpl.class.getName(),
+                                ExternalLoginModule.class.getName(),
                                 
AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT,
-                                Collections.<String, Object>emptyMap()),
+                                options),
                         new AppConfigurationEntry(
-                                ExternalLoginModule.class.getName(),
+                                LoginModuleImpl.class.getName(),
                                 
AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
-                                options)
+                                Collections.<String, Object>emptyMap())
                 };
             }
         };