From 8ec2f05179c51a4272f6edacb33881ac7e7ebf09 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 18 Dec 2015 11:24:05 +0100
Subject: [PATCH] Revert "Use SeleneseTest to improve reliability of selenium"

This reverts commit a76c4cc7cee9d6974324d93d936b904eab4960dc.
---
 .../src/test/java/it/actionPlan/ActionPlanUiTest.java  |  3 +--
 .../it/measureHistory/DifferentialPeriodsTest.java     | 10 +++++-----
 .../src/test/java/it/measureHistory/HistoryUiTest.java |  4 ++--
 .../src/test/java/it/settings/PropertySetsTest.java    |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/it/it-tests/src/test/java/it/actionPlan/ActionPlanUiTest.java b/it/it-tests/src/test/java/it/actionPlan/ActionPlanUiTest.java
index a381cecb272..1537f0e14cf 100644
--- a/it/it-tests/src/test/java/it/actionPlan/ActionPlanUiTest.java
+++ b/it/it-tests/src/test/java/it/actionPlan/ActionPlanUiTest.java
@@ -30,7 +30,6 @@ import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.sonar.wsclient.issue.ActionPlanClient;
-import util.selenium.SeleneseTest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.runProjectAnalysis;
@@ -79,7 +78,7 @@ public class ActionPlanUiTest {
         "/actionPlan/ActionPlanUiTest/edit_action_plan.html",
         // SONAR-3198
         "/actionPlan/ActionPlanUiTest/can_create_action_plan_with_date_today.html").build();
-    new SeleneseTest(selenese).runOn(orchestrator);
+    orchestrator.executeSelenese(selenese);
   }
 
 }
diff --git a/it/it-tests/src/test/java/it/measureHistory/DifferentialPeriodsTest.java b/it/it-tests/src/test/java/it/measureHistory/DifferentialPeriodsTest.java
index 908d109655a..c1e9606ab4e 100644
--- a/it/it-tests/src/test/java/it/measureHistory/DifferentialPeriodsTest.java
+++ b/it/it-tests/src/test/java/it/measureHistory/DifferentialPeriodsTest.java
@@ -14,7 +14,6 @@ import org.sonar.wsclient.services.Measure;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
 import util.ItUtils;
-import util.selenium.SeleneseTest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.projectDir;
@@ -90,14 +89,15 @@ public class DifferentialPeriodsTest {
     orchestrator.executeBuild(SonarRunner.create(projectDir("shared/xoo-sample")));
 
     // Use old way to execute Selenium because 'assertSelectOptions' action is not supported by SeleneseTest
-    new SeleneseTest(Selenese.builder().setHtmlTestsInClasspath("not-display-periods-selection-dropdown-on-first-analysis",
-      "/measureHistory/DifferentialPeriodsTest/not-display-periods-selection-dropdown-on-dashboard.html").build()).runOn(orchestrator);
+    orchestrator.executeSelenese(Selenese.builder().setHtmlTestsInClasspath("not-display-periods-selection-dropdown-on-first-analysis",
+      "/measureHistory/DifferentialPeriodsTest/not-display-periods-selection-dropdown-on-dashboard.html"
+      ).build());
 
     orchestrator.executeBuild(SonarRunner.create(projectDir("shared/xoo-sample")));
 
-    new SeleneseTest(Selenese.builder().setHtmlTestsInClasspath("display-periods-selection-dropdown-after-first-analysis",
+    orchestrator.executeSelenese(Selenese.builder().setHtmlTestsInClasspath("display-periods-selection-dropdown-after-first-analysis",
       "/measureHistory/DifferentialPeriodsTest/display-periods-selection-dropdown-on-dashboard.html"
-    ).build()).runOn(orchestrator);
+      ).build());
   }
 
 }
diff --git a/it/it-tests/src/test/java/it/measureHistory/HistoryUiTest.java b/it/it-tests/src/test/java/it/measureHistory/HistoryUiTest.java
index 84d733a3ade..bc957f94415 100644
--- a/it/it-tests/src/test/java/it/measureHistory/HistoryUiTest.java
+++ b/it/it-tests/src/test/java/it/measureHistory/HistoryUiTest.java
@@ -63,13 +63,13 @@ public class HistoryUiTest {
   @Test
   public void test_timemachine_widget() {
     // Use old way to execute Selenium because 'waitForTextPresent' action is not supported by SeleneseTest
-    new SeleneseTest(Selenese.builder().setHtmlTestsInClasspath("history-timemachine-widget",
+    orchestrator.executeSelenese(Selenese.builder().setHtmlTestsInClasspath("history-timemachine-widget",
       "/measureHistory/HistoryUiTest/history-timemachine-widget/time-machine-widget.html",
       // SONAR-3354 & SONAR-3353
       "/measureHistory/HistoryUiTest/history-timemachine-widget/should-display-empty-table-if-no-measure.html",
       // SONAR-3650
       "/measureHistory/HistoryUiTest/history-timemachine-widget/should-exclude-new-metrics.html"
-      ).build()).runOn(orchestrator);
+      ).build());
   }
 
   /**
diff --git a/it/it-tests/src/test/java/it/settings/PropertySetsTest.java b/it/it-tests/src/test/java/it/settings/PropertySetsTest.java
index 3678d33c348..7a0f7b34c7e 100644
--- a/it/it-tests/src/test/java/it/settings/PropertySetsTest.java
+++ b/it/it-tests/src/test/java/it/settings/PropertySetsTest.java
@@ -45,7 +45,7 @@ public class PropertySetsTest {
       "/settings/PropertySetsTest/property-sets/all_types.html"
       ).build();
     // Use the old runner because it fails with the new Selenium runner
-    new SeleneseTest(selenese).runOn(orchestrator);
+    orchestrator.executeSelenese(selenese);
 
     // SSF-25 Check that the password has well be setted as now it does not appears in the html source code
     String sonarDemoValue = getProperty("sonar.demo");
-- 
2.39.5