epugh 2004/05/30 08:25:41
Modified: src/test/org/apache/turbine/services/crypto
CryptoRunningInMerlinTest.java
CryptoRunningInECMTest.java
src/test/org/apache/turbine/services/template
DefaultsTest.java InitTest.java ClassTest.java
TemplateTest.java
src/test/org/apache/turbine TorqueLoadTest.java
TurbineConfigTest.java ConfigurationTest.java
DestroyTest.java
src/test/org/apache/turbine/services/velocity
PathConverterTest.java
src/test/org/apache/turbine/util BaseValueParserTest.java
src/test/org/apache/turbine/util/uri TurbineURITest.java
src/test/org/apache/turbine/services/security
AccessControlListTest.java
Log:
Cleanup unit tests a bit.
Revision Changes Path
1.2 +1 -9
jakarta-turbine-2/src/test/org/apache/turbine/services/crypto/CryptoRunningInMerlinTest.java
Index: CryptoRunningInMerlinTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/crypto/CryptoRunningInMerlinTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CryptoRunningInMerlinTest.java 16 Feb 2004 07:10:10 -0000 1.1
+++ CryptoRunningInMerlinTest.java 30 May 2004 15:25:40 -0000 1.2
@@ -54,9 +54,6 @@
* <http://www.apache.org/>.
*/
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.fulcrum.crypto.CryptoAlgorithm;
import org.apache.fulcrum.crypto.CryptoService;
import org.apache.turbine.services.TurbineServices;
@@ -83,11 +80,6 @@
super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(CryptoRunningInMerlinTest.class);
}
public void testMd5()
1.2 +1 -9
jakarta-turbine-2/src/test/org/apache/turbine/services/crypto/CryptoRunningInECMTest.java
Index: CryptoRunningInECMTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/crypto/CryptoRunningInECMTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CryptoRunningInECMTest.java 16 Feb 2004 07:10:10 -0000 1.1
+++ CryptoRunningInECMTest.java 30 May 2004 15:25:40 -0000 1.2
@@ -54,9 +54,6 @@
* <http://www.apache.org/>.
*/
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.fulcrum.crypto.CryptoAlgorithm;
import org.apache.fulcrum.crypto.CryptoService;
import org.apache.turbine.services.TurbineServices;
@@ -83,11 +80,6 @@
super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(CryptoRunningInECMTest.class);
}
public void testMd5()
1.5 +1 -9
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
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultsTest.java 7 Jun 2003 11:46:11 -0000 1.4
+++ DefaultsTest.java 30 May 2004 15:25:40 -0000 1.5
@@ -54,9 +54,6 @@
* <http://www.apache.org/>.
*/
-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;
@@ -81,11 +78,6 @@
tc.initialize();
ts = (TemplateService)
TurbineServices.getInstance().getService(TemplateService.SERVICE_NAME);
- }
-
- public static Test suite()
- {
- return new TestSuite(DefaultsTest.class);
}
public void testDefaults()
1.6 +1 -10
jakarta-turbine-2/src/test/org/apache/turbine/services/template/InitTest.java
Index: InitTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/template/InitTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InitTest.java 9 Jun 2003 12:38:45 -0000 1.5
+++ InitTest.java 30 May 2004 15:25:40 -0000 1.6
@@ -54,12 +54,7 @@
* <http://www.apache.org/>.
*/
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.template.TemplateEngineService;
-import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.services.velocity.VelocityService;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
@@ -88,10 +83,6 @@
ts = (TemplateService)
TurbineServices.getInstance().getService(TemplateService.SERVICE_NAME);
}
- public static Test suite()
- {
- return new TestSuite(InitTest.class);
- }
public void testService()
throws Exception
1.5 +1 -9
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
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClassTest.java 7 Jun 2003 11:46:11 -0000 1.4
+++ ClassTest.java 30 May 2004 15:25:40 -0000 1.5
@@ -54,9 +54,6 @@
* <http://www.apache.org/>.
*/
-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;
@@ -83,11 +80,6 @@
tc.initialize();
ts = (TemplateService)
TurbineServices.getInstance().getService(TemplateService.SERVICE_NAME);
- }
-
- public static Test suite()
- {
- return new TestSuite(ClassTest.class);
}
public void testTemplateDefaults()
1.5 +1 -7
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
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TemplateTest.java 7 Jun 2003 11:46:11 -0000 1.4
+++ TemplateTest.java 30 May 2004 15:25:40 -0000 1.5
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-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;
@@ -84,10 +82,6 @@
ts = (TemplateService)
TurbineServices.getInstance().getService(TemplateService.SERVICE_NAME);
}
- public static Test suite()
- {
- return new TestSuite(TemplateTest.class);
- }
public void testTemplateDefaults()
{
1.5 +1 -9
jakarta-turbine-2/src/test/org/apache/turbine/TorqueLoadTest.java
Index: TorqueLoadTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/TorqueLoadTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TorqueLoadTest.java 16 Feb 2004 07:10:10 -0000 1.4
+++ TorqueLoadTest.java 30 May 2004 15:25:41 -0000 1.5
@@ -54,9 +54,6 @@
* <http://www.apache.org/>.
*/
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.torque.Torque;
import org.apache.torque.avalon.TorqueComponent;
import org.apache.turbine.services.TurbineServices;
@@ -76,11 +73,6 @@
public TorqueLoadTest(String name) throws Exception
{
super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(TorqueLoadTest.class);
}
/**
1.4 +2 -11
jakarta-turbine-2/src/test/org/apache/turbine/TurbineConfigTest.java
Index: TurbineConfigTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/TurbineConfigTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineConfigTest.java 9 Jun 2003 12:07:28 -0000 1.3
+++ TurbineConfigTest.java 30 May 2004 15:25:41 -0000 1.4
@@ -59,10 +59,6 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.turbine.Turbine;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
import org.apache.turbine.util.TurbineXmlConfig;
@@ -85,12 +81,7 @@
{
super(name);
}
-
- public static Test suite()
- {
- return new TestSuite(TurbineConfigTest.class);
- }
-
+
public void testTurbineConfigWithPropertiesFile() throws Exception
{
String value = new File("/conf/test/TemplateService.properties").getPath();
1.10 +1 -9
jakarta-turbine-2/src/test/org/apache/turbine/ConfigurationTest.java
Index: ConfigurationTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/ConfigurationTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConfigurationTest.java 28 Jul 2003 16:49:48 -0000 1.9
+++ ConfigurationTest.java 30 May 2004 15:25:41 -0000 1.10
@@ -54,9 +54,6 @@
* <http://www.apache.org/>.
*/
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.commons.configuration.Configuration;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
@@ -85,11 +82,6 @@
public ConfigurationTest(String name) throws Exception
{
super(name);
- }
-
- public static Test suite()
- {
- return new TestSuite(ConfigurationTest.class);
}
public void testCreateTurbineWithConfigurationXML() throws Exception
1.3 +1 -10 jakarta-turbine-2/src/test/org/apache/turbine/DestroyTest.java
Index: DestroyTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/DestroyTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DestroyTest.java 7 Jun 2003 11:46:10 -0000 1.2
+++ DestroyTest.java 30 May 2004 15:25:41 -0000 1.3
@@ -54,10 +54,6 @@
* <http://www.apache.org/>.
*/
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.turbine.Turbine;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
@@ -78,11 +74,6 @@
{
super(name);
tc = new TurbineConfig(".", "/conf/test/TemplateService.properties");
- }
-
- public static Test suite()
- {
- return new TestSuite(DestroyTest.class);
}
public void testDestroy()
1.7 +1 -11
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
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PathConverterTest.java 9 Jun 2003 12:38:46 -0000 1.6
+++ PathConverterTest.java 30 May 2004 15:25:41 -0000 1.7
@@ -54,16 +54,10 @@
* <http://www.apache.org/>.
*/
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.commons.collections.ExtendedProperties;
import org.apache.commons.configuration.Configuration;
-
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;
@@ -92,10 +86,6 @@
vs = (VelocityService)
TurbineServices.getInstance().getService(VelocityService.SERVICE_NAME);
}
- public static Test suite()
- {
- return new TestSuite(PathConverterTest.class);
- }
public void testService()
throws Exception
1.5 +1 -15
jakarta-turbine-2/src/test/org/apache/turbine/util/BaseValueParserTest.java
Index: BaseValueParserTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/util/BaseValueParserTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseValueParserTest.java 20 Jun 2003 20:46:21 -0000 1.4
+++ BaseValueParserTest.java 30 May 2004 15:25:41 -0000 1.5
@@ -56,11 +56,8 @@
import java.math.BigDecimal;
-import junit.framework.TestSuite;
-
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
-
import org.apache.turbine.services.ServiceManager;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.test.BaseTestCase;
@@ -111,17 +108,6 @@
protected void tearDown()
{
parser = null;
- }
-
- /**
- * Factory method for creating a TestSuite for this class.
- *
- * @return the test suite
- */
- public static TestSuite suite()
- {
- TestSuite suite = new TestSuite(BaseValueParserTest.class);
- return suite;
}
public void testGetByte()
1.3 +1 -14
jakarta-turbine-2/src/test/org/apache/turbine/util/uri/TurbineURITest.java
Index: TurbineURITest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/util/uri/TurbineURITest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineURITest.java 7 Jun 2003 11:46:11 -0000 1.2
+++ TurbineURITest.java 30 May 2004 15:25:41 -0000 1.3
@@ -54,11 +54,8 @@
* <http://www.apache.org/>.
*/
-import junit.framework.TestSuite;
-
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
-
import org.apache.turbine.services.ServiceManager;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.test.BaseTestCase;
@@ -114,16 +111,6 @@
turi = null;
}
- /**
- * Factory method for creating a TestSuite for this class.
- *
- * @return the test suite
- */
- public static TestSuite suite()
- {
- TestSuite suite = new TestSuite(TurbineURITest.class);
- return suite;
- }
public void testAddRemove()
{
1.5 +32 -43
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
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AccessControlListTest.java 20 Jun 2003 20:46:21 -0000 1.4
+++ AccessControlListTest.java 30 May 2004 15:25:41 -0000 1.5
@@ -82,62 +82,51 @@
super(name);
}
- public void testSelection()
+ public void testSelection() throws Exception
{
- try
- {
- doit();
- }
- catch( Exception e )
- {
- fail( e.getMessage() );
- }
- }
+ ServiceManager serviceManager = TurbineServices.getInstance();
+ serviceManager.setApplicationRoot(".");
- public void doit()
- throws Exception
- {
- ServiceManager serviceManager = TurbineServices.getInstance();
- serviceManager.setApplicationRoot(".");
+ Configuration cfg = new BaseConfiguration();
- Configuration cfg = new BaseConfiguration();
+ cfg.setProperty(PREFIX + "classname",
+ DBSecurityService.class.getName());
- cfg.setProperty(PREFIX + "classname",
- DBSecurityService.class.getName());
+ cfg.setProperty(PREFIX + "acl.class",
+ TurbineAccessControlList.class.getName());
- cfg.setProperty(PREFIX + "acl.class",
- TurbineAccessControlList.class.getName());
+ // We must run init!
+ cfg.setProperty(PREFIX+"earlyInit", "true");
- // We must run init!
- cfg.setProperty(PREFIX+"earlyInit", "true");
+ /* Ugh */
- /* Ugh */
+ cfg.setProperty("services." + FactoryService.SERVICE_NAME + ".classname",
+ TurbineFactoryService.class.getName());
- cfg.setProperty("services." + FactoryService.SERVICE_NAME + ".classname",
- TurbineFactoryService.class.getName());
+ serviceManager.setConfiguration(cfg);
- serviceManager.setConfiguration(cfg);
+ serviceManager.init();
- serviceManager.init();
+ Class aclClass = TurbineSecurity.getService().getAclClass();
- Class aclClass = TurbineSecurity.getService().getAclClass();
+ if(!aclClass.getName().equals(TurbineAccessControlList.class.getName()))
+ {
+ fail("ACL Class is " + aclClass.getName()
+ + ", expected was " + TurbineAccessControlList.class.getName());
+ }
- if(!aclClass.getName().equals(TurbineAccessControlList.class.getName()))
- {
- fail("ACL Class is " + aclClass.getName()
- + ", expected was " + TurbineAccessControlList.class.getName());
- }
+ Map roles = new HashMap();
+ Map permissions = new HashMap();
- Map roles = new HashMap();
- Map permissions = new HashMap();
+ AccessControlList aclTest =
+ TurbineSecurity.getService().getAclInstance(roles, permissions);
+
+ if(aclTest == null)
+ {
+ fail("Security Service failed to deliver a " + aclClass.getName()
+ + " Object");
+ }
+ }
- AccessControlList aclTest =
- TurbineSecurity.getService().getAclInstance(roles, permissions);
- if(aclTest == null)
- {
- fail("Security Service failed to deliver a " + aclClass.getName()
- + " Object");
- }
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
