fix(opcua): fix issues with PascalString

apache · Aug 3, 2023 · 4610930 · 4610930
1 parent 40644f7
commit 4610930
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/plc4go/protocols/opcua/readwrite/model/PascalString.go b/plc4go/protocols/opcua/readwrite/model/PascalString.go
diff --git a/plc4go/protocols/opcua/readwrite/model/StaticHelper.go b/plc4go/protocols/opcua/readwrite/model/StaticHelper.go
@@ -32,5 +32,5 @@ func Utf8LengthToPascalLength(_ context.Context, stringValue string) int32 {
 }
 
 func PascalLengthToUtf8Length(_ context.Context, slength int32) int32 {
-	return utils.Max(slength*8, 0)
+	return utils.Max(slength, 0)
 }
diff --git a/plc4go/spi/testutils/DriverTestRunner.go b/plc4go/spi/testutils/DriverTestRunner.go
@@ -553,7 +553,7 @@ func RunDriverTestsuite(t *testing.T, driver plc4go.PlcDriver, testPath string,
 			}
 			t.Logf("Running testcase %s", testcase.name)
 			if err := testsuite.Run(t, driverManager, testcase); err != nil {
-				testsuite.LogDelimiterSection(t, "=", "Failure:\n%+v", err)
+				testsuite.LogDelimiterSection(t, "=", "Failure:\n%s", err)
 				t.FailNow()
 			}
 		})

diff --git a/plc4go/tests/drivers/tests/opcua_driver_test.go b/plc4go/tests/drivers/tests/opcua_driver_test.go
@@ -33,7 +33,7 @@ import (
 func TestOPCUADriver(t *testing.T) {
 	t.Skip("Not yet finished")
 	parser := func(readBufferByteBased utils.ReadBufferByteBased) (any, error) {
-		return readWriteModel.MessagePDUParseWithBuffer(context.Background(), readBufferByteBased, true)
+		return readWriteModel.MessagePDUParseWithBuffer(context.Background(), readBufferByteBased, false)
 	}
 	optionsForTesting := testutils.EnrichOptionsWithOptionsForTesting(t)
 	testutils.RunDriverTestsuite(

diff --git a/.../drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PascalString.java b/.../drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PascalString.java
@@ -51,10 +51,9 @@ public String getStringValue() {
 
   public int getStringLength() {
     return (int)
-        ((org.apache.plc4x.java.opcua.readwrite.utils.StaticHelper.pascalLengthToUtf8Length(
-                org.apache.plc4x.java.opcua.readwrite.utils.StaticHelper.utf8LengthToPascalLength(
-                    getStringValue())))
-            / (8));
+        (org.apache.plc4x.java.opcua.readwrite.utils.StaticHelper.pascalLengthToUtf8Length(
+            org.apache.plc4x.java.opcua.readwrite.utils.StaticHelper.utf8LengthToPascalLength(
+                getStringValue())));
   }
 
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
@@ -118,9 +117,8 @@ public static PascalString staticParse(ReadBuffer readBuffer) throws ParseExcept
         readVirtualField(
             "stringLength",
             int.class,
-            (org.apache.plc4x.java.opcua.readwrite.utils.StaticHelper.pascalLengthToUtf8Length(
-                    sLength))
-                / (8));
+            org.apache.plc4x.java.opcua.readwrite.utils.StaticHelper.pascalLengthToUtf8Length(
+                sLength));
 
     String stringValue =
         readSimpleField("stringValue", readString(readBuffer, (stringLength) * (8)));

diff --git a/...drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/readwrite/utils/StaticHelper.java b/...drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/readwrite/utils/StaticHelper.java
@@ -35,6 +35,6 @@ public static int utf8LengthToPascalLength(String stringValue) {
     }
 
     public static int pascalLengthToUtf8Length(int slength) {
-        return Math.max(slength * 8, 0);
+        return Math.max(slength, 0);
     }
 }
diff --git a/protocols/opcua/src/main/xslt/opc-manual.xsl b/protocols/opcua/src/main/xslt/opc-manual.xsl
@@ -381,8 +381,8 @@
 
 [type PascalString
     [implicit int 32    sLength      'STATIC_CALL("utf8LengthToPascalLength", stringValue)' ]
-    [virtual  int 32    stringLength 'STATIC_CALL("pascalLengthToUtf8Length", sLength)/8'   ]
-    [simple   vstring 'stringLength*8' stringValue                                          ]
+    [virtual  int 32    stringLength 'STATIC_CALL("pascalLengthToUtf8Length", sLength)'     ]
+    [simple   vstring   'stringLength*8' stringValue                                        ]
 ]
 
 [type PascalByteString