[jboss-cvs] JBossAS SVN: r96092 - in trunk/testsuite/src/main/org/jboss/ejb3/test: clusteredentity/unit and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 6 06:31:23 EST 2009
Author: bstansberry at jboss.com
Date: 2009-11-06 06:31:23 -0500 (Fri, 06 Nov 2009)
New Revision: 96092
Added:
trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/
Modified:
trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java
trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java
trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEmbeddedIdClassloaderTestCase.java
trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEntityQueryRedeployUnitTestCase.java
trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEntityQueryUnitTestCase.java
trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/ProvidedPrefixEntityQueryUnitTestCase.java
Log:
[JBAS-7428] svn copy classes from ejb3 project
Copied: trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity (from rev 96091, projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity)
Modified: trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java 2009-11-06 10:52:57 UTC (rev 96091)
+++ trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java 2009-11-06 11:31:23 UTC (rev 96092)
@@ -27,12 +27,11 @@
import javax.naming.InitialContext;
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.jboss.ejb3.test.clusteredentity.embeddedid.EmbeddedIdTest;
import org.jboss.ejb3.test.clusteredentity.embeddedid.MusicianPK;
-import org.jboss.ejb3.test.common.unit.DBSetup;
import org.jboss.test.JBossClusteredTestCase;
+import org.jboss.test.cluster.testutil.DBSetup;
/**
* Simple test of replication of entities and related queries with @EmbeddedId
@@ -154,15 +153,7 @@
public static Test suite() throws Exception
{
-
- TestSuite suite = new TestSuite();
- Test t1 = getDeploySetup(EmbeddedIdClassloaderTestCase.class,
+ return DBSetup.getDeploySetup(EmbeddedIdClassloaderTestCase.class,
"clusteredentity-embeddedid-test.ear");
-
- suite.addTest(t1);
-
- // Create an initializer for the test suite
- DBSetup wrapper = new DBSetup(suite);
- return wrapper;
}
}
Modified: trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java 2009-11-06 10:52:57 UTC (rev 96091)
+++ trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java 2009-11-06 11:31:23 UTC (rev 96092)
@@ -23,11 +23,10 @@
import javax.management.MBeanServerConnection;
-import org.jboss.ejb3.test.common.unit.DBSetup;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.jboss.test.cluster.testutil.DBSetup;
+
/**
* Tests EJB redeployment when entities with @Lob fields are stored
* in the second level cache.
@@ -78,13 +77,6 @@
public static Test suite() throws Exception
{
- TestSuite suite = new TestSuite();
- Test t1 = getDeploySetup(EntityQueryRedeployUnitTestCase.class, EAR_NAME + ".ear");
-
- suite.addTest(t1);
-
- // Create an initializer for the test suite
- DBSetup wrapper = new DBSetup(suite);
- return wrapper;
+ return DBSetup.getDeploySetup(EntityQueryRedeployUnitTestCase.class, EAR_NAME + ".ear");
}
}
Modified: trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java 2009-11-06 10:52:57 UTC (rev 96091)
+++ trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java 2009-11-06 11:31:23 UTC (rev 96092)
@@ -22,9 +22,8 @@
package org.jboss.ejb3.test.clusteredentity.unit;
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.jboss.ejb3.test.common.unit.DBSetup;
+import org.jboss.test.cluster.testutil.DBSetup;
/**
* Tests caching of queries involving custom types.
@@ -86,14 +85,7 @@
public static Test suite() throws Exception
{
- TestSuite suite = new TestSuite();
- Test t1 = getDeploySetup(EntityQueryUnitTestCase.class,
+ return DBSetup.getDeploySetup(EntityQueryUnitTestCase.class,
EAR_NAME + ".ear");
-
- suite.addTest(t1);
-
- // Create an initializer for the test suite
- DBSetup wrapper = new DBSetup(suite);
- return wrapper;
}
}
Modified: trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEmbeddedIdClassloaderTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEmbeddedIdClassloaderTestCase.java 2009-11-06 10:52:57 UTC (rev 96091)
+++ trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEmbeddedIdClassloaderTestCase.java 2009-11-06 11:31:23 UTC (rev 96092)
@@ -22,11 +22,10 @@
package org.jboss.ejb3.test.clusteredentity.unit;
-import org.jboss.ejb3.test.common.unit.DBSetup;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.jboss.test.cluster.testutil.DBSetup;
+
/**
* Executes the superclass tests, but with Hibernate and JBoss Cache
* configured for optimistic locking.
@@ -45,17 +44,8 @@
public static Test suite() throws Exception
{
-
- TestSuite suite = new TestSuite();
- // Deploy an optimistic cache before the ear
- Test t1 = getDeploySetup(OptimisticEmbeddedIdClassloaderTestCase.class,
+ return DBSetup.getDeploySetup(OptimisticEmbeddedIdClassloaderTestCase.class,
"clusteredentity-embeddedid-optimistic-test.ear");
-
- suite.addTest(t1);
-
- // Create an initializer for the test suite
- DBSetup wrapper = new DBSetup(suite);
- return wrapper;
}
@Override
Modified: trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEntityQueryRedeployUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEntityQueryRedeployUnitTestCase.java 2009-11-06 10:52:57 UTC (rev 96091)
+++ trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEntityQueryRedeployUnitTestCase.java 2009-11-06 11:31:23 UTC (rev 96092)
@@ -22,11 +22,10 @@
package org.jboss.ejb3.test.clusteredentity.unit;
-import org.jboss.ejb3.test.common.unit.DBSetup;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.jboss.test.cluster.testutil.DBSetup;
+
/**
* Executes the superclass tests, but with Hibernate and JBoss Cache
* configured for optimistic locking.
@@ -48,16 +47,8 @@
public static Test suite() throws Exception
{
- TestSuite suite = new TestSuite();
- // Deploy an optimistic cache before the ear
- Test t1 = getDeploySetup(OptimisticEntityQueryRedeployUnitTestCase.class,
+ return DBSetup.getDeploySetup(OptimisticEntityQueryRedeployUnitTestCase.class,
EAR_NAME + ".ear");
-
- suite.addTest(t1);
-
- // Create an initializer for the test suite
- DBSetup wrapper = new DBSetup(suite);
- return wrapper;
}
@Override
Modified: trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEntityQueryUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEntityQueryUnitTestCase.java 2009-11-06 10:52:57 UTC (rev 96091)
+++ trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/OptimisticEntityQueryUnitTestCase.java 2009-11-06 11:31:23 UTC (rev 96092)
@@ -22,11 +22,10 @@
package org.jboss.ejb3.test.clusteredentity.unit;
-import org.jboss.ejb3.test.common.unit.DBSetup;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.jboss.test.cluster.testutil.DBSetup;
+
/**
* Executes the superclass tests, but with Hibernate and JBoss Cache
* configured for optimistic locking.
@@ -45,16 +44,8 @@
public static Test suite() throws Exception
{
- TestSuite suite = new TestSuite();
- // Deploy an optimistic cache before the ear
- Test t1 = getDeploySetup(OptimisticEntityQueryUnitTestCase.class,
+ return DBSetup.getDeploySetup(OptimisticEntityQueryUnitTestCase.class,
EAR_NAME + ".ear");
-
- suite.addTest(t1);
-
- // Create an initializer for the test suite
- DBSetup wrapper = new DBSetup(suite);
- return wrapper;
}
@Override
Modified: trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/ProvidedPrefixEntityQueryUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/clusteredentity/unit/ProvidedPrefixEntityQueryUnitTestCase.java 2009-11-06 10:52:57 UTC (rev 96091)
+++ trunk/testsuite/src/main/org/jboss/ejb3/test/clusteredentity/unit/ProvidedPrefixEntityQueryUnitTestCase.java 2009-11-06 11:31:23 UTC (rev 96092)
@@ -22,12 +22,11 @@
package org.jboss.ejb3.test.clusteredentity.unit;
-import org.jboss.ejb3.test.common.unit.DBSetup;
-
import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.jboss.test.cluster.testutil.DBSetup;
+
/**
* Duplicates teh EntityQueryUnitTestCase, but with a
* hibernate.cache.region_prefix specified in persistence.xml.
@@ -46,15 +45,8 @@
public static Test suite() throws Exception
{
- TestSuite suite = new TestSuite();
- Test t1 = getDeploySetup(ProvidedPrefixEntityQueryUnitTestCase.class,
+ return DBSetup.getDeploySetup(ProvidedPrefixEntityQueryUnitTestCase.class,
EAR_NAME + ".ear");
-
- suite.addTest(t1);
-
- // Create an initializer for the test suite
- DBSetup wrapper = new DBSetup(suite);
- return wrapper;
}
@Override
More information about the jboss-cvs-commits
mailing list