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

[embjopr-commits at lists.jboss.org]

Author: fjuma
Date: 2009-04-17 10:48:59 -0400 (Fri, 17 Apr 2009)
New Revision: 299

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java
Log:
Made a minor change to the expected results for the JMS tests that set ObjectName ManagedProperties.
Modified the error messages for the "listFormattedSubPoolStatistics" tests.


Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java	2009-04-16 17:51:50 UTC (rev 298)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java	2009-04-17 14:48:59 UTC (rev 299)
@@ -552,11 +552,12 @@
     protected void checkMetrics(String datasourceName,
                                 DatasourceType datasourceType,
                                 Map<String, String> metricsMap) throws IOException, EmbJoprTestException {
-       
+        
         //refreshTreeNode(DS_NAV_LABEL);
-        ClickableElement datasourceTypeArrow = getNavTreeArrow(datasourceType.getLabel());
-        datasourceTypeArrow.click();
-
+        if(!ejtt.getNavTree().getNodeByLabel(datasourceType.getLabel()).isExpanded()) {
+            expandNavTreeArrow(datasourceType.getLabel());
+        }
+      
         HtmlAnchor datasource = getNavTreeLink(datasourceName);
         datasource.click();
 

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java	2009-04-16 17:51:50 UTC (rev 298)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java	2009-04-17 14:48:59 UTC (rev 299)
@@ -138,11 +138,13 @@
     private void navigateToPage(String datasourceName,
                                 DatasourceType datasourceType,
                                 String tabName) throws IOException, EmbJoprTestException {
-
+        
         //refreshTreeNode(DS_NAV_LABEL);
-        ClickableElement datasourceTypeArrow = getNavTreeArrow(datasourceType.getLabel());
-        datasourceTypeArrow.click();
-
+        
+        if(!ejtt.getNavTree().getNodeByLabel(datasourceType.getLabel()).isExpanded()) {
+            expandNavTreeArrow(datasourceType.getLabel());
+        }
+       
         HtmlAnchor datasource = getNavTreeLink(datasourceName);
         datasource.click();
 
@@ -711,13 +713,9 @@
                                     + "Available Connections Count: 16\n" 
                                     + "Max Connections In Use Count:4\n" 
                                     + "Connections Destroyed Count:0\n"
-                                    + "Connections In Use Count:4\n"
-                                    + "Total Block Time:0\n"
-                                    + "Average Block Time For Sub Pool:0\n"
-                                    + "Maximum Wait Time For Sub Pool:0\n"
-                                    + "Total Timed Out:0";
+                                    + "Connections In Use Count:4\n";
 
-            assertTrue("Incorrect sub pool statistics - \nexpected:\n\n" + expectedResult 
+            assertTrue("Incorrect sub pool statistics - \nexpected the result to contain:\n\n" + expectedResult 
                        + "\n\nbut was:\n\n" + actualResult,
                        actualResult.contains(expectedResult));
         } finally {
@@ -797,8 +795,8 @@
                                     + "Connections Destroyed Count:0\n"
                                     + "Connections In Use Count:8"; 
 
-            assertTrue("Incorrect sub pool statistics - \nexpected:\n\n" + expectedResult 
-                        + "\n\nbut was:\n\n" + actualResult.substring(0, actualResult.lastIndexOf("Total Block Time")),
+            assertTrue("Incorrect sub pool statistics - \nexpected the result to contain:\n\n" + expectedResult 
+                        + "\n\nbut was:\n\n" + actualResult,
                         actualResult.contains(expectedResult));
         } finally {
             

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java	2009-04-16 17:51:50 UTC (rev 298)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java	2009-04-17 14:48:59 UTC (rev 299)
@@ -127,8 +127,8 @@
     private TopicConnection topicConnection = null;
     private QueueConnection queueConnection = null;
     
-    private static final String DLQ = "jboss.messaging.destination:service=Queue,name=DLQ";
-    private static final String EXPIRY_QUEUE = "jboss.messaging.destination:service=Queue,name=ExpiryQueue";
+    private static final String DLQ = "jboss.messaging.destination:name=DLQ,service=Queue";
+    private static final String EXPIRY_QUEUE = "jboss.messaging.destination:name=ExpiryQueue,service=Queue";
     private static final String SERVER_PEER = "jboss.messaging:service=ServerPeer";
     
     /**