Browse Source

fix integration test : the root node of a PMD configuration is "ruleset" and not "resultset"

tags/2.6
fmallet 13 years ago
parent
commit
483e556846

+ 1
- 1
plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/PmdProfileExporter.java View File

} }


protected String exportPmdRulesetToXml(PmdRuleset pmdRuleset) { protected String exportPmdRulesetToXml(PmdRuleset pmdRuleset) {
Element eltRuleset = new Element("resultset");
Element eltRuleset = new Element("ruleset");
for (PmdRule pmdRule : pmdRuleset.getPmdRules()) { for (PmdRule pmdRule : pmdRuleset.getPmdRules()) {
Element eltRule = new Element("rule"); Element eltRule = new Element("rule");
addAttribute(eltRule, "ref", pmdRule.getRef()); addAttribute(eltRule, "ref", pmdRule.getRef());

+ 1
- 1
plugins/sonar-pmd-plugin/src/test/java/org/sonar/plugins/pmd/PmdConfigurationTest.java View File

assertThat(rulesets.size(), is(1)); assertThat(rulesets.size(), is(1));
File xmlFile = new File(rulesets.get(0)); File xmlFile = new File(rulesets.get(0));
assertThat(xmlFile.exists(), is(true)); assertThat(xmlFile.exists(), is(true));
assertThat(FileUtils.readFileToString(xmlFile), is("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<resultset />\r\n\r\n"));
assertThat(FileUtils.readFileToString(xmlFile), is("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<ruleset />\r\n\r\n"));
} }


@Test @Test

+ 2
- 2
plugins/sonar-pmd-plugin/src/test/resources/org/sonar/plugins/pmd/export_simple.xml View File

<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<resultset>
<ruleset>
<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"> <rule ref="rulesets/coupling.xml/CouplingBetweenObjects">
<priority>2</priority> <priority>2</priority>
<properties> <properties>
<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"> <rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify">
<priority>4</priority> <priority>4</priority>
</rule> </rule>
</resultset>
</ruleset>



+ 2
- 2
plugins/sonar-pmd-plugin/src/test/resources/org/sonar/plugins/pmd/export_xpath_rules.xml View File

<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<resultset>
<ruleset>
<rule class="net.sourceforge.pmd.rules.XPathRule" message="This is bad" name="MyOwnRule"> <rule class="net.sourceforge.pmd.rules.XPathRule" message="This is bad" name="MyOwnRule">
<priority>3</priority> <priority>3</priority>
<properties> <properties>
</property> </property>
</properties> </properties>
</rule> </rule>
</resultset>
</ruleset>



Loading…
Cancel
Save