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/06 11:19:54 UTC
[plc4x] branch develop updated: plc4x: removed traces from
unnecessary java class names from Test suites
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 28ad72f plc4x: removed traces from unnecessary java class names from Test suites
28ad72f is described below
commit 28ad72f4eb57d7fce1dfe0011b727492a59d5e2f
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu May 6 13:19:42 2021 +0200
plc4x: removed traces from unnecessary java class names from Test suites
---
plc4go/assets/testing/protocols/ads/DriverTestsuite.xml | 10 +++++-----
plc4go/assets/testing/protocols/eip/DriverTestsuite.xml | 2 +-
plc4go/assets/testing/protocols/modbus/DriverTestsuite.xml | 10 +++++-----
plc4go/assets/testing/protocols/s7/DriverTestsuite.xml | 4 ++--
plc4j/drivers/s7/src/test/resources/tests/PLC4X-272.xml | 2 +-
.../test/driver/internal/handlers/ApiRequestHandler.java | 11 +++++------
.../ads/src/test/resources/protocols/ads/DriverTestsuite.xml | 10 +++++-----
.../test/resources/protocols/canopen/CANOpenDriverSDOIT.xml | 10 +++++-----
.../eip/src/test/resources/protocols/eip/DriverTestsuite.xml | 2 +-
.../src/test/resources/protocols/modbus/DriverTestsuite.xml | 10 +++++-----
.../s7/src/test/resources/protocols/s7/DriverTestsuite.xml | 4 ++--
11 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/plc4go/assets/testing/protocols/ads/DriverTestsuite.xml b/plc4go/assets/testing/protocols/ads/DriverTestsuite.xml
index 5d0ef3d..c44d823 100644
--- a/plc4go/assets/testing/protocols/ads/DriverTestsuite.xml
+++ b/plc4go/assets/testing/protocols/ads/DriverTestsuite.xml
@@ -53,7 +53,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz</name>
@@ -221,7 +221,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz1</name>
@@ -434,7 +434,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz1</name>
@@ -770,7 +770,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz1</name>
@@ -1098,7 +1098,7 @@
</api-response>
<delay>500</delay>
<api-request name="Receive a second Read Request for the same resource from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz1</name>
diff --git a/plc4go/assets/testing/protocols/eip/DriverTestsuite.xml b/plc4go/assets/testing/protocols/eip/DriverTestsuite.xml
index 201aea8..0450d55 100644
--- a/plc4go/assets/testing/protocols/eip/DriverTestsuite.xml
+++ b/plc4go/assets/testing/protocols/eip/DriverTestsuite.xml
@@ -82,7 +82,7 @@
<name>Single element read request</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz</name>
diff --git a/plc4go/assets/testing/protocols/modbus/DriverTestsuite.xml b/plc4go/assets/testing/protocols/modbus/DriverTestsuite.xml
index 5e7e956..2724c2d 100644
--- a/plc4go/assets/testing/protocols/modbus/DriverTestsuite.xml
+++ b/plc4go/assets/testing/protocols/modbus/DriverTestsuite.xml
@@ -33,7 +33,7 @@
<name>Single element read request</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz</name>
@@ -116,7 +116,7 @@
<name>Array element read request</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz</name>
@@ -206,7 +206,7 @@
<name>Multi element read request</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz1</name>
@@ -350,7 +350,7 @@
<name>Single element write request</name>
<steps>
<api-request name="Receive Write Request from application">
- <TestWriteRequest className="org.apache.plc4x.test.driver.internal.api.TestWriteRequest">
+ <TestWriteRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestValueField">
<name>hurz</name>
@@ -435,7 +435,7 @@
<name>Array element write request</name>
<steps>
<api-request name="Receive Write Request from application">
- <TestWriteRequest className="org.apache.plc4x.test.driver.internal.api.TestWriteRequest">
+ <TestWriteRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestValueField">
<name>hurz</name>
diff --git a/plc4go/assets/testing/protocols/s7/DriverTestsuite.xml b/plc4go/assets/testing/protocols/s7/DriverTestsuite.xml
index 9758ca9..7f188b6 100644
--- a/plc4go/assets/testing/protocols/s7/DriverTestsuite.xml
+++ b/plc4go/assets/testing/protocols/s7/DriverTestsuite.xml
@@ -400,7 +400,7 @@
<name>Single element read request</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz</name>
@@ -559,7 +559,7 @@
<name>Single element read request with disabled PUT/GET</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz</name>
diff --git a/plc4j/drivers/s7/src/test/resources/tests/PLC4X-272.xml b/plc4j/drivers/s7/src/test/resources/tests/PLC4X-272.xml
index 4c5cb95..8f1ea81 100644
--- a/plc4j/drivers/s7/src/test/resources/tests/PLC4X-272.xml
+++ b/plc4j/drivers/s7/src/test/resources/tests/PLC4X-272.xml
@@ -475,7 +475,7 @@
<name>100 element read request</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest className="TestReadRequest">
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>field1</name>
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/driver/internal/handlers/ApiRequestHandler.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/driver/internal/handlers/ApiRequestHandler.java
index 72be54a..19a1f6a 100644
--- a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/driver/internal/handlers/ApiRequestHandler.java
+++ b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/driver/internal/handlers/ApiRequestHandler.java
@@ -42,10 +42,9 @@ public class ApiRequestHandler {
public void executeApiRequest(PlcConnection plcConnection) {
assert synchronizer != null;
- // TODO: replace with language agnostic lookup
- String className = payload.attributeValue("className");
- switch (className) {
- case "org.apache.plc4x.test.driver.internal.api.TestReadRequest": {
+ String typeName = payload.getName();
+ switch (typeName) {
+ case "TestReadRequest": {
final PlcReadRequest.Builder builder = plcConnection.readRequestBuilder();
if (payload.element("fields") != null) {
for (Element fieldElement : payload.element("fields").elements("field")) {
@@ -62,7 +61,7 @@ public class ApiRequestHandler {
synchronizer.responseFuture = plc4xRequest.execute();
break;
}
- case "org.apache.plc4x.test.driver.internal.api.TestWriteRequest": {
+ case "TestWriteRequest": {
final PlcWriteRequest.Builder builder = plcConnection.writeRequestBuilder();
if (payload.element("fields") != null) {
for (Element fieldElement : payload.element("fields").elements("field")) {
@@ -86,7 +85,7 @@ public class ApiRequestHandler {
break;
}
default:
- throw new PlcRuntimeException("Unknown class name" + className);
+ throw new PlcRuntimeException("Unknown class name" + typeName);
}
}
diff --git a/protocols/ads/src/test/resources/protocols/ads/DriverTestsuite.xml b/protocols/ads/src/test/resources/protocols/ads/DriverTestsuite.xml
index 5d0ef3d..c44d823 100644
--- a/protocols/ads/src/test/resources/protocols/ads/DriverTestsuite.xml
+++ b/protocols/ads/src/test/resources/protocols/ads/DriverTestsuite.xml
@@ -53,7 +53,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz</name>
@@ -221,7 +221,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz1</name>
@@ -434,7 +434,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz1</name>
@@ -770,7 +770,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz1</name>
@@ -1098,7 +1098,7 @@
</api-response>
<delay>500</delay>
<api-request name="Receive a second Read Request for the same resource from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz1</name>
diff --git a/protocols/canopen/src/test/resources/protocols/canopen/CANOpenDriverSDOIT.xml b/protocols/canopen/src/test/resources/protocols/canopen/CANOpenDriverSDOIT.xml
index c39bd41..e40350c 100644
--- a/protocols/canopen/src/test/resources/protocols/canopen/CANOpenDriverSDOIT.xml
+++ b/protocols/canopen/src/test/resources/protocols/canopen/CANOpenDriverSDOIT.xml
@@ -45,7 +45,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>expeditedSdo</name>
@@ -142,7 +142,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>expeditedShort</name>
@@ -219,7 +219,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>expeditedSdoCustomAnswer</name>
@@ -316,7 +316,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>segmentedSdo</name>
@@ -484,7 +484,7 @@
</description>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>TheFailingField</name>
diff --git a/protocols/eip/src/test/resources/protocols/eip/DriverTestsuite.xml b/protocols/eip/src/test/resources/protocols/eip/DriverTestsuite.xml
index 201aea8..0450d55 100644
--- a/protocols/eip/src/test/resources/protocols/eip/DriverTestsuite.xml
+++ b/protocols/eip/src/test/resources/protocols/eip/DriverTestsuite.xml
@@ -82,7 +82,7 @@
<name>Single element read request</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz</name>
diff --git a/protocols/modbus/src/test/resources/protocols/modbus/DriverTestsuite.xml b/protocols/modbus/src/test/resources/protocols/modbus/DriverTestsuite.xml
index 5e7e956..2724c2d 100644
--- a/protocols/modbus/src/test/resources/protocols/modbus/DriverTestsuite.xml
+++ b/protocols/modbus/src/test/resources/protocols/modbus/DriverTestsuite.xml
@@ -33,7 +33,7 @@
<name>Single element read request</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz</name>
@@ -116,7 +116,7 @@
<name>Array element read request</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz</name>
@@ -206,7 +206,7 @@
<name>Multi element read request</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz1</name>
@@ -350,7 +350,7 @@
<name>Single element write request</name>
<steps>
<api-request name="Receive Write Request from application">
- <TestWriteRequest className="org.apache.plc4x.test.driver.internal.api.TestWriteRequest">
+ <TestWriteRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestValueField">
<name>hurz</name>
@@ -435,7 +435,7 @@
<name>Array element write request</name>
<steps>
<api-request name="Receive Write Request from application">
- <TestWriteRequest className="org.apache.plc4x.test.driver.internal.api.TestWriteRequest">
+ <TestWriteRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestValueField">
<name>hurz</name>
diff --git a/protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml b/protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml
index 9758ca9..7f188b6 100644
--- a/protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml
+++ b/protocols/s7/src/test/resources/protocols/s7/DriverTestsuite.xml
@@ -400,7 +400,7 @@
<name>Single element read request</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz</name>
@@ -559,7 +559,7 @@
<name>Single element read request with disabled PUT/GET</name>
<steps>
<api-request name="Receive Read Request from application">
- <TestReadRequest className="org.apache.plc4x.test.driver.internal.api.TestReadRequest">
+ <TestReadRequest>
<fields>
<field className="org.apache.plc4x.test.driver.internal.api.TestField">
<name>hurz</name>