[jboss-cvs] JBoss Messaging SVN: r5361 - in trunk: src/main/org/jboss/messaging/core/server/impl and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 14 06:41:44 EST 2008
Author: jmesnil
Date: 2008-11-14 06:41:43 -0500 (Fri, 14 Nov 2008)
New Revision: 5361
Added:
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/NullInitialContext.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java
Modified:
trunk/src/main/org/jboss/messaging/core/server/MessagingServer.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServiceImpl.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
Log:
added integration tests for TopicControl
Modified: trunk/src/main/org/jboss/messaging/core/server/MessagingServer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/MessagingServer.java 2008-11-14 03:38:04 UTC (rev 5360)
+++ trunk/src/main/org/jboss/messaging/core/server/MessagingServer.java 2008-11-14 11:41:43 UTC (rev 5361)
@@ -27,6 +27,7 @@
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.core.settings.impl.QueueSettings;
+import org.jboss.messaging.core.transaction.ResourceManager;
import org.jboss.messaging.core.version.Version;
/**
@@ -100,4 +101,6 @@
PostOffice getPostOffice();
RemotingConnection getReplicatingConnection();
+
+ ResourceManager getResourceManager();
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-11-14 03:38:04 UTC (rev 5360)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-11-14 11:41:43 UTC (rev 5361)
@@ -403,6 +403,11 @@
return queueSettingsRepository;
}
+ public ResourceManager getResourceManager()
+ {
+ return resourceManager;
+ }
+
public Version getVersion()
{
return version;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServiceImpl.java 2008-11-14 03:38:04 UTC (rev 5360)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServiceImpl.java 2008-11-14 11:41:43 UTC (rev 5361)
@@ -61,7 +61,7 @@
JBMSecurityManager securityManager = new JBMSecurityManagerImpl(true);
- ManagementService managementService = new ManagementServiceImpl(ManagementFactory.getPlatformMBeanServer(), false);
+ ManagementService managementService = new ManagementServiceImpl(ManagementFactory.getPlatformMBeanServer(), config.isJMXManagementEnabled());
MessagingServer server = new MessagingServerImpl();
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-11-14 03:38:04 UTC (rev 5360)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2008-11-14 11:41:43 UTC (rev 5361)
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Map;
+import javax.management.NotificationBroadcasterSupport;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -34,9 +35,12 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.management.MessagingServerControlMBean;
+import org.jboss.messaging.core.management.impl.MessagingServerControl;
+import org.jboss.messaging.core.messagecounter.impl.MessageCounterManagerImpl;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
+import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.jms.JBossQueue;
@@ -44,6 +48,7 @@
import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.messaging.jms.server.JMSServerManager;
import org.jboss.messaging.jms.server.management.JMSManagementService;
+import org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl;
import org.jboss.messaging.util.JNDIUtil;
/**
@@ -78,6 +83,15 @@
private final JMSManagementService managementService;
+ public static JMSServerManagerImpl newJMSServerManagerImpl(MessagingServer server) throws Exception
+ {
+ MessagingServerControlMBean control = new MessagingServerControl(server.getPostOffice(), server.getStorageManager(), server.getConfiguration(),
+ server.getQueueSettingsRepository(), server.getResourceManager(), server, new MessageCounterManagerImpl(1000), new NotificationBroadcasterSupport());
+ JMSManagementService jmsManagementService = new JMSManagementServiceImpl(server.getManagementService());
+ return new JMSServerManagerImpl(control, server.getPostOffice(), server.getStorageManager(),
+ server.getQueueSettingsRepository(), jmsManagementService);
+ }
+
public JMSServerManagerImpl(final MessagingServerControlMBean server,
final PostOffice postOffice,
final StorageManager storageManager,
@@ -148,7 +162,7 @@
managementService.registerTopic(jBossTopic, jndiBinding, postOffice, storageManager);
return added;
}
-
+
public boolean undeployDestination(String name) throws Exception
{
List<String> jndiBindings = destinations.get(name);
Added: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/NullInitialContext.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/NullInitialContext.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/NullInitialContext.java 2008-11-14 11:41:43 UTC (rev 5361)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * 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.messaging.tests.integration.jms.management;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * A NullInitialContext
+ *
+ * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ * Created 14 nov. 2008 11:06:03
+ *
+ *
+ */
+public class NullInitialContext extends InitialContext
+{
+
+ public NullInitialContext() throws NamingException
+ {
+ super();
+ }
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // InitialContext overrides --------------------------------------
+
+ @Override
+ public void rebind(String name, Object obj) throws NamingException
+ {
+ // do nothing
+ }
+
+ // Public --------------------------------------------------------
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
Added: trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/management/TopicControlTest.java 2008-11-14 11:41:43 UTC (rev 5361)
@@ -0,0 +1,213 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * 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.messaging.tests.integration.jms.management;
+
+import static org.jboss.messaging.tests.util.RandomUtil.randomString;
+
+import java.lang.management.ManagementFactory;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Session;
+import javax.jms.Topic;
+import javax.management.MBeanServerInvocationHandler;
+
+import junit.framework.TestCase;
+
+import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
+import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
+import org.jboss.messaging.jms.JBossTopic;
+import org.jboss.messaging.jms.client.JBossConnectionFactory;
+import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
+import org.jboss.messaging.jms.server.management.TopicControlMBean;
+import org.jboss.messaging.jms.server.management.impl.JMSManagementServiceImpl;
+
+/**
+ * A TopicControlTest
+ *
+ * @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ * Created 13 nov. 2008 16:50:53
+ *
+ *
+ */
+public class TopicControlTest extends TestCase
+{
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private MessagingService service;
+
+ private JMSServerManagerImpl serverManager;
+
+ private String clientID;
+
+ private String subscriptionName;
+
+ private Topic topic;
+
+ // Static --------------------------------------------------------
+
+ private static void assertDurableSubscriptions(Topic topic, int expectedCount) throws Exception
+ {
+ TopicControlMBean topicControl = createTopicControl(topic);
+ assertEquals(expectedCount, topicControl.getDurableSubcriptionsCount());
+ }
+
+ private static TopicControlMBean createTopicControl(Topic topic) throws Exception
+ {
+ TopicControlMBean topicControl = (TopicControlMBean)MBeanServerInvocationHandler.newProxyInstance(ManagementFactory.getPlatformMBeanServer(),
+ JMSManagementServiceImpl.getJMSTopicObjectName(topic.getTopicName()),
+ TopicControlMBean.class,
+ false);
+ return topicControl;
+ }
+
+ // Constructors --------------------------------------------------
+
+ public TopicControlTest(String name)
+ {
+ super(name);
+ }
+
+ // Public --------------------------------------------------------
+
+ public void testDropDurableSubscriptionWithExistingSubscription() throws Exception
+ {
+ createDurableSubscriber(topic, clientID, subscriptionName);
+
+ assertDurableSubscriptions(topic, 1);
+
+ TopicControlMBean topicControl = createTopicControl(topic);
+ topicControl.dropDurableSubscription(clientID, subscriptionName);
+
+ assertDurableSubscriptions(topic, 0);
+ }
+
+ public void testDropDurableSubscriptionWithUnknownSubscription() throws Exception
+ {
+ createDurableSubscriber(topic, clientID, subscriptionName);
+
+ assertDurableSubscriptions(topic, 1);
+
+ TopicControlMBean topicControl = createTopicControl(topic);
+ try
+ {
+ topicControl.dropDurableSubscription(clientID, "this subscription does not exist");
+ fail("should throw an exception");
+ }
+ catch (Exception e)
+ {
+
+ }
+
+ assertDurableSubscriptions(topic, 1);
+ }
+
+ public void testDropAllSubscriptions() throws Exception
+ {
+ createDurableSubscriber(topic, clientID, subscriptionName);
+ createDurableSubscriber(topic, clientID, subscriptionName + "2");
+
+ assertDurableSubscriptions(topic, 2);
+
+ TopicControlMBean topicControl = createTopicControl(topic);
+ topicControl.dropAllSubscriptions();
+
+ assertDurableSubscriptions(topic, 0);
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ @Override
+ protected void setUp() throws Exception
+ {
+
+ Configuration conf = new ConfigurationImpl();
+ conf.setSecurityEnabled(false);
+ conf.setJMXManagementEnabled(true);
+ conf.getAcceptorConfigurations()
+ .add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory"));
+ service = MessagingServiceImpl.newNullStorageMessagingServer(conf);
+ service.start();
+
+ serverManager = JMSServerManagerImpl.newJMSServerManagerImpl(service.getServer());
+ serverManager.start();
+ serverManager.setInitialContext(new NullInitialContext());
+
+ clientID = randomString();
+ subscriptionName = randomString();
+
+ String topicName = randomString();
+ serverManager.createTopic(topicName, topicName);
+ topic = new JBossTopic(topicName);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ service.stop();
+
+ super.tearDown();
+ }
+
+ // Private -------------------------------------------------------
+
+ private void createDurableSubscriber(Topic topic, String clientID, String subscriptionName) throws JMSException
+ {
+ JBossConnectionFactory cf = new JBossConnectionFactory(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"),
+ null,
+ ClientSessionFactoryImpl.DEFAULT_PING_PERIOD,
+ ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT,
+ null,
+ ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE,
+ ClientSessionFactoryImpl.DEFAULT_SEND_WINDOW_SIZE,
+ ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
+ ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_PERSISTENT_SEND,
+ true,
+ ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP,
+ ClientSessionFactoryImpl.DEFAULT_MAX_CONNECTIONS);
+
+ Connection conn = cf.createConnection();
+
+ conn.setClientID(clientID);
+ Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ s.createDurableSubscriber(topic, subscriptionName);
+ }
+
+ // Inner classes -------------------------------------------------
+
+}
More information about the jboss-cvs-commits
mailing list