From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 9 Nov 2017 15:59:20 +0000 (+0100)
Subject: Remove duplicated SelenideConfig for UpgradeTest
X-Git-Tag: 7.0-RC1~338
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8e505e94aa625637f306cec663f89ea737fc9782;p=sonarqube.git

Remove duplicated SelenideConfig for UpgradeTest
---

diff --git a/tests/src/test/java/org/sonarqube/tests/upgrade/SelenideConfig.java b/tests/src/test/java/org/sonarqube/tests/upgrade/SelenideConfig.java
deleted file mode 100644
index b67e99b5735..00000000000
--- a/tests/src/test/java/org/sonarqube/tests/upgrade/SelenideConfig.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2017 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonarqube.tests.upgrade;
-
-import com.codeborne.selenide.Configuration;
-import com.google.common.collect.ImmutableSet;
-import java.util.Set;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static java.util.Objects.requireNonNull;
-
-enum SelenideConfig {
-  INSTANCE;
-
-  private static final Set<String> SUPPORTED_BROWSERS = ImmutableSet.of("firefox");
-
-  SelenideConfig() {
-    Configuration.reportsFolder = "target/screenshots";
-  }
-
-  public SelenideConfig setBrowser(String browser) {
-    checkArgument(SUPPORTED_BROWSERS.contains(requireNonNull(browser)), "Browser is not supported: %s", browser);
-    Configuration.browser = browser;
-    return this;
-  }
-
-  public SelenideConfig setBaseUrl(String s) {
-    Configuration.baseUrl = requireNonNull(s);
-    return this;
-  }
-
-}
diff --git a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java
index d79f57b0ac8..e27eb56cbc7 100644
--- a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java
@@ -37,6 +37,7 @@ import org.apache.commons.io.IOUtils;
 import org.junit.After;
 import org.junit.Test;
 import org.sonar.wsclient.services.ResourceQuery;
+import org.sonarqube.qa.util.SelenideConfig;
 import org.sonarqube.ws.WsMeasures.Measure;
 import org.sonarqube.ws.client.GetRequest;
 import org.sonarqube.ws.client.HttpConnector;
@@ -268,10 +269,7 @@ public class UpgradeTest {
   }
 
   private static void initSelenide(Orchestrator orchestrator) {
-    String browser = orchestrator.getConfiguration().getString("orchestrator.browser", "firefox");
-    SelenideConfig.INSTANCE
-      .setBrowser(browser)
-      .setBaseUrl(orchestrator.getServer().getUrl());
+    SelenideConfig.configure(orchestrator);
     WebDriverRunner.getWebDriver().manage().deleteAllCookies();
   }