]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-4898 delete sonar-application-test directory
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Wed, 30 Jul 2014 21:10:00 +0000 (23:10 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Wed, 30 Jul 2014 21:10:00 +0000 (23:10 +0200)
sonar-application-test/pom.xml [deleted file]
sonar-application-test/src/test/java/ForkTest.java [deleted file]
sonar-application-test/src/test/projects/xoo-sample/sonar-project.properties [deleted file]
sonar-application-test/src/test/projects/xoo-sample/src/main/xoo/sample/Sample.xoo [deleted file]
sonar-application-test/src/test/projects/xoo-sample/src/main/xoo/sample/Sample.xoo.measures [deleted file]

diff --git a/sonar-application-test/pom.xml b/sonar-application-test/pom.xml
deleted file mode 100644 (file)
index 382dabd..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.codehaus.sonar</groupId>
-    <artifactId>sonar</artifactId>
-    <version>4.5-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sonar-application-tests</artifactId>
-  <name>Sonar :: Application :: Tests</name>
-
-  <properties>
-    <sonar.buildVersion>4.5-SNAPSHOT</sonar.buildVersion>
-    <category>*</category>
-    <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
-    <surefire.argLine>-Xmx128m -server</surefire.argLine>
-  </properties>
-
-  <dependencies>
-    <!-- Force dependency on sonar-application -->
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-application</artifactId>
-      <version>${sonar.buildVersion}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-ws-client</artifactId>
-      <version>${sonar.buildVersion}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.sonarsource.orchestrator</groupId>
-      <artifactId>sonar-orchestrator</artifactId>
-      <version>2.15-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easytesting</groupId>
-      <artifactId>fest-assert</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/sonar-application-test/src/test/java/ForkTest.java b/sonar-application-test/src/test/java/ForkTest.java
deleted file mode 100644 (file)
index 79c5f35..0000000
+++ /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.<String, Object>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.<String, Object>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 (file)
index e01f062..0000000
+++ /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 (file)
index b121097..0000000
+++ /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 (file)
index a687109..0000000
+++ /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