You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2021/05/07 14:24:53 UTC
[plc4x] 02/04: plc4go: enabled eip ParserSerializerTestsuite.xml
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 76757130d21ef4ec3c0e6fa7bc0832efd2230ed4
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri May 7 15:46:51 2021 +0200
plc4go: enabled eip ParserSerializerTestsuite.xml
---
.../protocols/eip/ParserSerializerTestsuite.xml | 18 +++++++++---------
.../main/drivers/tests/eip_parser_serializer_test.go | 2 +-
.../protocols/eip/ParserSerializerTestsuite.xml | 18 +++++++++---------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/plc4go/assets/testing/protocols/eip/ParserSerializerTestsuite.xml b/plc4go/assets/testing/protocols/eip/ParserSerializerTestsuite.xml
index ee5301c..dffc33a 100644
--- a/plc4go/assets/testing/protocols/eip/ParserSerializerTestsuite.xml
+++ b/plc4go/assets/testing/protocols/eip/ParserSerializerTestsuite.xml
@@ -34,7 +34,7 @@
<len dataType="uint" bitLength="16">4</len>
<sessionHandle dataType="uint" bitLength="32">0</sessionHandle>
<status dataType="uint" bitLength="32">0</status>
- <senderContext>
+ <senderContext isList="true">
<value dataType="uint" bitLength="8">0</value>
<value dataType="uint" bitLength="8">0</value>
<value dataType="uint" bitLength="8">0</value>
@@ -65,7 +65,7 @@
<len dataType="uint" bitLength="16">40</len>
<sessionHandle dataType="uint" bitLength="32">4660</sessionHandle>
<status dataType="uint" bitLength="32">0</status>
- <senderContext>
+ <senderContext isList="true">
<value dataType="uint" bitLength="8">1</value>
<value dataType="uint" bitLength="8">0</value>
<value dataType="uint" bitLength="8">0</value>
@@ -104,7 +104,7 @@
<!--Here the tag should be 'rate' which is in ANSI hex '91 04 72 61 74 65'
but there seems to be some mismatch with the XML generation from Objects
(arguments are also in the wrong order) -->
- <tag>
+ <tag isList="true">
<value dataType="int" bitLength="8">-111</value>
<value dataType="int" bitLength="8">4</value>
<value dataType="int" bitLength="8">114</value>
@@ -139,7 +139,7 @@
<len dataType="uint" bitLength="16">26</len>
<sessionHandle dataType="uint" bitLength="32">4660</sessionHandle>
<status dataType="uint" bitLength="32">0</status>
- <senderContext>
+ <senderContext isList="true">
<value dataType="uint" bitLength="8">1</value>
<value dataType="uint" bitLength="8">0</value>
<value dataType="uint" bitLength="8">0</value>
@@ -169,7 +169,7 @@
<dataType> <!--0xC4-->
<CIPDataTypeCode dataType="uint" bitLength="16" stringRepresentation="DINT">196</CIPDataTypeCode>
</dataType>
- <data> <!--0x216 but again issue when parsing Object to XML-->
+ <data isList="true"> <!--0x216 but again issue when parsing Object to XML-->
<value dataType="int" bitLength="8">0</value>
<value dataType="int" bitLength="8">0</value>
<value dataType="int" bitLength="8">2</value>
@@ -197,7 +197,7 @@
<len dataType="uint" bitLength="16">52</len>
<sessionHandle dataType="uint" bitLength="32">4660</sessionHandle>
<status dataType="uint" bitLength="32">0</status>
- <senderContext>
+ <senderContext isList="true">
<value dataType="uint" bitLength="8">1</value>
<value dataType="uint" bitLength="8">0</value>
<value dataType="uint" bitLength="8">0</value>
@@ -236,7 +236,7 @@
<!--Here the tag should be 'CartonSize'' which is in ANSI hex '91 0A 43 61 72 74 6F 6E 53 69 7A 65'
but there seems to be some mismatch with the XML generation from Objects
(arguments are also in the wrong order) -->
- <tag>
+ <tag isList="true">
<value dataType="int" bitLength="8">-111</value>
<value dataType="int" bitLength="8">22</value>
<value dataType="int" bitLength="8">67</value>
@@ -255,7 +255,7 @@
</CIPDataTypeCode>
</dataType>
<elementNb dataType="uint" bitLength="16">1</elementNb>
- <data> <!--0x14 but again issue when parsing Object to XML-->
+ <data isList="true"> <!--0x14 but again issue when parsing Object to XML-->
<value dataType="int" bitLength="8">0</value>
<value dataType="int" bitLength="8">0</value>
<value dataType="int" bitLength="8">0</value>
@@ -287,7 +287,7 @@
<len dataType="uint" bitLength="16">20</len>
<sessionHandle dataType="uint" bitLength="32">4660</sessionHandle>
<status dataType="uint" bitLength="32">0</status>
- <senderContext>
+ <senderContext isList="true">
<value dataType="uint" bitLength="8">1</value>
<value dataType="uint" bitLength="8">0</value>
<value dataType="uint" bitLength="8">0</value>
diff --git a/plc4go/cmd/main/drivers/tests/eip_parser_serializer_test.go b/plc4go/cmd/main/drivers/tests/eip_parser_serializer_test.go
index b71d52b..c0ee973 100644
--- a/plc4go/cmd/main/drivers/tests/eip_parser_serializer_test.go
+++ b/plc4go/cmd/main/drivers/tests/eip_parser_serializer_test.go
@@ -26,6 +26,6 @@ import (
)
func TestEipParserSerializer(t *testing.T) {
- t.Skip("Still a WIP")
+ //t.Skip("Still a WIP")
testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/eip/ParserSerializerTestsuite.xml")
}
diff --git a/protocols/eip/src/test/resources/protocols/eip/ParserSerializerTestsuite.xml b/protocols/eip/src/test/resources/protocols/eip/ParserSerializerTestsuite.xml
index ee5301c..dffc33a 100644
--- a/protocols/eip/src/test/resources/protocols/eip/ParserSerializerTestsuite.xml
+++ b/protocols/eip/src/test/resources/protocols/eip/ParserSerializerTestsuite.xml
@@ -34,7 +34,7 @@
<len dataType="uint" bitLength="16">4</len>
<sessionHandle dataType="uint" bitLength="32">0</sessionHandle>
<status dataType="uint" bitLength="32">0</status>
- <senderContext>
+ <senderContext isList="true">
<value dataType="uint" bitLength="8">0</value>
<value dataType="uint" bitLength="8">0</value>
<value dataType="uint" bitLength="8">0</value>
@@ -65,7 +65,7 @@
<len dataType="uint" bitLength="16">40</len>
<sessionHandle dataType="uint" bitLength="32">4660</sessionHandle>
<status dataType="uint" bitLength="32">0</status>
- <senderContext>
+ <senderContext isList="true">
<value dataType="uint" bitLength="8">1</value>
<value dataType="uint" bitLength="8">0</value>
<value dataType="uint" bitLength="8">0</value>
@@ -104,7 +104,7 @@
<!--Here the tag should be 'rate' which is in ANSI hex '91 04 72 61 74 65'
but there seems to be some mismatch with the XML generation from Objects
(arguments are also in the wrong order) -->
- <tag>
+ <tag isList="true">
<value dataType="int" bitLength="8">-111</value>
<value dataType="int" bitLength="8">4</value>
<value dataType="int" bitLength="8">114</value>
@@ -139,7 +139,7 @@
<len dataType="uint" bitLength="16">26</len>
<sessionHandle dataType="uint" bitLength="32">4660</sessionHandle>
<status dataType="uint" bitLength="32">0</status>
- <senderContext>
+ <senderContext isList="true">
<value dataType="uint" bitLength="8">1</value>
<value dataType="uint" bitLength="8">0</value>
<value dataType="uint" bitLength="8">0</value>
@@ -169,7 +169,7 @@
<dataType> <!--0xC4-->
<CIPDataTypeCode dataType="uint" bitLength="16" stringRepresentation="DINT">196</CIPDataTypeCode>
</dataType>
- <data> <!--0x216 but again issue when parsing Object to XML-->
+ <data isList="true"> <!--0x216 but again issue when parsing Object to XML-->
<value dataType="int" bitLength="8">0</value>
<value dataType="int" bitLength="8">0</value>
<value dataType="int" bitLength="8">2</value>
@@ -197,7 +197,7 @@
<len dataType="uint" bitLength="16">52</len>
<sessionHandle dataType="uint" bitLength="32">4660</sessionHandle>
<status dataType="uint" bitLength="32">0</status>
- <senderContext>
+ <senderContext isList="true">
<value dataType="uint" bitLength="8">1</value>
<value dataType="uint" bitLength="8">0</value>
<value dataType="uint" bitLength="8">0</value>
@@ -236,7 +236,7 @@
<!--Here the tag should be 'CartonSize'' which is in ANSI hex '91 0A 43 61 72 74 6F 6E 53 69 7A 65'
but there seems to be some mismatch with the XML generation from Objects
(arguments are also in the wrong order) -->
- <tag>
+ <tag isList="true">
<value dataType="int" bitLength="8">-111</value>
<value dataType="int" bitLength="8">22</value>
<value dataType="int" bitLength="8">67</value>
@@ -255,7 +255,7 @@
</CIPDataTypeCode>
</dataType>
<elementNb dataType="uint" bitLength="16">1</elementNb>
- <data> <!--0x14 but again issue when parsing Object to XML-->
+ <data isList="true"> <!--0x14 but again issue when parsing Object to XML-->
<value dataType="int" bitLength="8">0</value>
<value dataType="int" bitLength="8">0</value>
<value dataType="int" bitLength="8">0</value>
@@ -287,7 +287,7 @@
<len dataType="uint" bitLength="16">20</len>
<sessionHandle dataType="uint" bitLength="32">4660</sessionHandle>
<status dataType="uint" bitLength="32">0</status>
- <senderContext>
+ <senderContext isList="true">
<value dataType="uint" bitLength="8">1</value>
<value dataType="uint" bitLength="8">0</value>
<value dataType="uint" bitLength="8">0</value>