From 555448aba8b86342ec36ef78f7db5312883e386c Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Mon, 11 Sep 2017 21:29:46 +0200
Subject: [PATCH] Apply schema for javascript rules tests

---
 .../rule/basic/xml/AssignmentInOperand.xml    | 19 +++++++++++--------
 .../rule/basic/xml/AvoidTrailingComma.xml     |  9 ++++++---
 .../rule/basic/xml/ConsistentReturn.xml       |  5 ++++-
 .../rule/basic/xml/EqualComparison.xml        |  5 ++++-
 .../rule/basic/xml/GlobalVariable.xml         |  5 ++++-
 .../basic/xml/InnaccurateNumericLiteral.xml   |  5 ++++-
 .../rule/basic/xml/ScopeForInVariable.xml     |  5 ++++-
 .../rule/basic/xml/UnreachableCode.xml        |  5 ++++-
 .../rule/basic/xml/UseBaseWithParseInt.xml    |  5 ++++-
 .../rule/braces/xml/ForLoopsMustUseBraces.xml |  5 ++++-
 .../braces/xml/IfElseStmtsMustUseBraces.xml   |  5 ++++-
 .../rule/braces/xml/IfStmtsMustUseBraces.xml  |  5 ++++-
 .../braces/xml/WhileLoopsMustUseBraces.xml    |  5 ++++-
 .../controversial/xml/AvoidWithStatement.xml  |  5 ++++-
 .../rule/unnecessary/xml/NoElseReturn.xml     |  5 ++++-
 .../rule/unnecessary/xml/UnnecessaryBlock.xml |  5 ++++-
 .../xml/UnnecessaryParentheses.xml            |  5 ++++-
 17 files changed, 77 insertions(+), 26 deletions(-)

diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/AssignmentInOperand.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/AssignmentInOperand.xml
index 16866bbc98..32af117b12 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/AssignmentInOperand.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/AssignmentInOperand.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok, all cases
@@ -44,8 +47,8 @@ x ? true : x = false;
         <description><![CDATA[
 Ok, allow assignment, if
      ]]></description>
-        <expected-problems>0</expected-problems>
         <rule-property name="allowIf">true</rule-property>
