From 04dd8ed3ace12b889258c7b07d1bb5abca673c6e Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Mon, 19 Oct 2015 15:24:27 +0200 Subject: [PATCH] update ITs relying on the system info page --- .../suite/AdministrationTestSuite.java | 2 - .../suite/administration/SystemInfoTest.java | 45 ------ .../SystemInfoTest/system-info-page.html | 59 -------- .../server-administration/system_info.html | 128 ++++++++++-------- .../server_id/valid_id.html | 4 +- 5 files changed, 71 insertions(+), 167 deletions(-) delete mode 100644 it/it-tests/src/test/java/administration/suite/administration/SystemInfoTest.java delete mode 100644 it/it-tests/src/test/resources/administration/suite/SystemInfoTest/system-info-page.html diff --git a/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java b/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java index 4f169b418db..6eca10ab2bd 100644 --- a/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java +++ b/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java @@ -23,7 +23,6 @@ import administration.suite.administration.BulkDeletionTest; import administration.suite.administration.ProjectAdministrationTest; import administration.suite.administration.PropertySetsTest; import administration.suite.administration.SubCategoriesTest; -import administration.suite.administration.SystemInfoTest; import administration.suite.ui.I18nTest; import com.sonar.orchestrator.Orchestrator; import org.junit.ClassRule; @@ -39,7 +38,6 @@ import static util.ItUtils.pluginArtifact; ProjectAdministrationTest.class, PropertySetsTest.class, SubCategoriesTest.class, - SystemInfoTest.class, I18nTest.class }) public class AdministrationTestSuite { diff --git a/it/it-tests/src/test/java/administration/suite/administration/SystemInfoTest.java b/it/it-tests/src/test/java/administration/suite/administration/SystemInfoTest.java deleted file mode 100644 index 435756fcf62..00000000000 --- a/it/it-tests/src/test/java/administration/suite/administration/SystemInfoTest.java +++ /dev/null @@ -1,45 +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 administration.suite.administration; - -import administration.suite.AdministrationTestSuite; -import com.sonar.orchestrator.Orchestrator; -import com.sonar.orchestrator.selenium.Selenese; -import org.junit.ClassRule; -import org.junit.Test; -import selenium.SeleneseTest; - -public class SystemInfoTest { - - @ClassRule - public static Orchestrator orchestrator = AdministrationTestSuite.ORCHESTRATOR; - - /** - * SONAR-6928 - */ - @Test - public void test_system_info_page() throws Exception { - Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("system-info-page", - "/administration/suite/SystemInfoTest/system-info-page.html" - ).build(); - new SeleneseTest(selenese).runOn(orchestrator); - } - -} diff --git a/it/it-tests/src/test/resources/administration/suite/SystemInfoTest/system-info-page.html b/it/it-tests/src/test/resources/administration/suite/SystemInfoTest/system-info-page.html deleted file mode 100644 index b71bea2876e..00000000000 --- a/it/it-tests/src/test/resources/administration/suite/SystemInfoTest/system-info-page.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - system-info-page - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
open/sonar/sessions/logout
open/sonar/sessions/login
typeloginadmin
typepasswordadmin
clickAndWaitcommit
open/sonar/system
waitForTextcontent*Automatic User Creation*
waitForElementPresentid=logs-link
waitForElementPresentid=download-link
- - diff --git a/it/it-tests/src/test/resources/server/ServerAdministrationTest/server-administration/system_info.html b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server-administration/system_info.html index 8239c6e124a..2527e2e48f2 100644 --- a/it/it-tests/src/test/resources/server/ServerAdministrationTest/server-administration/system_info.html +++ b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server-administration/system_info.html @@ -2,68 +2,78 @@ - - system_info + + system_info - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
system_info
open/sonar/sessions/logout
open/sonar/sessions/new
typeloginadmin
typepasswordadmin
clickAndWaitcommit
open/sonar/system/index
assertTextsonarqube*Version*.*-SNAPSHOT*
assertTextdatabase*Database Version*Pool Active Connections*
assertTextsystem*Start Time*Processors*
assertTextjvmproperties*java.class.path*java.specification.version*
system_info
open/sonar/sessions/logout
open/sonar/sessions/new
typeloginadmin
typepasswordadmin
clickAndWaitcommit
open/sonar/system/index
waitForTextid=content*Version*.*-SNAPSHOT*
waitForTextid=content*Database Version*
waitForTextid=content*Pool Active Connections*
waitForTextid=content*Start Time*
waitForTextid=content*Processors*
waitForTextid=content*java.class.path*java.specification.version*
diff --git a/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/valid_id.html b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/valid_id.html index b3e2b5a72ff..ead837d11c8 100644 --- a/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/valid_id.html +++ b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/valid_id.html @@ -94,8 +94,8 @@ - assertText - sonarqube + waitForText + id=content glob:*Server ID*${server_id}* -- 2.39.5