From 791dd8e8fb255948d58240514644cbd4b344e576 Mon Sep 17 00:00:00 2001
From: simonbrandhof <simon.brandhof@gmail.com>
Date: Wed, 15 Dec 2010 11:58:50 +0000
Subject: [PATCH] rename Java integration tests with pattern *IT.java

---
 .../{src/it => }/integration-tests-backup.xml |  0
 tests/integration/tests/pom.xml               | 29 ++-----------------
 .../sonar/tests/integration/VariationsIT.java | 23 +++++++++++++++
 3 files changed, 26 insertions(+), 26 deletions(-)
 rename tests/integration/tests/{src/it => }/integration-tests-backup.xml (100%)
 create mode 100644 tests/integration/tests/src/it/java/org/sonar/tests/integration/VariationsIT.java

diff --git a/tests/integration/tests/src/it/integration-tests-backup.xml b/tests/integration/tests/integration-tests-backup.xml
similarity index 100%
rename from tests/integration/tests/src/it/integration-tests-backup.xml
rename to tests/integration/tests/integration-tests-backup.xml
diff --git a/tests/integration/tests/pom.xml b/tests/integration/tests/pom.xml
index fbad8a117e5..f79a7b2c7f3 100644
--- a/tests/integration/tests/pom.xml
+++ b/tests/integration/tests/pom.xml
@@ -16,13 +16,6 @@
   </properties>
 
   <build>
-    <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>${basedir}/src/it/resources</directory>
-      </testResource>
-    </testResources>
-
     <plugins>
       <plugin>
         <groupId>org.codehaus.sonar</groupId>
@@ -33,8 +26,8 @@
             <phase>pre-integration-test</phase>
             <configuration>
               <background>true</background>
-              <extensionsDir>${basedir}/target/extensions</extensionsDir>
-              <configBackup>${basedir}/src/it/integration-tests-backup.xml</configBackup>
+              <extensionsDir>${project.basedir}/target/extensions</extensionsDir>
+              <configBackup>${project.basedir}/integration-tests-backup.xml</configBackup>
               <clean>true</clean>
             </configuration>
             <goals>
@@ -45,7 +38,7 @@
             <id>analyze-projects</id>
             <phase>pre-integration-test</phase>
             <configuration>
-              <projectsDir>${basedir}/maven-projects</projectsDir>
+              <projectsDir>${project.basedir}/maven-projects</projectsDir>
             </configuration>
             <goals>
               <goal>analyze</goal>
@@ -118,11 +111,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.6</version>
         <configuration>
-          <includes>
-            <include>**/*.java</include>
-          </includes>
           <systemProperties>
             <property>
               <name>sonar.url</name>
@@ -188,16 +177,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <!-- Skip the normal tests, we'll run them in the integration-test phase -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
     </plugins>
   </build>
 
@@ -217,11 +196,9 @@
       <artifactId>sonar-it-reference-plugin</artifactId>
       <version>${project.version}</version>
     </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.7</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
diff --git a/tests/integration/tests/src/it/java/org/sonar/tests/integration/VariationsIT.java b/tests/integration/tests/src/it/java/org/sonar/tests/integration/VariationsIT.java
new file mode 100644
index 00000000000..20307d6367a
--- /dev/null
+++ b/tests/integration/tests/src/it/java/org/sonar/tests/integration/VariationsIT.java
@@ -0,0 +1,23 @@
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2009 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar 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.
+ *
+ * Sonar 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 Sonar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+ */
+package org.sonar.tests.integration;
+
+public class VariationsIT {
+}
-- 
2.39.5