Better regexp support for Selenium its

diff --git a/it/it-tests/src/test/java/administration/suite/ui/I18nTest.java b/it/it-tests/src/test/java/administration/suite/ui/I18nTest.java
index 14a9ec84f4dd4b0b1df40c6dfea83dd1ea9b9fa0..13bd580806658b926ae7ad0b1b201f45c44d8742 100644 (file)
--- a/it/it-tests/src/test/java/administration/suite/ui/I18nTest.java
+++ b/it/it-tests/src/test/java/administration/suite/ui/I18nTest.java
@@ -27,6 +27,7 @@ import com.sonar.orchestrator.selenium.Selenese;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
+import selenium.SeleneseTest;
 
 import static util.ItUtils.projectDir;
 
@@ -53,8 +54,7 @@ public class I18nTest {
       "/ui/i18n/french-pack.html",
       "/ui/i18n/locale-with-france-country.html",
       "/ui/i18n/locale-with-swiss-country.html").build();
-    // Use the old runner because it fails with the new Selenium runner
-    orchestrator.executeSelenese(selenese);
+    new SeleneseTest(selenese).runOn(orchestrator);
   }
 
 }

diff --git a/it/it-tests/src/test/java/selenium/SeleneseTest.java b/it/it-tests/src/test/java/selenium/SeleneseTest.java
index ecd716775fc1b99fa3e8ee77a9960e4a170c70f8..d45862843fc8f55b012662e2cf699b5ea4fca0fe 100644 (file)
--- a/it/it-tests/src/test/java/selenium/SeleneseTest.java
+++ b/it/it-tests/src/test/java/selenium/SeleneseTest.java
@@ -270,7 +270,8 @@ public class SeleneseTest {
     }
 
     if (pattern.startsWith("regexp:")) {
-      find(selector).should().match(Pattern.compile(pattern.substring(7)));
+      String expectedRegEx = pattern.replaceFirst("regexp:", ".*") + ".*";
+      find(selector).should().match(Pattern.compile(expectedRegEx, Pattern.DOTALL));
       return;
     }
 
@@ -287,7 +288,8 @@ public class SeleneseTest {
     }
 
     if (pattern.startsWith("regexp:")) {
-      find(selector).should().not().match(Pattern.compile(pattern.substring(7)));
+      String expectedRegEx = pattern.replaceFirst("regexp:", ".*") + ".*";
+      find(selector).should().not().match(Pattern.compile(expectedRegEx, Pattern.DOTALL));
       return;
     }