]> source.dussan.org Git - sonarqube.git/commitdiff
projects / sonarqube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 046911d)
SONAR-8355 Fix IT using /all_projects page 1365/head
authorJulien Lancelot <julien.lancelot@sonarsource.com>
Tue, 8 Nov 2016 14:37:48 +0000 (15:37 +0100)
committerJulien Lancelot <julien.lancelot@sonarsource.com>
Wed, 9 Nov 2016 15:47:34 +0000 (16:47 +0100)
it/it-tests/src/test/java/it/Category4Suite.java patch | blob | history
it/it-tests/src/test/java/it/componentSearch/AllProjectsTest.java [deleted file] patch | blob | history
it/it-tests/src/test/resources/componentSearch/AllProjectsTest/test_all_projects_page.html [deleted file] patch | blob | history
it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html patch | blob | history

diff --git a/it/it-tests/src/test/java/it/Category4Suite.java b/it/it-tests/src/test/java/it/Category4Suite.java
index 0924e5bd957789ab81ed18136ca41af8c2196a1c..9d9c8b61501ed5148ba19da7ea501ed551b1097c 100644 (file)
--- a/it/it-tests/src/test/java/it/Category4Suite.java
+++ b/it/it-tests/src/test/java/it/Category4Suite.java
@@ -24,7 +24,6 @@ import it.analysisExclusion.FileExclusionsTest;
 import it.analysisExclusion.IssueExclusionsTest;
 import it.component.ComponentsWsTest;
 import it.component.ProjectSearchTest;
-import it.componentSearch.AllProjectsTest;
 import it.dbCleaner.PurgeTest;
 import it.duplication.CrossProjectDuplicationsOnRemoveFileTest;
 import it.duplication.CrossProjectDuplicationsTest;
@@ -87,8 +86,6 @@ import static util.ItUtils.xooPlugin;
   ProjectComparisonTest.class,
   // project search
   SearchProjectsTest.class,
-  // component search
-  AllProjectsTest.class,
   // http
   HttpHeadersTest.class,
   // ui
diff --git a/it/it-tests/src/test/java/it/componentSearch/AllProjectsTest.java b/it/it-tests/src/test/java/it/componentSearch/AllProjectsTest.java
deleted file mode 100644 (file)
index 524eb6c..0000000
--- a/it/it-tests/src/test/java/it/componentSearch/AllProjectsTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact 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 it.componentSearch;
-
-import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.build.SonarScanner;
-import com.sonar.orchestrator.selenium.Selenese;
-import it.Category4Suite;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import util.selenium.SeleneseTest;
-
-import static util.ItUtils.projectDir;
-
-public class AllProjectsTest {
-
-  @ClassRule
-  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
-
-  @BeforeClass
-  public static void inspectProject() {
-    orchestrator.executeBuild(
-      SonarScanner.create(projectDir("shared/xoo-sample"))
-        .setProjectKey("all-project-test-project")
-        .setProjectName("AllProjectsTest Project")
-    );
-  }
-
-  @Test
-  public void test_all_projects_page() {
-    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("test_all_projects_page",
-      "/componentSearch/AllProjectsTest/test_all_projects_page.html"
-    ).build();
-    new SeleneseTest(selenese).runOn(orchestrator);
-  }
-
-}
diff --git a/it/it-tests/src/test/resources/componentSearch/AllProjectsTest/test_all_projects_page.html b/it/it-tests/src/test/resources/componentSearch/AllProjectsTest/test_all_projects_page.html
deleted file mode 100644 (file)
index 551ede1..0000000
--- a/it/it-tests/src/test/resources/componentSearch/AllProjectsTest/test_all_projects_page.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>should-display-all-projects-page</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<tbody>
-<tr>
-       <td>open</td>
-       <td>/all_projects?qualifier=TRK</td>
-       <td></td>
-</tr>
-<tr>
-       <td>waitForText</td>
-       <td>id=content</td>
-       <td>*All Projects*</td>
-</tr>
-<tr>
-       <td>waitForText</td>
-       <td>id=content</td>
-       <td>*Name*</td>
-</tr>
-<tr>
-       <td>waitForText</td>
-       <td>id=content</td>
-       <td>*AllProjectsTest Project*</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html
index e14c673dfdba992712c961f5cfc2a4f6ec4e2424..da3efc1eb67e149c3390c4d9eb4ed9ce49ecc8fe 100644 (file)
--- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html
@@ -45,9 +45,14 @@
 </tr>
 <tr>
        <td>open</td>
-       <td>/all_projects?qualifier=TRK</td>
+       <td>/projects</td>
        <td></td>
 </tr>
+<tr>
+       <td>waitForText</td>
+       <td>css=.page-main</td>
+       <td>*1 projects*</td>
+</tr>
 <tr>
        <td>assertTextPresent</td>
        <td>Sample</td>
@@ -85,9 +90,14 @@
 </tr>
 <tr>
        <td>open</td>
-       <td>/all_projects?qualifier=TRK</td>
+       <td>/projects</td>
        <td></td>
 </tr>
+<tr>
+       <td>waitForText</td>
+       <td>css=.page-main</td>
+       <td>*0 projects*</td>
+</tr>
 <tr>
        <td>assertTextNotPresent</td>
        <td>content</td>
Continuous Inspection: https://github.com/SonarSource/sonarqube