Revert "RuleRepositoryTestHelper is back"

This reverts commit 3f42ac85a4495333dbe76e1b1587ea05b7d900a4.

diff --git a/sonar-deprecated/pom.xml b/sonar-deprecated/pom.xml
index 82394aebe91954766c0c966629a935d611263ab5..1a21f72325e66da1964c359e54937f142b061b33 100644 (file)
--- a/sonar-deprecated/pom.xml
+++ b/sonar-deprecated/pom.xml
@@ -39,8 +39,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>sonar-testing-harness</artifactId>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sonar-testing-harness/pom.xml b/sonar-testing-harness/pom.xml
index 9e42d67fdb3ad7d8706932981b8c775ecbd591cf..e32a3a72f4321903e45a33ea4598bce6d6e79666 100644 (file)
--- a/sonar-testing-harness/pom.xml
+++ b/sonar-testing-harness/pom.xml
@@ -44,11 +44,6 @@
       <artifactId>sonar-plugin-api</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-deprecated</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-plugin-api</artifactId>

diff --git a/sonar-testing-harness/src/main/java/org/sonar/test/i18n/RuleRepositoryTestHelper.java b/sonar-testing-harness/src/main/java/org/sonar/test/i18n/RuleRepositoryTestHelper.java
deleted file mode 100644 (file)
index 62c45d8..0000000
--- a/sonar-testing-harness/src/main/java/org/sonar/test/i18n/RuleRepositoryTestHelper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2013 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.
- */
-package org.sonar.test.i18n;
-
-import com.google.common.io.Closeables;
-import org.sonar.api.rules.Rule;
-import org.sonar.api.rules.RuleRepository;
-import org.sonar.api.utils.SonarException;
-import org.sonar.test.TestUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Properties;
-
-public final class RuleRepositoryTestHelper {
-  private RuleRepositoryTestHelper() {
-    // Static utility class
-  }
-
-  public static List<Rule> createRulesWithNameAndDescription(String pluginKey, RuleRepository repository) {
-    Properties props = loadProperties(String.format("/org/sonar/l10n/%s.properties", pluginKey));
-
-    List<Rule> rules = repository.createRules();
-    for (Rule rule : rules) {
-      String name = props.getProperty(String.format("rule.%s.%s.name", repository.getKey(), rule.getKey()));
-      String description = TestUtils.getResourceContent(String.format("/org/sonar/l10n/%s/rules/%s/%s.html", pluginKey, repository.getKey(), rule.getKey()));
-
-      rule.setName(name);
-      rule.setDescription(description);
-    }
-
-    return rules;
-  }
-
-  private static Properties loadProperties(String resourcePath) {
-    Properties properties = new Properties();
-
-    InputStream input = null;
-    try {
-      input = TestUtils.class.getResourceAsStream(resourcePath);
-      properties.load(input);
-      return properties;
-    } catch (IOException e) {
-      throw new SonarException("Unable to read properties " + resourcePath, e);
-    } finally {
-      Closeables.closeQuietly(input);
-    }
-  }
-}