You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2022/01/28 09:17:58 UTC
[plc4x] 01/05: fix(plc4j): Made the integration tests work with failsafe 3.0.0-M5
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 1cd02bf95be1932b7ff2f98527b1379388be98dc
Author: cdutz <ch...@c-ware.de>
AuthorDate: Thu Jan 27 23:27:21 2022 +0100
fix(plc4j): Made the integration tests work with failsafe 3.0.0-M5
---
.../src/main/java/org/apache/plc4x/test/XmlTestsuiteLoader.java | 7 ++++++-
.../test/parserserializer/ParserSerializerTestsuiteRunner.java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/XmlTestsuiteLoader.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/XmlTestsuiteLoader.java
index 5f24dc5..2a5ed23 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/XmlTestsuiteLoader.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/XmlTestsuiteLoader.java
@@ -20,6 +20,7 @@ package org.apache.plc4x.test;
import org.apache.plc4x.test.model.LocationAware;
+import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URI;
@@ -40,7 +41,11 @@ public abstract class XmlTestsuiteLoader {
protected XmlTestsuiteLoader(String testsuiteDocument) {
this.testsuiteDocument = testsuiteDocument;
- this.testsuiteDocumentXml = getClass().getResourceAsStream(testsuiteDocument);
+ try {
+ this.testsuiteDocumentXml = getClass().getClassLoader().getUnnamedModule().getResourceAsStream(testsuiteDocument);
+ } catch (IOException e) {
+ throw new IllegalArgumentException("Suite " + testsuiteDocument + " not found");
+ }
if (testsuiteDocumentXml == null) {
throw new IllegalArgumentException("Suite " + testsuiteDocument + " not found");
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/parserserializer/ParserSerializerTestsuiteRunner.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/parserserializer/ParserSerializerTestsuiteRunner.java
index ad2994c..05458b8 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/parserserializer/ParserSerializerTestsuiteRunner.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/parserserializer/ParserSerializerTestsuiteRunner.java
@@ -148,7 +148,7 @@ public class ParserSerializerTestsuiteRunner extends XmlTestsuiteLoader {
try {
MessageInput<?> messageInput = MessageResolver.getMessageIOStaticLinked(
testSuite.getOptions(),
- testcase.getXml().elements().get(0).getName()
+ testcase.getRootType()
);
LOGGER.trace("Parsing message");
Message parsedOutput = (Message) messageInput.parse(readBuffer, testcase.getParserArguments().toArray());