[jboss-cvs] JBossAS SVN: r99967 - in branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging: test and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2010-01-26 19:33:06 -0500 (Tue, 26 Jan 2010)
New Revision: 99967

Modified:
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JBossJMSTestCase.java
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
Log:
changes

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JBossJMSTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JBossJMSTestCase.java	2010-01-27 00:13:53 UTC (rev 99966)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JBossJMSTestCase.java	2010-01-27 00:33:06 UTC (rev 99967)
@@ -128,6 +128,7 @@
    {
       deployTopic("securedTopic", null);
       deployTopic("testDurableTopic", null);
+      deployTopic("testTopic", null);
 
       deployQueue("testQueue", null);
       deployQueue("A", null);

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java	2010-01-27 00:13:53 UTC (rev 99966)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java	2010-01-27 00:33:06 UTC (rev 99967)
@@ -70,9 +70,9 @@
    static String TEST_DURABLE_TOPIC = "/topic/testDurableTopic";
 
    //JMSProviderAdapter providerAdapter;
-   static Context context;
-   static Connection queueConnection;
-   static Connection topicConnection;
+   private Context context;
+   private Connection queueConnection;
+   private Connection topicConnection;
 
    public void setUp() throws Exception
    {
@@ -89,7 +89,7 @@
    protected void tearDown() throws Exception
    {
 	   super.tearDown();
-	   drainQueue();
+	   //drainQueue();
 	   disconnect();
 	   
    }
@@ -131,7 +131,7 @@
 
       ConnectionFactory topicFactory = (ConnectionFactory) context.lookup(TOPIC_FACTORY);
       topicConnection = topicFactory.createConnection();
-      getLog().debug("Connection to JBossMQ established.");
+
    }
 
    protected void disconnect() throws Exception
@@ -147,6 +147,13 @@
 	      topicConnection.close();
 	      topicConnection = null;
 	  }
+	   
+	  if (context != null)
+	  {
+        context.close();
+	  }
+     context = null;
+
    }
 
    /**
@@ -471,8 +478,8 @@
       connect();
 
       Session session = queueConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-      Queue jndiQueue = (Queue) getInitialContext().lookup("queue/testQueue");
+      
+      Queue jndiQueue = (Queue) context.lookup("/queue/testQueue");
       Queue createQueue = session.createQueue(jndiQueue.getQueueName());
       assertTrue("Failed for " + QUEUE_FACTORY, jndiQueue.equals(createQueue));