[embjopr-commits] EMBJOPR SVN: r640 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: util and 1 other directory.

embjopr-commits at lists.jboss.org embjopr-commits at lists.jboss.org
Thu Jul 30 18:31:56 EDT 2009


Author: ozizka at redhat.com
Date: 2009-07-30 18:31:56 -0400 (Thu, 30 Jul 2009)
New Revision: 640

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
 * JMSOperationsTest updated.

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java	2009-07-30 21:19:20 UTC (rev 639)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java	2009-07-30 22:31:56 UTC (rev 640)
@@ -23,7 +23,6 @@
 package org.jboss.jopr.jsfunit.as5.jmsDestinations;
 
 import com.gargoylesoftware.htmlunit.html.*;
-import junit.framework.Test;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -46,7 +45,6 @@
 import javax.management.ObjectName;
 import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.ContentTable;
 import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.ContentTableRow;
-import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit;
 
 
 /**
@@ -65,7 +63,7 @@
      * after executing the "Remove All Messages" operation for a topic
      * when there are no messages.
      */
-    public void testRemoveAllMessagesAfterTopicCreation() throws Exception {
+    public void XtextRemoveAllMessagesAfterTopicCreation() throws Exception {
         String jndiName = "RemoveAllMessagesAfterTopicCreation"; 
 
         // Create the topic first
@@ -144,7 +142,7 @@
      * after executing the "Remove All Messages" operation for a queue
      * when there are no messages.
      */
-    public void testRemoveAllMessagesAfterQueueCreation() throws Exception {
+    public void XtextRemoveAllMessagesAfterQueueCreation() throws Exception {
 
         String jndiName = "RemoveAllMessagesMAfterQueueCreation"; 
 
@@ -231,7 +229,7 @@
      * after executing the "Reset Message Counter" operation for a queue
      * right after creation.
      */
-    public void testResetMessageCounterAfterQueueCreation() throws Exception {
+    public void XtextResetMessageCounterAfterQueueCreation() throws Exception {
         String jndiName = "ResetMessageCounterAfterQueueCreation"; 
 
         // Create the queue first
@@ -260,7 +258,7 @@
      * after executing the "Reset Message Counter" operation for a queue
      * when there are multiple messages in the queue.
      */
-    public void testQueueResetMessageCounterAfterMultipleMessages() throws Exception {
+    public void XtextQueueResetMessageCounterAfterMultipleMessages() throws Exception {
         String jndiName = "QueueResetMessageCounterAfterMultipleMessages"; 
 
         // Create the queue first
@@ -275,7 +273,7 @@
      * when there are multiple messages in the queue. Use a queue that 
      * already exists.
      */
-    public void testQueueResetMessageCounterAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
+    public void XtextQueueResetMessageCounterAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
         String jndiName = "ResetMessageCounterMultipleMessagesExistingQueue";
        
         expandNavTreeArrow(JMS_NAV_LABEL); 
@@ -315,7 +313,7 @@
      * executing the "Reset Message Counter History" operation for a queue
      * after creation.
      */
-    public void testResetMessageCounterHistoryAfterQueueCreation() throws Exception {
+    public void XtextResetMessageCounterHistoryAfterQueueCreation() throws Exception {
         String jndiName = "ResetMessageCounterHistoryAfterQueueCreation"; 
 
         // Create the queue first
@@ -344,7 +342,7 @@
      * executing the "Reset Message Counter History" operation for a queue
      * that has multiple messages.
      */
-    public void testQueueResetMessageCounterHistoryAfterMultipleMessages() throws Exception {
+    public void XtextQueueResetMessageCounterHistoryAfterMultipleMessages() throws Exception {
         String jndiName = "QueueResetMessageCounterHistoryAfterMultipleMessages"; 
 
         // Create the queue first
@@ -358,7 +356,7 @@
      * executing the "Reset Message Counter History" operation for a queue
      * that has multiple messages. Use a queue that already exists.
      */
-    public void testQueueResetMessageCounterHistoryAfterMultipleMessagesUsingExsitingServiceFile() throws Exception {
+    public void XtextQueueResetMessageCounterHistoryAfterMultipleMessagesUsingExsitingServiceFile() throws Exception {
         String jndiName = "ResetMessageCounterHistoryMultipleMessagesExistingQueue";
        
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -397,7 +395,7 @@
      * after the "List All Subscriptions" operation is invoked for
      * a topic right after creation.
      */
-    public void testListAllSubscriptionsAfterTopicCreation() throws Exception {
+    public void XtextListAllSubscriptionsAfterTopicCreation() throws Exception {
         String jndiName = "ListAllSubscriptionsAfterTopicCreation"; 
 
         // Create the topic first
@@ -427,7 +425,7 @@
      * the "List All Subscriptions" operation for a topic that has multiple subscribers.
      * Use a topic that already exists.
      */
-    public void testTopicListAllSubscriptionsAfterMultipleSubscribersUsingExistingServiceFile() throws Exception {
+    public void XtextTopicListAllSubscriptionsAfterMultipleSubscribersUsingExistingServiceFile() throws Exception {
         String jndiName = "ListAllSubscriptionsMultipleSubscribersExistingTopic"; 
 
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -459,7 +457,7 @@
      * after the "List Durable Subscriptions" operation is invoked for
      * a topic right after creation.
      */
-    public void testListDurableSubscriptionsAfterTopicCreation() throws Exception {
+    public void XtextListDurableSubscriptionsAfterTopicCreation() throws Exception {
         String jndiName = "ListDurableSubscriptionsAfterTopicCreation"; 
 
         // Create the topic first
@@ -474,7 +472,7 @@
      * the "List Durable Subscriptions" operation for a topic that has multiple 
      * durable subscribers.
      */
-    public void testTopicListDurableSubscriptionsAfterMultipleSubscribers() throws Exception {
+    public void XtextTopicListDurableSubscriptionsAfterMultipleSubscribers() throws Exception {
         String jndiName = "ListDurableSubscriptionsAfterMultipleSubscribers"; 
 
         // Create the topic first
@@ -489,7 +487,7 @@
      * the "List Durable Subscriptions" operation for a topic that has multiple 
      * durable subscribers. Use a topic that already exists.
      */
-    public void testTopicListDurableSubscriptionsAfterMultipleSubscribersUsingExistingServiceFile() throws Exception {
+    public void XtextTopicListDurableSubscriptionsAfterMultipleSubscribersUsingExistingServiceFile() throws Exception {
         String jndiName = "ListDurableSubscriptionsMultipleSubscribersExistingTopic"; 
 
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -514,7 +512,7 @@
      * after the "List Non Durable Subscriptions" operation is invoked for
      * a topic right after creation.
      */
-    public void testListNonDurableSubscriptionsAfterTopicCreation() throws Exception {
+    public void XtextListNonDurableSubscriptionsAfterTopicCreation() throws Exception {
         String jndiName = "ListNonDurableSubscriptionsAfterTopicCreation"; 
 
         // Create the topic first
@@ -529,7 +527,7 @@
      * the "List Non Durable Subscriptions" operation for a topic that has multiple 
      * non-durable subscribers.
      */
-    public void testTopicListNonDurableSubscriptionsAfterMultipleSubscribers() throws Exception {
+    public void XtextTopicListNonDurableSubscriptionsAfterMultipleSubscribers() throws Exception {
         String jndiName = "ListNonDurableSubscriptionsAfterMultipleSubscribers"; 
 
         // Create the topic first
@@ -544,7 +542,7 @@
      * the "List Non Durable Subscriptions" operation for a topic that has multiple 
      * non-durable subscribers. Use a topic that already exists.
      */
-    public void testTopicListNonDurableSubscriptionsAfterMultipleSubscribersUsingExistingServiceFile() throws Exception {
+    public void XtextTopicListNonDurableSubscriptionsAfterMultipleSubscribersUsingExistingServiceFile() throws Exception {
         String jndiName = "ListNonDurableSubscriptionsMultipleSubscribersExistingTopic"; 
 
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -570,7 +568,7 @@
      * operation for queues is executed successfully after creating
      * a new queue.
      */
-    public void testListMessageCounterAsHTMLAfterQueueCreation() throws Exception {
+    public void XtextListMessageCounterAsHTMLAfterQueueCreation() throws Exception {
         ArrayList<String> expectedValues = new ArrayList<String>();
         
         String jndiName = "ListMessageCounterAfterQueueCreation"; 
@@ -605,7 +603,7 @@
      * operation for queues returns the correct results when the queue has
      * multiple messages. 
      */
-    public void testListMessageCounterAsHTMLAfterMultipleMessagess() throws Exception {
+    public void XtextListMessageCounterAsHTMLAfterMultipleMessagess() throws Exception {
         String jndiName = "ListMessageCounterAfterMultipleMessages";
         
         // Create the queue first
@@ -620,7 +618,7 @@
      * operation for queues returns the correct results when the queue has
      * multiple messages. Use a queue that already exists.
      */
-    public void testListMessageCounterAsHTMLAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
+    public void XtextListMessageCounterAsHTMLAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
         String jndiName = "ListMessageCounterMultipleMessagesExistingQueue";
         expandNavTreeArrow(JMS_NAV_LABEL);
         
@@ -665,7 +663,7 @@
      * operation for queues returns the correct results after creating
      * a new queue.
      */
-    public void testListMessageCounterHistoryAsHTMLAfterQueueCreation() throws Exception {
+    public void XtextListMessageCounterHistoryAsHTMLAfterQueueCreation() throws Exception {
         String jndiName = "ListMessageCounterHistoryAfterQueueCreation"; 
         
         ArrayList<String> expectedValue = new ArrayList<String>();
@@ -687,7 +685,7 @@
      * operation for queues returns the correct results. Use a queue that already
      * exists.
      */
-    public void testListMessageCounterHistoryAsHTMLUsingExistingServiceFile() throws Exception {
+    public void XtextListMessageCounterHistoryAsHTMLUsingExistingServiceFile() throws Exception {
         String jndiName = "ListMessageCounterHistoryExistingQueue";
         
         ArrayList<String> expectedValue = new ArrayList<String>();
@@ -710,7 +708,7 @@
      * operation for topics returns the correct results after creating
      * a new topic.
      */
-    public void testListDurableSubscriptionsAsHTMLAfterTopicCreation() throws Exception {
+    public void XtextListDurableSubscriptionsAsHTMLAfterTopicCreation() throws Exception {
         String jndiName = "ListDurableSubscriptionsHtmlAfterTopicCreation"; 
 
         // Create the topic first
@@ -728,7 +726,7 @@
      * operation for topics returns the correct results when the topic
      * has multiple durable subscribers.
      */
-    public void testListDurableSubscriptionsAsHTMLAfterMultipleSubscribers() 
+    public void XtextListDurableSubscriptionsAsHTMLAfterMultipleSubscribers()
         throws Exception {
         
         String jndiName = "ListDurableSubscriptionsHtmlAfterMultipleSubscribers";
@@ -743,7 +741,7 @@
      * operation for topics returns the correct results when the topic
      * has multiple durable subscribers. Use a topic that already exists.
      */
-    public void testListDurableSubscriptionsAsHTMLAfterMultipleSubscribersUsingExistingServiceFile() 
+    public void XtextListDurableSubscriptionsAsHTMLAfterMultipleSubscribersUsingExistingServiceFile()
         throws Exception {
         
         String jndiName = "ListDurableSubscriptionsHtmlMultipleSubscribersExistingTopic";
@@ -797,7 +795,7 @@
      * operation for topics returns the correct results after creating
      * a new topic.
      */
-    public void testListNonDurableSubscriptionsAsHTMLAfterTopicCreation() throws Exception {
+    public void XtextListNonDurableSubscriptionsAsHTMLAfterTopicCreation() throws Exception {
         String jndiName = "ListNonDurableSubscriptionsHtmlAfterTopicCreation"; 
 
         // Create the topic first
@@ -815,7 +813,7 @@
      * operation for topics returns the correct results when the topic
      * has multiple non durable subscribers.
      */
-    public void testListNonDurableSubscriptionsAsHTMLAfterMultipleSubscribers() 
+    public void XtextListNonDurableSubscriptionsAsHTMLAfterMultipleSubscribers()
         throws Exception {
         
         String jndiName = "ListNonDurableSubscriptionsHtmlAfterMultipleSubscribers";
@@ -830,7 +828,7 @@
      * operation for topics returns the correct results when the topic
      * has multiple non durable subscribers. Use a topic that already exists.
      */
-    public void testListNonDurableSubscriptionsAsHTMLAfterMultipleSubscribersUsingExistingServiceFile() 
+    public void XtextListNonDurableSubscriptionsAsHTMLAfterMultipleSubscribersUsingExistingServiceFile()
         throws Exception {
         
         String jndiName = "ListNonDurableSubscriptionsHtmlMultipleSubscribersExistingTopic";
@@ -873,7 +871,7 @@
      * operation for topics returns the correct results after creating
      * a new topic.
      */
-    public void testListAllSubscriptionsAsHTMLAfterTopicCreation() throws Exception {
+    public void XtextListAllSubscriptionsAsHTMLAfterTopicCreation() throws Exception {
         String jndiName = "ListAllSubscriptionsHtmlAfterTopicCreation"; 
 
         // Create the topic first
@@ -891,7 +889,7 @@
      * operation for topics returns the correct results when the topic
      * has multiple durable subscribers.
      */
-    public void testListAllSubscriptionsAsHTMLAfterMultipleSubscribers() 
+    public void XtextListAllSubscriptionsAsHTMLAfterMultipleSubscribers()
         throws Exception {
         
         String jndiName = "ListAllSubscriptionsHtmlAfterMultipleSubscribers";
@@ -906,7 +904,7 @@
      * operation for topics returns the correct results when the topic
      * has multiple durable subscribers. Use a topic that already exists.
      */
-    public void testListAllSubscriptionsAsHTMLAfterMultipleSubscribersUsingExistingServiceFile() 
+    public void XtextListAllSubscriptionsAsHTMLAfterMultipleSubscribersUsingExistingServiceFile()
         throws Exception {
         
         String jndiName = "ListAllSubscriptionsHtmlMultipleSubscribersExistingTopic";
@@ -1080,7 +1078,7 @@
      * Assertion: Make sure that the "Start" operation for topics is executed 
      * successfully.
      */
-    public void testTopicStartOperation() throws Exception {
+    public void XtextTopicStartOperation() throws Exception {
         String jndiName = "TopicStart"; 
 
         // Create the topic first
@@ -1095,7 +1093,7 @@
      * Assertion: Make sure that the "Start" operation for topics is executed 
      * successfully. Use a topic that already exists.
      */
-    public void testTopicStartOperationUsingExistingServiceFile() throws Exception {
+    public void XtextTopicStartOperationUsingExistingServiceFile() throws Exception {
         String jndiName = "StartOperationExistingTopic"; 
 
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -1109,7 +1107,7 @@
      * Assertion: Make sure that the "Start" operation for queues is executed 
      * successfully.
      */
-    public void testQueueStartOperation() throws Exception {
+    public void XtextQueueStartOperation() throws Exception {
         String jndiName = "QueueStart"; 
 
         // Create the queue first
@@ -1124,7 +1122,7 @@
      * Assertion: Make sure that the "Start" operation for queues is executed 
      * successfully. Use a queue that already exists.
      */
-    public void testQueueStartOperationUsingExistingServiceFile() throws Exception {
+    public void XtextQueueStartOperationUsingExistingServiceFile() throws Exception {
         String jndiName = "StartOperationExistingQueue"; 
 
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -1202,7 +1200,7 @@
      * Assertion: Make sure that the "Stop" operation for topics is executed 
      * successfully.
      */
-    public void testTopicStopOperation() throws Exception {
+    public void XtextTopicStopOperation() throws Exception {
         String jndiName = "TopicStop"; 
 
         // Create the topic first
@@ -1217,7 +1215,7 @@
      * Assertion: Make sure that the "Stop" operation for topics is executed 
      * successfully. Use a topic that already exists.
      */
-    public void testTopicStopOperationUsingExistingServiceFile() throws Exception {
+    public void XtextTopicStopOperationUsingExistingServiceFile() throws Exception {
         String jndiName = "StopOperationExistingTopic"; 
 
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -1231,7 +1229,7 @@
      * Assertion: Make sure that the "Stop" operation for queues is executed 
      * successfully.
      */
-    public void testQueueStopOperation() throws Exception {
+    public void XtextQueueStopOperation() throws Exception {
         String jndiName = "QueueStop"; 
 
         // Create the queue first
@@ -1246,7 +1244,7 @@
      * Assertion: Make sure that the "Stop" operation for queues is executed 
      * successfully. Use a queue that already exists.
      */
-    public void testQueueStopOperationUsingExistingServiceFile() throws Exception {
+    public void XtextQueueStopOperationUsingExistingServiceFile() throws Exception {
         String jndiName = "StopOperationExistingQueue"; 
 
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -1262,7 +1260,7 @@
      * Assertion: Make sure that the "List All Messages" operation for topics 
      * returns the correct results after creating a new topic.
      */
-    public void testListAllMessagesAfterTopicCreation() throws Exception {
+    public void XtextListAllMessagesAfterTopicCreation() throws Exception {
         String jndiName = "ListAllMessagesAfterTopicCreation"; 
 
         // Create the topic first
@@ -1284,7 +1282,7 @@
      * Assertion: Make sure that the "List All Messages" operation for topics 
      * returns the correct results when the topic has multiple messages.
      */
-    public void testTopicListAllMessagesAfterMultipleMessages() throws Exception {
+    public void XtextTopicListAllMessagesAfterMultipleMessages() throws Exception {
         String jndiName = "TopicListAllMessagesAfterMultipleMessages";
         
         // Create the topic first
@@ -1298,7 +1296,7 @@
      * returns the correct results when the topic has multiple messages. 
      * Use a topic that already exists.
      */
-    public void testTopicListAllMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
+    public void XtextTopicListAllMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
         String jndiName = "ListAllMessagesMultipleMessagesExistingTopic";
         
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -1338,7 +1336,7 @@
      * Assertion: Make sure that the "List All Messages" operation for queues
      * returns the correct results after creating a new queue.
      */
-    public void testListAllMessagesAfterQueueCreation() throws Exception {
+    public void XtextListAllMessagesAfterQueueCreation() throws Exception {
         String jndiName = "ListAllMessagesAfterQueueCreation"; 
 
         // Create the queue first
@@ -1358,7 +1356,7 @@
      * Assertion: Make sure that the "List All Messages" operation for queues 
      * returns the correct results when the queue has multiple messages.
      */
-    public void testQueueListAllMessagesAfterMultipleMessages() throws Exception {
+    public void XtextQueueListAllMessagesAfterMultipleMessages() throws Exception {
         String jndiName = "QueueListAllMessagesAfterMultipleMessages";
         
         // Create the queue first
@@ -1372,7 +1370,7 @@
      * returns the correct results when the queue has multiple messages. 
      * Use a queue that already exists.
      */
-    public void testQueueListAllMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
+    public void XtextQueueListAllMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
         String jndiName = "ListAllMessagesMultipleMessagesExistingQueue";
         
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -1411,7 +1409,7 @@
      * Assertion: Make sure that the "List Durable Messages" operation for topics 
      * returns the correct results after creating a new topic.
      */
-    public void testListDurableMessagesAfterTopicCreation() throws Exception {
+    public void XtextListDurableMessagesAfterTopicCreation() throws Exception {
         String jndiName = "ListDurableMessagesAfterTopicCreation"; 
 
         // Create the topic first
@@ -1433,7 +1431,7 @@
      * Assertion: Make sure that the "List Durable Messages" operation for topics 
      * returns the correct results when the topic has multiple messages.
      */
-    public void testTopicListDurableMessagesAfterMultipleMessages() throws Exception {
+    public void XtextTopicListDurableMessagesAfterMultipleMessages() throws Exception {
         String jndiName = "TopicListDurableMessagesAfterMultipleMessages";
         
         // Create the topic first
@@ -1447,7 +1445,7 @@
      * returns the correct results when the topic has multiple messages. 
      * Use a topic that already exists.
      */
-    public void testTopicListDurableMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
+    public void XtextTopicListDurableMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
         String jndiName = "ListDurableMessagesMultipleMessagesExistingTopic";
         
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -1485,7 +1483,7 @@
      * Assertion: Make sure that the "List Durable Messages" operation for 
      * queues returns the correct results after creating a new queue.
      */
-    public void testListDurableMessagesAfterQueueCreation() throws Exception {
+    public void XtextListDurableMessagesAfterQueueCreation() throws Exception {
         String jndiName = "ListDurableMessagesAfterQueueCreation"; 
 
         // Create the queue first
@@ -1505,7 +1503,7 @@
      * Assertion: Make sure that the "List Durable Messages" operation for queues 
      * returns the correct results when the queue has multiple messages.
      */
-    public void testQueueListDurableMessagesAfterMultipleMessages() throws Exception {
+    public void XtextQueueListDurableMessagesAfterMultipleMessages() throws Exception {
         String jndiName = "QueueListDurableMessagesAfterMultipleMessages";
         
         // Create the queue first
@@ -1519,7 +1517,7 @@
      * returns the correct results when the queue has multiple messages. Use a queue 
      * that already exists.
      */
-    public void testQueueListDurableMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
+    public void XtextQueueListDurableMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
         String jndiName = "ListDurableMessagesMultipleMessagesExistingQueue";
         
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -1554,7 +1552,7 @@
      * Assertion: Make sure that the "List Non Durable Messages" operation for 
      * topics returns the correct results after creating a new topic.
      */
-    public void testListNonDurableMessagesAfterTopicCreation() throws Exception {
+    public void XtextListNonDurableMessagesAfterTopicCreation() throws Exception {
         String jndiName = "ListNonDurableMessagesAfterTopicCreation"; 
 
         // Create the topic first
@@ -1575,7 +1573,7 @@
      * Assertion: Make sure that the "List Non Durable Messages" operation for 
      * topics returns the correct results when the topic has multiple messages.
      */
-    public void testTopicListNonDurableMessagesAfterMultipleMessages() throws Exception {
+    public void XtextTopicListNonDurableMessagesAfterMultipleMessages() throws Exception {
         String jndiName = "TopicListNonDurableMessagesAfterMultipleMessages";
         
         // Create the topic first
@@ -1589,7 +1587,7 @@
      * topics returns the correct results when the topic has multiple messages. 
      * Use a topic that already exists.
      */
-    public void testTopicListNonDurableMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
+    public void XtextTopicListNonDurableMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
         String jndiName = "ListNonDurableMessagesMultipleMessagesExistingTopic";
         
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -1648,7 +1646,7 @@
      * Assertion: Make sure that the "List Non Durable Messages" operation for 
      * queues returns the correct results after creating a new queue.
      */
-    public void testListNonDurableMessagesAfterQueueCreation() throws Exception {
+    public void XtextListNonDurableMessagesAfterQueueCreation() throws Exception {
         String jndiName = "ListNonDurableMessagesAfterQueueCreation"; 
 
         // Create the queue first
@@ -1668,7 +1666,7 @@
      * Assertion: Make sure that the "List Non Durable Messages" operation for 
      * queues returns the correct results when the queue has multiple messages.
      */
-    public void testQueueListNonDurableMessagesAfterMultipleMessages() throws Exception {
+    public void XtextQueueListNonDurableMessagesAfterMultipleMessages() throws Exception {
         String jndiName = "QueueListNonDurableMessagesAfterMultipleMessages";
         
         // Create the queue first
@@ -1682,7 +1680,7 @@
      * queues returns the correct results when the queue has multiple messages. 
      * Use a queue that already exists.
      */
-    public void testQueueListNonDurableMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
+    public void XtextQueueListNonDurableMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception {
         String jndiName = "ListNonDurableMessagesMultipleMessagesExistingQueue";
         
         expandNavTreeArrow(JMS_NAV_LABEL);
@@ -1909,9 +1907,12 @@
 
 				// Get the rows and list them.
 				List<ContentTableRow> rows = opResultTable.getRows();
-				int rowsCount = rows.size();
-				log.info("List contains "+rowsCount+" subscriptions.");
+				int subscCount = rows.size() -1;
+				log.info("List contains "+subscCount+" subscriptions.");
 				for( ContentTableRow row : rows ) {
+					if( row.isHeader() )
+						continue;
+					
 					// Id	Durable	Message Count	Actions
 					String rowInfo = String.format(" Id: '%s'	Durable: '%s'	Message Count: '%s'	Actions: '%s'", 
 									row.getCellTextByColumnName("Id"),
@@ -1923,11 +1924,11 @@
 
 				// Check whether the list is empty / non-empty as expected.
         if(shouldBeEmpty) {
-					if( rowsCount != 0 ){
-            throw new EmbJoprTestException("Expected empty list but found "+rowsCount+" subscriptions. See the log for more info. Page dumped.", this);
+					if( subscCount != 0 ){
+            throw new EmbJoprTestException("Expected empty list but found "+subscCount+" subscriptions. See the log for more info. Page dumped.", this);
 					}
         } else {
-					{
+					if( subscCount <= 0 ){
             throw new EmbJoprTestException("Expected non-empty list. See the log for more info. Page dumped.", this);
 					}
         }

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java	2009-07-30 21:19:20 UTC (rev 639)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java	2009-07-30 22:31:56 UTC (rev 640)
@@ -46,6 +46,7 @@
 import org.jboss.mx.util.MBeanServerLocator;
 import org.mozilla.javascript.NativeFunction;
 import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 
 
 
@@ -746,15 +747,46 @@
 
 
 	/**
-	 *
+	 *  EJTT parts which are based on an HTML element.
 	 */
-	 public interface HtmlElementBacked {
-		 public HtmlElement getElement();
-		 public HtmlAnchor getFirstLinkContaining();
-	 }
+	public interface HtmlElementBacked {
+	 public HtmlElement getElement();
+	 public HtmlElement getFirstByXPath( String xPath ) throws HtmlElementNotFoundException ;
+	 public List<HtmlElement> getByXPath( String xPath ) throws HtmlElementNotFoundException;
+	}
 
 
+	/**
+	 *  
+	 */
+	protected class HtmlElementBackedBase implements HtmlElementBacked {
 
+		protected HtmlTableRow element;
+		public HtmlTableRow getElement() {			return element;		}
+
+		public HtmlElementBackedBase(HtmlTableRow element) {
+			this.element = element;
+		}
+
+
+		public HtmlElement getFirstByXPath( String xPath ) throws HtmlElementNotFoundException {
+			HtmlElement elm = this.element.getFirstByXPath(xPath);
+			if( null == elm )
+				throw new HtmlElementNotFoundException("No element found using xPath: "+xPath);
+			return elm;
+		}
+		public List<HtmlElement> getByXPath( String xPath ) throws HtmlElementNotFoundException {
+			List<HtmlElement> elms = (List<HtmlElement>) this.element.getByXPath(xPath);
+			if( elms.size() == 0 )
+				throw new HtmlElementNotFoundException("No elements found using xPath: "+xPath);
+			return elms;
+		}
+
+	}
+
+
+
+
 	/**
 	 * Inner class for manipulation with tab content box.
 	 */
@@ -1502,23 +1534,40 @@
 
 
 
+
 	/**
 	 * Row of a content table.
 	 * Contains convenience methods for accessing content table rows in EmbJopr.
 	 */
-	public class ContentTableRow {
+	public class ContentTableRow extends HtmlElementBackedBase {
 
-		private HtmlTableRow element;
-		public HtmlTableRow getElement() {			return element;		}
-
 		private ContentTable containingTable;
 
 		private ContentTableRow(HtmlTableRow elm, ContentTable containingTable) {
-			this.element = elm;
+			super(elm);
 			this.containingTable = containingTable;
 		}
 
+
 		/**
+		 *  Returns true if this row contains at least one TH element and no TD element.
+		 */
+		public boolean isHeader(){
+			/* Does not work - returns:   headers.getLength(): 8;  cells.getLength(): 196;
+			NodeList headers = this.getElement().getElementsByTagName("th");
+			NodeList cells = this.getElement().getElementsByTagName("td");
+			log.debug("headers.getLength(): "+headers.getLength()+";  cells.getLength(): "+cells.getLength()+";");
+			return headers.getLength() != 0  &&  cells.getLength() == 0;
+			/**/
+
+			List<?> headers = this.getElement().getByXPath("./th");
+			List<?> cells = this.getElement().getByXPath("./td");
+			//log.debug("isHeader(): headers.size(): "+headers.size()+";  cells.size(): "+cells.size()+";");
+			return headers.size() != 0  &&  cells.size() == 0;
+		}
+
+
+		/**
 		 * Finds a <button> or <input type="button"> with the given label.
 		 * @param label The label of the button. Compared to a trimmed label text of the button.
 		 * @returns the button element - either HtmlButtonInput or HtmlButton.



More information about the embjopr-commits mailing list