[jboss-cvs] JBoss Messaging SVN: r6018 - in trunk/tests/jms-tests/src/org/jboss/test/messaging: jms and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 6 08:32:05 EST 2009
Author: jmesnil
Date: 2009-03-06 08:32:05 -0500 (Fri, 06 Mar 2009)
New Revision: 6018
Modified:
trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SessionTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/XATest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/ObjectMessageDeliveryTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java
Log:
test suite cleanup
* removed JBM specific code from the tests and replaced them with JMS code
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-03-06 13:18:00 UTC (rev 6017)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-03-06 13:32:05 UTC (rev 6018)
@@ -36,15 +36,17 @@
import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.Topic;
+import javax.jms.TopicConnectionFactory;
+import javax.jms.XAConnectionFactory;
import javax.management.ObjectName;
import javax.naming.InitialContext;
+import javax.transaction.TransactionManager;
+import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
+
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.server.MessagingServer;
-import org.jboss.messaging.jms.JBossQueue;
-import org.jboss.messaging.jms.JBossTopic;
-import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.messaging.jms.server.JMSServerManager;
import org.jboss.messaging.jms.server.management.SubscriptionInfo;
import org.jboss.test.messaging.tools.ServerManagement;
@@ -391,17 +393,32 @@
return getInitialContext(0);
}
- public JBossConnectionFactory getConnectionFactory() throws Exception
+ public ConnectionFactory getConnectionFactory() throws Exception
{
- return (JBossConnectionFactory) getInitialContext().lookup("/ConnectionFactory");
+ return (ConnectionFactory) getInitialContext().lookup("/ConnectionFactory");
}
+ public TopicConnectionFactory getTopicConnectionFactory() throws Exception
+ {
+ return (TopicConnectionFactory) getInitialContext().lookup("/ConnectionFactory");
+ }
+ public XAConnectionFactory getXAConnectionFactory() throws Exception
+ {
+ return (XAConnectionFactory) getInitialContext().lookup("/ConnectionFactory");
+ }
+
public InitialContext getInitialContext(int serverid) throws Exception
{
return new InitialContext(ServerManagement.getJNDIEnvironment(serverid));
}
+ protected TransactionManager getTransactionManager()
+ {
+ return new TransactionManagerImple();
+ }
+
+
public void configureSecurityForDestination(String destName, boolean isQueue, HashSet<Role> roles) throws Exception
{
servers.get(0).configureSecurityForDestination(destName, isQueue, roles);
@@ -629,14 +646,7 @@
protected void removeAllMessages(String destName, boolean isQueue, int server) throws Exception
{
- if (isQueue)
- {
- servers.get(server).removeAllMessages(new JBossQueue(destName));
- }
- else
- {
- servers.get(server).removeAllMessages(new JBossTopic(destName));
- }
+ servers.get(server).removeAllMessages(destName, isQueue);
}
protected int getNoSubscriptions(Topic topic)
@@ -779,16 +789,6 @@
servers.get(0).configureSecurityForDestination(s, b, lockedConf);
}
- protected void addAddressSettings(String name, long scheduledDeliveryTime)
- {
- servers.get(0).addAddressSettings("queuejms." + name, scheduledDeliveryTime);
- }
-
- protected void removeAddressSettings(String name)
- {
- servers.get(0).removeAddressSettings(name);
- }
-
protected void kill(int i) throws Exception
{
log.info("Attempting to kill server " + i);
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SessionTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SessionTest.java 2009-03-06 13:18:00 UTC (rev 6017)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SessionTest.java 2009-03-06 13:32:05 UTC (rev 6018)
@@ -148,7 +148,7 @@
public void testGetSession2() throws Exception
{
- XAConnection conn = getConnectionFactory().createXAConnection();
+ XAConnection conn = getXAConnectionFactory().createXAConnection();
XASession sess = conn.createXASession();
sess.getSession();
@@ -339,7 +339,7 @@
public void testGetXAResource2() throws Exception
{
- XAConnection conn = getConnectionFactory().createXAConnection();
+ XAConnection conn = getXAConnectionFactory().createXAConnection();
XASession sess = conn.createXASession();
sess.getXAResource();
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/XATest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/XATest.java 2009-03-06 13:18:00 UTC (rev 6017)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/XATest.java 2009-03-06 13:32:05 UTC (rev 6018)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
import javax.jms.DeliveryMode;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -35,6 +36,7 @@
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.XAConnection;
+import javax.jms.XAConnectionFactory;
import javax.jms.XASession;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
@@ -47,7 +49,6 @@
import org.jboss.messaging.core.client.impl.ClientSessionImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.transaction.impl.XidImpl;
-import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.test.messaging.JBMServerTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
import org.jboss.tm.TransactionManagerLocator;
@@ -76,8 +77,10 @@
protected Transaction suspendedTx;
- protected JBossConnectionFactory cf;
+ protected XAConnectionFactory xacf;
+ protected ConnectionFactory cf;
+
// Constructors --------------------------------------------------
// TestCase overrides -------------------------------------------
@@ -88,7 +91,9 @@
cf = getConnectionFactory();
- tm = TransactionManagerLocator.getInstance().getTransactionManager();//this.getTransactionManager();
+ xacf = getXAConnectionFactory();
+
+ tm = getTransactionManager();
assertTrue(tm instanceof TransactionManagerImple);
@@ -145,7 +150,7 @@
try
{
- conn1 = cf.createXAConnection();
+ conn1 = xacf.createXAConnection();
XASession sess1 = conn1.createXASession();
@@ -179,7 +184,7 @@
conn1.close();
- conn1 = cf.createXAConnection();
+ conn1 = xacf.createXAConnection();
XAResource res = conn1.createXASession().getXAResource();
@@ -226,7 +231,7 @@
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
tm.begin();
@@ -284,7 +289,7 @@
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
tm.begin();
@@ -354,7 +359,7 @@
Connection conn2 = null;
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
tm.begin();
@@ -407,7 +412,7 @@
Connection conn2 = null;
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
tm.begin();
@@ -476,7 +481,7 @@
Connection conn2 = null;
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
tm.begin();
@@ -543,7 +548,7 @@
m = sessProducer.createTextMessage("XATest2");
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -620,7 +625,7 @@
m = sessProducer.createTextMessage("XATest2");
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -700,7 +705,7 @@
m = sessProducer.createTextMessage("XATest2");
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -782,7 +787,7 @@
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -857,7 +862,7 @@
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
tm.begin();
@@ -912,7 +917,7 @@
Connection conn2 = null;
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
tm.begin();
@@ -970,7 +975,7 @@
m = sessProducer.createTextMessage("XATest2");
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -1040,7 +1045,7 @@
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -1125,7 +1130,7 @@
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -1200,7 +1205,7 @@
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -1284,7 +1289,7 @@
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -1444,7 +1449,7 @@
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -1608,7 +1613,7 @@
m = sessProducer.createTextMessage("jellyfish4");
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -1728,7 +1733,7 @@
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -1797,7 +1802,7 @@
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -1870,7 +1875,7 @@
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -1932,7 +1937,7 @@
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
conn.start();
tm.begin();
@@ -2004,7 +2009,7 @@
m = sessProducer.createTextMessage("jellyfish2");
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
//Create a session
XASession sess1 = conn.createXASession();
@@ -2093,7 +2098,7 @@
m = sessProducer.createTextMessage("jellyfish2");
prod.send(m);
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
//Create a session
XASession sess1 = conn.createXASession();
@@ -2186,7 +2191,7 @@
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
//Create a session
XASession sess1 = conn.createXASession();
@@ -2268,7 +2273,7 @@
try
{
- conn = cf.createXAConnection();
+ conn = xacf.createXAConnection();
//Create a session
XASession sess1 = conn.createXASession();
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/ObjectMessageDeliveryTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/ObjectMessageDeliveryTest.java 2009-03-06 13:18:00 UTC (rev 6017)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/ObjectMessageDeliveryTest.java 2009-03-06 13:32:05 UTC (rev 6018)
@@ -66,7 +66,7 @@
*/
public void testTopic() throws Exception
{
- TopicConnection conn = getConnectionFactory().createTopicConnection();
+ TopicConnection conn = getTopicConnectionFactory().createTopicConnection();
try
{
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2009-03-06 13:18:00 UTC (rev 6017)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2009-03-06 13:32:05 UTC (rev 6018)
@@ -44,8 +44,6 @@
import javax.management.NotificationListener;
import javax.management.ObjectName;
import javax.naming.InitialContext;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import org.jboss.kernel.spi.deployment.KernelDeployment;
@@ -53,14 +51,17 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.management.ObjectNames;
+import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.BindingType;
+import org.jboss.messaging.core.remoting.server.RemotingService;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.settings.impl.AddressSettings;
import org.jboss.messaging.integration.bootstrap.JBMBootstrapServer;
-import org.jboss.messaging.jms.JBossDestination;
+import org.jboss.messaging.jms.JBossQueue;
+import org.jboss.messaging.jms.JBossTopic;
import org.jboss.messaging.jms.server.JMSServerManager;
import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
import org.jboss.messaging.jms.server.management.SubscriptionInfo;
@@ -70,7 +71,6 @@
import org.jboss.test.messaging.tools.ConfigurationHelper;
import org.jboss.test.messaging.tools.ServerManagement;
import org.jboss.test.messaging.tools.jboss.MBeanConfigurationElement;
-import org.jboss.tm.TransactionManagerLocator;
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
@@ -182,91 +182,6 @@
return directory.delete();
}
- protected void deleteAllData() throws Exception
- {
- log.info("DELETING ALL DATA FROM DATABASE!");
-
- InitialContext ctx = getInitialContext();
-
- // We need to execute each drop in its own transaction otherwise postgresql will not execute
- // further commands after one fails
-
- TransactionManager mgr = TransactionManagerLocator.locateTransactionManager();
- DataSource ds = (DataSource)ctx.lookup("java:/DefaultDS");
-
- javax.transaction.Transaction txOld = mgr.suspend();
-
- executeStatement(mgr, ds, "DELETE FROM JBM_POSTOFFICE");
-
- executeStatement(mgr, ds, "DELETE FROM JBM_MSG_REF");
-
- executeStatement(mgr, ds, "DELETE FROM JBM_MSG");
-
- executeStatement(mgr, ds, "DELETE FROM JBM_TX");
-
- executeStatement(mgr, ds, "DELETE FROM JBM_COUNTER");
-
- executeStatement(mgr, ds, "DELETE FROM JBM_USER");
-
- executeStatement(mgr, ds, "DELETE FROM JBM_ROLE");
-
- if (txOld != null)
- {
- mgr.resume(txOld);
- }
-
- log.debug("done with the deleting data");
- }
-
- private void executeStatement(TransactionManager mgr, DataSource ds, String statement) throws Exception
- {
- Connection conn = null;
- boolean exception = false;
-
- try
- {
- try
- {
- mgr.begin();
-
- conn = ds.getConnection();
-
- log.debug("executing " + statement);
-
- PreparedStatement ps = conn.prepareStatement(statement);
-
- ps.executeUpdate();
-
- log.debug(statement + " executed");
-
- ps.close();
- }
- catch (SQLException e)
- {
- // Ignore
- log.debug("Failed to execute statement", e);
- exception = true;
- }
- }
- finally
- {
- if (conn != null)
- {
- conn.close();
- }
-
- if (exception)
- {
- mgr.rollback();
- }
- else
- {
- mgr.commit();
- }
- }
-
- }
-
public synchronized boolean stop() throws Exception
{
bootstrap.shutDown();
@@ -652,20 +567,6 @@
return (JMSServerManager)bootstrap.getKernel().getRegistry().getEntry("JMSServerManager").getTarget();
}
- public void addAddressSettings(String name, long redeliveryDelay)
- {
- AddressSettings qs = getMessagingServer().getAddressSettingsRepository().getMatch("*");
- AddressSettings newSets = new AddressSettings();
- newSets.setRedeliveryDelay(redeliveryDelay);
- newSets.merge(qs);
- getMessagingServer().getAddressSettingsRepository().addMatch(name, newSets);
- }
-
- public void removeAddressSettings(String name)
- {
- getMessagingServer().getAddressSettingsRepository().removeMatch(name);
- }
-
public InitialContext getInitialContext() throws Exception
{
Properties props = new Properties();
@@ -711,10 +612,15 @@
return -1;
}
}
-
- public void removeAllMessages(JBossDestination destination) throws Exception
+
+ public void removeAllMessages(String destination, boolean isQueue) throws Exception
{
- Binding binding = getMessagingServer().getPostOffice().getBinding(destination.getSimpleAddress());
+ SimpleString address = JBossQueue.createAddressFromName(destination);
+ if (!isQueue)
+ {
+ address = JBossTopic.createAddressFromName(destination);
+ }
+ Binding binding = getMessagingServer().getPostOffice().getBinding(address);
if (binding != null && binding.getType() == BindingType.LOCAL_QUEUE)
{
((Queue)binding.getBindable()).deleteAllReferences();
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2009-03-06 13:18:00 UTC (rev 6017)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2009-03-06 13:32:05 UTC (rev 6018)
@@ -44,7 +44,6 @@
import org.jboss.messaging.core.management.ObjectNames;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.server.MessagingServer;
-import org.jboss.messaging.jms.JBossDestination;
import org.jboss.messaging.jms.server.JMSServerManager;
import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
import org.jboss.messaging.jms.server.management.SubscriptionInfo;
@@ -458,9 +457,9 @@
return server.getJMSServerManager();
}
- public void removeAllMessages(JBossDestination destination) throws Exception
+ public void removeAllMessages(String destination, boolean isQueue) throws Exception
{
- server.removeAllMessages(destination);
+ server.removeAllMessages(destination, isQueue);
}
public Integer getMessageCountForQueue(String queueName) throws Exception
@@ -491,16 +490,6 @@
server.setSecurityConfig(defConfig);
}
- public void addAddressSettings(String name, long redeliveryDelay)
- {
- server.addAddressSettings(name, redeliveryDelay);
- }
-
- public void removeAddressSettings(String name)
- {
- server.removeAddressSettings(name);
- }
-
public InitialContext getInitialContext() throws Exception
{
Hashtable env = new Hashtable();
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java 2009-03-06 13:18:00 UTC (rev 6017)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java 2009-03-06 13:32:05 UTC (rev 6018)
@@ -256,7 +256,7 @@
InitialContext getInitialContext() throws Exception;
- void removeAllMessages(JBossDestination destination) throws Exception;
+ void removeAllMessages(String destination, boolean isQueue) throws Exception;
Integer getMessageCountForQueue(String queueName) throws Exception;
@@ -270,8 +270,4 @@
//void setDefaultRedeliveryDelay(long delay) throws Exception;
JMSServerManager getJMSServerManager() throws Exception;
-
- void addAddressSettings(String name, long redeliveryDelay);
-
- void removeAddressSettings(String name);
}
More information about the jboss-cvs-commits
mailing list