@@ -13,6 +13,7 @@ env: | |||
- JOB=ITS IT_CATEGORY=issue | |||
- JOB=ITS IT_CATEGORY=analysis | |||
- JOB=ITS IT_CATEGORY=administration | |||
- JOB=ITS IT_CATEGORY=server | |||
- JOB=ITS IT_CATEGORY=plugins | |||
- JOB=ITS IT_CATEGORY=qualitygate | |||
- JOB=ITS IT_CATEGORY=updatecenter |
@@ -23,13 +23,13 @@ import administration.suite.administration.BulkDeletionTest; | |||
import administration.suite.administration.ProjectAdministrationTest; | |||
import administration.suite.administration.PropertySetsTest; | |||
import administration.suite.administration.SubCategoriesTest; | |||
import administration.suite.administration.WebServiceTest; | |||
import administration.suite.server.ServerAdministrationTest; | |||
import administration.suite.ui.I18nTest; | |||
import com.sonar.orchestrator.Orchestrator; | |||
import org.junit.ClassRule; | |||
import org.junit.runner.RunWith; | |||
import org.junit.runners.Suite; | |||
import server.suite.ServerAdministrationTest; | |||
import server.suite.WebServiceTest; | |||
import util.ItUtils; | |||
import static util.ItUtils.pluginArtifact; |
@@ -3,7 +3,7 @@ | |||
* All rights reserved | |||
* mailto:contact AT sonarsource DOT com | |||
*/ | |||
package administration; | |||
package server; | |||
import com.sonar.orchestrator.Orchestrator; | |||
import com.sonar.orchestrator.util.NetworkUtils; |
@@ -3,7 +3,7 @@ | |||
* All rights reserved | |||
* mailto:contact AT sonarsource DOT com | |||
*/ | |||
package administration; | |||
package server; | |||
import com.sonar.orchestrator.Orchestrator; | |||
import com.sonar.orchestrator.OrchestratorBuilder; |
@@ -3,9 +3,8 @@ | |||
* All rights reserved | |||
* mailto:contact AT sonarsource DOT com | |||
*/ | |||
package administration.suite.server; | |||
package server.suite; | |||
import administration.suite.AdministrationTestSuite; | |||
import com.sonar.orchestrator.Orchestrator; | |||
import com.sonar.orchestrator.selenium.Selenese; | |||
import java.io.IOException; | |||
@@ -30,7 +29,7 @@ import static org.junit.Assert.fail; | |||
public class ServerAdministrationTest { | |||
@ClassRule | |||
public static Orchestrator orchestrator = AdministrationTestSuite.ORCHESTRATOR; | |||
public static final Orchestrator orchestrator = ServerTestSuite.ORCHESTRATOR; | |||
@Test | |||
public void get_sonar_version() { |
@@ -0,0 +1,40 @@ | |||
/* | |||
* 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 server.suite; | |||
import com.sonar.orchestrator.Orchestrator; | |||
import org.junit.ClassRule; | |||
import org.junit.runner.RunWith; | |||
import org.junit.runners.Suite; | |||
import util.ItUtils; | |||
@RunWith(Suite.class) | |||
@Suite.SuiteClasses({ | |||
ServerAdministrationTest.class, | |||
WebServiceTest.class | |||
}) | |||
public class ServerTestSuite { | |||
@ClassRule | |||
public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv() | |||
.addPlugin(ItUtils.xooPlugin()) | |||
.build(); | |||
} |
@@ -3,9 +3,8 @@ | |||
* All rights reserved | |||
* mailto:contact AT sonarsource DOT com | |||
*/ | |||
package administration.suite.administration; | |||
package server.suite; | |||
import administration.suite.AdministrationTestSuite; | |||
import com.google.common.base.Function; | |||
import com.google.common.collect.Iterables; | |||
import com.sonar.orchestrator.Orchestrator; | |||
@@ -34,7 +33,7 @@ import static util.ItUtils.projectDir; | |||
public class WebServiceTest { | |||
@ClassRule | |||
public static Orchestrator orchestrator = AdministrationTestSuite.ORCHESTRATOR; | |||
public static final Orchestrator orchestrator = ServerTestSuite.ORCHESTRATOR; | |||
@Before | |||
public void inspectProject() { |