[jboss-cvs] JBossAS SVN: r101854 - projects/test/trunk/src/main/java/org/jboss/test/jms.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-03-04 10:47:51 -0500 (Thu, 04 Mar 2010)
New Revision: 101854

Modified:
   projects/test/trunk/src/main/java/org/jboss/test/jms/HornetQTestAdmin.java
   projects/test/trunk/src/main/java/org/jboss/test/jms/JMSTestAdmin.java
Log:
tweaks

Modified: projects/test/trunk/src/main/java/org/jboss/test/jms/HornetQTestAdmin.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/jms/HornetQTestAdmin.java	2010-03-04 15:47:43 UTC (rev 101853)
+++ projects/test/trunk/src/main/java/org/jboss/test/jms/HornetQTestAdmin.java	2010-03-04 15:47:51 UTC (rev 101854)
@@ -60,7 +60,8 @@
 
    public void createQueue(String name, TestRole... securityConfig) throws Exception
    {
-      createQueue(name, new String[] {"/queue/" + name, name}, securityConfig);
+      createQueue(name, new String[]
+      { "/queue/" + name, name }, securityConfig);
    }
 
    private void addRoles(String address, TestRole[] securityConf) throws Exception
@@ -68,9 +69,10 @@
 
       if (securityConf == null || securityConf.length == 0)
       {
-         securityConf = new TestRole[]{ new TestRole("guest", true, true, true) };
+         securityConf = new TestRole[]
+         { new TestRole("guest", true, true, true) };
       }
-      
+
       String sendRoles = "";
       String consumeRoles = "";
       String createDurableQueueRoles = "";
@@ -78,51 +80,50 @@
       String createTempQueueRoles = "";
       String deleteTempQueueRoles = "";
       String manageRoles = "";
-      
+
       for (TestRole role : securityConf)
       {
          if (role.isSend())
          {
             sendRoles += sendRoles.isEmpty() ? role.getName() : "," + role.getName();
          }
-         
+
          if (role.isConsume())
          {
             consumeRoles += consumeRoles.isEmpty() ? role.getName() : "," + role.getName();
          }
-         
+
          if (role.isCreateDurableQueue())
          {
             createDurableQueueRoles += createDurableQueueRoles.isEmpty() ? role.getName() : "," + role.getName();
          }
-         
+
          if (role.isDeleteDurableQueue())
          {
             deleteDurableQueueRoles += deleteDurableQueueRoles.isEmpty() ? role.getName() : "," + role.getName();
          }
-         
+
          if (role.isCreateNonDurableQueue())
          {
             createTempQueueRoles += createTempQueueRoles.isEmpty() ? role.getName() : "," + role.getName();
          }
-         
+
          if (role.isDeleteNonDurableQueue())
          {
             deleteTempQueueRoles += deleteTempQueueRoles.isEmpty() ? role.getName() : "," + role.getName();
          }
-         
+
          if (role.isManage())
          {
             manageRoles += manageRoles.isEmpty() ? role.getName() : "," + role.getName();
          }
       }
-      
-      jmx.invoke(hornetQCoreServerName, "addSecuritySettings", new Object[]{address, sendRoles, consumeRoles, createDurableQueueRoles,
-                                                         deleteDurableQueueRoles, createTempQueueRoles, deleteTempQueueRoles,
-                                                         manageRoles}, new String[]{String.class.getName(), 
-                                                         String.class.getName(), String.class.getName(), 
-                                                         String.class.getName(), String.class.getName(), 
-                                                         String.class.getName(), String.class.getName(), String.class.getName()});
+
+      jmx.invoke(hornetQCoreServerName, "addSecuritySettings", new Object[]
+      { address, sendRoles, consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, createTempQueueRoles,
+            deleteTempQueueRoles, manageRoles }, new String[]
+      { String.class.getName(), String.class.getName(), String.class.getName(), String.class.getName(), String.class.getName(),
+            String.class.getName(), String.class.getName(), String.class.getName() });
    }
 
    /**
@@ -135,8 +136,7 @@
       if (isTopic)
       {
          address = "jms.topic." + address;
-      }
-      else
+      } else
       {
          address = "jms.queue." + address;
       }
@@ -146,14 +146,14 @@
    private void resetRoles(boolean isTopic, String address) throws Exception
    {
       jmx.invoke(hornetQCoreServerName, "removeSecuritySettings", new Object[]
-      {address}, new String[]
-      {String.class.getName()});
+      { address }, new String[]
+      { String.class.getName() });
 
    }
 
    public void createQueue(String name, String[] jndiArray, TestRole... securityConfig) throws Exception
    {
-      for (String jndi: jndiArray)
+      for (String jndi : jndiArray)
       {
          jmx.invoke(hornetQJMSServerName, "createQueue", new Object[]
          { name, jndi }, new String[]
@@ -167,12 +167,13 @@
 
    public void createTopic(String name, TestRole... securityConfig) throws Exception
    {
-      createTopic(name, new String[]{"/topic/" + name, name}, securityConfig);
+      createTopic(name, new String[]
+      { "/topic/" + name, name }, securityConfig);
    }
 
    public void createTopic(String name, String[] jndiArray, TestRole... securityConfig) throws Exception
    {
-      for (String jndi: jndiArray)
+      for (String jndi : jndiArray)
       {
          jmx.invoke(hornetQJMSServerName, "createTopic", new Object[]
          { name, jndi }, new String[]
@@ -212,6 +213,26 @@
       }
    }
 
+   public void destroyEveryDestination() throws Exception
+   {
+      String[] queues = (String[]) jmx.getAttribute(hornetQJMSServerName, "QueueNames");
+      
+      for (String queue : queues)
+      {
+         if (!queue.equals("DLQ") && !queue.equals("ExpiryQueue"))
+         {
+            deleteQueue(queue);
+         }
+      }
+
+      String[] topics = (String[]) jmx.getAttribute(hornetQJMSServerName, "TopicNames");
+      
+      for (String topic : topics)
+      {
+         deleteTopic(topic);
+      }
+   }
+
    @Override
    public void destroyCreatedDestinations() throws Exception
    {

Modified: projects/test/trunk/src/main/java/org/jboss/test/jms/JMSTestAdmin.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/jms/JMSTestAdmin.java	2010-03-04 15:47:43 UTC (rev 101853)
+++ projects/test/trunk/src/main/java/org/jboss/test/jms/JMSTestAdmin.java	2010-03-04 15:47:51 UTC (rev 101854)
@@ -83,6 +83,8 @@
 	
 	public abstract void destroyCreatedDestinations() throws Exception;
 	
+	public abstract void destroyEveryDestination() throws Exception;
+	
 	public abstract ObjectName createQueueJMXName(String queueName);
 	
 	public abstract ObjectName createTopicJMXName(String queueName);