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/03 08:41:07 UTC
[plc4x] 01/02: test(plc4go/cbus): small optimization regarding required errors
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
commit 60f560662d080876b974525f251ff4d28f23ecdc
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Sat Jun 3 10:39:25 2023 +0200
test(plc4go/cbus): small optimization regarding required errors
---
plc4go/internal/cbus/Browser_test.go | 23 ++++++-----------------
plc4go/internal/cbus/Discoverer_test.go | 16 ++++------------
2 files changed, 10 insertions(+), 29 deletions(-)
diff --git a/plc4go/internal/cbus/Browser_test.go b/plc4go/internal/cbus/Browser_test.go
index 8fc96fc76f..f89593b75f 100644
--- a/plc4go/internal/cbus/Browser_test.go
+++ b/plc4go/internal/cbus/Browser_test.go
@@ -22,7 +22,6 @@ package cbus
import (
"context"
"fmt"
- "github.com/apache/plc4x/plc4go/spi/utils"
"net/url"
"sync/atomic"
"testing"
@@ -38,11 +37,13 @@ import (
"github.com/apache/plc4x/plc4go/spi/testutils"
"github.com/apache/plc4x/plc4go/spi/transports"
"github.com/apache/plc4x/plc4go/spi/transports/test"
+ "github.com/apache/plc4x/plc4go/spi/utils"
spiValues "github.com/apache/plc4x/plc4go/spi/values"
"github.com/pkg/errors"
"github.com/rs/zerolog"
"github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
func TestNewBrowser(t *testing.T) {
@@ -99,10 +100,7 @@ func TestBrowser_BrowseQuery(t *testing.T) {
transport := test.NewTransport(loggerOption)
transportUrl := url.URL{Scheme: "test"}
transportInstance, err := transport.CreateTransportInstance(transportUrl, nil, loggerOption)
- if err != nil {
- t.Error(err)
- t.FailNow()
- }
+ require.NoError(t, err)
t.Cleanup(func() {
assert.NoError(t, transportInstance.Close())
})
@@ -162,10 +160,7 @@ func TestBrowser_BrowseQuery(t *testing.T) {
}
})
err = transport.AddPreregisteredInstances(transportUrl, transportInstance)
- if err != nil {
- t.Error(err)
- t.FailNow()
- }
+ require.NoError(t, err)
driver := NewDriver(loggerOption)
connectionConnectResult := <-driver.GetConnection(transportUrl, map[string]transports.Transport{"test": transport}, map[string][]string{})
if err := connectionConnectResult.GetErr(); err != nil {
@@ -380,10 +375,7 @@ func TestBrowser_getInstalledUnitAddressBytes(t *testing.T) {
transport := test.NewTransport(loggerOption)
transportUrl := url.URL{Scheme: "test"}
transportInstance, err := transport.CreateTransportInstance(transportUrl, nil, loggerOption)
- if err != nil {
- t.Error(err)
- t.FailNow()
- }
+ require.NoError(t, err)
t.Cleanup(func() {
assert.NoError(t, transportInstance.Close())
})
@@ -438,10 +430,7 @@ func TestBrowser_getInstalledUnitAddressBytes(t *testing.T) {
}
})
err = transport.AddPreregisteredInstances(transportUrl, transportInstance)
- if err != nil {
- t.Error(err)
- t.FailNow()
- }
+ require.NoError(t, err)
connectionConnectResult := <-NewDriver(loggerOption).GetConnection(transportUrl, map[string]transports.Transport{"test": transport}, map[string][]string{})
if err := connectionConnectResult.GetErr(); err != nil {
t.Error(err)
diff --git a/plc4go/internal/cbus/Discoverer_test.go b/plc4go/internal/cbus/Discoverer_test.go
index 5418525b15..fb5274ee2c 100644
--- a/plc4go/internal/cbus/Discoverer_test.go
+++ b/plc4go/internal/cbus/Discoverer_test.go
@@ -40,6 +40,7 @@ import (
"github.com/rs/zerolog"
"github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
"golang.org/x/net/nettest"
)
@@ -178,10 +179,7 @@ func TestDiscoverer_createDeviceScanDispatcher(t *testing.T) {
},
setup: func(t *testing.T, fields *fields, args *args) {
listen, err := net.Listen("tcp", "127.0.0.1:0")
- if err != nil {
- t.Error(err)
- t.FailNow()
- }
+ require.NoError(t, err)
go func() {
conn, err := listen.Accept()
if err != nil {
@@ -210,15 +208,9 @@ func TestDiscoverer_createDeviceScanDispatcher(t *testing.T) {
loggerOption := options.WithCustomLogger(logger)
transport := tcp.NewTransport(loggerOption)
parse, err := url.Parse("tcp://" + listen.Addr().String())
- if err != nil {
- t.Error(err)
- t.FailNow()
- }
+ require.NoError(t, err)
instance, err := transport.CreateTransportInstance(*parse, nil, loggerOption)
- if err != nil {
- t.Error(err)
- t.FailNow()
- }
+ require.NoError(t, err)
args.tcpTransportInstance = instance.(*tcp.TransportInstance)
},
},