henning 2004/08/14 13:57:59
Modified: . Tag: TURBINE_2_3_BRANCH project.xml
src/test/org/apache/turbine Tag: TURBINE_2_3_BRANCH
TestTurbine.java
src/test/org/apache/turbine/services/security Tag:
TURBINE_2_3_BRANCH AccessControlListTest.java
TestSecurity.java TestSecurityACL.java
TestSecurityGroup.java TestSecurityPermission.java
TestSecurityRole.java TestSecurityUser.java
TestSecurityUserManager.java
src/test/org/apache/turbine/services/security/torque Tag:
TURBINE_2_3_BRANCH TestTorqueSecurity.java
src/test/org/apache/turbine/services/template Tag:
TURBINE_2_3_BRANCH ClassTest.java DefaultsTest.java
TemplateTest.java
src/test/org/apache/turbine/services/velocity Tag:
TURBINE_2_3_BRANCH PathConverterTest.java
src/test/org/apache/turbine/test Tag: TURBINE_2_3_BRANCH
BaseTestCase.java BaseTurbineTest.java
Added: conf/test Tag: TURBINE_2_3_BRANCH commons-logging.properties
src/test/org/apache/turbine/test Tag: TURBINE_2_3_BRANCH
BaseTurbineHsqlTest.java
Log:
- configure commons-logging from commons-logging.properties for the
test cases.
- bump c-l to 1.0.4 in project.xml, add resource for unit testing
- _finally_ get rid of the dreaded "double initialization of Turbine attempted"
from the test cases
- factor out the Hsql init, run it only once per test case.
- remove the Turbine init from the old test cases, extend BaseTurbineTest
instead.
Revision Changes Path
No revision
No revision
1.136.2.6 +9 -1 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.136.2.5
retrieving revision 1.136.2.6
diff -u -r1.136.2.5 -r1.136.2.6
--- project.xml 3 Aug 2004 15:53:40 -0000 1.136.2.5
+++ project.xml 14 Aug 2004 20:57:56 -0000 1.136.2.6
@@ -395,7 +395,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<type>jar</type>
</dependency>
@@ -616,6 +616,14 @@
<excludes>
<exclude>**/test/*.java</exclude>
</excludes>
+ <resources>
+ <resource>
+ <directory>conf/test</directory>
+ <includes>
+ <include>commons-logging.properties</include>
+ </includes>
+ </resource>
+ </resources>
</unitTest>
<integrationUnitTestSourceDirectory/>
<integrationUnitTest/>
No revision
No revision
1.1.2.1 +4 -0 jakarta-turbine-2/conf/test/Attic/commons-logging.properties
No revision
No revision
1.1.2.2 +3 -2
jakarta-turbine-2/src/test/org/apache/turbine/Attic/TestTurbine.java
Index: TestTurbine.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/Attic/TestTurbine.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestTurbine.java 29 Jul 2004 15:08:56 -0000 1.1.2.1
+++ TestTurbine.java 14 Aug 2004 20:57:56 -0000 1.1.2.2
@@ -32,8 +32,9 @@
extends BaseTurbineTest
{
public TestTurbine(String name)
+ throws Exception
{
- super(name);
+ super(name, "conf/test/TurbineResources.properties");
}
public static Test suite()
No revision
No revision
1.4.2.2 +0 -1
jakarta-turbine-2/src/test/org/apache/turbine/services/security/AccessControlListTest.java
Index: AccessControlListTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/security/AccessControlListTest.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- AccessControlListTest.java 27 Feb 2004 11:18:44 -0000 1.4.2.1
+++ AccessControlListTest.java 14 Aug 2004 20:57:57 -0000 1.4.2.2
@@ -26,7 +26,6 @@
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.factory.FactoryService;
import org.apache.turbine.services.factory.TurbineFactoryService;
-import org.apache.turbine.services.security.SecurityService;
import org.apache.turbine.services.security.db.DBSecurityService;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.security.AccessControlList;
1.1.2.2 +7 -10
jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurity.java
Index: TestSecurity.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurity.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestSecurity.java 29 Jul 2004 15:08:56 -0000 1.1.2.1
+++ TestSecurity.java 14 Aug 2004 20:57:57 -0000 1.1.2.2
@@ -23,21 +23,18 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.services.security.SecurityService;
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.util.security.GroupSet;
-import org.apache.turbine.util.security.PasswordMismatchException;
-import org.apache.turbine.util.security.PermissionSet;
-import org.apache.turbine.util.security.RoleSet;
-import org.apache.turbine.util.security.TurbineAccessControlList;
-import org.apache.turbine.util.security.UnknownEntityException;
-
import org.apache.turbine.services.security.torque.TorqueGroup;
import org.apache.turbine.services.security.torque.TorquePermission;
import org.apache.turbine.services.security.torque.TorqueRole;
import org.apache.turbine.services.security.torque.TorqueUser;
import org.apache.turbine.test.BaseTurbineTest;
import org.apache.turbine.test.HsqlDB;
+import org.apache.turbine.util.security.GroupSet;
+import org.apache.turbine.util.security.PasswordMismatchException;
+import org.apache.turbine.util.security.PermissionSet;
+import org.apache.turbine.util.security.RoleSet;
+import org.apache.turbine.util.security.TurbineAccessControlList;
+import org.apache.turbine.util.security.UnknownEntityException;
public class TestSecurity
extends BaseTurbineTest
@@ -47,7 +44,7 @@
public TestSecurity(String name)
throws Exception
{
- super(name);
+ super(name, "conf/test/TurbineResources.properties");
hsqlDB = new HsqlDB("jdbc:hsqldb:.",
Turbine.getRealPath("conf/test/create-db.sql"));
}
1.1.2.2 +3 -11
jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurityACL.java
Index: TestSecurityACL.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurityACL.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestSecurityACL.java 29 Jul 2004 15:08:56 -0000 1.1.2.1
+++ TestSecurityACL.java 14 Aug 2004 20:57:57 -0000 1.1.2.2
@@ -19,26 +19,18 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.turbine.Turbine;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.services.security.SecurityService;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.test.BaseTurbineHsqlTest;
import org.apache.turbine.util.security.AccessControlList;
-import org.apache.turbine.test.BaseTurbineTest;
-import org.apache.turbine.test.HsqlDB;
-
public class TestSecurityACL
- extends BaseTurbineTest
+ extends BaseTurbineHsqlTest
{
- private HsqlDB hsqlDB = null;
-
public TestSecurityACL(String name)
throws Exception
{
- super(name);
- hsqlDB = new HsqlDB("jdbc:hsqldb:.",
Turbine.getRealPath("conf/test/create-db.sql"));
+ super(name, "conf/test/TurbineResources.properties");
}
public static Test suite()
1.1.2.2 +3 -11
jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurityGroup.java
Index: TestSecurityGroup.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurityGroup.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestSecurityGroup.java 29 Jul 2004 15:08:56 -0000 1.1.2.1
+++ TestSecurityGroup.java 14 Aug 2004 20:57:57 -0000 1.1.2.2
@@ -19,28 +19,20 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.turbine.Turbine;
import org.apache.turbine.om.security.Group;
-import org.apache.turbine.services.security.SecurityService;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.test.BaseTurbineHsqlTest;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
import org.apache.turbine.util.security.GroupSet;
import org.apache.turbine.util.security.UnknownEntityException;
-import org.apache.turbine.test.BaseTurbineTest;
-import org.apache.turbine.test.HsqlDB;
-
public class TestSecurityGroup
- extends BaseTurbineTest
+ extends BaseTurbineHsqlTest
{
- private HsqlDB hsqlDB = null;
-
public TestSecurityGroup(String name)
throws Exception
{
- super(name);
- hsqlDB = new HsqlDB("jdbc:hsqldb:.",
Turbine.getRealPath("conf/test/create-db.sql"));
+ super(name, "conf/test/TurbineResources.properties");
}
public static Test suite()
1.1.2.2 +3 -11
jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurityPermission.java
Index: TestSecurityPermission.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurityPermission.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestSecurityPermission.java 29 Jul 2004 15:08:56 -0000 1.1.2.1
+++ TestSecurityPermission.java 14 Aug 2004 20:57:57 -0000 1.1.2.2
@@ -19,29 +19,21 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.turbine.Turbine;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
-import org.apache.turbine.services.security.SecurityService;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.test.BaseTurbineHsqlTest;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
import org.apache.turbine.util.security.PermissionSet;
import org.apache.turbine.util.security.UnknownEntityException;
-import org.apache.turbine.test.BaseTurbineTest;
-import org.apache.turbine.test.HsqlDB;
-
public class TestSecurityPermission
- extends BaseTurbineTest
+ extends BaseTurbineHsqlTest
{
- private HsqlDB hsqlDB = null;
-
public TestSecurityPermission(String name)
throws Exception
{
- super(name);
- hsqlDB = new HsqlDB("jdbc:hsqldb:.",
Turbine.getRealPath("conf/test/create-db.sql"));
+ super(name, "conf/test/TurbineResources.properties");
}
public static Test suite()
1.1.2.2 +4 -12
jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurityRole.java
Index: TestSecurityRole.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurityRole.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestSecurityRole.java 29 Jul 2004 15:08:57 -0000 1.1.2.1
+++ TestSecurityRole.java 14 Aug 2004 20:57:57 -0000 1.1.2.2
@@ -19,12 +19,10 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.turbine.Turbine;
-import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.Group;
+import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.services.security.SecurityService;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.test.BaseTurbineHsqlTest;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
@@ -32,19 +30,13 @@
import org.apache.turbine.util.security.RoleSet;
import org.apache.turbine.util.security.UnknownEntityException;
-import org.apache.turbine.test.BaseTurbineTest;
-import org.apache.turbine.test.HsqlDB;
-
public class TestSecurityRole
- extends BaseTurbineTest
+ extends BaseTurbineHsqlTest
{
- private HsqlDB hsqlDB = null;
-
public TestSecurityRole(String name)
throws Exception
{
- super(name);
- hsqlDB = new HsqlDB("jdbc:hsqldb:.",
Turbine.getRealPath("conf/test/create-db.sql"));
+ super(name, "conf/test/TurbineResources.properties");
}
public static Test suite()
1.1.2.2 +3 -12
jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurityUser.java
Index: TestSecurityUser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurityUser.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestSecurityUser.java 29 Jul 2004 15:08:57 -0000 1.1.2.1
+++ TestSecurityUser.java 14 Aug 2004 20:57:57 -0000 1.1.2.2
@@ -22,28 +22,19 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.turbine.Turbine;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.services.security.SecurityService;
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.services.security.UserManager;
+import org.apache.turbine.test.BaseTurbineHsqlTest;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
import org.apache.turbine.util.security.UnknownEntityException;
-import org.apache.turbine.test.BaseTurbineTest;
-import org.apache.turbine.test.HsqlDB;
-
public class TestSecurityUser
- extends BaseTurbineTest
+ extends BaseTurbineHsqlTest
{
- private HsqlDB hsqlDB = null;
-
public TestSecurityUser(String name)
throws Exception
{
- super(name);
- hsqlDB = new HsqlDB("jdbc:hsqldb:.",
Turbine.getRealPath("conf/test/create-db.sql"));
+ super(name, "conf/test/TurbineResources.properties");
}
public static Test suite()
1.1.2.2 +3 -12
jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurityUserManager.java
Index: TestSecurityUserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/security/Attic/TestSecurityUserManager.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestSecurityUserManager.java 29 Jul 2004 15:08:57 -0000 1.1.2.1
+++ TestSecurityUserManager.java 14 Aug 2004 20:57:57 -0000 1.1.2.2
@@ -21,29 +21,20 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.turbine.Turbine;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.services.security.SecurityService;
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.services.security.UserManager;
+import org.apache.turbine.test.BaseTurbineHsqlTest;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
import org.apache.turbine.util.security.PasswordMismatchException;
import org.apache.turbine.util.security.UnknownEntityException;
-import org.apache.turbine.test.BaseTurbineTest;
-import org.apache.turbine.test.HsqlDB;
-
public class TestSecurityUserManager
- extends BaseTurbineTest
+ extends BaseTurbineHsqlTest
{
- private HsqlDB hsqlDB = null;
-
public TestSecurityUserManager(String name)
throws Exception
{
- super(name);
- hsqlDB = new HsqlDB("jdbc:hsqldb:.",
Turbine.getRealPath("conf/test/create-db.sql"));
+ super(name, "conf/test/TurbineResources.properties");
}
public static Test suite()
No revision
No revision
1.1.2.2 +1 -1
jakarta-turbine-2/src/test/org/apache/turbine/services/security/torque/Attic/TestTorqueSecurity.java
Index: TestTorqueSecurity.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/security/torque/Attic/TestTorqueSecurity.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestTorqueSecurity.java 29 Jul 2004 15:08:57 -0000 1.1.2.1
+++ TestTorqueSecurity.java 14 Aug 2004 20:57:58 -0000 1.1.2.2
@@ -37,7 +37,7 @@
public TestTorqueSecurity(String name)
throws Exception
{
- super(name);
+ super(name, "conf/test/TurbineResources.properties");
hsqlDB = new HsqlDB("jdbc:hsqldb:.",
Turbine.getRealPath("conf/test/create-db.sql"));
}
No revision
No revision
1.4.2.3 +6 -11
jakarta-turbine-2/src/test/org/apache/turbine/services/template/ClassTest.java
Index: ClassTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/template/ClassTest.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- ClassTest.java 20 May 2004 03:32:53 -0000 1.4.2.2
+++ ClassTest.java 14 Aug 2004 20:57:58 -0000 1.4.2.3
@@ -20,8 +20,7 @@
import junit.framework.TestSuite;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.util.TurbineConfig;
+import org.apache.turbine.test.BaseTurbineTest;
/**
* Tests the class mapping of the Template Service for screen,
@@ -32,18 +31,14 @@
*/
public class ClassTest
- extends BaseTestCase
+ extends BaseTurbineTest
{
- private static TurbineConfig tc = null;
- private static TemplateService ts = null;
-
+ private TemplateService ts = null;
+
public ClassTest(String name)
throws Exception
{
- super(name);
- tc = new TurbineConfig(".", "/conf/test/TemplateService.properties");
- tc.initialize();
-
+ super(name, "/conf/test/TemplateService.properties");
ts = (TemplateService)
TurbineServices.getInstance().getService(TemplateService.SERVICE_NAME);
}
1.4.2.3 +6 -10
jakarta-turbine-2/src/test/org/apache/turbine/services/template/DefaultsTest.java
Index: DefaultsTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/template/DefaultsTest.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- DefaultsTest.java 20 May 2004 03:32:53 -0000 1.4.2.2
+++ DefaultsTest.java 14 Aug 2004 20:57:58 -0000 1.4.2.3
@@ -20,8 +20,7 @@
import junit.framework.TestSuite;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.util.TurbineConfig;
+import org.apache.turbine.test.BaseTurbineTest;
/**
* Tests all the various defaults for the Template Service.
@@ -30,17 +29,14 @@
* @version $Id$
*/
public class DefaultsTest
- extends BaseTestCase
+ extends BaseTurbineTest
{
- private static TurbineConfig tc = null;
- private static TemplateService ts = null;
-
+ private TemplateService ts = null;
+
public DefaultsTest(String name)
throws Exception
{
- super(name);
- tc = new TurbineConfig(".", "/conf/test/TemplateService.properties");
- tc.initialize();
+ super(name, "/conf/test/TemplateService.properties");
ts = (TemplateService)
TurbineServices.getInstance().getService(TemplateService.SERVICE_NAME);
}
1.4.2.3 +5 -8
jakarta-turbine-2/src/test/org/apache/turbine/services/template/TemplateTest.java
Index: TemplateTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/template/TemplateTest.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- TemplateTest.java 20 May 2004 03:32:53 -0000 1.4.2.2
+++ TemplateTest.java 14 Aug 2004 20:57:58 -0000 1.4.2.3
@@ -18,9 +18,9 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.util.TurbineConfig;
+import org.apache.turbine.test.BaseTurbineTest;
/**
* Tests all the various template mappings for Screen and Layout
@@ -31,17 +31,14 @@
*/
public class TemplateTest
- extends BaseTestCase
+ extends BaseTurbineTest
{
- private static TurbineConfig tc = null;
private static TemplateService ts = null;
public TemplateTest(String name)
throws Exception
{
- super(name);
- tc = new TurbineConfig(".", "/conf/test/TemplateService.properties");
- tc.initialize();
+ super(name, "/conf/test/TemplateService.properties");
ts = (TemplateService)
TurbineServices.getInstance().getService(TemplateService.SERVICE_NAME);
}
No revision
No revision
1.6.2.3 +4 -10
jakarta-turbine-2/src/test/org/apache/turbine/services/velocity/PathConverterTest.java
Index: PathConverterTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/velocity/PathConverterTest.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- PathConverterTest.java 20 May 2004 03:33:12 -0000 1.6.2.2
+++ PathConverterTest.java 14 Aug 2004 20:57:59 -0000 1.6.2.3
@@ -24,10 +24,7 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.velocity.TurbineVelocityService;
-import org.apache.turbine.services.velocity.VelocityService;
-import org.apache.turbine.test.BaseTestCase;
-import org.apache.turbine.util.TurbineConfig;
+import org.apache.turbine.test.BaseTurbineTest;
/**
* Tests startup of the Velocity Service and translation of various
@@ -37,18 +34,15 @@
* @version $Id$
*/
public class PathConverterTest
- extends BaseTestCase
+ extends BaseTurbineTest
{
- private static TurbineConfig tc = null;
private static VelocityService vs = null;
private static String fileSeperator = System.getProperty("file.separator");
public PathConverterTest(String name)
throws Exception
{
- super(name);
- tc = new TurbineConfig(".", "/conf/test/TemplateService.properties");
- tc.initialize();
+ super(name, "/conf/test/TemplateService.properties");
vs = (VelocityService)
TurbineServices.getInstance().getService(VelocityService.SERVICE_NAME);
}
No revision
No revision
1.3.2.3 +4 -14
jakarta-turbine-2/src/test/org/apache/turbine/test/BaseTestCase.java
Index: BaseTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/test/BaseTestCase.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- BaseTestCase.java 20 May 2004 03:33:12 -0000 1.3.2.2
+++ BaseTestCase.java 14 Aug 2004 20:57:59 -0000 1.3.2.3
@@ -21,15 +21,12 @@
import java.io.FileNotFoundException;
import java.util.Properties;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.Log4jFactory;
+import junit.framework.TestCase;
import org.apache.log4j.PropertyConfigurator;
import org.apache.turbine.Turbine;
-import junit.framework.TestCase;
-
/**
* Base functionality to be extended by all Apache Turbine test cases. Test
* case implementations are used to automate testing via JUnit.
@@ -41,32 +38,25 @@
public abstract class BaseTestCase
extends TestCase
{
- File log4jFile = new File("conf/test/Log4j.properties");
+ private static File log4jFile = new File("conf/test/Log4j.properties");
public BaseTestCase(String name)
throws Exception
{
super(name);
- Properties p = new Properties();
try
{
+ Properties p = new Properties();
p.load(new FileInputStream(log4jFile));
p.setProperty(Turbine.APPLICATION_ROOT_KEY, new
File(".").getAbsolutePath());
PropertyConfigurator.configure(p);
-
}
catch (FileNotFoundException fnf)
{
System.err.println("Could not open Log4J configuration file "
+ log4jFile);
}
-
- //
- // Set up Commons Logging to use the Log4J Logging
- //
- System.getProperties().setProperty(LogFactory.class.getName(),
- Log4jFactory.class.getName());
}
}
1.1.2.2 +12 -46
jakarta-turbine-2/src/test/org/apache/turbine/test/Attic/BaseTurbineTest.java
Index: BaseTurbineTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/test/Attic/BaseTurbineTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BaseTurbineTest.java 29 Jul 2004 15:08:57 -0000 1.1.2.1
+++ BaseTurbineTest.java 14 Aug 2004 20:57:59 -0000 1.1.2.2
@@ -17,18 +17,8 @@
*/
import java.io.File;
-import java.io.FileInputStream;
-
import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.Log4jFactory;
-
-import org.apache.log4j.PropertyConfigurator;
import org.apache.turbine.Turbine;
import org.apache.turbine.util.TurbineConfig;
@@ -42,49 +32,25 @@
*/
public abstract class BaseTurbineTest
- extends TestCase
-
+ extends BaseTestCase
{
private File log4jFile = new File("conf/test/Log4j.properties");
- private TurbineConfig turbineConfig = null;
+ private static TurbineConfig turbineConfig = null;
- public BaseTurbineTest(String name)
+ public BaseTurbineTest(String name, String config)
+ throws Exception
{
super(name);
- initLog4J();
-
- Map initParams = new HashMap();
-
initParams.put(TurbineConfig.PROPERTIES_PATH_KEY,"conf/test/TurbineResources.properties");
- initParams.put(Turbine.LOGGING_ROOT_KEY, "target/test-logs");
-
- turbineConfig = new TurbineConfig(".", initParams);
- turbineConfig.initialize();
- }
-
- private void initLog4J()
- {
- Properties p = new Properties();
- try
- {
- p.load(new FileInputStream(log4jFile));
- p.setProperty(Turbine.APPLICATION_ROOT_KEY,
- new File(".").getAbsolutePath());
- PropertyConfigurator.configure(p);
- }
- catch (Exception e)
+ if (turbineConfig == null)
{
- System.err.println("Could not open Log4J configuration file "
- + log4jFile);
- }
+ Map initParams = new HashMap();
+ initParams.put(TurbineConfig.PROPERTIES_PATH_KEY, config); //
"conf/test/TurbineResources.properties"
+ initParams.put(Turbine.LOGGING_ROOT_KEY, "target/test-logs");
- //
- // Set up Commons Logging to use the Log4J Logging
- //
- System.getProperties().setProperty(
- LogFactory.class.getName(),
- Log4jFactory.class.getName());
+ turbineConfig = new TurbineConfig(".", initParams);
+ turbineConfig.initialize();
+ }
}
-
}
No revision
Index: BaseTurbineTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/test/Attic/BaseTurbineTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BaseTurbineTest.java 29 Jul 2004 15:08:57 -0000 1.1.2.1
+++ BaseTurbineTest.java 14 Aug 2004 20:57:59 -0000 1.1.2.2
@@ -17,18 +17,8 @@
*/
import java.io.File;
-import java.io.FileInputStream;
-
import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.Log4jFactory;
-
-import org.apache.log4j.PropertyConfigurator;
import org.apache.turbine.Turbine;
import org.apache.turbine.util.TurbineConfig;
@@ -42,49 +32,25 @@
*/
public abstract class BaseTurbineTest
- extends TestCase
-
+ extends BaseTestCase
{
private File log4jFile = new File("conf/test/Log4j.properties");
- private TurbineConfig turbineConfig = null;
+ private static TurbineConfig turbineConfig = null;
- public BaseTurbineTest(String name)
+ public BaseTurbineTest(String name, String config)
+ throws Exception
{
super(name);
- initLog4J();
-
- Map initParams = new HashMap();
-
initParams.put(TurbineConfig.PROPERTIES_PATH_KEY,"conf/test/TurbineResources.properties");
- initParams.put(Turbine.LOGGING_ROOT_KEY, "target/test-logs");
-
- turbineConfig = new TurbineConfig(".", initParams);
- turbineConfig.initialize();
- }
-
- private void initLog4J()
- {
- Properties p = new Properties();
- try
- {
- p.load(new FileInputStream(log4jFile));
- p.setProperty(Turbine.APPLICATION_ROOT_KEY,
- new File(".").getAbsolutePath());
- PropertyConfigurator.configure(p);
- }
- catch (Exception e)
+ if (turbineConfig == null)
{
- System.err.println("Could not open Log4J configuration file "
- + log4jFile);
- }
+ Map initParams = new HashMap();
+ initParams.put(TurbineConfig.PROPERTIES_PATH_KEY, config); //
"conf/test/TurbineResources.properties"
+ initParams.put(Turbine.LOGGING_ROOT_KEY, "target/test-logs");
- //
- // Set up Commons Logging to use the Log4J Logging
- //
- System.getProperties().setProperty(
- LogFactory.class.getName(),
- Log4jFactory.class.getName());
+ turbineConfig = new TurbineConfig(".", initParams);
+ turbineConfig.initialize();
+ }
}
-
}
No revision
Index: BaseTurbineTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/test/Attic/BaseTurbineTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BaseTurbineTest.java 29 Jul 2004 15:08:57 -0000 1.1.2.1
+++ BaseTurbineTest.java 14 Aug 2004 20:57:59 -0000 1.1.2.2
@@ -17,18 +17,8 @@
*/
import java.io.File;
-import java.io.FileInputStream;
-
import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.Log4jFactory;
-
-import org.apache.log4j.PropertyConfigurator;
import org.apache.turbine.Turbine;
import org.apache.turbine.util.TurbineConfig;
@@ -42,49 +32,25 @@
*/
public abstract class BaseTurbineTest
- extends TestCase
-
+ extends BaseTestCase
{
private File log4jFile = new File("conf/test/Log4j.properties");
- private TurbineConfig turbineConfig = null;
+ private static TurbineConfig turbineConfig = null;
- public BaseTurbineTest(String name)
+ public BaseTurbineTest(String name, String config)
+ throws Exception
{
super(name);
- initLog4J();
-
- Map initParams = new HashMap();
-
initParams.put(TurbineConfig.PROPERTIES_PATH_KEY,"conf/test/TurbineResources.properties");
- initParams.put(Turbine.LOGGING_ROOT_KEY, "target/test-logs");
-
- turbineConfig = new TurbineConfig(".", initParams);
- turbineConfig.initialize();
- }
-
- private void initLog4J()
- {
- Properties p = new Properties();
- try
- {
- p.load(new FileInputStream(log4jFile));
- p.setProperty(Turbine.APPLICATION_ROOT_KEY,
- new File(".").getAbsolutePath());
- PropertyConfigurator.configure(p);
- }
- catch (Exception e)
+ if (turbineConfig == null)
{
- System.err.println("Could not open Log4J configuration file "
- + log4jFile);
- }
+ Map initParams = new HashMap();
+ initParams.put(TurbineConfig.PROPERTIES_PATH_KEY, config); //
"conf/test/TurbineResources.properties"
+ initParams.put(Turbine.LOGGING_ROOT_KEY, "target/test-logs");
- //
- // Set up Commons Logging to use the Log4J Logging
- //
- System.getProperties().setProperty(
- LogFactory.class.getName(),
- Log4jFactory.class.getName());
+ turbineConfig = new TurbineConfig(".", initParams);
+ turbineConfig.initialize();
+ }
}
-
}
1.1.2.1 +46 -0
jakarta-turbine-2/src/test/org/apache/turbine/test/Attic/BaseTurbineHsqlTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
