SONAR-2031: Fix ITs

diff --git a/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/pom.xml b/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/pom.xml
deleted file mode 100644 (file)
index 9396ed7..0000000
--- a/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<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">\r
-  <modelVersion>4.0.0</modelVersion>\r
-  <groupId>org.sonar.tests</groupId>\r
-  <artifactId>reuse-rules-config</artifactId>\r
-  <version>1.0-SNAPSHOT</version>\r
-  <packaging>jar</packaging>\r
-  <name>[SONAR-583] reuse-rules-config</name>\r
-  <description>see http://jira.codehaus.org/browse/SONAR-583</description>\r
-       <build>\r
-         <plugins>\r
-           <plugin>\r
-             <groupId>org.apache.maven.plugins</groupId>\r
-             <artifactId>maven-compiler-plugin</artifactId>\r
-             <configuration>\r
-               <source>1.5</source>\r
-               <target>1.5</target>\r
-             </configuration>\r
-           </plugin>
-           <plugin>\r
-             <groupId>org.apache.maven.plugins</groupId>\r
-             <artifactId>maven-checkstyle-plugin</artifactId>\r
-             <configuration>\r
-               <configLocation>rules/checkstyle.xml</configLocation>\r
-             </configuration>\r
-       </plugin>\r
-       <plugin>\r
-             <groupId>org.apache.maven.plugins</groupId>\r
-             <artifactId>maven-pmd-plugin</artifactId>\r
-             <configuration>\r
-               <rulesets>\r
-                 <ruleset>rules/pmd.xml</ruleset>\r
-               </rulesets>\r
-             </configuration>\r
-           </plugin>\r
-           <plugin>\r
-        <!-- Note that sonar-findbugs-plugin didn't allow reusing existing configuration since SONAR-1772 -->\r
-             <groupId>org.codehaus.mojo</groupId>\r
-             <artifactId>findbugs-maven-plugin</artifactId>\r
-             <configuration>\r
-               <includeFilterFile>rules/findbugs.xml</includeFilterFile>\r
-             </configuration>\r
-           </plugin>\r
-         </plugins>    \r
-   </build>
-   
-   <properties>\r
-     <sonar.profile>Empty profile</sonar.profile>
-     <sonar.reuseExistingRulesConfiguration>true</sonar.reuseExistingRulesConfiguration>
-   </properties>\r
-</project>
\ No newline at end of file

diff --git a/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/rules/checkstyle.xml b/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/rules/checkstyle.xml
deleted file mode 100644 (file)
index 4dbeb04..0000000
--- a/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/rules/checkstyle.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"><!-- generated by Sonar -->
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="MagicNumber">
-      <property name="severity" value="info"/>
-    </module>
-    <module name="DesignForExtension">
-      <property name="severity" value="info"/>
-    </module>
-    <module name="SimplifyBooleanReturn"/>
-  </module>
-</module>
\ No newline at end of file

diff --git a/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/rules/findbugs.xml b/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/rules/findbugs.xml
deleted file mode 100644 (file)
index 54cbcd0..0000000
--- a/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/rules/findbugs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<FindBugsFilter>
-  <Match>
-    <Bug pattern="UPM_UNCALLED_PRIVATE_METHOD"/>
-  </Match>
-</FindBugsFilter>
\ No newline at end of file

diff --git a/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/rules/pmd.xml b/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/rules/pmd.xml
deleted file mode 100644 (file)
index 2491f95..0000000
--- a/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/rules/pmd.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset>
-  <description>Custom PMD rules</description>
-  <rule ref="rulesets/logging-java.xml/SystemPrintln">
-    <priority>5</priority>
-  </rule>
-  <rule ref="rulesets/strings.xml/UselessStringValueOf">
-    <priority>3</priority>
-  </rule>
-</ruleset>
\ No newline at end of file

diff --git a/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/src/main/java/org/sonar/tests/Hello.java b/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/src/main/java/org/sonar/tests/Hello.java
deleted file mode 100644 (file)
index 7485274..0000000
--- a/tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/src/main/java/org/sonar/tests/Hello.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.sonar.tests;
-
-public class Hello {
-  
-  private String hello;
-  private int magicNumber = 50;
-  
-  public Hello(String s) {
-    this.hello = s;
-  }
-  
-  private void say() {
-       System.out.println(hello);
-  }
-  
-  public int designForExtensionViolation() {
-    return 3;  
-  }
-  
-  private boolean simplifyBooleanReturn() {
-    if (true) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-}

diff --git a/tests/integration/tests/src/it/selenium/SONAR-583-reuse-rules-config.html b/tests/integration/tests/src/it/selenium/SONAR-583-reuse-rules-config.html
deleted file mode 100644 (file)
index 6d5fd28..0000000
--- a/tests/integration/tests/src/it/selenium/SONAR-583-reuse-rules-config.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:9000/" />
-<title>SONAR-583-reuse-rules-config</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">SONAR-583-reuse-rules-config</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/dashboard/index/org.sonar.tests:reuse-rules-config</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertTextPresent</td>
-       <td>profile Empty profile</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>m_violations</td>
-       <td>5</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>m_critical_violations</td>
-       <td>0</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>m_major_violations</td>
-       <td>2</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>m_minor_violations</td>
-       <td>3</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>m_blocker_violations</td>
-       <td>0</td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>m_info_violations</td>
-       <td>0</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>

diff --git a/tests/integration/tests/src/it/selenium/all-tests.html b/tests/integration/tests/src/it/selenium/all-tests.html
index 4dce17ef26ad68becde157ca8875a257c1d91b3d..7a54e69433e666af4f1c12e986238bfe049a7e86 100644 (file)
--- a/tests/integration/tests/src/it/selenium/all-tests.html
+++ b/tests/integration/tests/src/it/selenium/all-tests.html
@@ -60,9 +60,6 @@
 <tr>
   <td><a href="SONAR-222_maven_extensions.html">SONAR-222_maven_extensions</a></td>
 </tr>
-<tr>
-  <td><a href="SONAR-583-reuse-rules-config.html">SONAR-583-reuse-rules-config</a></td>
-</tr>
 <tr>
   <td><a href="SONAR-594-no-violations.html">SONAR-594-no-violations</a></td>
 </tr>