[embjopr-commits] EMBJOPR SVN: r684 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-08-21 19:36:40 -0400 (Fri, 21 Aug 2009)
New Revision: 684

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java
Log:
 * JMS - listMessageCounterAsHtmlAfterMultipleMessages() - checking values with regex's. Delta and Count values constraints diminished.

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-08-18 22:12:18 UTC (rev 683)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java	2009-08-21 23:36:40 UTC (rev 684)
@@ -639,12 +639,12 @@
         expectedBuffer.append(formatTableCell(DestinationType.QUEUE.getName()));
         expectedBuffer.append(formatTableCell(DestinationType.QUEUE.getName()
                                               + "." + jndiName));
-        expectedBuffer.append(formatTableCell("-"));  // Subscription
-        expectedBuffer.append(formatTableCell("-"));  // Durable 
-        expectedBuffer.append(formatTableCell("2"));  // Count
-        expectedBuffer.append(formatTableCell("2"));  // Count delta
-        expectedBuffer.append(formatTableCell("2"));  // Depth
-        expectedBuffer.append(formatTableCell("2"));  // Depth delta
+        expectedBuffer.append(formatTableCell("-"));        // Subscription    -
+        expectedBuffer.append(formatTableCell("-"));        // Durable         -
+        expectedBuffer.append(formatTableCell("(0|1|2)"));  // Count           0
+        expectedBuffer.append(formatTableCell("(-|\\d+)")); // Count delta     -
+        expectedBuffer.append(formatTableCell("2"));        // Depth           2
+        expectedBuffer.append(formatTableCell("\\d+"));     // Depth delta     2
         
         expectedValues.add(expectedBuffer.toString());
         
@@ -977,8 +977,9 @@
         
         assertFalse("The result of the operation was an empty string", result.equals(""));
         for(int i = 0; i < expectedValues.size(); i++) {
-            assertTrue("Expected the result to contain:\n\n" + expectedValues.get(i) + "\n\nbut was:\n\n" + shortenedResult,
-                        shortenedResult.contains(expectedValues.get(i)));
+					//if( !shortenedResult.contains(expectedValues.get(i)) )
+					if( !shortenedResult.matches(expectedValues.get(i)) )
+						fail("Expected the result to contain:\n\n" + expectedValues.get(i) + "\n\nbut was:\n\n" + shortenedResult);
         }
         
         // Clean up