+        <expected-problems>0</expected-problems>
         <code><![CDATA[
 if (x = true) {
 }
@@ -56,8 +59,8 @@ if (x = true) {
         <description><![CDATA[
 Ok, allow assignment, while
      ]]></description>
-        <expected-problems>0</expected-problems>
         <rule-property name="allowWhile">true</rule-property>
+        <expected-problems>0</expected-problems>
         <code><![CDATA[
 while (x = true) {
 }
@@ -68,8 +71,8 @@ while (x = true) {
         <description><![CDATA[
 Ok, allow assignment, do
      ]]></description>
-        <expected-problems>0</expected-problems>
         <rule-property name="allowWhile">true</rule-property>
+        <expected-problems>0</expected-problems>
         <code><![CDATA[
 do {
 } while(x = true);
@@ -80,8 +83,8 @@ do {
         <description><![CDATA[
 Ok, allow assignment, for
      ]]></description>
-        <expected-problems>0</expected-problems>
         <rule-property name="allowFor">true</rule-property>
+        <expected-problems>0</expected-problems>
         <code><![CDATA[
 for (var i = 0; x = true; i++) {
 }
@@ -92,8 +95,8 @@ for (var i = 0; x = true; i++) {
         <description><![CDATA[
 Ok, allow assignment, ternary
      ]]></description>
-        <expected-problems>0</expected-problems>
         <rule-property name="allowTernary">true</rule-property>
+        <expected-problems>0</expected-problems>
         <code><![CDATA[
 (x = true) ? true : false;
      ]]></code>
@@ -103,8 +106,8 @@ Ok, allow assignment, ternary
         <description><![CDATA[
 Ok, allow assignment, ternary results
      ]]></description>
-        <expected-problems>0</expected-problems>
         <rule-property name="allowTernaryResults">true</rule-property>
+        <expected-problems>0</expected-problems>
         <code><![CDATA[
 x ? x = true : false;
 x ? true : x = false;
@@ -135,8 +138,8 @@ x ? true : (++x || --x || x++ || x--);
         <description><![CDATA[
 Ok, allow increment/decrement, all cases
      ]]></description>
-        <expected-problems>0</expected-problems>
         <rule-property name="allowIncrementDecrement">true</rule-property>
+        <expected-problems>0</expected-problems>
         <code><![CDATA[
 if (++x || --x || x++ || x--) {
 }
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/AvoidTrailingComma.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/AvoidTrailingComma.xml
index 04a6593b9e..ffb5e389c8 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/AvoidTrailingComma.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/AvoidTrailingComma.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok, object literals
@@ -54,8 +57,8 @@ x={a:1,b:{c:{d:{},},},};
         <description><![CDATA[
 Ok, allow object literals
      ]]></description>
-        <expected-problems>0</expected-problems>
         <rule-property name="allowObjectLiteral">true</rule-property>
+        <expected-problems>0</expected-problems>
         <code><![CDATA[
 x = {,};
 x = {a : 1,};
@@ -117,8 +120,8 @@ x=[1,[2,[3,[4,],],],];
         <description><![CDATA[
 Ok, allow array literals
      ]]></description>
-        <expected-problems>0</expected-problems>
         <rule-property name="allowArrayLiteral">true</rule-property>
+        <expected-problems>0</expected-problems>
         <code><![CDATA[
 x = [,];
 x = [1,];
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/ConsistentReturn.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/ConsistentReturn.xml
index 89ccd6a80a..cba62209db 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/ConsistentReturn.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/ConsistentReturn.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok, no return
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/EqualComparison.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/EqualComparison.xml
index dfa7faa748..6a6b781364 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/EqualComparison.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/EqualComparison.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok, all cases
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/GlobalVariable.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/GlobalVariable.xml
index 3154e9010b..0c7a49e4bd 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/GlobalVariable.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/GlobalVariable.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok, all cases
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/InnaccurateNumericLiteral.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/InnaccurateNumericLiteral.xml
index 47412b9e7a..6659953521 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/InnaccurateNumericLiteral.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/InnaccurateNumericLiteral.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok integer
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/ScopeForInVariable.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/ScopeForInVariable.xml
index 1cb2c0c796..f18523bb9d 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/ScopeForInVariable.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/ScopeForInVariable.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok, global scope
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/UnreachableCode.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/UnreachableCode.xml
index 8bfd2d2322..e580d95fac 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/UnreachableCode.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/UnreachableCode.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok, return
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/UseBaseWithParseInt.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/UseBaseWithParseInt.xml
index 2b7738a9a0..1c34cbfd7c 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/UseBaseWithParseInt.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/basic/xml/UseBaseWithParseInt.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
 <test-code>
     <description><![CDATA[
 KO, missing the base argument
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/ForLoopsMustUseBraces.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/ForLoopsMustUseBraces.xml
index 3d98bd2930..905465fdc3 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/ForLoopsMustUseBraces.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/ForLoopsMustUseBraces.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/IfElseStmtsMustUseBraces.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/IfElseStmtsMustUseBraces.xml
index 4a272ea500..0ced445b77 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/IfElseStmtsMustUseBraces.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/IfElseStmtsMustUseBraces.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok, if/else
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/IfStmtsMustUseBraces.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/IfStmtsMustUseBraces.xml
index 87c8fcca9f..5afa804950 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/IfStmtsMustUseBraces.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/IfStmtsMustUseBraces.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/WhileLoopsMustUseBraces.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/WhileLoopsMustUseBraces.xml
index a85b24a4c8..2441ed140b 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/WhileLoopsMustUseBraces.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/braces/xml/WhileLoopsMustUseBraces.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok, with braces
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/controversial/xml/AvoidWithStatement.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/controversial/xml/AvoidWithStatement.xml
index 838005caf7..1571546f73 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/controversial/xml/AvoidWithStatement.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/controversial/xml/AvoidWithStatement.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Basic case
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/unnecessary/xml/NoElseReturn.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/unnecessary/xml/NoElseReturn.xml
index a8d43338a8..821af59848 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/unnecessary/xml/NoElseReturn.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/unnecessary/xml/NoElseReturn.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description>Simple violation</description>
         <expected-problems>1</expected-problems>
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/unnecessary/xml/UnnecessaryBlock.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/unnecessary/xml/UnnecessaryBlock.xml
index 7620855edb..4714657bbc 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/unnecessary/xml/UnnecessaryBlock.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/unnecessary/xml/UnnecessaryBlock.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok, function
diff --git a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/unnecessary/xml/UnnecessaryParentheses.xml b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/unnecessary/xml/UnnecessaryParentheses.xml
index df7fdefb18..613f1e8722 100644
--- a/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/unnecessary/xml/UnnecessaryParentheses.xml
+++ b/pmd-javascript/src/test/resources/net/sourceforge/pmd/lang/ecmascript/rule/unnecessary/xml/UnnecessaryParentheses.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<test-data>
+<test-data
+    xmlns="http://pmd.sourceforge.net/rule-tests"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/rule-tests http://pmd.sourceforge.net/rule-tests_1_0_0.xsd">
     <test-code>
         <description><![CDATA[
 Ok, simple