svn commit: r1524381 - in /turbine/core/trunk: conf/test/ src/test/org/apache/turbine/pipeline/ src/test/org/apache/turbine/services/security/ src/test/org/apache/turbine/test/

[tv]

Author: tv
Date: Wed Sep 18 12:08:41 2013
New Revision: 1524381

URL: http://svn.apache.org/r1524381
Log:
Tests run also with DefaultSecurityService

Removed:
    turbine/core/trunk/src/test/org/apache/turbine/services/security/
    turbine/core/trunk/src/test/org/apache/turbine/test/MockSecurityService.java
    turbine/core/trunk/src/test/org/apache/turbine/test/MockUserManager.java
Modified:
    turbine/core/trunk/conf/test/CompleteTurbineResources.properties
    
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java

Modified: turbine/core/trunk/conf/test/CompleteTurbineResources.properties
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/CompleteTurbineResources.properties?rev=1524381&r1=1524380&r2=1524381&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/CompleteTurbineResources.properties (original)
+++ turbine/core/trunk/conf/test/CompleteTurbineResources.properties Wed Sep 18 
12:08:41 2013
@@ -322,8 +322,7 @@ services.ServletService.classname=org.ap
 
services.AssemblerBrokerService.classname=org.apache.turbine.services.assemblerbroker.TurbineAssemblerBrokerService
 
services.UniqueIdService.classname=org.apache.turbine.services.uniqueid.TurbineUniqueIdService
 # Default
-# 
services.SecurityService.classname=org.apache.turbine.services.security.DefaultSecurityService
-services.SecurityService.classname=org.apache.turbine.test.MockSecurityService
+services.SecurityService.classname=org.apache.turbine.services.security.DefaultSecurityService
 
services.PullService.classname=org.apache.turbine.services.pull.TurbinePullService
 
services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
 services.UIService.classname = org.apache.turbine.services.ui.TurbineUIService
@@ -592,7 +591,7 @@ services.SchedulerService.earlyInit=true
 
 # Default: org.apache.turbine.services.security.passive.PassiveUserManager
 # The MockUserManager is used in testing...
-services.SecurityService.user.manager = org.apache.turbine.test.MockUserManager
+services.SecurityService.user.manager = 
org.apache.turbine.services.security.DefaultUserManager
 
 # -------------------------------------------------------------------
 #

Modified: 
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java?rev=1524381&r1=1524380&r2=1524381&view=diff
==============================================================================
--- 
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
 (original)
+++ 
turbine/core/trunk/src/test/org/apache/turbine/pipeline/DefaultLoginValveTest.java
 Wed Sep 18 12:08:41 2013
@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRes
 import org.apache.turbine.TurbineConstants;
 import org.apache.turbine.modules.actions.LoginUser;
 import org.apache.turbine.om.security.User;
+import org.apache.turbine.services.security.TurbineSecurity;
 import org.apache.turbine.test.BaseTestCase;
 import org.apache.turbine.test.EnhancedMockHttpServletRequest;
 import org.apache.turbine.test.EnhancedMockHttpSession;
@@ -87,6 +88,11 @@ public class DefaultLoginValveTest exten
                     ".",
             "/conf/test/CompleteTurbineResources.properties");
         tc.initialize();
+
+        // User must exist
+        User user = TurbineSecurity.getUserInstance();
+        user.setName("username");
+        TurbineSecurity.addUser(user, "password");
     }
 
     /**