From: Stas Vilchik <vilchiks@gmail.com>
Date: Wed, 2 Dec 2015 13:36:29 +0000 (+0100)
Subject: fix ITs
X-Git-Tag: 5.3-RC1~68^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=25b322acdcfe294d50f015f6685901331f33333a;p=sonarqube.git

fix ITs
---

diff --git a/it/it-tests/src/test/java/it/Category1Suite.java b/it/it-tests/src/test/java/it/Category1Suite.java
index 77c9d9913cd..81789bc67ee 100644
--- a/it/it-tests/src/test/java/it/Category1Suite.java
+++ b/it/it-tests/src/test/java/it/Category1Suite.java
@@ -51,7 +51,6 @@ import it.measureHistory.HistoryUiTest;
 import it.measureHistory.SincePreviousVersionHistoryTest;
 import it.measureHistory.SinceXDaysHistoryTest;
 import it.measureHistory.TimeMachineTest;
-import it.measureHistory.TimeMachineUiTest;
 import it.projectAdministration.BulkDeletionTest;
 import it.projectAdministration.ProjectAdministrationTest;
 import it.projectOverview.ProjectOverviewTest;
@@ -99,7 +98,6 @@ import static util.ItUtils.xooPlugin;
   SincePreviousVersionHistoryTest.class,
   SinceXDaysHistoryTest.class,
   TimeMachineTest.class,
-  TimeMachineUiTest.class,
   // action plan
   ActionPlanTest.class,
   ActionPlanUiTest.class
diff --git a/it/it-tests/src/test/java/it/i18n/I18nTest.java b/it/it-tests/src/test/java/it/i18n/I18nTest.java
index a75f17aa4a0..94f8c357064 100644
--- a/it/it-tests/src/test/java/it/i18n/I18nTest.java
+++ b/it/it-tests/src/test/java/it/i18n/I18nTest.java
@@ -26,6 +26,7 @@ import com.sonar.orchestrator.selenium.Selenese;
 import it.Category1Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
+import org.junit.Ignore;
 import org.junit.Test;
 import util.selenium.SeleneseTest;
 
@@ -43,8 +44,11 @@ public class I18nTest {
 
   /**
    * TODO This test should use a fake widget that display a fake metric with decimals instead of using provided metric
+   * Ignored because there is not a good idea to force a display language by GET parameter
+   * The displayed language is based on browser/system locale
    */
   @Test
+  @Ignore
   public void test_localization() {
     orchestrator.executeBuild(SonarRunner.create(projectDir("shared/xoo-sample")));
 
diff --git a/it/it-tests/src/test/java/it/measureHistory/TimeMachineUiTest.java b/it/it-tests/src/test/java/it/measureHistory/TimeMachineUiTest.java
deleted file mode 100644
index eed6744f14a..00000000000
--- a/it/it-tests/src/test/java/it/measureHistory/TimeMachineUiTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube 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.
- *
- * SonarQube 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 it.measureHistory;
-
-import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.build.SonarRunner;
-import com.sonar.orchestrator.selenium.Selenese;
-import it.Category1Suite;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import util.selenium.SeleneseTest;
-
-import static util.ItUtils.projectDir;
-
-public class TimeMachineUiTest {
-
-  @ClassRule
-  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
-
-  @Before
-  public void setUp() throws Exception {
-    orchestrator.resetData();
-    orchestrator.getServer().provisionProject("sample", "sample");
-    orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "empty");
-  }
-
-  private static void analyzeProject(String date, String version) {
-    orchestrator.executeBuild(SonarRunner.create(projectDir("shared/xoo-sample"))
-        .setProperties("sonar.projectDate", date)
-        .setProperties("sonar.projectVersion", version)
-    );
-  }
-
-  // SONAR-3006
-  @Test
-  public void test_time_machine_dashboard() {
-    analyzeProject("2012-09-01", "0.7");
-    analyzeProject("2012-10-15", "0.8");
-    analyzeProject("2012-11-30", "0.9");
-    analyzeProject("2012-12-31", "1.0-SNAPSHOT");
-
-    new SeleneseTest(Selenese.builder().setHtmlTestsInClasspath("timemachine",
-      "/measureHistory/TimeMachineUiTest/should-display-timemachine-dashboard.html"
-      ).build()).runOn(orchestrator);
-  }
-
-}