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

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

Author: alex.loubyansky at jboss.com
Date: 2010-03-16 19:12:02 -0400 (Tue, 16 Mar 2010)
New Revision: 102490

Modified:
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java
Log:
adde a test for existence of the DLQ and messageCount

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java	2010-03-16 22:04:46 UTC (rev 102489)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java	2010-03-16 23:12:02 UTC (rev 102490)
@@ -113,9 +113,9 @@
 
       suite.addTest(new JmsDestinationUnitTestCase("testQueueTemplate"));
       suite.addTest(new JmsDestinationUnitTestCase("testTopicTemplate"));
-//      suite.addTest(new JmsDestinationUnitTestCase("testDLQ"));
+      suite.addTest(new JmsDestinationUnitTestCase("testDLQ"));
       suite.addTest(new JmsDestinationUnitTestCase("testCreateQueue"));
-//      suite.addTest(new JmsDestinationUnitTestCase("testQueueMetrics"));
+      suite.addTest(new JmsDestinationUnitTestCase("testQueueMetrics"));
 //      suite.addTest(new JmsDestinationUnitTestCase("testQueueOperations"));
 //      suite.addTest(new JmsDestinationUnitTestCase("testQueueRestart"));
       suite.addTest(new JmsDestinationUnitTestCase("testRemoveQueue"));
@@ -163,14 +163,20 @@
    public void testDLQ() throws Exception
    {
       ManagementView mgtView = getManagementView();
-      ManagedComponent queue = mgtView.getComponent("/queue/DLQ", QueueType);
+      ManagedComponent queue = mgtView.getComponent("DLQ", QueueType);
       assertNotNull(queue);
-      assertEquals("/queue/DLQ", queue.getName());
+      assertEquals("DLQ", queue.getName());
       // Validate some of the expected properties
-      ManagedProperty serverPeer = queue.getProperty("serverPeer");
-      assertNotNull(serverPeer);
-      MetaType serverPeerType = serverPeer.getMetaType();
-      assertEquals(SimpleMetaType.STRING, serverPeerType);
+      ManagedProperty bindings = queue.getProperty("bindings");
+      assertNotNull(bindings);
+      assertEquals(ArrayMetaType.getArrayType(SimpleMetaType.STRING), bindings.getMetaType());
+      Object o = bindings.getValue();
+      assertNotNull(o);
+      o = getMetaValueFactory().unwrap((MetaValue) o);
+      assertTrue(o.getClass().toString(), o instanceof String[]);
+      String[] entries = (String[]) o;
+      assertEquals(1, entries.length);
+      assertEquals("/queue/DLQ", entries[0]);
    }
 
    public void testCreateQueue() throws Exception
@@ -593,15 +599,15 @@
       // The message count property
       ManagedProperty messageCount = component.getProperty("messageCount");
       assertNotNull("messageCount", messageCount);
-      ManagedProperty messageCounter = component.getProperty("messageCounter");
-      assertNotNull("messageCounter", messageCounter);
+      //ManagedProperty messageCounter = component.getProperty("messageCounter");
+      //assertNotNull("messageCounter", messageCounter);
 
       // Clear any 
-      Set<ManagedOperation> ops = component.getOperations();
-      ManagedOperation removeAllMessages = ManagedOperationMatcher.findOperation(ops, "removeAllMessages");
-      assertNotNull("removeAllMessages", removeAllMessages);
-      removeAllMessages.invoke();
-      assertEquals(SimpleValueSupport.wrap(0), messageCount.getValue());
+//      Set<ManagedOperation> ops = component.getOperations();
+//      ManagedOperation removeAllMessages = ManagedOperationMatcher.findOperation(ops, "removeAllMessages");
+//      assertNotNull("removeAllMessages", removeAllMessages);
+//      removeAllMessages.invoke();
+//      assertEquals(SimpleValueSupport.wrap(0), messageCount.getValue());
 
       // Send a message
       Queue queue = (Queue) getInitialContext().lookup(jndiName);
@@ -616,42 +622,44 @@
       sender.send(s.createTextMessage("Hey!"));
 
       SimpleValue messageCount1 = (SimpleValue) messageCount.getValue();
