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 2022/01/20 11:52:49 UTC
[plc4x] branch develop updated: test(bacnet): fixed test suite path
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
The following commit(s) were added to refs/heads/develop by this push:
new 12006db test(bacnet): fixed test suite path
12006db is described below
commit 12006db7342f83c42235bf53195661b3fc229ee0
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Jan 20 12:52:22 2022 +0100
test(bacnet): fixed test suite path
---
.../drivers/tests/bacnet_parser_serializer_test.go | 20 +++++++++-----------
.../BACnetParserSerializerTestSuiteGenerator.java | 4 ++--
.../plc4x/test/migration/MessageResolver.java | 2 +-
.../bacnet}/ParserSerializerTestsuite.xml | Bin 480568 -> 480569 bytes
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/BACnetParserSerializerTestSuiteGenerator.java b/plc4go/cmd/main/drivers/tests/bacnet_parser_serializer_test.go
similarity index 52%
copy from plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/BACnetParserSerializerTestSuiteGenerator.java
copy to plc4go/cmd/main/drivers/tests/bacnet_parser_serializer_test.go
index 9d13bde..bb47f9a 100644
--- a/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/BACnetParserSerializerTestSuiteGenerator.java
+++ b/plc4go/cmd/main/drivers/tests/bacnet_parser_serializer_test.go
@@ -16,18 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.plc4x.java.bacnetip;
-import org.apache.plc4x.java.bacnetip.readwrite.BVLC;
-import org.apache.plc4x.test.generator.ParserSerializerTestsuiteGenerator;
+package tests
-import java.nio.file.Path;
+import (
+ _ "github.com/apache/plc4x/plc4go/cmd/main/initializetest"
+ "github.com/apache/plc4x/plc4go/internal/plc4go/spi/testutils"
+ "testing"
+)
-public class BACnetParserSerializerTestSuiteGenerator {
-
- public static void main(String... args) {
- String pcapFile = Path.of("plc4j/utils/test-generator/src/test/resources/bacnet-stack-services.cap").toAbsolutePath().toString();
- String xmlTestSuiteFile = Path.of("protocols/bacnetip/src/test/resources/protocols.bacnet/ParserSerializerTestsuite.xml").toAbsolutePath().toString();
- ParserSerializerTestsuiteGenerator.main("-tBACnet/IP", "-pbacnet", BVLC.class.getName(), pcapFile, xmlTestSuiteFile);
- }
+func TestBacnetParserSerializer(t *testing.T) {
+ t.Skip("Test not ready yet")
+ testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml")
}
diff --git a/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/BACnetParserSerializerTestSuiteGenerator.java b/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/BACnetParserSerializerTestSuiteGenerator.java
index 9d13bde..a8a04b8 100644
--- a/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/BACnetParserSerializerTestSuiteGenerator.java
+++ b/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/BACnetParserSerializerTestSuiteGenerator.java
@@ -27,7 +27,7 @@ public class BACnetParserSerializerTestSuiteGenerator {
public static void main(String... args) {
String pcapFile = Path.of("plc4j/utils/test-generator/src/test/resources/bacnet-stack-services.cap").toAbsolutePath().toString();
- String xmlTestSuiteFile = Path.of("protocols/bacnetip/src/test/resources/protocols.bacnet/ParserSerializerTestsuite.xml").toAbsolutePath().toString();
- ParserSerializerTestsuiteGenerator.main("-tBACnet/IP", "-pbacnet", BVLC.class.getName(), pcapFile, xmlTestSuiteFile);
+ String xmlTestSuiteFile = Path.of("protocols/bacnetip/src/test/resources/protocols/bacnet/ParserSerializerTestsuite.xml").toAbsolutePath().toString();
+ ParserSerializerTestsuiteGenerator.main("-tBACnet/IP", "-pbacnetip", BVLC.class.getName(), pcapFile, xmlTestSuiteFile);
}
}
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/migration/MessageResolver.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/migration/MessageResolver.java
index aa9b00a..ebd5206 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/migration/MessageResolver.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/migration/MessageResolver.java
@@ -139,7 +139,7 @@ public class MessageResolver {
}
};
} catch (DriverTestsuiteException e) {
- throw new ParserSerializerTestsuiteException("Unable to instantiate IO component", e.getCause());
+ throw new ParserSerializerTestsuiteException("Unable to instantiate IO component", e);
}
}
diff --git a/protocols/bacnetip/src/test/resources/protocols.bacnet/ParserSerializerTestsuite.xml b/protocols/bacnetip/src/test/resources/protocols/bacnet/ParserSerializerTestsuite.xml
similarity index 99%
rename from protocols/bacnetip/src/test/resources/protocols.bacnet/ParserSerializerTestsuite.xml
rename to protocols/bacnetip/src/test/resources/protocols/bacnet/ParserSerializerTestsuite.xml
index e5a5d3a..e5de824 100644
Binary files a/protocols/bacnetip/src/test/resources/protocols.bacnet/ParserSerializerTestsuite.xml and b/protocols/bacnetip/src/test/resources/protocols/bacnet/ParserSerializerTestsuite.xml differ