From: Simon Brandhof Date: Wed, 30 Jul 2014 21:10:00 +0000 (+0200) Subject: SONAR-4898 delete sonar-application-test directory X-Git-Tag: 4.5-RC1~323 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4b766b79cd6bea66106e98a3a7a54211add6e785;p=sonarqube.git SONAR-4898 delete sonar-application-test directory --- diff --git a/sonar-application-test/pom.xml b/sonar-application-test/pom.xml deleted file mode 100644 index 382dabd3436..00000000000 --- a/sonar-application-test/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 4.0.0 - - - org.codehaus.sonar - sonar - 4.5-SNAPSHOT - - - sonar-application-tests - Sonar :: Application :: Tests - - - 4.5-SNAPSHOT - * - true - -Xmx128m -server - - - - - - org.codehaus.sonar - sonar-application - ${sonar.buildVersion} - - - - org.codehaus.sonar - sonar-ws-client - ${sonar.buildVersion} - test - - - com.sonarsource.orchestrator - sonar-orchestrator - 2.15-SNAPSHOT - test - - - junit - junit - test - - - org.easytesting - fest-assert - test - - - - diff --git a/sonar-application-test/src/test/java/ForkTest.java b/sonar-application-test/src/test/java/ForkTest.java deleted file mode 100644 index 79c5f35f152..00000000000 --- a/sonar-application-test/src/test/java/ForkTest.java +++ /dev/null @@ -1,73 +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. - */ -import com.sonar.orchestrator.Orchestrator; -import com.sonar.orchestrator.OrchestratorBuilder; -import com.sonar.orchestrator.build.SonarRunner; -import com.sonar.orchestrator.locator.MavenLocation; -import org.junit.After; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; - -import java.io.File; -import java.util.Collections; - -import static org.fest.assertions.Assertions.assertThat; -import static org.fest.assertions.Fail.fail; - -public class ForkTest { - - private Orchestrator orchestrator; - - @ClassRule - public static TemporaryFolder temp = new TemporaryFolder(); - - @After - public void stop() { - if (orchestrator != null) { - orchestrator.stop(); - } - } - - @Test - public void start_and_stop() { - OrchestratorBuilder builder = Orchestrator.builderEnv(); - builder.setSonarVersion("DEV"); - builder.addPlugin(MavenLocation.create("com.sonarsource.xoo", "sonar-xoo-plugin", "1.0-SNAPSHOT")); - orchestrator = builder.build(); - orchestrator.start(); - - // verify web service that requests elasticsearch - String json = orchestrator.getServer().wsClient().get("/api/rules/search", Collections.emptyMap()); - assertThat(json).startsWith("{").endsWith("}"); - - // project analysis - orchestrator.executeBuild(SonarRunner.create(new File("src/test/projects/xoo-sample"))); - - orchestrator.stop(); - try { - orchestrator.getServer().wsClient().get("/api/rules/search", Collections.emptyMap()); - fail("Server is not stopped"); - } catch (Exception e) { - // ok - } - } - -} diff --git a/sonar-application-test/src/test/projects/xoo-sample/sonar-project.properties b/sonar-application-test/src/test/projects/xoo-sample/sonar-project.properties deleted file mode 100644 index e01f062e51b..00000000000 --- a/sonar-application-test/src/test/projects/xoo-sample/sonar-project.properties +++ /dev/null @@ -1,5 +0,0 @@ -sonar.projectKey=sample -sonar.projectName=Sample -sonar.projectVersion=1.0-SNAPSHOT -sonar.sources=src/main/xoo -sonar.language=xoo \ No newline at end of file diff --git a/sonar-application-test/src/test/projects/xoo-sample/src/main/xoo/sample/Sample.xoo b/sonar-application-test/src/test/projects/xoo-sample/src/main/xoo/sample/Sample.xoo deleted file mode 100644 index b1210973dd9..00000000000 --- a/sonar-application-test/src/test/projects/xoo-sample/src/main/xoo/sample/Sample.xoo +++ /dev/null @@ -1,12 +0,0 @@ -package sample; - -public class Sample { - - public Sample(int i) { - int j = i++; - } - - private String myMethod() { - return "hello"; - } -} diff --git a/sonar-application-test/src/test/projects/xoo-sample/src/main/xoo/sample/Sample.xoo.measures b/sonar-application-test/src/test/projects/xoo-sample/src/main/xoo/sample/Sample.xoo.measures deleted file mode 100644 index a687109155a..00000000000 --- a/sonar-application-test/src/test/projects/xoo-sample/src/main/xoo/sample/Sample.xoo.measures +++ /dev/null @@ -1,13 +0,0 @@ -lines:13 -ncloc:13 -#Used by dashboard/widgets tests -lcom4:2 -complexity:3 -complexity_in_classes:3 -classes:1 -comment_lines:3 -public_api:5 -public_undocumented_api:2 -duplicated_files:1 -duplicated_blocks:2 -duplicated_lines:3