Author: tv
Date: Sun Jan 4 08:39:38 2009
New Revision: 731294
URL: http://svn.apache.org/viewvc?rev=731294&view=rev
Log:
Fixed unit tests
Modified:
turbine/core/trunk/conf/roleConfiguration.xml
turbine/core/trunk/conf/test/CompleteTurbineResources.properties
turbine/core/trunk/conf/test/TemplateService.properties
turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
turbine/core/trunk/src/test/org/apache/turbine/test/EnhancedMockHttpServletRequest.java
Modified: turbine/core/trunk/conf/roleConfiguration.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/conf/roleConfiguration.xml?rev=731294&r1=731293&r2=731294&view=diff
==============================================================================
--- turbine/core/trunk/conf/roleConfiguration.xml (original)
+++ turbine/core/trunk/conf/roleConfiguration.xml Sun Jan 4 08:39:38 2009
@@ -31,7 +31,7 @@
shorthand="torque"
default-class="org.apache.torque.avalon.TorqueComponent" />
- <role
+ <role
name="org.apache.fulcrum.cache.GlobalCacheService"
shorthand="cache"
default-class="org.apache.fulcrum.cache.DefaultGlobalCacheService"/>
Modified: turbine/core/trunk/conf/test/CompleteTurbineResources.properties
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/CompleteTurbineResources.properties?rev=731294&r1=731293&r2=731294&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/CompleteTurbineResources.properties (original)
+++ turbine/core/trunk/conf/test/CompleteTurbineResources.properties Sun Jan 4
08:39:38 2009
@@ -880,6 +880,7 @@
# Name and location to the configuration file for the container.
#
services.AvalonComponentService.containerConfiguration =
conf/test/fulcrumContainerConfiguration.xml
+services.AvalonComponentService.earlyInit=true
# -------------------------------------------------------------------
#
Modified: turbine/core/trunk/conf/test/TemplateService.properties
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/TemplateService.properties?rev=731294&r1=731293&r2=731294&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/TemplateService.properties (original)
+++ turbine/core/trunk/conf/test/TemplateService.properties Sun Jan 4 08:39:38
2009
@@ -80,3 +80,4 @@
services.AvalonComponentService.componentConfiguration =
conf/test/fulcrumComponentConfiguration.xml
services.AvalonComponentService.componentRoles =
conf/test/fulcrumRoleConfiguration.xml
+services.AvalonComponentService.earlyInit = true
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java?rev=731294&r1=731293&r2=731294&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java
Sun Jan 4 08:39:38 2009
@@ -19,7 +19,6 @@
* under the License.
*/
-import java.util.Hashtable;
import java.util.List;
import org.apache.turbine.Turbine;
@@ -42,7 +41,7 @@
public abstract class GenericLoader
{
/** The Assembler Broker Service */
- protected static AssemblerBrokerService ab =
TurbineAssemblerBroker.getService();
+ protected AssemblerBrokerService ab = TurbineAssemblerBroker.getService();
/** @serial This can be serialized */
private boolean reload = false;
@@ -51,8 +50,7 @@
private static final String TURBINE_PACKAGE = "org.apache.turbine.modules";
/** Packages paths for Turbine */
- private static final List TURBINE_PACKAGES =
- Turbine.getConfiguration().getList(TurbineConstants.MODULE_PACKAGES);
+ private static List TURBINE_PACKAGES = null;
/**
* Basic constructor for creating a loader.
@@ -143,6 +141,12 @@
*/
public static List getPackages()
{
+ if (TURBINE_PACKAGES == null)
+ {
+ TURBINE_PACKAGES =
+
Turbine.getConfiguration().getList(TurbineConstants.MODULE_PACKAGES);
+ }
+
List packages = TURBINE_PACKAGES;
if (!packages.contains(TURBINE_PACKAGE))
Modified:
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java?rev=731294&r1=731293&r2=731294&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentServiceTest.java
Sun Jan 4 08:39:38 2009
@@ -61,6 +61,7 @@
// decide here wether to start ECM or YAAFI
// cfg.setProperty(PREFIX + "classname",
TurbineAvalonComponentService.class.getName());
cfg.setProperty(PREFIX + "classname",
TurbineYaafiComponentService.class.getName());
+ cfg.setProperty(PREFIX + "earlyInit", "true");
// we want to configure the service to load test TEST configuration
files
cfg.setProperty(PREFIX + "componentConfiguration",
Modified:
turbine/core/trunk/src/test/org/apache/turbine/test/EnhancedMockHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/test/EnhancedMockHttpServletRequest.java?rev=731294&r1=731293&r2=731294&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/test/EnhancedMockHttpServletRequest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/test/EnhancedMockHttpServletRequest.java
Sun Jan 4 08:39:38 2009
@@ -20,6 +20,8 @@
*/
+import java.util.Locale;
+
import com.mockobjects.servlet.MockHttpServletRequest;
/**
@@ -39,12 +41,29 @@
super();
// TODO Auto-generated constructor stub
}
- public int getServerPort(){
- return 8080;
+
+ /**
+ * @see
com.mockobjects.servlet.MockHttpServletRequest#getCharacterEncoding()
+ */
+ public String getCharacterEncoding()
+ {
+ return "US-ASCII";
+ }
+
+ /**
+ * @see com.mockobjects.servlet.MockHttpServletRequest#getServerPort()
+ */
+ public int getServerPort()
+ {
+ return 8080;
}
- public String getCharacterEncoding(){
- return "US-ASCII";
+ /**
+ * @see com.mockobjects.servlet.MockHttpServletRequest#getLocale()
+ */
+ public Locale getLocale()
+ {
+ return Locale.US;
}
}
