test(plc4go/opcua): driver test suite test works now

plc4go/internal/opcua/Connection.go

@@ -236,7 +236,10 @@ func (c *Connection) fireConnectionError(err error, ch chan<- plc4go.PlcConnecti
 		c.log.Debug().Err(err).Msg("Error disconnecting message codec on connection error")
 	}
 	c.SetConnected(false)
-	close(c.disconnectEvent)
+	select {
+	case c.disconnectEvent <- struct{}{}:
+	default:
+	}
 }
 
 func (c *Connection) fireConnected(ch chan<- plc4go.PlcConnectionConnectResult) {
@@ -247,5 +250,8 @@ func (c *Connection) fireConnected(ch chan<- plc4go.PlcConnectionConnectResult)
 		c.log.Info().Msg("Successfully connected")
 	}
 	c.SetConnected(true)
-	close(c.connectEvent)
+	select {
+	case c.connectEvent <- struct{}{}:
+	default:
+	}
 }

plc4go/internal/opcua/MessageCodec.go

@@ -27,6 +27,7 @@ import (
 	"github.com/apache/plc4x/plc4go/spi/default"
 	"github.com/apache/plc4x/plc4go/spi/options"
 	"github.com/apache/plc4x/plc4go/spi/transports"
+	"github.com/apache/plc4x/plc4go/spi/utils"
 	"sync"
 
 	"github.com/pkg/errors"
@@ -71,14 +72,14 @@ func (m *MessageCodec) Send(message spi.Message) error {
 	}
 
 	// Serialize the request
-	theBytes, err := messagePdu.Serialize()
-	if err != nil {
+	wbbb := utils.NewWriteBufferByteBased(utils.WithByteOrderForByteBasedBuffer(binary.LittleEndian))
+	if err := messagePdu.SerializeWithWriteBuffer(context.Background(), wbbb); err != nil {
 		return errors.Wrap(err, "error serializing request")
 	}
+	theBytes := wbbb.GetBytes()
 
 	// Send it to the PLC
-	err = m.GetTransportInstance().Write(theBytes)
-	if err != nil {
+	if err := m.GetTransportInstance().Write(theBytes); err != nil {
 		return errors.Wrap(err, "error sending request")
 	}
 	return nil
@@ -102,21 +103,22 @@ func (m *MessageCodec) Receive() (spi.Message, error) {
 			m.log.Trace().Uint32("numBytesAvailable", numBytesAvailable).Msg("check available bytes < 8")
 			return numBytesAvailable < 8
 		}); err != nil {
-		m.log.Warn().Err(err).Msg("error filling buffer")
+		m.log.Debug().Err(err).Msg("error filling buffer")
 	}
 
 	data, err := ti.PeekReadableBytes(8)
 	if err != nil {
 		m.log.Debug().Err(err).Msg("error peeking")
 		return nil, nil
 	}
-	numberOfBytesToRead := binary.LittleEndian.Uint32(data[:4])
+	numberOfBytesToRead := binary.LittleEndian.Uint32(data[4:8])
 	readBytes, err := ti.Read(numberOfBytesToRead)
 	if err != nil {
 		return nil, errors.Wrapf(err, "could not read %d bytes", readBytes)
 	}
 	ctxForModel := options.GetLoggerContextForModel(context.Background(), m.log, options.WithPassLoggerToModel(m.passLogToModel))
-	messagePdu, err := readWriteModel.MessagePDUParse(ctxForModel, readBytes, true)
+	rbbb := utils.NewReadBufferByteBased(readBytes, utils.WithByteOrderForReadBufferByteBased(binary.LittleEndian))
+	messagePdu, err := readWriteModel.MessagePDUParseWithBuffer(ctxForModel, rbbb, true)
 	if err != nil {
 		return nil, errors.New("Could not parse pdu")
 	}

plc4go/spi/default/DefaultCodec.go

@@ -273,7 +273,7 @@ func (m *defaultCodec) HandleMessages(message spi.Message) bool {
 			expectationLog.Trace().Msg("doesn't accept message")
 		}
 	}
-	m.log.Trace().Bool("messageHandled", messageHandled).Msg("handled message")
+	m.log.Trace().Bool("messageHandled", messageHandled).Msg("finished message handling")
 	return messageHandled
 }
 

plc4go/spi/testutils/DriverTestRunner.go

@@ -152,7 +152,7 @@ func (m DriverTestsuite) Run(t *testing.T, driverManager plc4go.PlcDriverManager
 		t.Log("no testcase steps")
 	}
 
-	if len(testcase.steps) > 0 {
+	if len(m.teardownSteps) > 0 {
 		// Run the teardown steps
 		m.LogDelimiterSection(t, "-", "Performing teardown for: %s", testcase.name)
 		for _, testStep := range m.teardownSteps {
@@ -561,9 +561,6 @@ func RunDriverTestsuite(t *testing.T, driver plc4go.PlcDriver, testPath string,
 			}
 		})
 	}
-	t.Logf("Done running %d testcases", len(testsuite.testcases))
-	// Execute the tests in the testsuite
-	t.Log(testsuite.name)
 }
 
 type ConnectionConnectAwaiter interface {

plc4go/tests/drivers/tests/opcua_driver_test.go

@@ -31,7 +31,7 @@ import (
 )
 
 func TestOPCUADriver(t *testing.T) {
-	t.Skip("Not yet finished")
+	//t.Skip("Not yet finished")
 	parser := func(readBufferByteBased utils.ReadBufferByteBased) (any, error) {
 		return readWriteModel.MessagePDUParseWithBuffer(context.Background(), readBufferByteBased, false)
 	}

protocols/opcua/src/test/resources/protocols/opcua/DriverTestsuite.xml

@@ -39,16 +39,16 @@
           <messageType dataType="string" bitLength="24" encoding="UTF-8">HEL</messageType>
           <OpcuaHelloRequest>
             <chunk dataType="string" bitLength="8" encoding="UTF-8">F</chunk>
-            <messageSize dataType="int" bitLength="32">52</messageSize>
+            <messageSize dataType="int" bitLength="32">47</messageSize>
             <version dataType="int" bitLength="32">0</version>
             <receiveBufferSize dataType="int" bitLength="32">65535</receiveBufferSize>
             <sendBufferSize dataType="int" bitLength="32">65535</sendBufferSize>
             <maxMessageSize dataType="int" bitLength="32">2097152</maxMessageSize>
             <maxChunkCount dataType="int" bitLength="32">64</maxChunkCount>
             <endpoint>
               <PascalString>
-                <sLength dataType="int" bitLength="32">20</sLength>
-                <stringValue dataType="string" bitLength="160" encoding="UTF-8">opc.test://hurz:null</stringValue>
+                <sLength dataType="int" bitLength="32">15</sLength>
+                <stringValue dataType="string" bitLength="120" encoding="UTF-8">opc.test://hurz</stringValue>
               </PascalString>
             </endpoint>
           </OpcuaHelloRequest>