You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2003/11/04 15:16:48 UTC

cvs commit: jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/acl AccessControlListTest.java

epugh       2003/11/04 06:16:48

  Modified:    security/src/test/org/apache/fulcrum/security/model/simple/manager
                        AbstractSimpleModelManagerTest.java
               security/src/test/org/apache/fulcrum/security/authenticator
                        TextMatchAuthenticatorTest.java
                        CryptoAuthenticatorTest.java
                        NoOpAuthenticatorTest.java
               security/src/test/org/apache/fulcrum/security
                        StartingSecurityServicesTest.java
               security/src/test/org/apache/fulcrum/security/acl
                        AccessControlListTest.java
  Log:
  Cleanup docs and exception throws.
  
  Revision  Changes    Path
  1.2       +1 -1      jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractSimpleModelManagerTest.java
  
  Index: AbstractSimpleModelManagerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/model/simple/manager/AbstractSimpleModelManagerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractSimpleModelManagerTest.java	30 Oct 2003 14:25:35 -0000	1.1
  +++ AbstractSimpleModelManagerTest.java	4 Nov 2003 14:16:47 -0000	1.2
  @@ -66,7 +66,7 @@
       protected UserManager userManager;
       protected SecurityService securityService;
   
  -    public void setUp()
  +    public void setUp() throws Exception
       {
           super.setUp();
           roleManager = securityService.getRoleManager();
  
  
  
  1.3       +3 -3      jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/authenticator/TextMatchAuthenticatorTest.java
  
  Index: TextMatchAuthenticatorTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/authenticator/TextMatchAuthenticatorTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TextMatchAuthenticatorTest.java	26 Aug 2003 21:16:32 -0000	1.2
  +++ TextMatchAuthenticatorTest.java	4 Nov 2003 14:16:47 -0000	1.3
  @@ -58,11 +58,11 @@
   
   import junit.framework.TestCase;
   
  +
   /**
  - * @author Eric Pugh
    *
  - * To change the template for this generated type comment go to
  - * Window>Preferences>Java>Code Generation>Code and Comments
  + * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
  + * @version $Id$
    */
   public class TextMatchAuthenticatorTest extends TestCase
   {
  
  
  
  1.4       +3 -3      jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java
  
  Index: CryptoAuthenticatorTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/authenticator/CryptoAuthenticatorTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CryptoAuthenticatorTest.java	26 Aug 2003 21:16:32 -0000	1.3
  +++ CryptoAuthenticatorTest.java	4 Nov 2003 14:16:47 -0000	1.4
  @@ -56,11 +56,11 @@
   import org.apache.fulcrum.security.entity.User;
   import org.apache.fulcrum.security.model.simple.entity.SimpleUser;
   import org.apache.fulcrum.testcontainer.BaseUnitTest;
  +
   /**
  - * @author Eric Pugh
    *
  - * To change the template for this generated type comment go to
  - * Window>Preferences>Java>Code Generation>Code and Comments
  + * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
  + * @version $Id$
    */
   public class CryptoAuthenticatorTest extends BaseUnitTest
   {
  
  
  
  1.3       +2 -3      jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/authenticator/NoOpAuthenticatorTest.java
  
  Index: NoOpAuthenticatorTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/authenticator/NoOpAuthenticatorTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NoOpAuthenticatorTest.java	26 Aug 2003 21:16:32 -0000	1.2
  +++ NoOpAuthenticatorTest.java	4 Nov 2003 14:16:47 -0000	1.3
  @@ -59,10 +59,9 @@
   import junit.framework.TestCase;
   
   /**
  - * @author Eric Pugh
    *
  - * To change the template for this generated type comment go to
  - * Window>Preferences>Java>Code Generation>Code and Comments
  + * @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
  + * @version $Id$
    */
   public class NoOpAuthenticatorTest extends TestCase
   {
  
  
  
  1.8       +2 -6      jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.java
  
  Index: StartingSecurityServicesTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/StartingSecurityServicesTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StartingSecurityServicesTest.java	30 Oct 2003 18:23:43 -0000	1.7
  +++ StartingSecurityServicesTest.java	4 Nov 2003 14:16:47 -0000	1.8
  @@ -63,11 +63,7 @@
       {
           super(name);
       }
  -    public void setUp()
  -    {
  -        super.setUp();
  -        //        this.release(sc);
  -    }
  +
       public void testStartingTorqueSecurity() throws Exception
       {
           this.setRoleFileName(null);
  
  
  
  1.5       +3 -10     jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java
  
  Index: AccessControlListTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/security/src/test/org/apache/fulcrum/security/acl/AccessControlListTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AccessControlListTest.java	30 Oct 2003 14:25:36 -0000	1.4
  +++ AccessControlListTest.java	4 Nov 2003 14:16:47 -0000	1.5
  @@ -56,7 +56,6 @@
   import java.util.HashMap;
   import java.util.Map;
   
  -import org.apache.avalon.framework.component.ComponentException;
   import org.apache.fulcrum.factory.FactoryService;
   import org.apache.fulcrum.security.GroupManager;
   import org.apache.fulcrum.security.PermissionManager;
  @@ -103,11 +102,10 @@
       {
           junit.textui.TestRunner.run(AccessControlListTest.class);
       }
  -    protected void setUp()
  +    protected void setUp() throws Exception
       {
           super.setUp();
  -        try
  -        {
  +       
               this.setRoleFileName(null);
               this.setConfigurationFileName("src/test/AccessControlList.xml");
               factoryService = (FactoryService) this.lookup(FactoryService.ROLE);
  @@ -117,12 +115,7 @@
               roleManager =  securityService.getRoleManager();
               permissionManager = securityService.getPermissionManager();
               modelManager = (SimpleModelManager)securityService.getModelManager();
  -        }
  -        catch (ComponentException e)
  -        {
  -            e.printStackTrace();
  -            fail(e.getMessage());
  -        }
  +        
       }
       /*
        * Class to test for Object getInstance(String, Object[], String[])
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org