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 2023/06/02 08:46:57 UTC
[plc4x] branch develop updated: test(plc4go/driver): move to configured logger
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 39e450524c test(plc4go/driver): move to configured logger
39e450524c is described below
commit 39e450524cf435fb97142049a90a81cc13702b8f
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Jun 2 10:46:49 2023 +0200
test(plc4go/driver): move to configured logger
---
plc4go/spi/testutils/ManualTestRunner.go | 6 +--
plc4go/tests/drivers/tests/abeth_driver_test.go | 11 ++++-
.../drivers/tests/abeth_parser_serializer_test.go | 9 +++-
plc4go/tests/drivers/tests/ads_driver_test.go | 15 ++++--
.../drivers/tests/ads_parser_serializer_test.go | 8 +++-
.../drivers/tests/bacnet_parser_serializer_test.go | 9 +++-
plc4go/tests/drivers/tests/df1_driver_test.go | 11 ++++-
.../drivers/tests/df1_parser_serializer_test.go | 10 ++--
plc4go/tests/drivers/tests/eip_driver_test.go | 12 +++--
.../drivers/tests/eip_parser_serializer_test.go | 16 +++++--
plc4go/tests/drivers/tests/firmata_driver_test.go | 10 +++-
.../tests/firmata_parser_serializer_test.go | 9 +++-
plc4go/tests/drivers/tests/knxnetip_driver_test.go | 15 ++++--
.../tests/knxnetip_parser_serializer_test.go | 9 +++-
.../tests/drivers/tests/manual_ads_driver_test.go | 16 ++++---
.../drivers/tests/manual_bacnet_driver_test.go | 15 +++---
plc4go/tests/drivers/tests/manual_bacnet_test.go | 7 +--
.../tests/drivers/tests/manual_cbus_driver_test.go | 49 +++++++++++++-------
.../tests/drivers/tests/manual_s7_driver_test.go | 16 ++++---
plc4go/tests/drivers/tests/modbus_driver_test.go | 15 ++++--
.../drivers/tests/modbus_parser_serializer_test.go | 9 +++-
plc4go/tests/drivers/tests/s7_driver_test.go | 9 ++--
.../drivers/tests/s7_parser_serializer_test.go | 3 +-
plc4go/tests/initializetest/init.go | 54 ----------------------
24 files changed, 203 insertions(+), 140 deletions(-)
diff --git a/plc4go/spi/testutils/ManualTestRunner.go b/plc4go/spi/testutils/ManualTestRunner.go
index 317e00db42..7d9a2a627c 100644
--- a/plc4go/spi/testutils/ManualTestRunner.go
+++ b/plc4go/spi/testutils/ManualTestRunner.go
@@ -49,7 +49,7 @@ type ManualTestSuite struct {
t *testing.T
}
-func NewManualTestSuite(connectionString string, driverManager plc4go.PlcDriverManager, t *testing.T) *ManualTestSuite {
+func NewManualTestSuite(t *testing.T, connectionString string, driverManager plc4go.PlcDriverManager) *ManualTestSuite {
return &ManualTestSuite{
ConnectionString: connectionString,
DriverManager: driverManager,
@@ -74,7 +74,7 @@ func WithUnwrappedValue(unwrap bool) WithTestCaseOption {
}
}
-func (m *ManualTestSuite) Run(t *testing.T) plc4go.PlcConnection {
+func (m *ManualTestSuite) Run() plc4go.PlcConnection {
connectionResult := <-m.DriverManager.GetConnection(m.ConnectionString)
if err := connectionResult.GetErr(); err != nil {
tracer, ok := errors.Cause(err).(interface{ StackTrace() errors.StackTrace })
@@ -92,7 +92,7 @@ func (m *ManualTestSuite) Run(t *testing.T) plc4go.PlcConnection {
m.t.Cleanup(func() {
connection.Close()
})
- t.Log("Reading all types in separate requests")
+ m.t.Log("Reading all types in separate requests")
// Run all entries separately:
for _, testCase := range m.TestCases {
tagName := testCase.Address
diff --git a/plc4go/tests/drivers/tests/abeth_driver_test.go b/plc4go/tests/drivers/tests/abeth_driver_test.go
index 0e711567a6..2d99f4ca73 100644
--- a/plc4go/tests/drivers/tests/abeth_driver_test.go
+++ b/plc4go/tests/drivers/tests/abeth_driver_test.go
@@ -24,11 +24,18 @@ import (
"github.com/apache/plc4x/plc4go/internal/ads"
abethIO "github.com/apache/plc4x/plc4go/protocols/abeth/readwrite"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/abeth/readwrite/model"
+ "github.com/apache/plc4x/plc4go/spi/options"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestAbEthDriver(t *testing.T) {
t.Skip("No test yet available")
- testutils.RunDriverTestsuite(t, ads.NewDriver(), "assets/testing/protocols/abeth/DriverTestsuite.xml", abethIO.AbethXmlParserHelper{})
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+ testutils.RunDriverTestsuite(
+ t,
+ ads.NewDriver(options.WithCustomLogger(testutils.ProduceTestingLogger(t))),
+ "assets/testing/protocols/abeth/DriverTestsuite.xml",
+ abethIO.AbethXmlParserHelper{},
+ )
}
diff --git a/plc4go/tests/drivers/tests/abeth_parser_serializer_test.go b/plc4go/tests/drivers/tests/abeth_parser_serializer_test.go
index a640be1398..ab12adbe49 100644
--- a/plc4go/tests/drivers/tests/abeth_parser_serializer_test.go
+++ b/plc4go/tests/drivers/tests/abeth_parser_serializer_test.go
@@ -23,10 +23,15 @@ import (
"testing"
abethIO "github.com/apache/plc4x/plc4go/protocols/abeth/readwrite"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/abeth/readwrite/model"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestAbEthParserSerializer(t *testing.T) {
- testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/abeth/ParserSerializerTestsuite.xml", abethIO.AbethParserHelper{})
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+ testutils.RunParserSerializerTestsuite(
+ t,
+ "assets/testing/protocols/abeth/ParserSerializerTestsuite.xml",
+ abethIO.AbethParserHelper{},
+ )
}
diff --git a/plc4go/tests/drivers/tests/ads_driver_test.go b/plc4go/tests/drivers/tests/ads_driver_test.go
index 0cf15a4907..55da0e8316 100644
--- a/plc4go/tests/drivers/tests/ads_driver_test.go
+++ b/plc4go/tests/drivers/tests/ads_driver_test.go
@@ -25,16 +25,23 @@ import (
"github.com/apache/plc4x/plc4go/internal/ads"
adsIO "github.com/apache/plc4x/plc4go/protocols/ads/readwrite"
- adsModel "github.com/apache/plc4x/plc4go/protocols/ads/readwrite/model"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/ads/readwrite/model"
+ "github.com/apache/plc4x/plc4go/spi/options"
"github.com/apache/plc4x/plc4go/spi/testutils"
"github.com/apache/plc4x/plc4go/spi/utils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestAdsDriver(t *testing.T) {
t.Skip("I have to port the commands for reading the symbol-table first")
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
parser := func(readBufferByteBased utils.ReadBufferByteBased) (any, error) {
- return adsModel.AmsTCPPacketParseWithBuffer(context.Background(), readBufferByteBased)
+ return readWriteModel.AmsTCPPacketParseWithBuffer(context.Background(), readBufferByteBased)
}
- testutils.RunDriverTestsuite(t, ads.NewDriver(), "assets/testing/protocols/ads/DriverTestsuite.xml", adsIO.AdsXmlParserHelper{}, testutils.WithRootTypeParser(parser))
+ testutils.RunDriverTestsuite(
+ t,
+ ads.NewDriver(options.WithCustomLogger(testutils.ProduceTestingLogger(t))),
+ "assets/testing/protocols/ads/DriverTestsuite.xml",
+ adsIO.AdsXmlParserHelper{},
+ testutils.WithRootTypeParser(parser),
+ )
}
diff --git a/plc4go/tests/drivers/tests/ads_parser_serializer_test.go b/plc4go/tests/drivers/tests/ads_parser_serializer_test.go
index 2822693f0b..5e6832e3eb 100644
--- a/plc4go/tests/drivers/tests/ads_parser_serializer_test.go
+++ b/plc4go/tests/drivers/tests/ads_parser_serializer_test.go
@@ -23,10 +23,14 @@ import (
"testing"
adsIO "github.com/apache/plc4x/plc4go/protocols/ads/readwrite"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/ads/readwrite/model"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestAdsParserSerializer(t *testing.T) {
- testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/ads/ParserSerializerTestsuite.xml", adsIO.AdsParserHelper{})
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+ testutils.RunParserSerializerTestsuite(t,
+ "assets/testing/protocols/ads/ParserSerializerTestsuite.xml",
+ adsIO.AdsParserHelper{},
+ )
}
diff --git a/plc4go/tests/drivers/tests/bacnet_parser_serializer_test.go b/plc4go/tests/drivers/tests/bacnet_parser_serializer_test.go
index 2340459380..b498e9ecd6 100644
--- a/plc4go/tests/drivers/tests/bacnet_parser_serializer_test.go
+++ b/plc4go/tests/drivers/tests/bacnet_parser_serializer_test.go
@@ -20,13 +20,18 @@
package tests
import (
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model"
"testing"
bacnetIO "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestBacnetParserSerializer(t *testing.T) {
- testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml", bacnetIO.BacnetipParserHelper{})
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+ testutils.RunParserSerializerTestsuite(
+ t,
+ "assets/testing/protocols/bacnet/ParserSerializerTestsuite.xml",
+ bacnetIO.BacnetipParserHelper{},
+ )
}
diff --git a/plc4go/tests/drivers/tests/df1_driver_test.go b/plc4go/tests/drivers/tests/df1_driver_test.go
index 66a68aafb1..afd0134d0b 100644
--- a/plc4go/tests/drivers/tests/df1_driver_test.go
+++ b/plc4go/tests/drivers/tests/df1_driver_test.go
@@ -20,15 +20,22 @@
package tests
import (
+ "github.com/apache/plc4x/plc4go/spi/options"
"testing"
"github.com/apache/plc4x/plc4go/internal/ads"
df1IO "github.com/apache/plc4x/plc4go/protocols/df1/readwrite"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/df1/readwrite/model"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestDf1Driver(t *testing.T) {
t.Skip("No test yet")
- testutils.RunDriverTestsuite(t, ads.NewDriver(), "assets/testing/protocols/df1/DriverTestsuite.xml", df1IO.Df1XmlParserHelper{})
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+ testutils.RunDriverTestsuite(
+ t,
+ ads.NewDriver(options.WithCustomLogger(testutils.ProduceTestingLogger(t))),
+ "assets/testing/protocols/df1/DriverTestsuite.xml",
+ df1IO.Df1XmlParserHelper{},
+ )
}
diff --git a/plc4go/tests/drivers/tests/df1_parser_serializer_test.go b/plc4go/tests/drivers/tests/df1_parser_serializer_test.go
index 480387a3a5..6c0c6110fd 100644
--- a/plc4go/tests/drivers/tests/df1_parser_serializer_test.go
+++ b/plc4go/tests/drivers/tests/df1_parser_serializer_test.go
@@ -23,11 +23,15 @@ import (
"testing"
df1IO "github.com/apache/plc4x/plc4go/protocols/df1/readwrite"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/df1/readwrite/model"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestDf1ParserSerializer(t *testing.T) {
- //t.Skip("Still a WIP")
- testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/df1/ParserSerializerTestsuite.xml", df1IO.Df1ParserHelper{})
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+ testutils.RunParserSerializerTestsuite(
+ t,
+ "assets/testing/protocols/df1/ParserSerializerTestsuite.xml",
+ df1IO.Df1ParserHelper{},
+ )
}
diff --git a/plc4go/tests/drivers/tests/eip_driver_test.go b/plc4go/tests/drivers/tests/eip_driver_test.go
index 7db0efca8b..114bade845 100644
--- a/plc4go/tests/drivers/tests/eip_driver_test.go
+++ b/plc4go/tests/drivers/tests/eip_driver_test.go
@@ -24,11 +24,17 @@ import (
"github.com/apache/plc4x/plc4go/internal/eip"
eipIO "github.com/apache/plc4x/plc4go/protocols/eip/readwrite"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/eip/readwrite/model"
+ "github.com/apache/plc4x/plc4go/spi/options"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestEIPDriver(t *testing.T) {
- /*initializetest.GoFullDebug()*/
- testutils.RunDriverTestsuite(t, eip.NewDriver(), "assets/testing/protocols/eip/DriverTestsuite.xml", eipIO.EipXmlParserHelper{})
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+ testutils.RunDriverTestsuite(
+ t,
+ eip.NewDriver(options.WithCustomLogger(testutils.ProduceTestingLogger(t))),
+ "assets/testing/protocols/eip/DriverTestsuite.xml",
+ eipIO.EipXmlParserHelper{},
+ )
}
diff --git a/plc4go/tests/drivers/tests/eip_parser_serializer_test.go b/plc4go/tests/drivers/tests/eip_parser_serializer_test.go
index daa1ae4232..7b87ef8fe9 100644
--- a/plc4go/tests/drivers/tests/eip_parser_serializer_test.go
+++ b/plc4go/tests/drivers/tests/eip_parser_serializer_test.go
@@ -23,14 +23,24 @@ import (
"testing"
eipIO "github.com/apache/plc4x/plc4go/protocols/eip/readwrite"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/eip/readwrite/model"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestEipParserSerializerBigEndian(t *testing.T) {
- testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/eip/ParserSerializerTestsuiteBigEndian.xml", eipIO.EipParserHelper{})
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+ testutils.RunParserSerializerTestsuite(
+ t,
+ "assets/testing/protocols/eip/ParserSerializerTestsuiteBigEndian.xml",
+ eipIO.EipParserHelper{},
+ )
}
func TestEipParserSerializerLittleEndian(t *testing.T) {
- testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/eip/ParserSerializerTestsuiteLittleEndian.xml", eipIO.EipParserHelper{})
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+ testutils.RunParserSerializerTestsuite(
+ t,
+ "assets/testing/protocols/eip/ParserSerializerTestsuiteLittleEndian.xml",
+ eipIO.EipParserHelper{},
+ )
}
diff --git a/plc4go/tests/drivers/tests/firmata_driver_test.go b/plc4go/tests/drivers/tests/firmata_driver_test.go
index 51978054d9..cfbfb64c5a 100644
--- a/plc4go/tests/drivers/tests/firmata_driver_test.go
+++ b/plc4go/tests/drivers/tests/firmata_driver_test.go
@@ -24,11 +24,17 @@ import (
"github.com/apache/plc4x/plc4go/internal/knxnetip"
firmataIO "github.com/apache/plc4x/plc4go/protocols/firmata/readwrite"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/firmata/readwrite/model"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestFirmataDriver(t *testing.T) {
t.Skip("no testsuite yet")
- testutils.RunDriverTestsuite(t, knxnetip.NewDriver(), "assets/testing/protocols/firmata/DriverTestsuite.xml", firmataIO.FirmataXmlParserHelper{})
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+ testutils.RunDriverTestsuite(
+ t,
+ knxnetip.NewDriver(),
+ "assets/testing/protocols/firmata/DriverTestsuite.xml",
+ firmataIO.FirmataXmlParserHelper{},
+ )
}
diff --git a/plc4go/tests/drivers/tests/firmata_parser_serializer_test.go b/plc4go/tests/drivers/tests/firmata_parser_serializer_test.go
index 24f887d13e..682ef7fb51 100644
--- a/plc4go/tests/drivers/tests/firmata_parser_serializer_test.go
+++ b/plc4go/tests/drivers/tests/firmata_parser_serializer_test.go
@@ -23,10 +23,15 @@ import (
"testing"
firmataIO "github.com/apache/plc4x/plc4go/protocols/firmata/readwrite"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/firmata/readwrite/model"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestFirmataParserSerializer(t *testing.T) {
- testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/firmata/ParserSerializerTestsuite.xml", firmataIO.FirmataParserHelper{})
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+ testutils.RunParserSerializerTestsuite(
+ t,
+ "assets/testing/protocols/firmata/ParserSerializerTestsuite.xml",
+ firmataIO.FirmataParserHelper{},
+ )
}
diff --git a/plc4go/tests/drivers/tests/knxnetip_driver_test.go b/plc4go/tests/drivers/tests/knxnetip_driver_test.go
index 8008fedeba..443455f9a1 100644
--- a/plc4go/tests/drivers/tests/knxnetip_driver_test.go
+++ b/plc4go/tests/drivers/tests/knxnetip_driver_test.go
@@ -25,16 +25,23 @@ import (
"github.com/apache/plc4x/plc4go/internal/knxnetip"
knxIO "github.com/apache/plc4x/plc4go/protocols/knxnetip/readwrite"
- knxModel "github.com/apache/plc4x/plc4go/protocols/knxnetip/readwrite/model"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/knxnetip/readwrite/model"
+ "github.com/apache/plc4x/plc4go/spi/options"
"github.com/apache/plc4x/plc4go/spi/testutils"
"github.com/apache/plc4x/plc4go/spi/utils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestKNXNetIPDriver(t *testing.T) {
t.Skip("No test yet")
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
parser := func(readBufferByteBased utils.ReadBufferByteBased) (any, error) {
- return knxModel.KnxNetIpMessageParseWithBuffer(context.Background(), readBufferByteBased)
+ return readWriteModel.KnxNetIpMessageParseWithBuffer(context.Background(), readBufferByteBased)
}
- testutils.RunDriverTestsuite(t, knxnetip.NewDriver(), "assets/testing/protocols/knxnetip/DriverTestsuite.xml", knxIO.KnxnetipXmlParserHelper{}, testutils.WithRootTypeParser(parser))
+ testutils.RunDriverTestsuite(
+ t,
+ knxnetip.NewDriver(options.WithCustomLogger(testutils.ProduceTestingLogger(t))),
+ "assets/testing/protocols/knxnetip/DriverTestsuite.xml",
+ knxIO.KnxnetipXmlParserHelper{},
+ testutils.WithRootTypeParser(parser),
+ )
}
diff --git a/plc4go/tests/drivers/tests/knxnetip_parser_serializer_test.go b/plc4go/tests/drivers/tests/knxnetip_parser_serializer_test.go
index a8baa531a1..9a15e03fd2 100644
--- a/plc4go/tests/drivers/tests/knxnetip_parser_serializer_test.go
+++ b/plc4go/tests/drivers/tests/knxnetip_parser_serializer_test.go
@@ -23,10 +23,15 @@ import (
"testing"
knxIO "github.com/apache/plc4x/plc4go/protocols/knxnetip/readwrite"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/knxnetip/readwrite/model"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestKNXNetIPParserSerializer(t *testing.T) {
- testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/knxnetip/ParserSerializerTestsuite.xml", knxIO.KnxnetipParserHelper{})
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+ testutils.RunParserSerializerTestsuite(
+ t,
+ "assets/testing/protocols/knxnetip/ParserSerializerTestsuite.xml",
+ knxIO.KnxnetipParserHelper{},
+ )
}
diff --git a/plc4go/tests/drivers/tests/manual_ads_driver_test.go b/plc4go/tests/drivers/tests/manual_ads_driver_test.go
index 26285c7d58..8237a381e6 100644
--- a/plc4go/tests/drivers/tests/manual_ads_driver_test.go
+++ b/plc4go/tests/drivers/tests/manual_ads_driver_test.go
@@ -26,13 +26,14 @@ import (
"github.com/apache/plc4x/plc4go/internal/ads"
"github.com/apache/plc4x/plc4go/pkg/api"
"github.com/apache/plc4x/plc4go/pkg/api/transports"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/ads/readwrite/model"
+ "github.com/apache/plc4x/plc4go/spi/options"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestManualAds(t *testing.T) {
t.Skip()
-
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
/*
* Test program code on the PLC with the test-data.
*
@@ -83,10 +84,11 @@ func TestManualAds(t *testing.T) {
targetAmsNetId := spsIp + ".1.1"
targetAmsPort := 851
connectionString := fmt.Sprintf("ads:tcp://%s?sourceAmsNetId=%s&sourceAmsPort=%d&targetAmsNetId=%s&targetAmsPort=%d", spsIp, sourceAmsNetId, sourceAmsPort, targetAmsNetId, targetAmsPort)
- driverManager := plc4go.NewPlcDriverManager()
- driverManager.RegisterDriver(ads.NewDriver())
- transports.RegisterTcpTransport(driverManager)
- test := testutils.NewManualTestSuite(connectionString, driverManager, t)
+ withCustomLogger := options.WithCustomLogger(testutils.ProduceTestingLogger(t))
+ driverManager := plc4go.NewPlcDriverManager(withCustomLogger)
+ driverManager.RegisterDriver(ads.NewDriver(withCustomLogger))
+ transports.RegisterTcpTransport(driverManager, withCustomLogger)
+ test := testutils.NewManualTestSuite(t, connectionString, driverManager)
test.AddTestCase("main.hurz_BOOL:BOOL", true)
test.AddTestCase("main.hurz_BYTE:BYTE", []bool{false, false, true, false, true, false, true, false})
test.AddTestCase("main.hurz_WORD:WORD", []bool{true, false, true, false, false, true, false, true, true, false, true, true, true, false, false, false})
@@ -110,5 +112,5 @@ func TestManualAds(t *testing.T) {
test.AddTestCase("main.hurz_TOD:TOD", "16:17:18.123")
test.AddTestCase("main.hurz_DATE_AND_TIME:DATE_AND_TIME", "1996-05-06T15:36:30")
test.AddTestCase("main.hurz_DT:DT", "1972-03-29T00:00")
- test.Run(t)
+ test.Run()
}
diff --git a/plc4go/tests/drivers/tests/manual_bacnet_driver_test.go b/plc4go/tests/drivers/tests/manual_bacnet_driver_test.go
index 0acadfc436..c15e17692c 100644
--- a/plc4go/tests/drivers/tests/manual_bacnet_driver_test.go
+++ b/plc4go/tests/drivers/tests/manual_bacnet_driver_test.go
@@ -25,21 +25,24 @@ import (
"github.com/apache/plc4x/plc4go/internal/bacnetip"
"github.com/apache/plc4x/plc4go/pkg/api"
"github.com/apache/plc4x/plc4go/pkg/api/transports"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model"
+ "github.com/apache/plc4x/plc4go/spi/options"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestManualBacnetDriver(t *testing.T) {
t.Skip()
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
connectionString := "bacnet-ip://192.168.178.101"
- driverManager := plc4go.NewPlcDriverManager()
- driverManager.RegisterDriver(bacnetip.NewDriver())
- transports.RegisterUdpTransport(driverManager)
- test := testutils.NewManualTestSuite(connectionString, driverManager, t)
+ withCustomLogger := options.WithCustomLogger(testutils.ProduceTestingLogger(t))
+ driverManager := plc4go.NewPlcDriverManager(withCustomLogger)
+ driverManager.RegisterDriver(bacnetip.NewDriver(withCustomLogger))
+ transports.RegisterUdpTransport(driverManager, withCustomLogger)
+ test := testutils.NewManualTestSuite(t, connectionString, driverManager)
test.AddTestCase("ANALOG_OUTPUT,133/PRESENT_VALUE", true)
test.AddTestCase("DEVICE,133/LOCATION&DESCRIPTION", true)
- test.Run(t)
+ test.Run()
}
diff --git a/plc4go/tests/drivers/tests/manual_bacnet_test.go b/plc4go/tests/drivers/tests/manual_bacnet_test.go
index 2b32d37f82..d925a9fdcd 100644
--- a/plc4go/tests/drivers/tests/manual_bacnet_test.go
+++ b/plc4go/tests/drivers/tests/manual_bacnet_test.go
@@ -22,13 +22,14 @@ package tests
import (
"testing"
- "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model"
+ "github.com/apache/plc4x/plc4go/spi/testutils"
"github.com/stretchr/testify/require"
)
func TestManualBacnet(t *testing.T) {
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
rawBytes := []byte{
/*00000000*/ 0x00, 0x22, 0x5f, 0x07, 0xcc, 0x90, 0x00, 0x24, 0xe8, 0xf9, 0x21, 0xa0, 0x08, 0x00, 0x45, 0x00, //|."_....$..!...E.|
/*00000010*/ 0x00, 0x53, 0x55, 0xb9, 0x00, 0x00, 0x80, 0x11, 0x60, 0xc1, 0xc0, 0xa8, 0x01, 0x68, 0xc0, 0xa8, //|.SU.....`....h..|
@@ -38,6 +39,6 @@ func TestManualBacnet(t *testing.T) {
/*00000050*/ 0xff, 0xff, 0xff, 0xff, 0x0c, 0x00, 0xc0, 0x00, 0x01, 0x19, 0x55, 0x3c, 0xff, 0xff, 0xff, 0xff, //|..........U<....|
/*00000060*/ 0x3f, //|?|
}
- _, err := model.BVLCParse(rawBytes[42:])
+ _, err := readWriteModel.BVLCParse(rawBytes[42:])
require.NoError(t, err)
}
diff --git a/plc4go/tests/drivers/tests/manual_cbus_driver_test.go b/plc4go/tests/drivers/tests/manual_cbus_driver_test.go
index d7e3889d65..1383cb02a0 100644
--- a/plc4go/tests/drivers/tests/manual_cbus_driver_test.go
+++ b/plc4go/tests/drivers/tests/manual_cbus_driver_test.go
@@ -21,6 +21,7 @@ package tests
import (
"fmt"
+ "github.com/apache/plc4x/plc4go/spi/options"
"testing"
"time"
@@ -28,9 +29,9 @@ import (
"github.com/apache/plc4x/plc4go/pkg/api"
apiModel "github.com/apache/plc4x/plc4go/pkg/api/model"
"github.com/apache/plc4x/plc4go/pkg/api/transports"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/cbus/readwrite/model"
"github.com/apache/plc4x/plc4go/spi/testutils"
"github.com/apache/plc4x/plc4go/spi/utils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
"github.com/stretchr/testify/require"
)
@@ -38,11 +39,15 @@ import (
func TestManualCBusDriverMixed(t *testing.T) {
t.Skip()
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+
+ withCustomLogger := options.WithCustomLogger(testutils.ProduceTestingLogger(t))
+
connectionString := "c-bus://192.168.178.101"
- driverManager := plc4go.NewPlcDriverManager()
- driverManager.RegisterDriver(cbus.NewDriver())
- transports.RegisterTcpTransport(driverManager)
- test := testutils.NewManualTestSuite(connectionString, driverManager, t)
+ driverManager := plc4go.NewPlcDriverManager(withCustomLogger)
+ driverManager.RegisterDriver(cbus.NewDriver(withCustomLogger))
+ transports.RegisterTcpTransport(driverManager, withCustomLogger)
+ test := testutils.NewManualTestSuite(t, connectionString, driverManager)
// TODO: fix those test cases
//test.AddTestCase("status/binary/0x04", "PlcStruct{\n application: \"LIGHTING_38\"\n blockStart: \"false, false, false, false, false, false, false, false\"\n values: \"DOES_NOT_EXIST, OFF, ERROR, ON, DOES_NOT_EXIST, OFF, ERROR, ON, DOES_NOT_EXIST, OFF, ERROR, ON, DOES_NOT_EXIST, OFF, ERROR, ON, DOES_NOT_EXIST, OFF, ERROR, ON, DOES_NOT_EXIST, OFF, ERROR, ON, DOES_NOT_EXIST, OFF, ERROR, ON, DOES_NOT_EXIST, OFF, ERROR, ON, DOES_NOT_EXIST, OFF, ERROR, ON, DOES_NOT_EXIST, OFF, ERROR, ON, [...]
@@ -51,7 +56,7 @@ func TestManualCBusDriverMixed(t *testing.T) {
//test.AddTestCase("cal/0/identify=[FirmwareVersion]", true)
//test.AddTestCase("cal/0/gestatus=[0xFF, 1]", true)
- plcConnection := test.Run(t)
+ plcConnection := test.Run()
t.Run("Subscription test", func(t *testing.T) {
gotMMI := make(chan bool)
gotSAL := make(chan bool)
@@ -113,10 +118,14 @@ func TestManualCBusDriverMixed(t *testing.T) {
func TestManualCBusBrowse(t *testing.T) {
t.Skip()
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+
+ withCustomLogger := options.WithCustomLogger(testutils.ProduceTestingLogger(t))
+
connectionString := "c-bus://192.168.178.101?Monitor=false&MonitoredApplication1=0x00&MonitoredApplication2=0x00"
- driverManager := plc4go.NewPlcDriverManager()
- driverManager.RegisterDriver(cbus.NewDriver())
- transports.RegisterTcpTransport(driverManager)
+ driverManager := plc4go.NewPlcDriverManager(withCustomLogger)
+ driverManager.RegisterDriver(cbus.NewDriver(withCustomLogger))
+ transports.RegisterTcpTransport(driverManager, withCustomLogger)
connectionResult := <-driverManager.GetConnection(connectionString)
if err := connectionResult.GetErr(); err != nil {
t.Error(err)
@@ -140,10 +149,14 @@ func TestManualCBusBrowse(t *testing.T) {
func TestManualCBusRead(t *testing.T) {
t.Skip()
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+
+ withCustomLogger := options.WithCustomLogger(testutils.ProduceTestingLogger(t))
+
connectionString := "c-bus://192.168.178.101?Monitor=false&MonitoredApplication1=0x00&MonitoredApplication2=0x00"
- driverManager := plc4go.NewPlcDriverManager()
- driverManager.RegisterDriver(cbus.NewDriver())
- transports.RegisterTcpTransport(driverManager)
+ driverManager := plc4go.NewPlcDriverManager(withCustomLogger)
+ driverManager.RegisterDriver(cbus.NewDriver(withCustomLogger))
+ transports.RegisterTcpTransport(driverManager, withCustomLogger)
connectionResult := <-driverManager.GetConnection(connectionString)
if err := connectionResult.GetErr(); err != nil {
t.Error(err)
@@ -162,12 +175,16 @@ func TestManualCBusRead(t *testing.T) {
func TestManualDiscovery(t *testing.T) {
t.Skip()
- driverManager := plc4go.NewPlcDriverManager()
- driver := cbus.NewDriver()
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
+
+ withCustomLogger := options.WithCustomLogger(testutils.ProduceTestingLogger(t))
+
+ driverManager := plc4go.NewPlcDriverManager(withCustomLogger)
+ driver := cbus.NewDriver(withCustomLogger)
driverManager.RegisterDriver(driver)
- transports.RegisterTcpTransport(driverManager)
+ transports.RegisterTcpTransport(driverManager, withCustomLogger)
err := driver.Discover(func(event apiModel.PlcDiscoveryItem) {
- println(event.(fmt.Stringer).String())
+ t.Log(event.(fmt.Stringer).String())
})
require.NoError(t, err)
}
diff --git a/plc4go/tests/drivers/tests/manual_s7_driver_test.go b/plc4go/tests/drivers/tests/manual_s7_driver_test.go
index 8b599a4f85..9c90fa97bb 100644
--- a/plc4go/tests/drivers/tests/manual_s7_driver_test.go
+++ b/plc4go/tests/drivers/tests/manual_s7_driver_test.go
@@ -20,18 +20,19 @@
package tests
import (
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/s7/readwrite/model"
+ "github.com/apache/plc4x/plc4go/spi/options"
"testing"
"github.com/apache/plc4x/plc4go/internal/s7"
"github.com/apache/plc4x/plc4go/pkg/api"
"github.com/apache/plc4x/plc4go/pkg/api/transports"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestManualS7Driver(t *testing.T) {
t.Skip()
-
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
/*
Test program code on the PLC with the test-data.
Located in "main"
@@ -68,10 +69,11 @@ func TestManualS7Driver(t *testing.T) {
*/
connectionString := "s7://192.168.23.30"
- driverManager := plc4go.NewPlcDriverManager()
- driverManager.RegisterDriver(s7.NewDriver())
- transports.RegisterTcpTransport(driverManager)
- test := testutils.NewManualTestSuite(connectionString, driverManager, t)
+ withCustomLogger := options.WithCustomLogger(testutils.ProduceTestingLogger(t))
+ driverManager := plc4go.NewPlcDriverManager(withCustomLogger)
+ driverManager.RegisterDriver(s7.NewDriver(withCustomLogger))
+ transports.RegisterTcpTransport(driverManager, withCustomLogger)
+ test := testutils.NewManualTestSuite(t, connectionString, driverManager)
test.AddTestCase("%DB4:0.0:BOOL", true)
test.AddTestCase("%DB4:1:BYTE", []bool{false, false, true, false, true, false, true, false})
@@ -109,5 +111,5 @@ func TestManualS7Driver(t *testing.T) {
test.AddTestCase("%DB4:140:STRING(10)", "hurz")
test.AddTestCase("%DB4:396:WSTRING(10)", "wolf")
- test.Run(t)
+ test.Run()
}
diff --git a/plc4go/tests/drivers/tests/modbus_driver_test.go b/plc4go/tests/drivers/tests/modbus_driver_test.go
index 45e4cbdba6..a52b91fb79 100644
--- a/plc4go/tests/drivers/tests/modbus_driver_test.go
+++ b/plc4go/tests/drivers/tests/modbus_driver_test.go
@@ -25,15 +25,22 @@ import (
"github.com/apache/plc4x/plc4go/internal/modbus"
modbusIO "github.com/apache/plc4x/plc4go/protocols/modbus/readwrite"
- modbusModel "github.com/apache/plc4x/plc4go/protocols/modbus/readwrite/model"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/modbus/readwrite/model"
+ "github.com/apache/plc4x/plc4go/spi/options"
"github.com/apache/plc4x/plc4go/spi/testutils"
"github.com/apache/plc4x/plc4go/spi/utils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestModbusDriver(t *testing.T) {
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
parser := func(readBufferByteBased utils.ReadBufferByteBased) (any, error) {
- return modbusModel.ModbusTcpADUParseWithBuffer(context.Background(), readBufferByteBased, modbusModel.DriverType_MODBUS_TCP, false)
+ return readWriteModel.ModbusTcpADUParseWithBuffer(context.Background(), readBufferByteBased, readWriteModel.DriverType_MODBUS_TCP, false)
}
- testutils.RunDriverTestsuite(t, modbus.NewModbusTcpDriver(), "assets/testing/protocols/modbus/tcp/DriverTestsuite.xml", modbusIO.ModbusXmlParserHelper{}, testutils.WithRootTypeParser(parser))
+ testutils.RunDriverTestsuite(
+ t,
+ modbus.NewModbusTcpDriver(options.WithCustomLogger(testutils.ProduceTestingLogger(t))),
+ "assets/testing/protocols/modbus/tcp/DriverTestsuite.xml",
+ modbusIO.ModbusXmlParserHelper{},
+ testutils.WithRootTypeParser(parser),
+ )
}
diff --git a/plc4go/tests/drivers/tests/modbus_parser_serializer_test.go b/plc4go/tests/drivers/tests/modbus_parser_serializer_test.go
index 9ae44c137b..47d9ba4dc4 100644
--- a/plc4go/tests/drivers/tests/modbus_parser_serializer_test.go
+++ b/plc4go/tests/drivers/tests/modbus_parser_serializer_test.go
@@ -23,12 +23,17 @@ import (
"testing"
modbusIO "github.com/apache/plc4x/plc4go/protocols/modbus/readwrite"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/modbus/readwrite/model"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestModbusParserSerializer(t *testing.T) {
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
//testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/modbus/ascii/ParserSerializerTestsuite.xml", modbusIO.ModbusParserHelper{})
//testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/modbus/rtu/ParserSerializerTestsuite.xml", modbusIO.ModbusParserHelper{})
- testutils.RunParserSerializerTestsuite(t, "assets/testing/protocols/modbus/tcp/ParserSerializerTestsuite.xml", modbusIO.ModbusParserHelper{})
+ testutils.RunParserSerializerTestsuite(
+ t,
+ "assets/testing/protocols/modbus/tcp/ParserSerializerTestsuite.xml",
+ modbusIO.ModbusParserHelper{},
+ )
}
diff --git a/plc4go/tests/drivers/tests/s7_driver_test.go b/plc4go/tests/drivers/tests/s7_driver_test.go
index cff90228ab..763337957d 100644
--- a/plc4go/tests/drivers/tests/s7_driver_test.go
+++ b/plc4go/tests/drivers/tests/s7_driver_test.go
@@ -21,23 +21,24 @@ package tests
import (
"context"
+ "github.com/apache/plc4x/plc4go/spi/options"
"testing"
"github.com/apache/plc4x/plc4go/internal/s7"
s7IO "github.com/apache/plc4x/plc4go/protocols/s7/readwrite"
- s7Model "github.com/apache/plc4x/plc4go/protocols/s7/readwrite/model"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/s7/readwrite/model"
"github.com/apache/plc4x/plc4go/spi/testutils"
"github.com/apache/plc4x/plc4go/spi/utils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestS7Driver(t *testing.T) {
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
parser := func(readBufferByteBased utils.ReadBufferByteBased) (any, error) {
- return s7Model.TPKTPacketParseWithBuffer(context.Background(), readBufferByteBased)
+ return readWriteModel.TPKTPacketParseWithBuffer(context.Background(), readBufferByteBased)
}
testutils.RunDriverTestsuite(
t,
- s7.NewDriver(),
+ s7.NewDriver(options.WithCustomLogger(testutils.ProduceTestingLogger(t))),
"assets/testing/protocols/s7/DriverTestsuite.xml",
s7IO.S7XmlParserHelper{},
testutils.WithRootTypeParser(parser),
diff --git a/plc4go/tests/drivers/tests/s7_parser_serializer_test.go b/plc4go/tests/drivers/tests/s7_parser_serializer_test.go
index 3f2f0f57db..d11274379e 100644
--- a/plc4go/tests/drivers/tests/s7_parser_serializer_test.go
+++ b/plc4go/tests/drivers/tests/s7_parser_serializer_test.go
@@ -23,11 +23,12 @@ import (
"testing"
s7IO "github.com/apache/plc4x/plc4go/protocols/s7/readwrite"
+ readWriteModel "github.com/apache/plc4x/plc4go/protocols/s7/readwrite/model"
"github.com/apache/plc4x/plc4go/spi/testutils"
- _ "github.com/apache/plc4x/plc4go/tests/initializetest"
)
func TestS7ParserSerializer(t *testing.T) {
+ testutils.SetToTestingLogger(t, readWriteModel.Plc4xModelLog)
testutils.RunParserSerializerTestsuite(
t,
"assets/testing/protocols/s7/ParserSerializerTestsuite.xml",
diff --git a/plc4go/tests/initializetest/init.go b/plc4go/tests/initializetest/init.go
deleted file mode 100644
index 37bb014827..0000000000
--- a/plc4go/tests/initializetest/init.go
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package initializetest
-
-import (
- "github.com/apache/plc4x/plc4go/pkg/api/config"
- "github.com/rs/zerolog"
- "github.com/rs/zerolog/log"
- "github.com/rs/zerolog/pkgerrors"
- "os"
-)
-
-func init() {
- SetupDefaultLoggerForTest()
-}
-
-// SetupDefaultLoggerForTest This is the default log setting for Jenkins
-func SetupDefaultLoggerForTest() {
- onJenkins := os.Getenv("JENKINS_URL") != ""
- log.Logger = log.
- //// Enable below if you want to see the filenames
- //With().Caller().Logger().
- Output(zerolog.ConsoleWriter{Out: os.Stderr, NoColor: onJenkins}).
- Level(zerolog.InfoLevel)
-}
-
-// GoFullDebug can be called to set up logger for debug (the call to this should not be committed)
-func GoFullDebug() {
- zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
- log.Logger = log.
- With().Caller().Logger().
- Output(zerolog.ConsoleWriter{Out: os.Stderr}).
- Level(zerolog.DebugLevel)
- config.TraceTransactionManagerWorkers = false
- config.TraceTransactionManagerTransactions = false
- config.TraceDefaultMessageCodecWorker = false
-}