[jboss-svn-commits] JBoss Portal SVN: r5247 - in trunk: cms/src/main/org/jboss/portal/test/cms cms/src/main/org/jboss/portal/test/cms/commands core/src/main/org/jboss/portal/test/core/model/instance core/src/main/org/jboss/portal/test/core/state identity/src/main/org/jboss/portal/test/identity test/src/main/org/jboss/portal/test/framework/junit test/src/main/org/jboss/portal/test/framework/junit/metadata
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 25 11:39:31 EDT 2006
Author: julien at jboss.com
Date: 2006-09-25 11:39:05 -0400 (Mon, 25 Sep 2006)
New Revision: 5247
Removed:
trunk/test/src/main/org/jboss/portal/test/framework/junit/DatabaseTestSuite.java
Modified:
trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java
trunk/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java
trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java
trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java
trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java
trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java
trunk/identity/src/main/org/jboss/portal/test/identity/DBUserTestCase.java
trunk/test/src/main/org/jboss/portal/test/framework/junit/metadata/TestCaseParameterMetaData.java
Log:
- removed DatabaseTestSuite in favor of the new parametrization mechanism for tests
- factored out boiler plate code in cms tests
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -22,10 +22,16 @@
package org.jboss.portal.test.cms;
import junit.framework.TestCase;
-
+import junit.framework.TestSuite;
import org.jboss.portal.test.framework.TestRuntimeContext;
import org.jboss.portal.test.framework.embedded.DataSourceSupport;
+import org.jboss.portal.test.framework.junit.TestCaseFactory;
+import org.jboss.portal.test.framework.junit.metadata.TestCaseMetaData;
+import org.jboss.portal.test.framework.junit.metadata.TestCaseParameterMetaData;
+import java.net.URL;
+import java.util.Map;
+
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -40,9 +46,9 @@
/** . */
private TestRuntimeContext runtimeContext;
- public AbstractCMSTestCase(DataSourceSupport.Config dsCfg)
+ public AbstractCMSTestCase(Map parametrization)
{
- this.dsCfg = dsCfg;
+ dsCfg = (DataSourceSupport.Config)parametrization.get("DataSourceConfig");
}
public void setUp() throws Exception
@@ -57,6 +63,14 @@
protected void tearDown() throws Exception
{
runtimeContext.stop();
+ }
+ public static TestSuite createTestSuite(Class clazz) throws Exception
+ {
+ URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
+ TestCaseMetaData testCaseMD = new TestCaseMetaData();
+ testCaseMD.bindParameter(new TestCaseParameterMetaData("DataSourceConfig"), DataSourceSupport.Config.fromXML2(configsURL));
+ TestSuite suite = TestCaseFactory.create(testCaseMD, clazz);
+ return suite;
}
}
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,27 +21,22 @@
*/
package org.jboss.portal.test.cms;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-
-import org.jboss.portal.common.util.LoaderResource;
-import org.jboss.portal.common.util.CLLoader;
-import org.jboss.portal.cms.impl.jcr.jackrabbit.JackrabbitJCRService;
-import org.jboss.portal.cms.util.RepositoryUtil;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
+import junit.framework.TestSuite;
import org.apache.jackrabbit.core.nodetype.NodeTypeManagerImpl;
+import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
import org.apache.jackrabbit.name.QName;
+import org.jboss.portal.cms.impl.jcr.jackrabbit.JackrabbitJCRService;
+import org.jboss.portal.cms.util.RepositoryUtil;
+import org.jboss.portal.common.util.CLLoader;
+import org.jboss.portal.common.util.LoaderResource;
+import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.Session;
import javax.jcr.Workspace;
-import javax.jcr.Node;
import javax.jcr.nodetype.NodeTypeManager;
+import java.util.Map;
-import junit.framework.TestSuite;
-
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision$
@@ -49,9 +44,9 @@
public class JackrabbitTestCase extends AbstractCMSTestCase
{
- public JackrabbitTestCase(DataSourceSupport.Config dsCfg)
+ public JackrabbitTestCase(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
private JackrabbitJCRService jcr;
@@ -139,30 +134,6 @@
public static TestSuite suite() throws Exception
{
-
- TestSuite suite = new TestSuite();
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- for (int i = 0; i < configs.length; i++)
- {
- DataSourceSupport.Config config = configs[i];
-
- //
- Method[] methods = JackrabbitTestCase.class.getMethods();
- for (int j = 0; j < methods.length; j++)
- {
- Method method = methods[j];
- int modifiers = method.getModifiers();
- if (Modifier.isPublic(modifiers) && !Modifier.isAbstract(modifiers) && !Modifier.isStatic(modifiers) && method.getName().startsWith("test"))
- {
- JackrabbitTestCase testCase = new JackrabbitTestCase(config);
- testCase.setName(method.getName());
- suite.addTest(testCase);
- }
- }
- }
-
- //
- return suite;
+ return createTestSuite(TestRepositoryBootStrap.class);
}
}
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,22 +21,17 @@
*/
package org.jboss.portal.test.cms;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-import java.util.Locale;
-
-import javax.jcr.Session;
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.impl.jcr.JCRCMS;
import org.jboss.portal.cms.util.RepositoryUtil;
import org.jboss.portal.common.util.CLLoader;
import org.jboss.portal.common.util.LoaderResource;
import org.jboss.portal.common.util.XML;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
+import javax.jcr.Session;
+import java.util.Locale;
+import java.util.Map;
+
/**
* Tests JCRCMS Service
*
@@ -45,9 +40,9 @@
public class TestRepositoryBootStrap extends AbstractCMSTestCase
{
- public TestRepositoryBootStrap(DataSourceSupport.Config dsCfg)
+ public TestRepositoryBootStrap(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
private JCRCMS service;
@@ -85,30 +80,6 @@
public static TestSuite suite() throws Exception
{
-
- TestSuite suite = new TestSuite();
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- for (int i = 0; i < configs.length; i++)
- {
- DataSourceSupport.Config config = configs[i];
-
- //
- Method[] methods = TestRepositoryBootStrap.class.getMethods();
- for (int j = 0; j < methods.length; j++)
- {
- Method method = methods[j];
- int modifiers = method.getModifiers();
- if (Modifier.isPublic(modifiers) && !Modifier.isAbstract(modifiers) && !Modifier.isStatic(modifiers) && method.getName().startsWith("test"))
- {
- TestRepositoryBootStrap testCase = new TestRepositoryBootStrap(config);
- testCase.setName(method.getName());
- suite.addTest(testCase);
- }
- }
- }
-
- //
- return suite;
+ return createTestSuite(TestRepositoryBootStrap.class);
}
}
\ No newline at end of file
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,15 +21,11 @@
*/
package org.jboss.portal.test.cms;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.util.NodeUtil;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
+import java.util.Map;
+
/**
* Tests RepositoryUtil
*
@@ -121,9 +117,9 @@
}
}
- public TestRepositoryUtil(DataSourceSupport.Config dsCfg)
+ public TestRepositoryUtil(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
public void setUp() throws Exception
@@ -139,30 +135,6 @@
public static TestSuite suite() throws Exception
{
-
- TestSuite suite = new TestSuite();
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- for (int i = 0; i < configs.length; i++)
- {
- DataSourceSupport.Config config = configs[i];
-
- //
- Method[] methods = TestRepositoryUtil.class.getMethods();
- for (int j = 0; j < methods.length; j++)
- {
- Method method = methods[j];
- int modifiers = method.getModifiers();
- if (Modifier.isPublic(modifiers) && !Modifier.isAbstract(modifiers) && !Modifier.isStatic(modifiers) && method.getName().startsWith("test"))
- {
- TestRepositoryUtil testCase = new TestRepositoryUtil(config);
- testCase.setName(method.getName());
- suite.addTest(testCase);
- }
- }
- }
-
- //
- return suite;
+ return createTestSuite(TestRepositoryUtil.class);
}
}
\ No newline at end of file
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,16 +21,16 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.util.Locale;
-
import org.jboss.portal.cms.impl.jcr.JCRCMS;
import org.jboss.portal.common.util.CLLoader;
import org.jboss.portal.common.util.LoaderResource;
import org.jboss.portal.common.util.XML;
import org.jboss.portal.test.cms.AbstractCMSTestCase;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
import org.w3c.dom.Document;
+import java.util.Locale;
+import java.util.Map;
+
/*
* Created on Sep 18, 2006
*
@@ -42,19 +42,15 @@
*
*/
protected JCRCMS service;
-
- /**
+
+ public AbstractCommandTestCase(Map parametrization)
+ {
+ super(parametrization);
+ }
+
+ /**
*
- *
*/
- public AbstractCommandTestCase(DataSourceSupport.Config dsCfg)
- {
- super(dsCfg);
- }
-
- /**
- *
- */
public void setUp() throws Exception
{
super.setUp();
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,23 +21,19 @@
*/
package org.jboss.portal.test.cms.commands;
+import junit.framework.TestSuite;
+import org.jboss.portal.cms.CMSException;
+import org.jboss.portal.cms.Command;
+import org.jboss.portal.cms.model.Folder;
+
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
-import junit.framework.TestSuite;
-
-import org.jboss.portal.cms.CMSException;
-import org.jboss.portal.cms.Command;
-import org.jboss.portal.cms.model.Folder;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
-
-
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -63,22 +59,18 @@
*
*
*/
- public TestFileArchiveUpload(DataSourceSupport.Config dsCfg)
+ public TestFileArchiveUpload(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFileArchiveUpload.class);
- return suite;
+ return createTestSuite(TestFileArchiveUpload.class);
}
public void testArchiveUpload() throws CMSException, IOException
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,22 +21,18 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-import java.util.Locale;
-
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.CMSException;
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.ContentImpl;
import org.jboss.portal.cms.impl.FileImpl;
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import java.util.Locale;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -62,22 +58,18 @@
*
*
*/
- public TestFileCopy(DataSourceSupport.Config dsCfg)
+ public TestFileCopy(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFileCopy.class);
- return suite;
+ return createTestSuite(TestFileCopy.class);
}
/**
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,15 +21,7 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-import java.util.Locale;
-
-import javax.jcr.Node;
-import javax.jcr.Session;
-
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.ContentImpl;
import org.jboss.portal.cms.impl.FileImpl;
@@ -37,10 +29,13 @@
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.util.NodeUtil;
import org.jboss.portal.cms.util.RepositoryUtil;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import javax.jcr.Node;
+import javax.jcr.Session;
+import java.util.Locale;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -66,22 +61,18 @@
*
*
*/
- public TestFileCreate(DataSourceSupport.Config dsCfg)
+ public TestFileCreate(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFileCreate.class);
- return suite;
+ return createTestSuite(TestFileCreate.class);
}
/**
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,16 +21,7 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-import java.util.Locale;
-
-import javax.jcr.Item;
-import javax.jcr.Node;
-import javax.jcr.Session;
-
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.ContentImpl;
import org.jboss.portal.cms.impl.FileImpl;
@@ -40,10 +31,14 @@
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.util.RepositoryUtil;
import org.jboss.portal.test.cms.mock.RuntimeExceptionCommand;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import javax.jcr.Item;
+import javax.jcr.Node;
+import javax.jcr.Session;
+import java.util.Locale;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -69,22 +64,18 @@
*
*
*/
- public TestFileCreateFailed(DataSourceSupport.Config dsCfg)
+ public TestFileCreateFailed(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFileCreateFailed.class);
- return suite;
+ return createTestSuite(TestFileCreateFailed.class);
}
/**
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,14 +21,7 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-import java.util.Locale;
-
-import javax.jcr.Session;
-
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.CMSException;
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.ContentImpl;
@@ -36,10 +29,12 @@
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.util.RepositoryUtil;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import javax.jcr.Session;
+import java.util.Locale;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -65,22 +60,18 @@
*
*
*/
- public TestFileDelete(DataSourceSupport.Config dsCfg)
+ public TestFileDelete(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFileDelete.class);
- return suite;
+ return createTestSuite(TestFileDelete.class);
}
/**
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,21 +21,18 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-import java.util.Locale;
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.CMSException;
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.ContentImpl;
import org.jboss.portal.cms.impl.FileImpl;
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import java.util.Locale;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -61,22 +58,18 @@
*
*
*/
- public TestFileGet(DataSourceSupport.Config dsCfg)
+ public TestFileGet(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFileGet.class);
- return suite;
+ return createTestSuite(TestFileGet.class);
}
/**
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,23 +21,19 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-import java.util.List;
-import java.util.Locale;
-
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.CMSException;
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.ContentImpl;
import org.jboss.portal.cms.impl.FileImpl;
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -63,22 +59,18 @@
*
*
*/
- public TestFileGetList(DataSourceSupport.Config dsCfg)
+ public TestFileGetList(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFileGetList.class);
- return suite;
+ return createTestSuite(TestFileGetList.class);
}
/**
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,22 +21,18 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-import java.util.Locale;
-
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.CMSException;
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.ContentImpl;
import org.jboss.portal.cms.impl.FileImpl;
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import java.util.Locale;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -62,22 +58,18 @@
*
*
*/
- public TestFileGetVersion(DataSourceSupport.Config dsCfg)
+ public TestFileGetVersion(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFileGetVersion.class);
- return suite;
+ return createTestSuite(TestFileGetVersion.class);
}
/**
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,15 +21,7 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-import java.util.Locale;
-
-import javax.jcr.Node;
-import javax.jcr.Property;
-import javax.jcr.Session;
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.CMSException;
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.ContentImpl;
@@ -38,10 +30,14 @@
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.util.RepositoryUtil;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.Session;
+import java.util.Locale;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -67,22 +63,18 @@
*
*
*/
- public TestFileUpdate(DataSourceSupport.Config dsCfg)
+ public TestFileUpdate(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFileUpdate.class);
- return suite;
+ return createTestSuite(TestFileUpdate.class);
}
/**
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,13 +21,7 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-import java.util.Date;
-import java.util.Locale;
-
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.ContentImpl;
import org.jboss.portal.cms.impl.FileImpl;
@@ -35,10 +29,12 @@
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.model.Folder;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -60,22 +56,18 @@
*
*
*/
- public TestFolderCopy(DataSourceSupport.Config dsCfg)
+ public TestFolderCopy(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFolderCopy.class);
- return suite;
+ return createTestSuite(TestFolderCopy.class);
}
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,24 +21,19 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-import java.util.Date;
-
-
-import javax.jcr.Node;
-import javax.jcr.Property;
-import javax.jcr.Session;
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.FolderImpl;
import org.jboss.portal.cms.model.Folder;
import org.jboss.portal.cms.util.RepositoryUtil;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.Session;
+import java.util.Date;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -60,22 +55,18 @@
*
*
*/
- public TestFolderCreate(DataSourceSupport.Config dsCfg)
+ public TestFolderCreate(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFolderCreate.class);
- return suite;
+ return createTestSuite(TestFolderCreate.class);
}
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,18 +21,14 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-
-import javax.jcr.Session;
-
import junit.framework.TestSuite;
-
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.util.RepositoryUtil;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import javax.jcr.Session;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -54,22 +50,18 @@
*
*
*/
- public TestFolderDelete(DataSourceSupport.Config dsCfg)
+ public TestFolderDelete(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFolderDelete.class);
- return suite;
+ return createTestSuite(TestFolderDelete.class);
}
/**
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,18 +21,15 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-import java.util.Date;
-
import junit.framework.TestSuite;
-
-import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.CMSException;
+import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.FolderImpl;
import org.jboss.portal.cms.model.Folder;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import java.util.Date;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -54,22 +51,18 @@
*
*
*/
- public TestFolderGet(DataSourceSupport.Config dsCfg)
+ public TestFolderGet(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFolderGet.class);
- return suite;
+ return createTestSuite(TestFolderGet.class);
}
Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -21,23 +21,18 @@
*/
package org.jboss.portal.test.cms.commands;
-import java.net.URL;
-import java.util.Date;
-
-
-import javax.jcr.Property;
-import javax.jcr.Session;
-
import junit.framework.TestSuite;
-
-import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.CMSException;
+import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.FolderImpl;
import org.jboss.portal.cms.model.Folder;
import org.jboss.portal.cms.util.RepositoryUtil;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import javax.jcr.Property;
+import javax.jcr.Session;
+import java.util.Date;
+import java.util.Map;
+
/**
* @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -59,22 +54,18 @@
*
*
*/
- public TestFolderUpdate(DataSourceSupport.Config dsCfg)
+ public TestFolderUpdate(Map parametrization)
{
- super(dsCfg);
+ super(parametrization);
}
-
+
/**
*
*
*/
public static TestSuite suite() throws Exception
{
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(TestFolderUpdate.class);
- return suite;
+ return createTestSuite(TestFolderUpdate.class);
}
Modified: trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -132,9 +132,6 @@
{
dataSourceConfig = (DataSourceSupport.Config)parametrization.get("DataSourceConfig");
persistLocally = ((Boolean)parametrization.get("PersistLocally")).booleanValue();
-
- //
- setName((String)parametrization.get(TestCaseParameterMetaData.TESTCASE_METHOD));
}
/** . */
Modified: trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -30,7 +30,6 @@
import org.apache.log4j.Level;
import org.jboss.portal.test.framework.embedded.DataSourceSupport;
import org.jboss.portal.test.framework.embedded.HibernateSupport;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
import org.jboss.portal.test.framework.junit.TransactionAssert;
import org.jboss.portal.test.framework.TestRuntimeContext;
import org.jboss.portal.portlet.test.ValueMapAssert;
@@ -58,7 +57,6 @@
import org.jboss.portal.portlet.test.support.PortletSupport;
import org.jboss.portal.common.value.StringValue;
-import java.net.URL;
import java.util.Collections;
import java.util.List;
@@ -77,14 +75,14 @@
Logger.getLogger("org.hibernate").setLevel(Level.ERROR);
}
- public static TestSuite suite() throws Exception
- {
- URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(ProducerTestCase.class);
- return suite;
- }
+// public static TestSuite suite() throws Exception
+// {
+// URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
+// DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
+// DatabaseTestSuite suite = new DatabaseTestSuite(configs);
+// suite.addTestCase(ProducerTestCase.class);
+// return suite;
+// }
/** . */
private TestRuntimeContext runtimeContext;
Modified: trunk/identity/src/main/org/jboss/portal/test/identity/DBUserTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/DBUserTestCase.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/DBUserTestCase.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -22,7 +22,9 @@
package org.jboss.portal.test.identity;
import org.jboss.portal.test.framework.TestRuntimeContext;
-import org.jboss.portal.test.framework.junit.DatabaseTestSuite;
+import org.jboss.portal.test.framework.junit.TestCaseFactory;
+import org.jboss.portal.test.framework.junit.metadata.TestCaseMetaData;
+import org.jboss.portal.test.framework.junit.metadata.TestCaseParameterMetaData;
import org.jboss.portal.test.framework.embedded.HibernateSupport;
import org.jboss.portal.test.framework.embedded.DataSourceSupport;
import org.jboss.portal.identity.db.DBUserModuleImpl;
@@ -38,6 +40,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Map;
import java.net.URL;
import junit.framework.TestSuite;
@@ -52,9 +55,9 @@
public static TestSuite suite() throws Exception
{
URL configsURL = Thread.currentThread().getContextClassLoader().getResource("datasources.xml");
- DataSourceSupport.Config[] configs = DataSourceSupport.Config.fromXML(configsURL);
- DatabaseTestSuite suite = new DatabaseTestSuite(configs);
- suite.addTestCase(DBUserTestCase.class);
+ TestCaseMetaData testCaseMD = new TestCaseMetaData();
+ testCaseMD.bindParameter(new TestCaseParameterMetaData("DataSourceConfig"), DataSourceSupport.Config.fromXML2(configsURL));
+ TestSuite suite = TestCaseFactory.create(testCaseMD, DBUserTestCase.class);
return suite;
}
@@ -66,6 +69,11 @@
Logger.getLogger("org.hibernate").setLevel(Level.ERROR);
}
+ public DBUserTestCase(Map parametrization)
+ {
+ dsCfg = (DataSourceSupport.Config)parametrization.get("DataSourceConfig");
+ }
+
/** . */
private TestRuntimeContext runtimeContext;
@@ -101,7 +109,7 @@
public String getName()
{
- return super.getName() + "_" + dsCfg.getDriverClass().replaceAll("\\.", "_");
+ return super.getName() + "," + dsCfg.getDisplayName();
}
protected void setUp() throws Exception
Deleted: trunk/test/src/main/org/jboss/portal/test/framework/junit/DatabaseTestSuite.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/junit/DatabaseTestSuite.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/test/src/main/org/jboss/portal/test/framework/junit/DatabaseTestSuite.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -1,105 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.portal.test.framework.junit;
-
-import junit.framework.TestSuite;
-import junit.framework.TestCase;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * Database test suite.
- *
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision$
- */
-public class DatabaseTestSuite extends TestSuite
-{
-
- /** . */
- private DataSourceSupport.Config[] configs;
-
- public DatabaseTestSuite(DataSourceSupport.Config[] configs)
- {
- this.configs = configs;
- }
-
- public DataSourceSupport.Config[] getConfigs()
- {
- return configs;
- }
-
- public void addTestCase(Class clazz) throws IllegalArgumentException
- {
- try
- {
- Constructor ctor = clazz.getConstructor(new Class[]{DataSourceSupport.Config.class});
-
- //
- for (int i = 0; i < configs.length; i++)
- {
- DataSourceSupport.Config config = configs[i];
- //
- Method[] methods = clazz.getMethods();
- for (int j = 0; j < methods.length; j++)
- {
- Method method = methods[j];
- int modifiers = method.getModifiers();
- if (Modifier.isPublic(modifiers) && !Modifier.isAbstract(modifiers) && !Modifier.isStatic(modifiers) && method.getName().startsWith("test"))
- {
- TestCase testCase = (TestCase)ctor.newInstance(new Object[]{config});
- testCase.setName(method.getName());
- addTest(testCase);
- }
- }
- }
- }
- catch (InstantiationException e)
- {
- IllegalArgumentException iae = new IllegalArgumentException();
- iae.initCause(e);
- throw iae;
- }
- catch (NoSuchMethodException e)
- {
- IllegalArgumentException iae = new IllegalArgumentException();
- iae.initCause(e);
- throw iae;
- }
- catch (IllegalAccessException e)
- {
- IllegalArgumentException iae = new IllegalArgumentException();
- iae.initCause(e);
- throw iae;
- }
- catch (InvocationTargetException e)
- {
- IllegalArgumentException iae = new IllegalArgumentException();
- iae.initCause(e);
- throw iae;
- }
- }
-}
Modified: trunk/test/src/main/org/jboss/portal/test/framework/junit/metadata/TestCaseParameterMetaData.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/junit/metadata/TestCaseParameterMetaData.java 2006-09-25 14:51:47 UTC (rev 5246)
+++ trunk/test/src/main/org/jboss/portal/test/framework/junit/metadata/TestCaseParameterMetaData.java 2006-09-25 15:39:05 UTC (rev 5247)
@@ -29,12 +29,6 @@
{
/** . */
- public static final String TESTCASE_CONSTRUCTOR = "TESTCASE_CONSTRUCTOR";
-
- /** . */
- public static final String TESTCASE_METHOD = "TESTCASE_METHOD";
-
- /** . */
private String name;
public TestCaseParameterMetaData(String name)
More information about the jboss-svn-commits
mailing list