[jboss-cvs] JBossAS SVN: r86933 - branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test.

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

Author: emuckenhuber
Date: 2009-04-07 11:46:31 -0400 (Tue, 07 Apr 2009)
New Revision: 86933

Modified:
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java
Log:
re-enable tests and close session

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java	2009-04-07 15:42:25 UTC (rev 86932)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java	2009-04-07 15:46:31 UTC (rev 86933)
@@ -99,19 +99,19 @@
    {
       TestSuite suite = new TestSuite();
 
-//      suite.addTest(new JmsDestinationUnitTestCase("testQueueTemplate"));
-//      suite.addTest(new JmsDestinationUnitTestCase("testTopicTemplate"));
-//      suite.addTest(new JmsDestinationUnitTestCase("testDLQ"));
-//      suite.addTest(new JmsDestinationUnitTestCase("testCreateQueue"));
-//      suite.addTest(new JmsDestinationUnitTestCase("testQueueMetrics"));
-//      suite.addTest(new JmsDestinationUnitTestCase("testQueueOperations"));
-//      suite.addTest(new JmsDestinationUnitTestCase("testRemoveQueue"));
+      suite.addTest(new JmsDestinationUnitTestCase("testQueueTemplate"));
+      suite.addTest(new JmsDestinationUnitTestCase("testTopicTemplate"));
+      suite.addTest(new JmsDestinationUnitTestCase("testDLQ"));
+      suite.addTest(new JmsDestinationUnitTestCase("testCreateQueue"));
+      suite.addTest(new JmsDestinationUnitTestCase("testQueueMetrics"));
+      suite.addTest(new JmsDestinationUnitTestCase("testQueueOperations"));
+      suite.addTest(new JmsDestinationUnitTestCase("testRemoveQueue"));
       suite.addTest(new JmsDestinationUnitTestCase("testCreateTopic"));
       suite.addTest(new JmsDestinationUnitTestCase("testTopicMetrics"));
       suite.addTest(new JmsDestinationUnitTestCase("testTopicOperations"));
       suite.addTest(new JmsDestinationUnitTestCase("testRemoveTopic"));
-//      suite.addTest(new JmsDestinationUnitTestCase("testCreateSecureQueue"));
-//      suite.addTest(new JmsDestinationUnitTestCase("testRemoveSecureQueue"));
+      suite.addTest(new JmsDestinationUnitTestCase("testCreateSecureQueue"));
+      suite.addTest(new JmsDestinationUnitTestCase("testRemoveSecureQueue"));
 
       return suite;
    }  
@@ -320,29 +320,35 @@
       session.createSubscriber(topic);
       
       TopicPublisher pub = session.createPublisher(topic);
-      
-      for(int i = 0; i < 10; i++)
-         pub.send(session.createTextMessage("Message nr " + i));
-      
-      SimpleValue nondurable = (SimpleValue)component.getProperty("nonDurableSubscriptionsCount").getValue();
-      SimpleValue durable = (SimpleValue)component.getProperty("durableSubscriptionsCount").getValue();
-      SimpleValue all = (SimpleValue)component.getProperty("allSubscriptionsCount").getValue();
-      SimpleValue allMessageCount = (SimpleValue)component.getProperty("allMessageCount").getValue();
-      
-      CollectionValue messageCounters = (CollectionValue) component.getProperty("messageCounters").getValue();
-      assertNotNull(messageCounters);
-      
-      assertEquals(1, nondurable.getValue());
-      assertEquals(0, durable.getValue());
-      assertEquals(1, all.getValue());
-      assertEquals(10, allMessageCount.getValue());
-
-      CompositeValue messageCounter = (CompositeValue) messageCounters.iterator().next();
-      assertNotNull(messageCounter);
-      
-      SimpleValue count = (SimpleValue) messageCounter.get("messageCount");
-      assertEquals(count, allMessageCount);
-      
+      try
+      {
+         for(int i = 0; i < 10; i++)
+            pub.send(session.createTextMessage("Message nr " + i));
+         
+         SimpleValue nondurable = (SimpleValue)component.getProperty("nonDurableSubscriptionsCount").getValue();
+         SimpleValue durable = (SimpleValue)component.getProperty("durableSubscriptionsCount").getValue();
+         SimpleValue all = (SimpleValue)component.getProperty("allSubscriptionsCount").getValue();
+         SimpleValue allMessageCount = (SimpleValue)component.getProperty("allMessageCount").getValue();
+         
+         CollectionValue messageCounters = (CollectionValue) component.getProperty("messageCounters").getValue();
+         assertNotNull(messageCounters);
+         
+         assertEquals(1, nondurable.getValue());
+         assertEquals(0, durable.getValue());
+         assertEquals(1, all.getValue());
+         assertEquals(10, allMessageCount.getValue());
+   
+         CompositeValue messageCounter = (CompositeValue) messageCounters.iterator().next();
+         assertNotNull(messageCounter);
+         
+         SimpleValue count = (SimpleValue) messageCounter.get("messageCount");
+         assertEquals(count, allMessageCount);
+      }
+      finally
+      {
+         pub.close();
+         session.close();
+      }
    }
 
    public void testTopicOperations() throws Exception