aboutsummaryrefslogtreecommitdiffstats
path: root/tests/integration
diff options
context:
space:
mode:
authorGodin <mandrikov@gmail.com>2010-12-06 16:52:44 +0000
committerGodin <mandrikov@gmail.com>2010-12-06 16:52:44 +0000
commit94224a5d7ff7b9f60b67b002a75fbc3045130268 (patch)
treecd18b0da5b2d93a439cd4072a8ff2008f634a7ec /tests/integration
parentabda43912a17b603677f0216b43aa38ee88333b4 (diff)
downloadsonarqube-94224a5d7ff7b9f60b67b002a75fbc3045130268.tar.gz
sonarqube-94224a5d7ff7b9f60b67b002a75fbc3045130268.zip
SONAR-2031: Fix ITs
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/pom.xml50
-rw-r--r--tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/rules/checkstyle.xml13
-rw-r--r--tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/rules/findbugs.xml6
-rw-r--r--tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/rules/pmd.xml10
-rw-r--r--tests/integration/tests/maven-projects/SONAR-583-reuse-rules-config/src/main/java/org/sonar/tests/Hello.java27
-rw-r--r--tests/integration/tests/src/it/selenium/SONAR-583-reuse-rules-config.html57
-rw-r--r--tests/integration/tests/src/it/selenium/all-tests.html3
7 files changed, 0 insertions, 166 deletions
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
index 9396ed7b1ad..00000000000
--- 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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.sonar.tests</groupId>
- <artifactId>reuse-rules-config</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>[SONAR-583] reuse-rules-config</name>
- <description>see http://jira.codehaus.org/browse/SONAR-583</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>rules/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <rulesets>
- <ruleset>rules/pmd.xml</ruleset>
- </rulesets>
- </configuration>
- </plugin>
- <plugin>
- <!-- Note that sonar-findbugs-plugin didn't allow reusing existing configuration since SONAR-1772 -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <includeFilterFile>rules/findbugs.xml</includeFilterFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <sonar.profile>Empty profile</sonar.profile>
- <sonar.reuseExistingRulesConfiguration>true</sonar.reuseExistingRulesConfiguration>
- </properties>
-</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
index 4dbeb04684c..00000000000
--- 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
index 54cbcd00fde..00000000000
--- 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
index 2491f95b9bc..00000000000
--- 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
index 7485274aad7..00000000000
--- 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
index 6d5fd288d03..00000000000
--- 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 4dce17ef26a..7a54e69433e 100644
--- a/tests/integration/tests/src/it/selenium/all-tests.html
+++ b/tests/integration/tests/src/it/selenium/all-tests.html
@@ -61,9 +61,6 @@
<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>
<tr>