From 7bf080b812838d4c610ed367ffbfd0a82ec012ed Mon Sep 17 00:00:00 2001 From: David Gageot Date: Wed, 2 Sep 2015 16:00:25 +0200 Subject: [PATCH] Revert "Better regexp support for Selenium its" This reverts commit aa224322a2accb2b80806d1f294ff0183e87949c. --- .../src/test/java/administration/suite/ui/I18nTest.java | 4 ++-- it/it-tests/src/test/java/selenium/SeleneseTest.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) 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 13bd5808066..14a9ec84f4d 100644 --- 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,7 +27,6 @@ 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; @@ -54,7 +53,8 @@ public class I18nTest { "/ui/i18n/french-pack.html", "/ui/i18n/locale-with-france-country.html", "/ui/i18n/locale-with-swiss-country.html").build(); - new SeleneseTest(selenese).runOn(orchestrator); + // Use the old runner because it fails with the new Selenium runner + orchestrator.executeSelenese(selenese); } } diff --git a/it/it-tests/src/test/java/selenium/SeleneseTest.java b/it/it-tests/src/test/java/selenium/SeleneseTest.java index d45862843fc..ecd716775fc 100644 --- a/it/it-tests/src/test/java/selenium/SeleneseTest.java +++ b/it/it-tests/src/test/java/selenium/SeleneseTest.java @@ -270,8 +270,7 @@ public class SeleneseTest { } if (pattern.startsWith("regexp:")) { - String expectedRegEx = pattern.replaceFirst("regexp:", ".*") + ".*"; - find(selector).should().match(Pattern.compile(expectedRegEx, Pattern.DOTALL)); + find(selector).should().match(Pattern.compile(pattern.substring(7))); return; } @@ -288,8 +287,7 @@ public class SeleneseTest { } if (pattern.startsWith("regexp:")) { - String expectedRegEx = pattern.replaceFirst("regexp:", ".*") + ".*"; - find(selector).should().not().match(Pattern.compile(expectedRegEx, Pattern.DOTALL)); + find(selector).should().not().match(Pattern.compile(pattern.substring(7))); return; } -- 2.39.5