[richfaces-svn-commits] JBoss Rich Faces SVN: r18699 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog.

[richfaces-svn-commits at lists.jboss.org]

Author: lfryc at redhat.com
Date: 2010-08-17 05:33:17 -0400 (Tue, 17 Aug 2010)
New Revision: 18699

Modified:
   modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/TestA4JLog.java
Log:
a4j:log tests - fixed locators and regexp

Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/TestA4JLog.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/TestA4JLog.java	2010-08-17 08:23:51 UTC (rev 18698)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/TestA4JLog.java	2010-08-17 09:33:17 UTC (rev 18699)
@@ -53,9 +53,9 @@
     private JQueryLocator submitButton = pjq("input[id$=submitButton]");
     private JQueryLocator output = pjq("span[id$=out]");
 
-    private JQueryLocator log = pjq("div.rich-log");
-    private JQueryLocator levelSelect = pjq("div.rich-log select");
-    private JQueryLocator logMsg = pjq("div.rich-log div.rich-log-contents div");
+    private JQueryLocator log = pjq("div.rf-log");
+    private JQueryLocator levelSelect = pjq("div.rf-log select");
+    private JQueryLocator logMsg = pjq("div.rf-log div.rf-log-contents div");
 
     @Override
     public URL getTestUrl() {
@@ -86,7 +86,7 @@
 
     @Test
     public void testClearButton() {
-        JQueryLocator clearButton = pjq("div.rich-log button");
+        JQueryLocator clearButton = pjq("div.rf-log button");
 
         selenium.typeKeys(input, "RichFaces 4");
         selenium.click(submitButton);
@@ -217,7 +217,7 @@
             return;
         }
         
-        String output = selenium.getText(msgType).replaceAll("\\[.*\\]:$", "");
+        String output = selenium.getText(msgType).replaceAll(" *\\[.*\\]:$", "");
         assertEquals(output, logLevel.toString().toLowerCase(), "Message type in log.");
         output = selenium.getText(msgContent);
         assertEquals(output, logLevel.toString(), "Message content.");