소스 검색

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

tags/2.6
fmallet 13 년 전
부모
커밋
483e556846

+ 1
- 1
plugins/sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/PmdProfileExporter.java 파일 보기

@@ -94,7 +94,7 @@ public class PmdProfileExporter extends ProfileExporter {
}

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

+ 1
- 1
plugins/sonar-pmd-plugin/src/test/java/org/sonar/plugins/pmd/PmdConfigurationTest.java 파일 보기

@@ -45,7 +45,7 @@ public class PmdConfigurationTest {
assertThat(rulesets.size(), is(1));
File xmlFile = new File(rulesets.get(0));
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

+ 2
- 2
plugins/sonar-pmd-plugin/src/test/resources/org/sonar/plugins/pmd/export_simple.xml 파일 보기

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


+ 2
- 2
plugins/sonar-pmd-plugin/src/test/resources/org/sonar/plugins/pmd/export_xpath_rules.xml 파일 보기

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


Loading…
취소
저장