Update tests to reset correctly: depends on #495

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/oom/Metrics.java

@@ -40,7 +40,7 @@ public final class Metrics {
 
 
     /** Sets whether computations are forced or not. Used for tests. */
-    public static void reset() {
+    /* default */ static void reset() {
         TOP_LEVEL_PACKAGE.reset();
     }
 

pmd-java/src/test/java/net/sourceforge/pmd/lang/java/oom/MetricsHook.java

@@ -0,0 +1,18 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.java.oom;
+
+/**
+ * Provides a hook into package-private methods of {@code oom}.
+ *
+ * @author Clément Fournier
+ */
+public class MetricsHook {
+
+    public static void reset() {
+        Metrics.reset();
+    }
+
+}

pmd-java/src/test/java/net/sourceforge/pmd/lang/java/oom/metrics/AllMetricsTest.java

@@ -4,10 +4,8 @@
 
 package net.sourceforge.pmd.lang.java.oom.metrics;
 
-import org.junit.After;
-import org.junit.AfterClass;
-
-import net.sourceforge.pmd.lang.java.oom.Metrics;
+import net.sourceforge.pmd.Rule;
+import net.sourceforge.pmd.lang.java.oom.MetricsHook;
 import net.sourceforge.pmd.testframework.SimpleAggregatorTst;
 
 /**
@@ -20,9 +18,9 @@ public class AllMetricsTest extends SimpleAggregatorTst {
 
 
     @Override
-    public Rule reset() {
-        System.err.println("resettt");
-        Metrics.reset();
+    protected Rule reinitializeRule(Rule rule) {
+        MetricsHook.reset();
+        return rule;
     }
 
 

pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/metrics/MetricsRulesTest.java

@@ -4,6 +4,8 @@
 
 package net.sourceforge.pmd.lang.java.rule.metrics;
 
+import net.sourceforge.pmd.Rule;
+import net.sourceforge.pmd.lang.java.oom.MetricsHook;
 import net.sourceforge.pmd.testframework.SimpleAggregatorTst;
 
 /**
@@ -14,6 +16,14 @@ public class MetricsRulesTest extends SimpleAggregatorTst {
 
     private static final String RULESET = "java-metrics";
 
+
+    @Override
+    protected Rule reinitializeRule(Rule rule) {
+        MetricsHook.reset();
+        return super.reinitializeRule(rule);
+    }
+
+
     @Override
     public void setUp() {
         addRule(RULESET, "CyclomaticComplexity");