[jboss-cvs] JBossAS SVN: r60697 - branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 20 00:08:31 EST 2007
Author: bstansberry at jboss.com
Date: 2007-02-20 00:08:31 -0500 (Tue, 20 Feb 2007)
New Revision: 60697
Modified:
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java
branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java
Log:
Configure to work as base class for optimistic locking test subclasses
Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java 2007-02-20 05:07:31 UTC (rev 60696)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EmbeddedIdClassloaderTestCase.java 2007-02-20 05:08:31 UTC (rev 60697)
@@ -23,24 +23,22 @@
import java.util.List;
import java.util.Properties;
-import java.util.Set;
import javax.naming.InitialContext;
-import org.jboss.ejb3.test.clusteredentity.Customer;
-import org.jboss.ejb3.test.clusteredentity.EntityTest;
-import org.jboss.ejb3.test.clusteredentity.classloader.EntityQueryTest;
-import org.jboss.ejb3.test.clusteredentity.embeddedid.MusicianPK;
-import org.jboss.ejb3.test.clusteredentity.embeddedid.EmbeddedIdTest;
-import org.jboss.test.JBossClusteredTestCase;
+
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.test.JBossClusteredTestCase;
+
/**
* Simple test of replication of entities and related queries with @EmbeddedId
* fields involved.
*
* @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 60233 $
*/
public class EmbeddedIdClassloaderTestCase
extends JBossClusteredTestCase
@@ -102,10 +100,15 @@
InitialContext ctx1 = new InitialContext(prop1);
log.info("Lookup sfsb from " + nodeJNDIAddress);
- return (EmbeddedIdTest) ctx1.lookup("clusteredentity-embeddedid-test/EmbeddedIdTestBean/remote");
+ return (EmbeddedIdTest) ctx1.lookup(getEarName() + "/EmbeddedIdTestBean/remote");
}
+ protected String getEarName()
+ {
+ return "clusteredentity-embeddedid-test";
+ }
+
public void testQuery() throws Exception
{
try
Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java 2007-02-20 05:07:31 UTC (rev 60696)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityClassloaderTestBase.java 2007-02-20 05:08:31 UTC (rev 60697)
@@ -39,10 +39,11 @@
* @author Brian Stansberry
* @version $Id: EntityUnitTestCase.java 57207 2006-09-26 12:06:13Z dimitris at jboss.org $
*/
-
public class EntityClassloaderTestBase
extends JBossClusteredTestCase
{
+ public static final String EAR_NAME = "clusteredentity-classloader-test";
+
protected org.apache.log4j.Logger log = getLog();
protected static final long SLEEP_TIME = 300L;
@@ -87,8 +88,10 @@
InitialContext ctx1 = new InitialContext(prop1);
log.info("Lookup sfsb from " + nodeJNDIAddress);
- return (EntityQueryTest)ctx1.lookup("clusteredentity-classloader-test/EntityQueryTestBean/remote");
+ EntityQueryTest eqt = (EntityQueryTest)ctx1.lookup(getEarName() + "/EntityQueryTestBean/remote");
+ eqt.getCache(isOptimistic());
+ return eqt;
}
protected void tearDown() throws Exception
@@ -297,4 +300,14 @@
log.warn("Interrupted while sleeping", e);
}
}
+
+ protected String getEarName()
+ {
+ return EAR_NAME;
+ }
+
+ protected boolean isOptimistic()
+ {
+ return false;
+ }
}
Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java 2007-02-20 05:07:31 UTC (rev 60696)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java 2007-02-20 05:08:31 UTC (rev 60697)
@@ -21,31 +21,21 @@
*/
package org.jboss.ejb3.test.clusteredentity.unit;
-import java.util.Properties;
-import javax.naming.InitialContext;
-
-import org.hibernate.cache.StandardQueryCache;
-import org.jboss.ejb3.test.clusteredentity.classloader.Account;
-import org.jboss.ejb3.test.clusteredentity.classloader.AccountHolderPK;
-import org.jboss.ejb3.test.clusteredentity.classloader.EntityQueryTest;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
-
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+
/**
* Tests EJB redeployment when entities with @Lob fields are stored
* in the second level cache.
*
* @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 60233 $
*/
public class EntityQueryRedeployUnitTestCase
extends EntityClassloaderTestBase
{
- private static boolean firstNamedRegionTest = true;
- private static final String EAR_NAME = "clusteredentity-classloader-test.ear";
-
public EntityQueryRedeployUnitTestCase(String name)
{
super(name);
@@ -58,9 +48,6 @@
// Now get the named query regions active
queryTest(false, true, true, true);
- // Don't set this false, as after redeploy it's as if its the first test
-// firstNamedRegionTest = false;
-
redeploy();
// Redo the test, but no entity creation
@@ -71,11 +58,11 @@
private void redeploy() throws Exception
{
RMIAdaptor[] adaptors = getAdaptors();
- undeploy(adaptors[1], EAR_NAME);
+ undeploy(adaptors[1], getEarName() + ".ear");
sleep(2000);
- deploy(adaptors[1], EAR_NAME);
+ deploy(adaptors[1], getEarName() + ".ear");
sleep(2000);
@@ -84,10 +71,11 @@
}
+
public static Test suite() throws Exception
{
TestSuite suite = new TestSuite();
- Test t1 = getDeploySetup(EntityQueryRedeployUnitTestCase.class, EAR_NAME);
+ Test t1 = getDeploySetup(EntityQueryRedeployUnitTestCase.class, EAR_NAME + ".ear");
suite.addTest(t1);
Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java 2007-02-20 05:07:31 UTC (rev 60696)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryUnitTestCase.java 2007-02-20 05:08:31 UTC (rev 60697)
@@ -21,14 +21,6 @@
*/
package org.jboss.ejb3.test.clusteredentity.unit;
-import java.util.Properties;
-import javax.naming.InitialContext;
-
-import org.hibernate.cache.StandardQueryCache;
-import org.jboss.ejb3.test.clusteredentity.classloader.Account;
-import org.jboss.ejb3.test.clusteredentity.classloader.AccountHolderPK;
-import org.jboss.ejb3.test.clusteredentity.classloader.EntityQueryTest;
-
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -36,7 +28,7 @@
* Tests caching of queries involving custom types.
*
* @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 60233 $
*/
public class EntityQueryUnitTestCase
extends EntityClassloaderTestBase
@@ -99,7 +91,7 @@
{
TestSuite suite = new TestSuite();
Test t1 = getDeploySetup(EntityQueryUnitTestCase.class,
- "clusteredentity-classloader-test.ear");
+ EAR_NAME + ".ear");
suite.addTest(t1);
Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java 2007-02-20 05:07:31 UTC (rev 60696)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityUnitTestCase.java 2007-02-20 05:08:31 UTC (rev 60697)
@@ -79,9 +79,11 @@
System.out.println("Create node 0");
EntityTest tester0 = (EntityTest)ctx0.lookup("EntityTestBean/remote");
-
+
try
{
+ tester0.getCache(isOptimistic());
+
Customer customer = tester0.createCustomer();
//Call finder twice since Hibernate seems to not actually save collections
@@ -112,6 +114,8 @@
InitialContext ctx1 = new InitialContext(prop1);
EntityTest tester1 = (EntityTest)ctx1.lookup("EntityTestBean/remote");
+ tester1.getCache(isOptimistic());
+
System.out.println("Find node 1");
customer = tester1.findByCustomerId(customer.getId());
@@ -134,8 +138,13 @@
}
}
+ protected boolean isOptimistic()
+ {
+ return false;
+ }
+
public static Test suite() throws Exception
{
- return JBossClusteredTestCase.getDeploySetup(EntityUnitTestCase.class, "clusteredentity-test.jar");
+ return getDeploySetup(EntityUnitTestCase.class, "clusteredentity-test.jar");
}
}
More information about the jboss-cvs-commits
mailing list