Fix tests because of removal of PluginConstants interface, which was replaced with a call to RuleSetFactory.getRegisteredRuleSets(). It is unclear to me why the plugin did explicit enumeration of the RuleSets, perhaps it was put in before the factory could enumerate them.
FYI, I am _not_ able to run these tests successfully. There is something about how to run them that I do not currently grok, nor am I too worried about it at this time. git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@6743 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
@ -47,7 +47,6 @@ import net.sourceforge.pmd.RuleSet;
|
|||||||
import net.sourceforge.pmd.RuleSetFactory;
|
import net.sourceforge.pmd.RuleSetFactory;
|
||||||
import net.sourceforge.pmd.RuleSetNotFoundException;
|
import net.sourceforge.pmd.RuleSetNotFoundException;
|
||||||
import net.sourceforge.pmd.RuleViolation;
|
import net.sourceforge.pmd.RuleViolation;
|
||||||
import net.sourceforge.pmd.eclipse.core.PluginConstants;
|
|
||||||
import net.sourceforge.pmd.eclipse.runtime.cmd.PMDEngine;
|
import net.sourceforge.pmd.eclipse.runtime.cmd.PMDEngine;
|
||||||
import net.sourceforge.pmd.lang.LanguageVersion;
|
import net.sourceforge.pmd.lang.LanguageVersion;
|
||||||
|
|
||||||
@ -181,15 +180,15 @@ public class BasicPMDTest extends TestCase {
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public void testDefaulltRuleSets() {
|
public void testDefaulltRuleSets() {
|
||||||
RuleSetFactory factory = new RuleSetFactory();
|
|
||||||
String allRuleSets[] = PluginConstants.PMD_JAVA_RULESETS;
|
|
||||||
for (String allRuleSet : allRuleSets) {
|
|
||||||
try {
|
try {
|
||||||
RuleSet ruleSet = factory.createRuleSet(allRuleSet);
|
RuleSetFactory factory = new RuleSetFactory();
|
||||||
|
Iterator<RuleSet> iterator = factory.getRegisteredRuleSets();
|
||||||
|
while (iterator.hasNext()) {
|
||||||
|
iterator.next();
|
||||||
|
}
|
||||||
} catch (RuleSetNotFoundException e) {
|
} catch (RuleSetNotFoundException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
fail("unable to load ruleset " + allRuleSet);
|
fail("unable to load registered rulesets ");
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -87,9 +87,10 @@ public class PMDCorePluginTest extends TestCase {
|
|||||||
assertFalse("No registered rulesets!", registeredRuleSets.isEmpty());
|
assertFalse("No registered rulesets!", registeredRuleSets.isEmpty());
|
||||||
|
|
||||||
RuleSetFactory factory = new RuleSetFactory();
|
RuleSetFactory factory = new RuleSetFactory();
|
||||||
for (String element : PluginConstants.PMD_JAVA_RULESETS) {
|
Iterator<RuleSet> iterator = factory.getRegisteredRuleSets();
|
||||||
RuleSet ruleSet = factory.createRuleSet(element);
|
while (iterator.hasNext()) {
|
||||||
assertTrue("RuleSet \"" + element + "\" has not been registered", ruleSetRegistered(ruleSet,
|
RuleSet ruleSet = iterator.next();
|
||||||
|
assertTrue("RuleSet \"" + ruleSet.getName() + "\" has not been registered", ruleSetRegistered(ruleSet,
|
||||||
registeredRuleSets));
|
registeredRuleSets));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -104,9 +105,10 @@ public class PMDCorePluginTest extends TestCase {
|
|||||||
assertFalse("No registered default rulesets!", defaultRuleSets.isEmpty());
|
assertFalse("No registered default rulesets!", defaultRuleSets.isEmpty());
|
||||||
|
|
||||||
RuleSetFactory factory = new RuleSetFactory();
|
RuleSetFactory factory = new RuleSetFactory();
|
||||||
for (String element : PluginConstants.PMD_JAVA_RULESETS) {
|
Iterator<RuleSet> iterator = factory.getRegisteredRuleSets();
|
||||||
RuleSet ruleSet = factory.createRuleSet(element);
|
while (iterator.hasNext()) {
|
||||||
assertTrue("RuleSet \"" + element + "\" has not been registered", ruleSetRegistered(ruleSet,
|
RuleSet ruleSet = iterator.next();
|
||||||
|
assertTrue("RuleSet \"" + ruleSet.getName() + "\" has not been registered", ruleSetRegistered(ruleSet,
|
||||||
defaultRuleSets));
|
defaultRuleSets));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user