-      assertTrue((Integer) (messageCount1).getValue() > 0);
-      CompositeValue messageCounterCV = (CompositeValue) messageCounter.getValue();
-      log.info(messageCounterCV);
-      assertEquals(messageCounterCV.get("messageCount"), messageCount1);
+      //assertTrue((Integer) (messageCount1).getValue() > 0);
+      assertEquals(1, messageCount1.getValue());
+      //CompositeValue messageCounterCV = (CompositeValue) messageCounter.getValue();
+      //log.info(messageCounterCV);
+      //assertEquals(messageCounterCV.get("messageCount"), messageCount1);
 
       // Message 2
       sender.send(s.createTextMessage("Message2"));
       
       SimpleValue messageCount2 = (SimpleValue) messageCount.getValue();
-      assertTrue(messageCount2.compareTo(messageCount1) > 0);
-      messageCounterCV = (CompositeValue) messageCounter.getValue();
-      assertEquals(messageCounterCV.get("messageCount"), messageCount2);
+      //assertTrue(messageCount2.compareTo(messageCount1) > 0);
+      assertEquals(2, messageCount2.getValue());
+      //messageCounterCV = (CompositeValue) messageCounter.getValue();
+      //assertEquals(messageCounterCV.get("messageCount"), messageCount2);
       
       //
-      ManagedOperation listAllMessages = ManagedOperationMatcher.findOperation(ops, "listAllMessages");
-      assertNotNull("listAllMessages", listAllMessages);
-      MetaValue msgs = listAllMessages.invoke();
-      assertNotNull(msgs);
-      log.info("listAllMessages.MV: "+msgs);
-      assertTrue("msgs is a CollectionValue", msgs instanceof CollectionValue);
-      CollectionValue msgsCV = (CollectionValue) msgs;
-      MetaValue[] msgsMVs = msgsCV.getElements();
-      assertTrue("listAllMessages length > 0", msgsMVs.length > 0);
-      for(MetaValue mv : msgsMVs)
-      {
-         assertTrue(mv instanceof CompositeValue);
-         CompositeValue cv = (CompositeValue) mv;
-         MetaValue JMSMessageID = cv.get("JMSMessageID");
-         log.info(JMSMessageID);
-         assertNotNull(JMSMessageID);
-         MetaValue JMSCorrelationID = cv.get("JMSCorrelationID");
-         log.info(JMSCorrelationID);
-         MetaValue JMSTimestamp = cv.get("JMSTimestamp");
-         log.info(JMSTimestamp);
-         assertNotNull(JMSTimestamp);
-      }
+//      ManagedOperation listAllMessages = ManagedOperationMatcher.findOperation(ops, "listAllMessages");
+//      assertNotNull("listAllMessages", listAllMessages);
+//      MetaValue msgs = listAllMessages.invoke();
+//      assertNotNull(msgs);
+//      log.info("listAllMessages.MV: "+msgs);
+//      assertTrue("msgs is a CollectionValue", msgs instanceof CollectionValue);
+//      CollectionValue msgsCV = (CollectionValue) msgs;
+//      MetaValue[] msgsMVs = msgsCV.getElements();
+//      assertTrue("listAllMessages length > 0", msgsMVs.length > 0);
+//      for(MetaValue mv : msgsMVs)
+//      {
+//         assertTrue(mv instanceof CompositeValue);
+//         CompositeValue cv = (CompositeValue) mv;
+//         MetaValue JMSMessageID = cv.get("JMSMessageID");
+//         log.info(JMSMessageID);
+//         assertNotNull(JMSMessageID);
+//         MetaValue JMSCorrelationID = cv.get("JMSCorrelationID");
+//         log.info(JMSCorrelationID);
+//         MetaValue JMSTimestamp = cv.get("JMSTimestamp");
+//         log.info(JMSTimestamp);
+//         assertNotNull(JMSTimestamp);
+//      }
       c.stop();
       c.close();
    }

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java	2010-03-16 22:04:46 UTC (rev 102489)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java	2010-03-16 23:12:02 UTC (rev 102490)
@@ -57,7 +57,7 @@
    public static void destroyEveryDestination() throws Exception
    {
       destroyDestinations();
-      JMSTestAdmin.getAdmin().destroyEveryDestination();
+      JMSTestAdmin.getAdmin().destroyCreatedDestinations();
    }