Author: ronvoe122
Date: 2007-12-23 09:21:22-0800
New Revision: 10522
Removed:
trunk/src/test/logs/
Modified:
trunk/src/test/TestCase.properties
trunk/src/test/TestTurbineConfiguration.xml
trunk/src/test/org/tigris/scarab/test/BaseScarabTestCase.java
trunk/src/test/org/tigris/scarab/test/BaseTurbineTestCase.java
trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java
Log:
Removed obsolete code and configuration entries from test infrastructure.
Modified: trunk/src/test/TestCase.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/TestCase.properties?view=diff&rev=10522&p1=trunk/src/test/TestCase.properties&p2=trunk/src/test/TestCase.properties&r1=10521&r2=10522
==============================================================================
--- trunk/src/test/TestCase.properties (original)
+++ trunk/src/test/TestCase.properties 2007-12-23 09:21:22-0800
@@ -1,17 +1,3 @@
-# properties only used in testing. The rest of the properties are loaded
-# from the properties files stored in target/scarab/WEB-INF/conf.
-root.dir=.
-log4j.file=../../target/scarab/WEB-INF/conf/log4j.properties
-services.VelocityService.file.resource.loader.path=../../src/webapp/WEB-INF/templates
-services.EmailService.file.resource.loader.path=../../src/webapp/WEB-INF/templates
+# properties only used in testing
+# for other properties see TestTurbineConfiguration.xml
unittest.teardown.shutdownServices=false
-scarab.attachments.repository=./
-
-# otherwise torque will try to use caching which mysteriously fails when
-# running tests under eclipse
-torque.manager.useCache = true
-
-services.YaafiComponentService.componentConfiguration=../../target/scarab/WEB-INF/conf/componentConfiguration.xml
-services.YaafiComponentService.componentRoles=../../target/scarab/WEB-INF/conf/componentRoles.xml
-services.YaafiComponentService.parameters=../../target/scarab/WEB-INF/conf/componentParameters.properties
-
Modified: trunk/src/test/TestTurbineConfiguration.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/TestTurbineConfiguration.xml?view=diff&rev=10522&p1=trunk/src/test/TestTurbineConfiguration.xml&p2=trunk/src/test/TestTurbineConfiguration.xml&r1=10521&r2=10522
==============================================================================
--- trunk/src/test/TestTurbineConfiguration.xml (original)
+++ trunk/src/test/TestTurbineConfiguration.xml 2007-12-23 09:21:22-0800
@@ -2,9 +2,9 @@
<configuration>
<properties className="org.apache.commons.configuration.PropertiesConfiguration" fileName="../../src/test/TestCase.properties"/>
- <properties className="org.apache.commons.configuration.PropertiesConfiguration" fileName="../../target/scarab/WEB-INF/conf/defaultCustom.properties"/>
- <properties className="org.apache.commons.configuration.PropertiesConfiguration" fileName="../../target/scarab/WEB-INF/conf/PermissionMapping.properties"/>
- <properties className="org.apache.commons.configuration.PropertiesConfiguration" fileName="../../target/scarab/WEB-INF/conf/TurbineResources.properties"/>
- <properties className="org.apache.commons.configuration.PropertiesConfiguration" fileName="../../target/scarab/WEB-INF/conf/Torque.properties"/>
+ <properties className="org.apache.commons.configuration.PropertiesConfiguration" fileName="WEB-INF/conf/defaultCustom.properties"/>
+ <properties className="org.apache.commons.configuration.PropertiesConfiguration" fileName="WEB-INF/conf/PermissionMapping.properties"/>
+ <properties className="org.apache.commons.configuration.PropertiesConfiguration" fileName="WEB-INF/conf/TurbineResources.properties"/>
+ <properties className="org.apache.commons.configuration.PropertiesConfiguration" fileName="WEB-INF/conf/Torque.properties"/>
</configuration>
Modified: trunk/src/test/org/tigris/scarab/test/BaseScarabTestCase.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/test/BaseScarabTestCase.java?view=diff&rev=10522&p1=trunk/src/test/org/tigris/scarab/test/BaseScarabTestCase.java&p2=trunk/src/test/org/tigris/scarab/test/BaseScarabTestCase.java&r1=10521&r2=10522
==============================================================================
--- trunk/src/test/org/tigris/scarab/test/BaseScarabTestCase.java (original)
+++ trunk/src/test/org/tigris/scarab/test/BaseScarabTestCase.java 2007-12-23 09:21:22-0800
@@ -46,13 +46,7 @@
* individuals on behalf of Collab.Net.
*/
-import java.io.File;
-
import org.apache.torque.om.NumberKey;
-import org.tigris.scarab.om.ActivitySet;
-import org.tigris.scarab.om.ActivitySetManager;
-import org.tigris.scarab.om.ActivitySetTypePeer;
-import org.tigris.scarab.om.Attachment;
import org.tigris.scarab.om.Attribute;
import org.tigris.scarab.om.AttributeManager;
import org.tigris.scarab.om.Issue;
@@ -84,21 +78,9 @@
private Attribute platformAttribute = null;
private Attribute voteAttribute = null;
private Attribute assignAttribute = null;
- private Attribute ccAttribute = null;
private static boolean initialized = false;
- public BaseScarabTestCase()
- {
- System.setProperty("applicationRoot", "./src/webapp");
- System.setProperty("urn:avalon:home", "./src/webapp");
- }
-
- public BaseScarabTestCase(String name) throws Exception
- {
- super(name);
- }
-
/*
* @see TestCase#setUp()
*/
@@ -186,20 +168,6 @@
return voteAttribute;
}
- protected ActivitySet getEditActivitySet() throws Exception
- {
- Attachment attach = new Attachment();
- attach.setTextFields(getUser1(), getIssue0(),
- Attachment.MODIFICATION__PK);
- attach.setName("commenttest");
- attach.save();
-
- ActivitySet trans = ActivitySetManager.getInstance(
- ActivitySetTypePeer.EDIT_ISSUE__PK, getUser1(), attach);
- trans.save();
- return trans;
- }
-
/**
* If something like an Issue needs a mapping to a Module, then this is
* Module #5 that you can use. For example, you should call:
@@ -223,14 +191,4 @@
}
return assignAttribute;
}
-
- protected Attribute getCcAttribute() throws Exception
- {
- if (ccAttribute == null)
- {
- ccAttribute = AttributeManager.getInstance(new NumberKey(13));
- }
- return ccAttribute;
- }
-
}
\ No newline at end of file
Modified: trunk/src/test/org/tigris/scarab/test/BaseTurbineTestCase.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/test/BaseTurbineTestCase.java?view=diff&rev=10522&p1=trunk/src/test/org/tigris/scarab/test/BaseTurbineTestCase.java&p2=trunk/src/test/org/tigris/scarab/test/BaseTurbineTestCase.java&r1=10521&r2=10522
==============================================================================
--- trunk/src/test/org/tigris/scarab/test/BaseTurbineTestCase.java (original)
+++ trunk/src/test/org/tigris/scarab/test/BaseTurbineTestCase.java 2007-12-23 09:21:22-0800
@@ -45,7 +45,6 @@
* This software consists of voluntary contributions made by many
* individuals on behalf of Collab.Net.
*/
-import java.io.File;
import java.util.HashMap;
import java.util.Map;
@@ -63,24 +62,21 @@
* @author <a href="mailto:[email protected]">Eric Pugh</a>
*/
public class BaseTurbineTestCase extends TestCase {
- private static TurbineConfig tc = null;
+ private static final String SCARAB_APPLICATION_ROOT = "target/scarab";
+
+ private static TurbineConfig tc = null;
private static boolean initialized = false;
public BaseTurbineTestCase() {
- System.setProperty("applicationRoot", "./target/test-classes");
}
- public BaseTurbineTestCase(String name) throws Exception {
- super(name);
- }
/*
* @see TestCase#setUp()
*/
protected void setUp() throws Exception {
if (!initialized) {
- createLog4jDirectory();
initTurbine();
initialized=true;
}
@@ -103,27 +99,12 @@
}
}
- private void createLog4jDirectory(){
- File log4jDir = new File("."
- + File.separator + "target"
- + File.separator + "scarab"
- + File.separator + "logs" + File.separator);
- if(!log4jDir.exists()){
- log4jDir.mkdirs();
- }
- }
private void initTurbine() throws Exception {
- File directoryFile = new File("src/test");
- String directory = directoryFile.getAbsolutePath();
-
Map params = new HashMap();
params.put(TurbineXmlConfig.CONFIGURATION_PATH_KEY,"../../src/test/TestTurbineConfiguration.xml");
- params.put(TurbineConstants.APPLICATION_ROOT,"target/scarab");
- /*tc =
- new TurbineXmlConfig(directory, "TestTurbineConfiguration.xml");*/
- tc = new TurbineXmlConfig(directory,params);
+ params.put(TurbineConstants.APPLICATION_ROOT,SCARAB_APPLICATION_ROOT);
+ tc = new TurbineXmlConfig(SCARAB_APPLICATION_ROOT,params);
tc.init();
-
}
Modified: trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java?view=diff&rev=10522&p1=trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java&p2=trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java&r1=10521&r2=10522
==============================================================================
--- trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java (original)
+++ trunk/src/test/org/tigris/scarab/xmlrpc/NewTicketHandlerTest.java 2007-12-23 09:21:22-0800
@@ -24,14 +24,6 @@
private String user;
private Hashtable attribs;
private String issueType;
-
- /**
- * @param arg0
- * @throws Exception
- */
- public NewTicketHandlerTest(String arg0) throws Exception {
- super(arg0);
- }
/* (non-Javadoc)
* @see junit.framework.TestCase#setUp()
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.