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/08/13 01:08:05 UTC
cvs commit: jakarta-turbine-2/src/test-cactus/testapp/WEB-INF/conf TurbineComplete.properties TurbineDefault.properties TurbineCacheTest.properties
epugh 2003/08/12 16:08:04
Modified: src/test-cactus/org/apache/turbine/services/cache
TurbineCacheTest.java
src/test-cactus/org/apache/turbine/util/parser
CSVParserTest.java TSVParserTest.java
BaseValueParserTest.java
src/test-cactus/org/apache/turbine/modules/screens
ErrorTest.java
src/test-cactus/testapp/WEB-INF/conf
TurbineComplete.properties
Removed: src/test-cactus/testapp/WEB-INF/conf
TurbineDefault.properties
TurbineCacheTest.properties
Log:
Cactus tests all run! I don't know why, but you can't change what properties file is being loaded.
All cactus tests should use same one..
Revision Changes Path
1.3 +2 -2 jakarta-turbine-2/src/test-cactus/org/apache/turbine/services/cache/TurbineCacheTest.java
Index: TurbineCacheTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test-cactus/org/apache/turbine/services/cache/TurbineCacheTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineCacheTest.java 3 Feb 2002 16:11:05 -0000 1.2
+++ TurbineCacheTest.java 12 Aug 2003 23:08:04 -0000 1.3
@@ -126,7 +126,7 @@
{
super.setUp();
config.setInitParameter("properties",
- "/WEB-INF/conf/TurbineCacheTest.properties");
+ "/WEB-INF/conf/TurbineComplete.properties");
turbine = new Turbine();
turbine.init(config);
}
1.2 +2 -2 jakarta-turbine-2/src/test-cactus/org/apache/turbine/util/parser/CSVParserTest.java
Index: CSVParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test-cactus/org/apache/turbine/util/parser/CSVParserTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CSVParserTest.java 18 Apr 2003 13:32:32 -0000 1.1
+++ CSVParserTest.java 12 Aug 2003 23:08:04 -0000 1.2
@@ -99,7 +99,7 @@
super.setUp();
config.setInitParameter("properties",
- "/WEB-INF/conf/TurbineDefault.properties");
+ "/WEB-INF/conf/TurbineComplete.properties");
turbine = new Turbine();
turbine.init(config);
}
1.2 +2 -2 jakarta-turbine-2/src/test-cactus/org/apache/turbine/util/parser/TSVParserTest.java
Index: TSVParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test-cactus/org/apache/turbine/util/parser/TSVParserTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TSVParserTest.java 18 Apr 2003 13:32:32 -0000 1.1
+++ TSVParserTest.java 12 Aug 2003 23:08:04 -0000 1.2
@@ -102,7 +102,7 @@
* properties file to be used.:
*/
config.setInitParameter("properties",
- "/WEB-INF/conf/TurbineDefault.properties");
+ "/WEB-INF/conf/TurbineComplete.properties");
turbine = new Turbine();
turbine.init(config);
}
1.3 +2 -2 jakarta-turbine-2/src/test-cactus/org/apache/turbine/util/parser/BaseValueParserTest.java
Index: BaseValueParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test-cactus/org/apache/turbine/util/parser/BaseValueParserTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseValueParserTest.java 1 Aug 2003 18:34:30 -0000 1.2
+++ BaseValueParserTest.java 12 Aug 2003 23:08:04 -0000 1.3
@@ -100,7 +100,7 @@
* properties file to be used.:
*/
config.setInitParameter("properties",
- "/WEB-INF/conf/TurbineCacheTest.properties");
+ "/WEB-INF/conf/TurbineComplete.properties");
turbine = new Turbine();
turbine.init(config);
theBaseValueParser = new BaseValueParser();
1.2 +4 -3 jakarta-turbine-2/src/test-cactus/org/apache/turbine/modules/screens/ErrorTest.java
Index: ErrorTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test-cactus/org/apache/turbine/modules/screens/ErrorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ErrorTest.java 18 Mar 2003 01:07:56 -0000 1.1
+++ ErrorTest.java 12 Aug 2003 23:08:04 -0000 1.2
@@ -3,11 +3,12 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.cactus.ServletTestCase;
import org.apache.turbine.Turbine;
import org.apache.turbine.modules.ScreenLoader;
+import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.services.rundata.RunDataService;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.RunDataFactory;
-import org.apache.cactus.*;
/**
* ErrorTest
@@ -85,7 +86,7 @@
turbine = new Turbine();
turbine.init(config);
- data = RunDataFactory.getRunData(request, response, config);
+ data = ((RunDataService) TurbineServices.getInstance().getService(RunDataService.SERVICE_NAME)).getRunData(request, response, config);
errorScreen =
(org.apache.turbine.modules.screens.Error) ScreenLoader
1.3 +1 -2 jakarta-turbine-2/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties
Index: TurbineComplete.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineComplete.properties 6 Jun 2003 09:43:57 -0000 1.2
+++ TurbineComplete.properties 12 Aug 2003 23:08:04 -0000 1.3
@@ -281,7 +281,6 @@
# will be initialized. Keep this is mind if you have services
# that depend on other services during initialization.
# -------------------------------------------------------------------
-
services.CryptoService.classname=org.apache.turbine.services.crypto.TurbineCryptoService
services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService
services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org