User: starksm 
  Date: 01/04/11 19:53:57

  Modified:    src/main/org/jboss/test LoginModulesTest.java
                        SRPLoginTest.java TestSRPLogin.java
  Log:
  Rename org.jboss.security.plugins.ProxyLoginModule
  Integrate JaasServerLoginModule fix and missing unit test.
  
  Revision  Changes    Path
  1.4       +47 -4     jbosssx/src/main/org/jboss/test/LoginModulesTest.java
  
  Index: LoginModulesTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/test/LoginModulesTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LoginModulesTest.java     2001/04/04 21:39:02     1.3
  +++ LoginModulesTest.java     2001/04/12 02:53:57     1.4
  @@ -28,13 +28,13 @@
   
   import org.jboss.security.SimpleGroup;
   import org.jboss.security.SimplePrincipal;
  -import org.jboss.security.auth.UsernamePasswordHandler;
  -import org.jboss.security.plugins.samples.UsernamePasswordLoginModule;
  +import org.jboss.security.auth.callback.UsernamePasswordHandler;
  +import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
   
   /** Tests of the sample LoginModule classes.
   
   @author [EMAIL PROTECTED]
  -@version $Revision: 1.3 $
  +@version $Revision: 1.4 $
   */
   public class LoginModulesTest extends TestCase
   {
  @@ -121,6 +121,14 @@
               AppConfigurationEntry[] entry = {ace};
               return entry;
           }
  +        AppConfigurationEntry[] testJaasServer()
  +        {
  +            String name = 
"org.jboss.security.plugins.samples.JaasServerLoginModule";
  +            AppConfigurationEntry ace = new AppConfigurationEntry(name,
  +                AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, new 
HashMap());
  +            AppConfigurationEntry[] entry = {ace};
  +            return entry;
  +        }
           AppConfigurationEntry[] testUsernamePassword()
           {
               return other();
  @@ -198,6 +206,33 @@
   
           lc.logout();
       }
  +    public void testJaasServer() throws Exception
  +    {
  +        System.out.println("testJaasServer");
  +        UsernamePasswordHandler handler = new UsernamePasswordHandler("scott", 
"echoman".toCharArray());
  +        LoginContext lc = new LoginContext("testJaasServer", handler);
  +        lc.login();
  +        Subject subject = lc.getSubject();
  +        Set groups = subject.getPrincipals(Group.class);
  +        assert("Principals contains scott", subject.getPrincipals().contains(new 
SimplePrincipal("scott")));
  +        assert("Principals contains Roles", groups.contains(new 
SimplePrincipal("Roles")));
  +        Group roles = (Group) groups.iterator().next();
  +        assert("Echo is a role", roles.isMember(new SimplePrincipal("Echo")));
  +        lc.logout();
  +
  +        handler = new UsernamePasswordHandler("stark", "javaman".toCharArray());
  +        lc = new LoginContext("testJaasServer", handler);
  +        lc.login();
  +        subject = lc.getSubject();
  +        groups = subject.getPrincipals(Group.class);
  +        assert("Principals contains stark", subject.getPrincipals().contains(new 
SimplePrincipal("stark")));
  +        assert("Principals contains Roles", groups.contains(new 
SimplePrincipal("Roles")));
  +        roles = (Group) groups.iterator().next();
  +        assert("Echo is NOT a role", roles.isMember(new SimplePrincipal("Echo")) == 
false);
  +        assert("Java is a role", roles.isMember(new SimplePrincipal("Java")));
  +        assert("Coder is a role", roles.isMember(new SimplePrincipal("Coder")));
  +        lc.logout();
  +    }
       public void testIdentity() throws Exception
       {
           System.out.println("testIdentity");
  @@ -281,7 +316,15 @@
       public void testJdbc() throws Exception
       {
           System.out.println("testJdbc");
  -        Class.forName ("org.enhydra.instantdb.jdbc.idbDriver");
  +        try
  +        {
  +            Class.forName ("org.enhydra.instantdb.jdbc.idbDriver");
  +        }
  +        catch(ClassNotFoundException e)
  +        {   // Skip the test
  +            System.out.println("Skipping test because 
org.enhydra.instantdb.jdbc.idbDriver was not found");
  +            return;
  +        }
           DataSource ds = new TestDS();
           Properties env = new Properties();
           org.jnp.server.Main naming = new org.jnp.server.Main();
  
  
  
  1.2       +1 -1      jbosssx/src/main/org/jboss/test/SRPLoginTest.java
  
  Index: SRPLoginTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/test/SRPLoginTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SRPLoginTest.java 2001/04/04 21:39:02     1.1
  +++ SRPLoginTest.java 2001/04/12 02:53:57     1.2
  @@ -11,14 +11,14 @@
   import org.jboss.security.SimplePrincipal;
   import org.jboss.security.SecurityPolicy;
   import org.jboss.security.SecurityPolicyParser;
  -import org.jboss.security.auth.UsernamePasswordHandler;
  +import org.jboss.security.auth.callback.UsernamePasswordHandler;
   
   /** A test of the SRPLogin module
   
   @see org.jboss.security.srp.jaas.SRPLoginModule
   
   @author [EMAIL PROTECTED]
  -@version $Revision: 1.1 $
  +@version $Revision: 1.2 $
   */
   public class SRPLoginTest extends junit.framework.TestCase
   {
  
  
  
  1.2       +1 -1      jbosssx/src/main/org/jboss/test/TestSRPLogin.java
  
  Index: TestSRPLogin.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/test/TestSRPLogin.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestSRPLogin.java 2001/03/05 09:53:38     1.1
  +++ TestSRPLogin.java 2001/04/12 02:53:57     1.2
  @@ -11,14 +11,14 @@
   import org.jboss.security.SimplePrincipal;
   import org.jboss.security.SecurityPolicy;
   import org.jboss.security.SecurityPolicyParser;
  -import org.jboss.security.plugins.UsernamePasswordHandler;
  +import org.jboss.security.auth.callback.UsernamePasswordHandler;
   
   /** A test of the SRPLogin module
   
   @see org.jboss.security.srp.jaas.SRPLoginModule
   
   @author [EMAIL PROTECTED]
  -@version $Revision: 1.1 $
  +@version $Revision: 1.2 $
   */
   public class TestSRPLogin extends junit.framework.TestCase
   {
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to