From c29f2a44e61e259a6103ef5ed874d3cf02c24d74 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Wed, 1 Nov 2017 18:54:10 +0100
Subject: [PATCH] Revert "Temporarily disable the unit tests until the rules
 are moved into the"

This reverts commit ded09b649895436c183eb7ffe93d5119a4d2a126.
---
 .../test/java/net/sourceforge/pmd/RuleSetFactoryTest.java  | 7 -------
 .../src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java | 2 --
 .../pmd/lang/java/rule/metrics/MetricsRulesTest.java       | 2 +-
 .../rule/strictexception/StrictExceptionRulesTest.java     | 2 +-
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/RuleSetFactoryTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/RuleSetFactoryTest.java
index 4b46d22c40..a761cd4e9a 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/RuleSetFactoryTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/RuleSetFactoryTest.java
@@ -7,7 +7,6 @@ package net.sourceforge.pmd;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -45,10 +44,4 @@ public class RuleSetFactoryTest extends AbstractRuleSetFactoryTest {
         RuleSet ruleset = ruleSetFactory.createRuleSet(ref);
         assertNotNull(ruleset);
     }
-
-    @Test
-    @Ignore("Rule classes need to be moved into the correct packages corresponding to their categories")
-    public void testAllPMDBuiltInRulesMeetConventions() {
-        // disabled test from super class
-    }
 }
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
index ffb9b761f6..3a5097af00 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
@@ -12,14 +12,12 @@ import java.util.Objects;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.RestoreSystemProperties;
 import org.junit.rules.ExternalResource;
 import org.junit.rules.TestRule;
 
-@Ignore
 public class PMDTaskTest extends AbstractAntTestHelper {
 
     public PMDTaskTest() {
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/metrics/MetricsRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/metrics/MetricsRulesTest.java
index 2b48020226..30d7b90bb4 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/metrics/MetricsRulesTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/metrics/MetricsRulesTest.java
@@ -27,6 +27,6 @@ public class MetricsRulesTest extends SimpleAggregatorTst {
     public void setUp() {
         addRule(RULESET, "CyclomaticComplexity");
         addRule(RULESET, "NPathComplexity");
-        //addRule(RULESET, "DataClass");
+        addRule(RULESET, "DataClass");
     }
 }
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/strictexception/StrictExceptionRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/strictexception/StrictExceptionRulesTest.java
index 7d8837341d..182d0be1ac 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/strictexception/StrictExceptionRulesTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/strictexception/StrictExceptionRulesTest.java
@@ -21,7 +21,7 @@ public class StrictExceptionRulesTest extends SimpleAggregatorTst {
         addRule(RULESET, "AvoidThrowingNullPointerException");
         addRule(RULESET, "AvoidThrowingRawExceptionTypes");
         addRule(RULESET, "DoNotExtendJavaLangError");
-        //addRule(RULESET, "DoNotExtendJavaLangThrowable");
+        addRule(RULESET, "DoNotExtendJavaLangThrowable");
         addRule(RULESET, "ExceptionAsFlowControl");
         addRule(RULESET, "SignatureDeclareThrowsException");
         addRule(RULESET, "DoNotThrowExceptionInFinally");