[jboss-cvs] JBossAS SVN: r67968 - in trunk/testsuite/src: resources/security and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Dec 5 18:16:51 EST 2007


Author: scott.stark at jboss.org
Date: 2007-12-05 18:16:50 -0500 (Wed, 05 Dec 2007)
New Revision: 67968

Modified:
   trunk/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/security/test/WebConstraintsUnitTestCase.java
   trunk/testsuite/src/resources/security/login-config.xml
Log:
Update the resource locations to allow unit tests to work both within eclipse and command line

Modified: trunk/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java	2007-12-05 21:35:37 UTC (rev 67967)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java	2007-12-05 23:16:50 UTC (rev 67968)
@@ -195,8 +195,11 @@
       AppConfigurationEntry[] testUsersRoles()
       {
          String name = "org.jboss.security.auth.spi.UsersRolesLoginModule";
+         HashMap options = new HashMap();
+         options.put("usersProperties", "security/users.properties");
+         options.put("rolesProperties", "security/roles.properties");
          AppConfigurationEntry ace = new AppConfigurationEntry(name,
-         AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, new HashMap());
+         AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, options);
          AppConfigurationEntry[] entry = {ace};
          return entry;
       }
@@ -204,7 +207,7 @@
       {
          String name = "org.jboss.security.auth.spi.UsersRolesLoginModule";
          HashMap options = new HashMap();
-         options.put("usersProperties", "usersb64.properties");
+         options.put("usersProperties", "security/usersb64.properties");
          options.put("hashAlgorithm", "MD5");
          options.put("hashEncoding", "base64");
          AppConfigurationEntry ace = new AppConfigurationEntry(name,
@@ -216,6 +219,8 @@
       {
          String name = "org.jboss.security.auth.spi.UsersRolesLoginModule";
          HashMap options = new HashMap();
+         options.put("usersProperties", "security/users.properties");
+         options.put("rolesProperties", "security/roles.properties");
          options.put("unauthenticatedIdentity", "nobody");
          AppConfigurationEntry ace = new AppConfigurationEntry(name,
          AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, options);
@@ -225,8 +230,11 @@
       AppConfigurationEntry[] testControlFlags()
       {
          String name1 = "org.jboss.security.auth.spi.UsersRolesLoginModule";
+         HashMap options1 = new HashMap();
+         options1.put("usersProperties", "security/users.properties");
+         options1.put("rolesProperties", "security/roles.properties");
          AppConfigurationEntry ace1 = new AppConfigurationEntry(name1,
-            AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT, new HashMap());
+            AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT, options1);
 
          String name2 = "org.jboss.security.auth.spi.DatabaseServerLoginModule";
          HashMap options = new HashMap();
@@ -282,6 +290,8 @@
          String name = "org.jboss.security.auth.spi.CertRolesLoginModule";
          HashMap options = new HashMap();
          options.put("securityDomain", "testCertRoles");
+         options.put("usersProperties", "security/users.properties");
+         options.put("rolesProperties", "security/roles.properties");
          AppConfigurationEntry ace = new AppConfigurationEntry(name,
             AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, options);
          AppConfigurationEntry[] entry = {ace};

Modified: trunk/testsuite/src/main/org/jboss/test/security/test/WebConstraintsUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/WebConstraintsUnitTestCase.java	2007-12-05 21:35:37 UTC (rev 67967)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/WebConstraintsUnitTestCase.java	2007-12-05 23:16:50 UTC (rev 67968)
@@ -100,6 +100,7 @@
    public void testGetAccess() throws Exception
    {
       log.debug("+++ testGetAccess");
+      Thread.sleep(10*1000);
       String baseURL = HttpUtils.getBaseURL("getUser", "getUserPass");
       // Test the Restricted GET security-constraint
       URL url = new URL(baseURL+"web-constraints/restricted/get-only");

Modified: trunk/testsuite/src/resources/security/login-config.xml
===================================================================
--- trunk/testsuite/src/resources/security/login-config.xml	2007-12-05 21:35:37 UTC (rev 67967)
+++ trunk/testsuite/src/resources/security/login-config.xml	2007-12-05 23:16:50 UTC (rev 67968)
@@ -88,14 +88,18 @@
    <application-policy name="testUsersRoles">
       <authentication>
          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-            flag="required"/>
+            flag="required">
+            <module-option name="usersProperties">security/users.properties</module-option>
+            <module-option name="rolesProperties">security/roles.properties</module-option>
+         </login-module>
       </authentication>
    </application-policy>
    <application-policy name="testUsersRolesHash">
       <authentication>
          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
             flag="required">
-            <module-option name="usersProperties">usersb64.properties</module-option>
+            <module-option name="usersProperties">security/usersb64.properties</module-option>
+            <module-option name="rolesProperties">security/roles.properties</module-option>
             <module-option name="hashAlgorithm">MD5</module-option>
             <module-option name="hashEncoding">base64</module-option>
          </login-module>
@@ -106,19 +110,25 @@
          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
             flag="required">
             <module-option name="unauthenticatedIdentity">nobody</module-option>
+            <module-option name="usersProperties">security/users.properties</module-option>
+            <module-option name="rolesProperties">security/roles.properties</module-option>
          </login-module>
       </authentication>
    </application-policy>
    <application-policy name="testControlFlags">
       <authentication>
          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-            flag="sufficient"/>
+            flag="sufficient">
+            <module-option name="usersProperties">security/users.properties</module-option>
+            <module-option name="rolesProperties">security/roles.properties</module-option>            
+         </login-module>
 
          <login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule"
             flag="sufficient">
             <module-option name="dsJndiName">testJdbc</module-option>
             <module-option name="principalsQuery">select Password from Principals where PrincipalID=?</module-option>
             <module-option name="rolesQuery">select Role, RoleGroup from Roles where PrincipalID=?</module-option>
+            <module-option name="suspendResume">false</module-option>
          </login-module>
       </authentication>
    </application-policy>
@@ -147,6 +157,8 @@
          <login-module code="org.jboss.security.auth.spi.CertRolesLoginModule"
             flag="required">
             <module-option name="securityDomain">testCertRoles</module-option>
+            <module-option name="usersProperties">security/users.properties</module-option>
+            <module-option name="rolesProperties">security/roles.properties</module-option>
          </login-module>
       </authentication>
    </application-policy>




More information about the jboss-cvs-commits mailing list