[jboss-cvs] JBossAS SVN: r101306 - in projects/test/trunk/src/main/java/org/jboss/test: jms and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2010-02-22 23:05:23 -0500 (Mon, 22 Feb 2010)
New Revision: 101306

Modified:
   projects/test/trunk/src/main/java/org/jboss/test/JBossJMSTestCase.java
   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:
Changing admin

Modified: projects/test/trunk/src/main/java/org/jboss/test/JBossJMSTestCase.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/JBossJMSTestCase.java	2010-02-23 04:03:47 UTC (rev 101305)
+++ projects/test/trunk/src/main/java/org/jboss/test/JBossJMSTestCase.java	2010-02-23 04:05:23 UTC (rev 101306)
@@ -72,7 +72,7 @@
    
    protected static void undeployDestinations() throws Exception
    {
-      JMSTestAdmin.getAdmin().undeployCreatedDestinations();
+      JMSTestAdmin.getAdmin().destroyCreatedDestinations();
    }
 
 
@@ -87,38 +87,7 @@
       JMSTestAdmin.getAdmin().deleteTopic(topic);
    }
    
-   /**
-    * Historically at jboss, lots of tests will use these destinations since JBoss 3. 
-    * This method is a tool to create the basic setting that most tests will use.  
-    * @throws Exception
-    */
-   protected static void setupBasicDestinations() throws Exception
-   {
-      deployTopic("securedTopic", new TestRole[]{
-            new TestRole("publisher", true, true, false)});
-      deployTopic("testTopic", new TestRole[]{
-            new TestRole("guest", true, true, true),
-            new TestRole("publisher", true, true, true),
-            new TestRole("durpublisher", true, true, true)});
-      deployTopic("testDurableTopic", new TestRole[]{
-            new TestRole("guest", true, true, true),
-            new TestRole("publisher", true, true, true),
-            new TestRole("durpublisher", true, true, true)});
 
-      deployQueue("testQueue", new TestRole[]{
-            new TestRole("guest", true, true, true),
-            new TestRole("publisher", true, true, true),
-            new TestRole("durpublisher", true, true, true)});
-      
-      deployQueue("A", new TestRole("guest", true, true, true));
-      deployQueue("B", new TestRole("guest", true, true, true));
-      deployQueue("C", new TestRole("guest", true, true, true));
-      deployQueue("D", new TestRole("guest", true, true, true));
-      deployQueue("ex", new TestRole("guest", true, true, true));
-   }
-
-
-
    /**
     * Create a JMS Queue.
     * 
@@ -165,7 +134,7 @@
     */
    public void createTopic(String name) throws Exception
    {
-      deployTopic(name, null);
+      deployTopic(name);
    }
 
    /**

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-02-23 04:03:47 UTC (rev 101305)
+++ projects/test/trunk/src/main/java/org/jboss/test/jms/HornetQTestAdmin.java	2010-02-23 04:05:23 UTC (rev 101306)
@@ -207,7 +207,7 @@
    }
 
    @Override
-   public void undeployCreatedDestinations() throws Exception
+   public void destroyCreatedDestinations() throws Exception
    {
       for (Map.Entry<String, TestRole[]> queue : deployedQueues.entrySet())
       {

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-02-23 04:03:47 UTC (rev 101305)
+++ projects/test/trunk/src/main/java/org/jboss/test/jms/JMSTestAdmin.java	2010-02-23 04:05:23 UTC (rev 101306)
@@ -81,7 +81,7 @@
 
    public abstract void deleteQueue(String queue) throws Exception;
 	
-	public abstract void undeployCreatedDestinations() throws Exception;
+	public abstract void destroyCreatedDestinations() throws Exception;
 	
 	public abstract ObjectName createQueueJMXName(String queueName);