plc4go: generalized DriverTestRunner.go by moving protocol specifics into their testing functions
+ Added more String() methods by reducing the parser arguments to actual serializer arguments
diff --git a/build-utils/language-go/src/main/resources/templates/go/model-template.go.ftlh b/build-utils/language-go/src/main/resources/templates/go/model-template.go.ftlh
index 5fbb670..8420ea7 100644
--- a/build-utils/language-go/src/main/resources/templates/go/model-template.go.ftlh
+++ b/build-utils/language-go/src/main/resources/templates/go/model-template.go.ftlh
@@ -1229,7 +1229,7 @@
</#if>
}
-<#if !type.parserArguments?has_content><#-- We only generate String() methods for serializer witout arguments -->
+<#if !helper.getSerializerArguments(type.parserArguments)?has_content><#-- We only generate String() methods for serializer witout arguments -->
func (m *${type.name}) String() string {
if m == nil {
return "<nil>"
diff --git a/plc4go/cmd/main/drivers/tests/abeth_driver_test.go b/plc4go/cmd/main/drivers/tests/abeth_driver_test.go
index d2ed178..1ecba89 100644
--- a/plc4go/cmd/main/drivers/tests/abeth_driver_test.go
+++ b/plc4go/cmd/main/drivers/tests/abeth_driver_test.go
@@ -21,6 +21,7 @@
import (
_ "github.com/apache/plc4x/plc4go/cmd/main/initializetest"
+ abethIO "github.com/apache/plc4x/plc4go/internal/plc4go/abeth/readwrite"
"github.com/apache/plc4x/plc4go/internal/plc4go/ads"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/testutils"
"testing"
@@ -28,5 +29,5 @@
func TestAbEthDriver(t *testing.T) {
t.Skip("No test yet available")
- testutils.RunDriverTestsuite(t, ads.NewDriver(), "assets/testing/protocols/abeth/DriverTestsuite.xml")
+ testutils.RunDriverTestsuite(t, ads.NewDriver(), "assets/testing/protocols/abeth/DriverTestsuite.xml", abethIO.AbethXmlParserHelper{})
}
diff --git a/plc4go/cmd/main/drivers/tests/ads_driver_test.go b/plc4go/cmd/main/drivers/tests/ads_driver_test.go
index 488284f..dc95dfa 100644
--- a/plc4go/cmd/main/drivers/tests/ads_driver_test.go
+++ b/plc4go/cmd/main/drivers/tests/ads_driver_test.go
@@ -22,10 +22,16 @@
import (
_ "github.com/apache/plc4x/plc4go/cmd/main/initializetest"
"github.com/apache/plc4x/plc4go/internal/plc4go/ads"
+ adsIO "github.com/apache/plc4x/plc4go/internal/plc4go/ads/readwrite"
+ adsModel "github.com/apache/plc4x/plc4go/internal/plc4go/ads/readwrite/model"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/testutils"
+ "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
"testing"
)
func TestAdsDriver(t *testing.T) {
- testutils.RunDriverTestsuite(t, ads.NewDriver(), "assets/testing/protocols/ads/DriverTestsuite.xml")
+ options := []testutils.WithOption{testutils.WithRootTypeParser(func(readBufferByteBased utils.ReadBufferByteBased) (interface{}, error) {
+ return adsModel.AmsTCPPacketParse(readBufferByteBased)
+ })}
+ testutils.RunDriverTestsuiteWithOptions(t, ads.NewDriver(), "assets/testing/protocols/ads/DriverTestsuite.xml", adsIO.AdsXmlParserHelper{}, options)
}
diff --git a/plc4go/cmd/main/drivers/tests/df1_driver_test.go b/plc4go/cmd/main/drivers/tests/df1_driver_test.go
index 728a6eb..38886d3 100644
--- a/plc4go/cmd/main/drivers/tests/df1_driver_test.go
+++ b/plc4go/cmd/main/drivers/tests/df1_driver_test.go
@@ -22,11 +22,12 @@
import (
_ "github.com/apache/plc4x/plc4go/cmd/main/initializetest"
"github.com/apache/plc4x/plc4go/internal/plc4go/ads"
+ df1IO "github.com/apache/plc4x/plc4go/internal/plc4go/df1/readwrite"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/testutils"
"testing"
)
func TestDf1Driver(t *testing.T) {
t.Skip("No test yet")
- testutils.RunDriverTestsuite(t, ads.NewDriver(), "assets/testing/protocols/df1/DriverTestsuite.xml")
+ testutils.RunDriverTestsuite(t, ads.NewDriver(), "assets/testing/protocols/df1/DriverTestsuite.xml", df1IO.Df1XmlParserHelper{})
}
diff --git a/plc4go/cmd/main/drivers/tests/eip_driver_test.go b/plc4go/cmd/main/drivers/tests/eip_driver_test.go
index ca2ed1f..861b2c8 100644
--- a/plc4go/cmd/main/drivers/tests/eip_driver_test.go
+++ b/plc4go/cmd/main/drivers/tests/eip_driver_test.go
@@ -22,10 +22,16 @@
import (
_ "github.com/apache/plc4x/plc4go/cmd/main/initializetest"
"github.com/apache/plc4x/plc4go/internal/plc4go/eip"
+ eipIO "github.com/apache/plc4x/plc4go/internal/plc4go/eip/readwrite"
+ eipModel "github.com/apache/plc4x/plc4go/internal/plc4go/eip/readwrite/model"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/testutils"
+ "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
"testing"
)
func TestEIPDriver(t *testing.T) {
- testutils.RunDriverTestsuite(t, eip.NewDriver(), "assets/testing/protocols/eip/DriverTestsuite.xml")
+ options := []testutils.WithOption{testutils.WithRootTypeParser(func(readBufferByteBased utils.ReadBufferByteBased) (interface{}, error) {
+ return eipModel.EipPacketParse(readBufferByteBased)
+ })}
+ testutils.RunDriverTestsuiteWithOptions(t, eip.NewDriver(), "assets/testing/protocols/eip/DriverTestsuite.xml", eipIO.EipXmlParserHelper{}, options)
}
diff --git a/plc4go/cmd/main/drivers/tests/firmata_driver_test.go b/plc4go/cmd/main/drivers/tests/firmata_driver_test.go
index 09f9703..ec2b653 100644
--- a/plc4go/cmd/main/drivers/tests/firmata_driver_test.go
+++ b/plc4go/cmd/main/drivers/tests/firmata_driver_test.go
@@ -21,6 +21,7 @@
import (
_ "github.com/apache/plc4x/plc4go/cmd/main/initializetest"
+ firmataIO "github.com/apache/plc4x/plc4go/internal/plc4go/firmata/readwrite"
"github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/testutils"
"testing"
@@ -28,5 +29,5 @@
func TestFirmataDriver(t *testing.T) {
t.Skip("no testsuite yet")
- testutils.RunDriverTestsuite(t, knxnetip.NewDriver(), "assets/testing/protocols/firmata/DriverTestsuite.xml")
+ testutils.RunDriverTestsuite(t, knxnetip.NewDriver(), "assets/testing/protocols/firmata/DriverTestsuite.xml", firmataIO.FirmataXmlParserHelper{})
}
diff --git a/plc4go/cmd/main/drivers/tests/knxnetip_driver_test.go b/plc4go/cmd/main/drivers/tests/knxnetip_driver_test.go
index 4833cc8..126614d 100644
--- a/plc4go/cmd/main/drivers/tests/knxnetip_driver_test.go
+++ b/plc4go/cmd/main/drivers/tests/knxnetip_driver_test.go
@@ -22,11 +22,17 @@
import (
_ "github.com/apache/plc4x/plc4go/cmd/main/initializetest"
"github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip"
+ knxIO "github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip/readwrite"
+ knxModel "github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip/readwrite/model"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/testutils"
+ "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
"testing"
)
func TestKNXNetIPDriver(t *testing.T) {
t.Skip("No test yet")
- testutils.RunDriverTestsuite(t, knxnetip.NewDriver(), "assets/testing/protocols/knxnetip/DriverTestsuite.xml")
+ options := []testutils.WithOption{testutils.WithRootTypeParser(func(readBufferByteBased utils.ReadBufferByteBased) (interface{}, error) {
+ return knxModel.KnxNetIpMessageParse(readBufferByteBased)
+ })}
+ testutils.RunDriverTestsuiteWithOptions(t, knxnetip.NewDriver(), "assets/testing/protocols/knxnetip/DriverTestsuite.xml", knxIO.KnxnetipXmlParserHelper{}, options)
}
diff --git a/plc4go/cmd/main/drivers/tests/modbus_driver_test.go b/plc4go/cmd/main/drivers/tests/modbus_driver_test.go
index 5c6d15c..0b03674 100644
--- a/plc4go/cmd/main/drivers/tests/modbus_driver_test.go
+++ b/plc4go/cmd/main/drivers/tests/modbus_driver_test.go
@@ -22,10 +22,16 @@
import (
_ "github.com/apache/plc4x/plc4go/cmd/main/initializetest"
"github.com/apache/plc4x/plc4go/internal/plc4go/modbus"
+ modbusIO "github.com/apache/plc4x/plc4go/internal/plc4go/modbus/readwrite"
+ modbusModel "github.com/apache/plc4x/plc4go/internal/plc4go/modbus/readwrite/model"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/testutils"
+ "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
"testing"
)
func TestModbusDriver(t *testing.T) {
- testutils.RunDriverTestsuite(t, modbus.NewDriver(), "assets/testing/protocols/modbus/DriverTestsuite.xml")
+ options := []testutils.WithOption{testutils.WithRootTypeParser(func(readBufferByteBased utils.ReadBufferByteBased) (interface{}, error) {
+ return modbusModel.ModbusTcpADUParse(readBufferByteBased, false)
+ })}
+ testutils.RunDriverTestsuiteWithOptions(t, modbus.NewDriver(), "assets/testing/protocols/modbus/DriverTestsuite.xml", modbusIO.ModbusXmlParserHelper{}, options)
}
diff --git a/plc4go/cmd/main/drivers/tests/s7_driver_test.go b/plc4go/cmd/main/drivers/tests/s7_driver_test.go
index 721e2d3..0db9de1 100644
--- a/plc4go/cmd/main/drivers/tests/s7_driver_test.go
+++ b/plc4go/cmd/main/drivers/tests/s7_driver_test.go
@@ -22,10 +22,16 @@
import (
_ "github.com/apache/plc4x/plc4go/cmd/main/initializetest"
"github.com/apache/plc4x/plc4go/internal/plc4go/s7"
+ s7IO "github.com/apache/plc4x/plc4go/internal/plc4go/s7/readwrite"
+ s7Model "github.com/apache/plc4x/plc4go/internal/plc4go/s7/readwrite/model"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/testutils"
+ "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils"
"testing"
)
func TestS7Driver(t *testing.T) {
- testutils.RunDriverTestsuite(t, s7.NewDriver(), "assets/testing/protocols/s7/DriverTestsuite.xml")
+ options := []testutils.WithOption{testutils.WithRootTypeParser(func(readBufferByteBased utils.ReadBufferByteBased) (interface{}, error) {
+ return s7Model.TPKTPacketParse(readBufferByteBased)
+ })}
+ testutils.RunDriverTestsuiteWithOptions(t, s7.NewDriver(), "assets/testing/protocols/s7/DriverTestsuite.xml", s7IO.S7XmlParserHelper{}, options)
}
diff --git a/plc4go/go.mod b/plc4go/go.mod
index b0f7aed..729b4f5 100644
--- a/plc4go/go.mod
+++ b/plc4go/go.mod
@@ -26,8 +26,6 @@
github.com/icza/bitio v1.0.0
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.20.0
- github.com/sigurn/crc16 v0.0.0-20160107003519-da416fad5162
- github.com/sigurn/utils v0.0.0-20190728110027-e1fefb11a144 // indirect
github.com/snksoft/crc v1.1.0
github.com/subchen/go-xmldom v1.1.2
github.com/tebeka/go2xunit v1.4.10 // indirect
diff --git a/plc4go/go.sum b/plc4go/go.sum
index 100fca5..e082f8e 100644
--- a/plc4go/go.sum
+++ b/plc4go/go.sum
@@ -31,10 +31,6 @@
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs=
github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo=
-github.com/sigurn/crc16 v0.0.0-20160107003519-da416fad5162 h1:2zlAtlrum6lg2lMiUWznq04fDudBDajMFl94Zyis67Y=
-github.com/sigurn/crc16 v0.0.0-20160107003519-da416fad5162/go.mod h1:9/etS5gpQq9BJsJMWg1wpLbfuSnkm8dPF6FdW2JXVhA=
-github.com/sigurn/utils v0.0.0-20190728110027-e1fefb11a144 h1:ccb8W1+mYuZvlpn/mJUMAbsFHTMCpcJBS78AsBQxNcY=
-github.com/sigurn/utils v0.0.0-20190728110027-e1fefb11a144/go.mod h1:VRI4lXkrUH5Cygl6mbG1BRUfMMoT2o8BkrtBDUAm+GU=
github.com/snksoft/crc v1.1.0 h1:HkLdI4taFlgGGG1KvsWMpz78PkOC9TkPVpTV/cuWn48=
github.com/snksoft/crc v1.1.0/go.mod h1:5/gUOsgAm7OmIhb6WJzw7w5g2zfJi4FrHYgGPdshE+A=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go
index 7bf0946..3ba198e 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/CIPEncapsulationReadResponse.go
@@ -158,3 +158,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *CIPEncapsulationReadResponse) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
index 29d106b..5da49d5 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1CommandResponseMessageProtectedTypedLogicalRead.go
@@ -170,3 +170,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *DF1CommandResponseMessageProtectedTypedLogicalRead) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go b/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go
index bb1eefa..934e667 100644
--- a/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go
+++ b/plc4go/internal/plc4go/abeth/readwrite/model/DF1ResponseMessage.go
@@ -273,3 +273,12 @@
}
return nil
}
+
+func (m *DF1ResponseMessage) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsData.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsData.go
index 184ec49..3a9b786 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsData.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsData.go
@@ -177,3 +177,12 @@
}
return nil
}
+
+func (m *AdsData) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItem.go b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItem.go
index f058809..79066b2 100644
--- a/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItem.go
+++ b/plc4go/internal/plc4go/ads/readwrite/model/AdsMultiRequestItem.go
@@ -142,3 +142,12 @@
}
return nil
}
+
+func (m *AdsMultiRequestItem) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go
index fff7a80..66c7d50 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDU.go
@@ -168,3 +168,12 @@
}
return nil
}
+
+func (m *APDU) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
index 185ef5a..ef489af 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUConfirmedRequest.go
@@ -350,3 +350,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *APDUConfirmedRequest) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
index d5bf0f0..3af3c86 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/APDUUnconfirmedRequest.go
@@ -180,3 +180,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *APDUUnconfirmedRequest) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
index 0beddb6..3c33849 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequest.go
@@ -214,3 +214,12 @@
}
return nil
}
+
+func (m *BACnetConfirmedServiceRequest) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
index 5e4269f..c41f7a2 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestConfirmedCOVNotification.go
@@ -440,3 +440,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BACnetConfirmedServiceRequestConfirmedCOVNotification) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
index 2a97d5d..fbf7063 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetConfirmedServiceRequestWriteProperty.go
@@ -362,3 +362,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BACnetConfirmedServiceRequestWriteProperty) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationBitString.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationBitString.go
index 63e0423..9d903ce 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationBitString.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationBitString.go
@@ -189,3 +189,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BACnetTagApplicationBitString) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationDouble.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationDouble.go
index 15f0eff..cbd5a3b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationDouble.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationDouble.go
@@ -146,3 +146,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BACnetTagApplicationDouble) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationEnumerated.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationEnumerated.go
index 2b3a14b..df2a2d6 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationEnumerated.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationEnumerated.go
@@ -170,3 +170,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BACnetTagApplicationEnumerated) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationReal.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationReal.go
index 01854dd..a2973aa 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationReal.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationReal.go
@@ -146,3 +146,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BACnetTagApplicationReal) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationSignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationSignedInteger.go
index 8d37294..a73b3e0 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationSignedInteger.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationSignedInteger.go
@@ -170,3 +170,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BACnetTagApplicationSignedInteger) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationUnsignedInteger.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationUnsignedInteger.go
index 269fbad..31327e8 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationUnsignedInteger.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagApplicationUnsignedInteger.go
@@ -170,3 +170,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BACnetTagApplicationUnsignedInteger) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagContext.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagContext.go
index 8a81d80..091026d 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagContext.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetTagContext.go
@@ -170,3 +170,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BACnetTagContext) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
index 3f60c7f..9a26aa1 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequest.go
@@ -176,3 +176,12 @@
}
return nil
}
+
+func (m *BACnetUnconfirmedServiceRequest) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
index ec4590e..919bffc 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer.go
@@ -283,3 +283,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BACnetUnconfirmedServiceRequestUnconfirmedPrivateTransfer) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go
index 8293a90..bf7bddb 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCForwardedNPDU.go
@@ -214,3 +214,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BVLCForwardedNPDU) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
index 6a7b2db..4eb17c9 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalBroadcastNPDU.go
@@ -154,3 +154,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BVLCOriginalBroadcastNPDU) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
index 0abd7d5..b4f467e 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/BVLCOriginalUnicastNPDU.go
@@ -154,3 +154,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *BVLCOriginalUnicastNPDU) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go
index d0522f3..8053638 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLM.go
@@ -182,3 +182,12 @@
}
return nil
}
+
+func (m *NLM) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
index 5be25f8..8c3ec37 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMIAmRouterToNetwork.go
@@ -167,3 +167,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *NLMIAmRouterToNetwork) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
index 26ee04f..31f1cc5 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NLMWhoIsRouterToNetwork.go
@@ -167,3 +167,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *NLMWhoIsRouterToNetwork) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go
index 15e53c8..d10ef18 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/NPDU.go
@@ -508,3 +508,12 @@
}
return nil
}
+
+func (m *NPDU) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go b/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go
index f49ba5d..2f9c157 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipExchange.go
@@ -201,3 +201,12 @@
}
return nil
}
+
+func (m *CipExchange) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go b/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go
index 3eeb6c1..5023d2d 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipRRData.go
@@ -209,3 +209,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *CipRRData) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go
index 2640e0b..c2b0f3d 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipReadResponse.go
@@ -259,3 +259,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *CipReadResponse) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/CipService.go b/plc4go/internal/plc4go/eip/readwrite/model/CipService.go
index 6f8031b..ea3f9ad 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/CipService.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/CipService.go
@@ -166,3 +166,12 @@
}
return nil
}
+
+func (m *CipService) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go
index 34c5474..63b02cd 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceRequest.go
@@ -195,3 +195,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *MultipleServiceRequest) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go
index 3f70084..26f76fa 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/MultipleServiceResponse.go
@@ -288,3 +288,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *MultipleServiceResponse) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/eip/readwrite/model/Services.go b/plc4go/internal/plc4go/eip/readwrite/model/Services.go
index 75f35bf..5375f95 100644
--- a/plc4go/internal/plc4go/eip/readwrite/model/Services.go
+++ b/plc4go/internal/plc4go/eip/readwrite/model/Services.go
@@ -193,3 +193,12 @@
}
return nil
}
+
+func (m *Services) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommand.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommand.go
index 3a1c004..33d7a5b 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommand.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommand.go
@@ -162,3 +162,12 @@
}
return nil
}
+
+func (m *FirmataCommand) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go
index 5cb56a4..0e9f593 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataCommandSysex.go
@@ -180,3 +180,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *FirmataCommandSysex) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessage.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessage.go
index 023bc3f..98629be 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessage.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessage.go
@@ -162,3 +162,12 @@
}
return nil
}
+
+func (m *FirmataMessage) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go
index d4cee17..f9c38a3 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/FirmataMessageCommand.go
@@ -154,3 +154,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *FirmataMessageCommand) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommand.go b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommand.go
index 9ecaeea..3aaaf85 100644
--- a/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommand.go
+++ b/plc4go/internal/plc4go/firmata/readwrite/model/SysexCommand.go
@@ -183,3 +183,12 @@
}
return nil
}
+
+func (m *SysexCommand) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go
index 780d90b..aefc4ed 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go
@@ -190,3 +190,12 @@
}
return nil
}
+
+func (m *Apdu) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go
index c2dae70..bf24f50 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go
@@ -184,3 +184,12 @@
}
return nil
}
+
+func (m *ApduData) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go
index da325af..3e9eba5 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go
@@ -156,3 +156,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *ApduDataContainer) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
index b14e03b..1578210 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
@@ -183,3 +183,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *ApduDataDeviceDescriptorResponse) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go
index f30cf39..5b45924 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go
@@ -234,3 +234,12 @@
}
return nil
}
+
+func (m *ApduDataExt) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
index 86b3a32..5b0eb2d 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
@@ -240,3 +240,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *ApduDataExtPropertyValueResponse) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
index e7582c8..e22ee3c 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueWrite.go
@@ -240,3 +240,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *ApduDataExtPropertyValueWrite) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
index 5514fe0..46a6935 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueResponse.go
@@ -183,3 +183,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *ApduDataGroupValueResponse) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
index 2c0779d..6164cd6 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
@@ -183,3 +183,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *ApduDataGroupValueWrite) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go
index 5bc9b04..5bcfebb 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go
@@ -154,3 +154,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *ApduDataOther) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go
index 66c1f74..dd6eafa 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/CEMI.go
@@ -198,3 +198,12 @@
}
return nil
}
+
+func (m *CEMI) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTable.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTable.go
index 30175f5..f5b15f3 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTable.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/ComObjectTable.go
@@ -142,3 +142,12 @@
}
return nil
}
+
+func (m *ComObjectTable) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
index f4328fe..c5dd685 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceConfigurationRequest.go
@@ -185,3 +185,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *DeviceConfigurationRequest) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress.go
index 7a8d784..24b6c5a 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxGroupAddress.go
@@ -142,3 +142,12 @@
}
return nil
}
+
+func (m *KnxGroupAddress) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
index 209ff39..cadee90 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/TunnelingRequest.go
@@ -185,3 +185,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *TunnelingRequest) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
index 021ed0a..e834686 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/UnknownMessage.go
@@ -164,3 +164,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *UnknownMessage) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go
index 5227329..19304ba 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusPDU.go
@@ -248,3 +248,12 @@
}
return nil
}
+
+func (m *ModbusPDU) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go
index bd6d45f..901afa4 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusSerialADU.go
@@ -201,3 +201,12 @@
}
return nil
}
+
+func (m *ModbusSerialADU) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go
index 479093c..6a0d647 100644
--- a/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go
+++ b/plc4go/internal/plc4go/modbus/readwrite/model/ModbusTcpADU.go
@@ -197,3 +197,12 @@
}
return nil
}
+
+func (m *ModbusTcpADU) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go
index 39ae78f..21e64cd 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPPacket.go
@@ -255,3 +255,12 @@
}
return nil
}
+
+func (m *COTPPacket) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go
index 0ff3577..32b07df 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameter.go
@@ -179,3 +179,12 @@
}
return nil
}
+
+func (m *COTPParameter) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
index 4a0ae18..eb5fc69 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/COTPParameterDisconnectAdditionalInformation.go
@@ -146,3 +146,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *COTPParameterDisconnectAdditionalInformation) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7Parameter.go b/plc4go/internal/plc4go/s7/readwrite/model/S7Parameter.go
index 0162d86..97dd720 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7Parameter.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7Parameter.go
@@ -165,3 +165,12 @@
}
return nil
}
+
+func (m *S7Parameter) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7Payload.go b/plc4go/internal/plc4go/s7/readwrite/model/S7Payload.go
index 1077e82..6c7d821 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7Payload.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7Payload.go
@@ -145,3 +145,12 @@
}
return nil
}
+
+func (m *S7Payload) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go
index 37df095..55548d0 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadReadVarResponse.go
@@ -176,3 +176,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *S7PayloadReadVarResponse) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go
index 0a97a16..643f287 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserData.go
@@ -171,3 +171,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *S7PayloadUserData) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItem.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItem.go
index 5541c8f..a716e8b 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItem.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadUserDataItem.go
@@ -261,3 +261,12 @@
}
return nil
}
+
+func (m *S7PayloadUserDataItem) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go
index 2696cf3..a456d27 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarRequest.go
@@ -176,3 +176,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *S7PayloadWriteVarRequest) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go
index d48e5c0..8c76529 100644
--- a/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go
+++ b/plc4go/internal/plc4go/s7/readwrite/model/S7PayloadWriteVarResponse.go
@@ -171,3 +171,12 @@
}
return m.Parent.SerializeParent(writeBuffer, m, ser)
}
+
+func (m *S7PayloadWriteVarResponse) String() string {
+ if m == nil {
+ return "<nil>"
+ }
+ buffer := utils.NewBoxedWriteBufferWithOptions(true, true)
+ m.Serialize(buffer)
+ return buffer.GetBox().String()
+}
diff --git a/plc4go/internal/plc4go/spi/testutils/DriverTestRunner.go b/plc4go/internal/plc4go/spi/testutils/DriverTestRunner.go
index 7181e21..0f76e29 100644
--- a/plc4go/internal/plc4go/spi/testutils/DriverTestRunner.go
+++ b/plc4go/internal/plc4go/spi/testutils/DriverTestRunner.go
@@ -23,16 +23,6 @@
"encoding/hex"
"encoding/xml"
"fmt"
- adsIO "github.com/apache/plc4x/plc4go/internal/plc4go/ads/readwrite"
- adsModel "github.com/apache/plc4x/plc4go/internal/plc4go/ads/readwrite/model"
- eipIO "github.com/apache/plc4x/plc4go/internal/plc4go/eip/readwrite"
- eipModel "github.com/apache/plc4x/plc4go/internal/plc4go/eip/readwrite/model"
- knxIO "github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip/readwrite"
- knxModel "github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip/readwrite/model"
- modbusIO "github.com/apache/plc4x/plc4go/internal/plc4go/modbus/readwrite"
- modbusModel "github.com/apache/plc4x/plc4go/internal/plc4go/modbus/readwrite/model"
- s7IO "github.com/apache/plc4x/plc4go/internal/plc4go/s7/readwrite"
- s7Model "github.com/apache/plc4x/plc4go/internal/plc4go/s7/readwrite/model"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/transports"
"github.com/apache/plc4x/plc4go/internal/plc4go/spi/transports/test"
@@ -56,11 +46,39 @@
outputFlavor string
driverName string
driverParameters map[string]string
+ bigEndian bool
+ parser XmlParser
+ rootTypeParser func(utils.ReadBufferByteBased) (interface{}, error)
setupSteps []TestStep
teardownSteps []TestStep
testcases []Testcase
}
+type XmlParser interface {
+ Parse(typeName string, xmlString string, parserArguments ...string) (interface{}, error)
+}
+
+type WithOption interface {
+ isOption() bool
+}
+
+type option struct {
+}
+
+func (_ option) isOption() bool {
+ return true
+}
+
+// WithRootTypeParser Can be used to output the root type of a protocol for better debugging
+func WithRootTypeParser(rootTypeParser func(utils.ReadBufferByteBased) (interface{}, error)) WithOption {
+ return withRootTypeParser{rootTypeParser: rootTypeParser}
+}
+
+type withRootTypeParser struct {
+ option
+ rootTypeParser func(utils.ReadBufferByteBased) (interface{}, error)
+}
+
func (m DriverTestsuite) Run(driverManager plc4go.PlcDriverManager, testcase Testcase) error {
var options []string
for key, value := range m.driverParameters {
@@ -241,7 +259,7 @@
// Parse the xml into a real model
log.Trace().Msg("parsing xml")
- expectedMessage, err := parseMessage(m.protocolName, typeName, payloadString, step)
+ expectedMessage, err := m.parseMessage(typeName, payloadString, step)
if err != nil {
return errors.Wrap(err, "Error parsing message")
}
@@ -253,11 +271,10 @@
return errors.Errorf("error converting type %t into Serializable type", expectedMessage)
}
var expectedWriteBuffer utils.WriteBufferByteBased
- switch m.driverName {
- case "ads", "eip":
- expectedWriteBuffer = utils.NewLittleEndianWriteBufferByteBased()
- default:
+ if m.bigEndian {
expectedWriteBuffer = utils.NewWriteBufferByteBased()
+ } else {
+ expectedWriteBuffer = utils.NewLittleEndianWriteBufferByteBased()
}
err = expectedSerializable.Serialize(expectedWriteBuffer)
if err != nil {
@@ -283,31 +300,20 @@
return errors.Wrap(err, "error getting bytes from transport")
}
+ var bufferFactory func([]byte) utils.ReadBufferByteBased
+ if m.bigEndian {
+ bufferFactory = utils.NewReadBufferByteBased
+ } else {
+ bufferFactory = utils.NewLittleEndianReadBufferByteBased
+ }
// Compare the bytes read with the ones we expect
log.Trace().Msg("Comparing outputs")
for i := range expectedRawOutput {
if expectedRawOutput[i] != actualRawOutput[i] {
- switch m.driverName {
- case "modbus":
- expectation := expectedSerializable.(*modbusModel.ModbusTcpADU)
- actual, err := modbusModel.ModbusTcpADUParse(utils.NewReadBufferByteBased(actualRawOutput), false)
- log.Error().Err(err).Msgf("A readable render of expectation:\n%v\nvs actual paket\n%v\n", expectation, actual)
- case "ads":
- expectation := expectedSerializable.(*adsModel.AmsTCPPacket)
- actual, err := adsModel.AmsTCPPacketParse(utils.NewLittleEndianReadBufferByteBased(actualRawOutput))
- log.Error().Err(err).Msgf("A readable render of expectation:\n%v\nvs actual paket\n%v\n", expectation, actual)
- case "eip":
- expectation := expectedSerializable.(*eipModel.EipPacket)
- actual, err := eipModel.EipPacketParse(utils.NewLittleEndianReadBufferByteBased(actualRawOutput))
- log.Error().Err(err).Msgf("A readable render of expectation:\n%v\nvs actual paket\n%v\n", expectation, actual)
- case "s7":
- expectation := expectedSerializable.(*s7Model.TPKTPacket)
- actual, err := s7Model.TPKTPacketParse(utils.NewReadBufferByteBased(actualRawOutput))
- log.Error().Err(err).Msgf("A readable render of expectation:\n%v\nvs actual paket\n%v\n", expectation, actual)
- case "knx":
- expectation := expectedSerializable.(*knxModel.KnxNetIpMessage)
- actual, err := knxModel.KnxNetIpMessageParse(utils.NewReadBufferByteBased(actualRawOutput))
- log.Error().Err(err).Msgf("A readable render of expectation:\n%v\nvs actual paket\n%v\n", expectation, actual)
+ if m.rootTypeParser != nil {
+ readBufferByteBased := bufferFactory(actualRawOutput)
+ actual, err := m.rootTypeParser(readBufferByteBased)
+ log.Error().Err(err).Msgf("A readable render of expectation:\n%v\nvs actual paket\n%v\n", expectedSerializable, actual)
}
return errors.Errorf("actual output doesn't match expected output:\nactual:\n%s\nexpected:\n%s", utils.Dump(actualRawOutput), utils.Dump(expectedRawOutput))
}
@@ -339,7 +345,7 @@
// Parse the xml into a real model
log.Trace().Msg("Parsing model")
- expectedMessage, err := parseMessage(m.protocolName, typeName, payloadString, step)
+ expectedMessage, err := m.parseMessage(typeName, payloadString, step)
if err != nil {
return errors.Wrap(err, "error parsing message")
}
@@ -351,11 +357,10 @@
return errors.New("error converting type into Serializable type")
}
var wb utils.WriteBufferByteBased
- switch m.driverName {
- case "ads", "eip":
- wb = utils.NewLittleEndianWriteBufferByteBased()
- default:
+ if m.bigEndian {
wb = utils.NewWriteBufferByteBased()
+ } else {
+ wb = utils.NewLittleEndianWriteBufferByteBased()
}
err = expectedSerializable.Serialize(wb)
if err != nil {
@@ -404,26 +409,15 @@
return nil
}
-func parseMessage(protocolName string, typeName string, payloadString string, step TestStep) (interface{}, error) {
- type Parser interface {
- Parse(typeName string, xmlString string, parserArguments ...string) (interface{}, error)
+func (m DriverTestsuite) parseMessage(typeName string, payloadString string, step TestStep) (interface{}, error) {
+ if m.parser == nil {
+ return nil, errors.Errorf("Protocol name %s has no mapped parser", m.protocolName)
}
- parserMap := map[string]Parser{
- "modbus": modbusIO.ModbusXmlParserHelper{},
- "ads": adsIO.AdsXmlParserHelper{},
- "eip": eipIO.EipXmlParserHelper{},
- "knxnetip": knxIO.KnxnetipXmlParserHelper{},
- "s7": s7IO.S7XmlParserHelper{},
+ parse, err := m.parser.Parse(typeName, payloadString, step.parserArguments...)
+ if err != nil {
+ return nil, errors.Wrap(err, "error parsing xml")
}
- if parser, ok := parserMap[protocolName]; ok {
- expected, err := parser.Parse(typeName, payloadString, step.parserArguments...)
- if err != nil {
- return nil, errors.Wrap(err, "error parsing xml")
- }
- return expected, nil
- } else {
- return nil, errors.Errorf("Protocol name %s has no mapped parser", protocolName)
- }
+ return parse, err
}
func (m DriverTestsuite) ParseXml(referenceXml *xmldom.Node, parserArguments []string) {
@@ -459,7 +453,11 @@
StepTypeTerminate StepType = 0x08
)
-func RunDriverTestsuite(t *testing.T, driver plc4go.PlcDriver, testPath string, skippedTestCases ...string) {
+func RunDriverTestsuite(t *testing.T, driver plc4go.PlcDriver, testPath string, parser XmlParser, skippedTestCases ...string) {
+ RunDriverTestsuiteWithOptions(t, driver, testPath, parser, nil, skippedTestCases...)
+}
+
+func RunDriverTestsuiteWithOptions(t *testing.T, driver plc4go.PlcDriver, testPath string, parser XmlParser, options []WithOption, skippedTestCases ...string) {
skippedTestCasesMap := map[string]bool{}
for _, skippedTestCase := range skippedTestCases {
skippedTestCasesMap[skippedTestCase] = true
@@ -472,8 +470,16 @@
return
}
+ var rootTypeParser func(utils.ReadBufferByteBased) (interface{}, error)
+ for _, withOption := range options {
+ switch withOption.(type) {
+ case withRootTypeParser:
+ log.Info().Msg("Using root type parser for better output")
+ rootTypeParser = withOption.(withRootTypeParser).rootTypeParser
+ }
+ }
// Parse the contents of the test-specification
- testsuite, err := ParseDriverTestsuite(*rootNode)
+ testsuite, err := ParseDriverTestsuite(*rootNode, parser, rootTypeParser)
if err != nil {
// TODO: zerolog doesn't render stack human readable :(
fmt.Printf("%+v\n", err)
@@ -553,10 +559,11 @@
return node, nil
}
-func ParseDriverTestsuite(node xmldom.Node) (*DriverTestsuite, error) {
+func ParseDriverTestsuite(node xmldom.Node, parser XmlParser, rootTypeParser func(utils.ReadBufferByteBased) (interface{}, error)) (*DriverTestsuite, error) {
if node.Name != "driver-testsuite" {
return nil, errors.New("invalid document structure")
}
+ bigEndian := node.GetAttributeValue("bigEndian") != "false"
var testsuiteName string
var protocolName string
var outputFlavor string
@@ -629,6 +636,9 @@
outputFlavor: outputFlavor,
driverName: driverName,
driverParameters: driverParameters,
+ bigEndian: bigEndian,
+ parser: parser,
+ rootTypeParser: rootTypeParser,
setupSteps: setupSteps,
teardownSteps: teardownSteps,
testcases: testcases,
