pmd integration tests: use the new rules XML format

diff --git a/tests/integration/pmd-extensions/pmd-extensions.xml b/tests/integration/pmd-extensions/pmd-extensions.xml
index 066df234898cfec4d2d2ee38455545f9d3c88c87..e4a820eb2a53791a5a4c759f94c8960ad5ce13b5 100644 (file)
--- a/tests/integration/pmd-extensions/pmd-extensions.xml
+++ b/tests/integration/pmd-extensions/pmd-extensions.xml
@@ -1,29 +1,36 @@
 <rules>\r
-  <rule key="MaximumMethodsCountCheck">\r
+  <rule>
+    <key>MaximumMethodsCountCheck</key>\r
     <name>Maximum Methods Count Check</name>\r
     <configKey>rulesets/extensions.xml/MaximumMethodsCountCheck</configKey>\r
-    <category name="Usability"/>\r
+    <isoCategory>Usability</isoCategory>\r
     <description>Maximum number of methods authorised</description>\r
-      <param key="maxAuthorisedMethodsCount" type="i">\r
+      <param>
+        <key>maxAuthorisedMethodsCount</key>\r
         <description>Maximum number of methods authorised. Default is 2.</description>\r
       </param>\r
   </rule>\r
-  <rule key="AvoidIfWithoutBrace">\r
+  <rule>
+    <key>AvoidIfWithoutBrace</key>\r
     <name>Avoid if without using brace</name>\r
     <configKey>rulesets/extensions.xml/AvoidIfWithoutBrace</configKey>\r
-    <category name="Usability"/>\r
+    <isoCategory>Usability</isoCategory>\r
     <description></description>\r
   </rule>
-  <rule key="PreventUseOfEmptyClass" priority="MAJOR">
+  <rule>
+    <key>PreventUseOfEmptyClass</key>
+    <priority>MAJOR</priority>
     <name><![CDATA[Prevent use of EmptyClass]]></name>
     <configKey><![CDATA[net.sourceforge.pmd.rules.XPathRule]]></configKey>
-    <category name="Maintainability"/>
+    <isoCategory>Maintainability</isoCategory>
     <description></description>
-    <param key="xpath" type="s">
+    <param>
+      <key>xpath</key>
       <description><![CDATA[XPath expressions.]]></description>
       <defaultValue>//VariableDeclarator[../Type/ReferenceType/ClassOrInterfaceType[@Image='EmptyClass']]</defaultValue>          
     </param>
-    <param key="message" type="s">
+    <param>
+      <key>message</key>
       <description><![CDATA[Message to display when a violation occurs.]]></description>
       <defaultValue>Prevent use of EmptyClass class</defaultValue>      
     </param>