[modelica] Cleanup rule test xml files

Avoid unnecessary CDATA for description
Use 4 space indentation instead of tabs
Remove trailing whitespace
End file with a newline
This commit is contained in:
Andreas Dangel
2020-05-16 17:05:47 +02:00
parent edc40521a3
commit 48da3feee0
3 changed files with 71 additions and 63 deletions

View File

@@ -1,79 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
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>Valid example</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
package Test
package Inc
model X
end X;
model Y
end Y;
end Inc;
model A
model Y
end Y;
end A;
model B
extends A;
import Inc.*;
X x;
end B;
package Inc
model X
end X;
model Y
end Y;
end Inc;
model A
model Y
end Y;
end A;
model B
extends A;
import Inc.*;
X x;
end B;
end Test;
]]></code>
</test-code>
<test-code>
<description>Valid example #2</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
package Test
model X
model X
model X
end X;
Test.X.X mdl;
end X;
Test.X.X mdl;
end X;
end Test;
]]></code>
</test-code>
<test-code>
<description>Invalid example: class Y is imported twice</description>
<expected-problems>1</expected-problems>
<code><![CDATA[
package Test
model Inc1
model X
end X;
model Y
end Y;
end Inc1;
model Inc2
model Y
end Y;
model Z
end Z;
end Inc2;
model B
import Inc1.*;
import Inc2.*;
Y y;
end B;
model Inc1
model X
end X;
model Y
end Y;
end Inc1;
model Inc2
model Y
end Y;
model Z
end Z;
end Inc2;
model B
import Inc1.*;
import Inc2.*;
Y y;
end B;
end Test;
]]></code>
</test-code>
<test-code regressionTest="false">
<description>Invalid example: suspicious reference to X</description>
<expected-problems>1</expected-problems>
<code><![CDATA[
package Test
model X
model X
model X
end X;
X mdl;
end X;
X mdl;
end X;
end Test;
]]></code>
</test-code>

View File

@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
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>Valid example</description>
<expected-problems>0</expected-problems>
@@ -11,6 +12,7 @@ package Test
end Test;
]]></code>
</test-code>
<test-code>
<description>Invalid example</description>
<expected-problems>1</expected-problems>

View File

@@ -1,49 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
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>Valid example #1</description>
<expected-problems>0</expected-problems>
<code><![CDATA[
package Test
connector Conn
Real x;
end Conn;
input Conn a;
output Conn b;
connector Conn
Real x;
end Conn;
input Conn a;
output Conn b;
equation
connect(a, b);
connect(a, b);
end Test;
]]></code>
</test-code>
<test-code>
<description>Plain variables are connected</description>
<expected-problems>2</expected-problems>
<code><![CDATA[
package Test
input Real x;
output Real y;
input Real x;
output Real y;
equation
connect(x, y);
connect(x, y);
end Test;
]]></code>
</test-code>
<test-code>
<description>Records are connected</description>
<expected-problems>2</expected-problems>
<code><![CDATA[
package Test
record R
Real a;
end R;
input R x;
output R y;
record R
Real a;
end R;
input R x;
output R y;
equation
connect(x, y);
connect(x, y);
end Test;
]]></code>
</test-code>
</test-data>