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/05/03 10:23:17 UTC
[plc4x] branch develop updated: refactor(plc4go/cbus): fix small code issues
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 88fbf2cd04 refactor(plc4go/cbus): fix small code issues
88fbf2cd04 is described below
commit 88fbf2cd0421363b42eacd5db989705f6c34355f
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed May 3 12:23:09 2023 +0200
refactor(plc4go/cbus): fix small code issues
---
plc4go/internal/cbus/Connection_test.go | 4 +++-
plc4go/internal/cbus/DriverContext.go | 2 +-
plc4go/internal/cbus/MessageCodec_test.go | 39 +++++++++++++++++++++++++++----
plc4go/internal/cbus/Subscriber.go | 2 ++
plc4go/internal/cbus/Subscriber_test.go | 31 +++++++++++++++++-------
plc4go/internal/cbus/Util.go | 2 +-
plc4go/internal/cbus/Util_test.go | 2 +-
7 files changed, 65 insertions(+), 17 deletions(-)
diff --git a/plc4go/internal/cbus/Connection_test.go b/plc4go/internal/cbus/Connection_test.go
index 6e9e1a83a7..daff836d99 100644
--- a/plc4go/internal/cbus/Connection_test.go
+++ b/plc4go/internal/cbus/Connection_test.go
@@ -582,7 +582,9 @@ func TestConnection_UnsubscriptionRequestBuilder(t *testing.T) {
fields fields
want apiModel.PlcUnsubscriptionRequestBuilder
}{
- // TODO: Add test cases.
+ {
+ name: "create one",
+ },
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
diff --git a/plc4go/internal/cbus/DriverContext.go b/plc4go/internal/cbus/DriverContext.go
index 069b817eb7..f0ed07b1f9 100644
--- a/plc4go/internal/cbus/DriverContext.go
+++ b/plc4go/internal/cbus/DriverContext.go
@@ -24,6 +24,6 @@ type DriverContext struct {
awaitDisconnectComplete bool
}
-func NewDriverContext(configuration Configuration) DriverContext {
+func NewDriverContext(_ Configuration) DriverContext {
return DriverContext{}
}
diff --git a/plc4go/internal/cbus/MessageCodec_test.go b/plc4go/internal/cbus/MessageCodec_test.go
index 99e0b9a22b..3d403b9172 100644
--- a/plc4go/internal/cbus/MessageCodec_test.go
+++ b/plc4go/internal/cbus/MessageCodec_test.go
@@ -656,13 +656,14 @@ func TestNewMessageCodec(t *testing.T) {
tests := []struct {
name string
args args
- want *MessageCodec
}{
- // TODO: Add test cases.
+ {
+ name: "create it",
+ },
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- assert.Equalf(t, tt.want, NewMessageCodec(tt.args.transportInstance), "NewMessageCodec(%v)", tt.args.transportInstance)
+ assert.NotNilf(t, NewMessageCodec(tt.args.transportInstance), "NewMessageCodec(%v)", tt.args.transportInstance)
})
}
}
@@ -682,7 +683,37 @@ func Test_extractMMIAndSAL(t *testing.T) {
args args
want bool
}{
- // TODO: Add test cases.
+ {
+ name: "extract it",
+ },
+ {
+ name: "monitored sal",
+ args: args{
+ codec: NewMessageCodec(nil),
+ message: readWriteModel.NewCBusMessageToClient(
+ readWriteModel.NewReplyOrConfirmationReply(
+ readWriteModel.NewReplyEncodedReply(
+ readWriteModel.NewMonitoredSALReply(
+ nil,
+ 0,
+ nil,
+ nil,
+ ),
+ nil,
+ 0,
+ nil,
+ nil,
+ ),
+ nil,
+ 0,
+ nil,
+ nil,
+ ),
+ nil,
+ nil,
+ ),
+ },
+ },
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
diff --git a/plc4go/internal/cbus/Subscriber.go b/plc4go/internal/cbus/Subscriber.go
index bd4b5ae27b..0061922e02 100644
--- a/plc4go/internal/cbus/Subscriber.go
+++ b/plc4go/internal/cbus/Subscriber.go
@@ -76,6 +76,8 @@ func (m *Subscriber) Unsubscribe(ctx context.Context, unsubscriptionRequest apiM
// TODO: As soon as we establish a connection, we start getting data...
// subscriptions are more a internal handling of which values to pass where.
+ _ = ctx
+ _ = unsubscriptionRequest
return result
}
diff --git a/plc4go/internal/cbus/Subscriber_test.go b/plc4go/internal/cbus/Subscriber_test.go
index 4cd204a9ac..6ffc4f7425 100644
--- a/plc4go/internal/cbus/Subscriber_test.go
+++ b/plc4go/internal/cbus/Subscriber_test.go
@@ -21,13 +21,14 @@ package cbus
import (
"context"
+ "testing"
+ "time"
+
apiModel "github.com/apache/plc4x/plc4go/pkg/api/model"
"github.com/apache/plc4x/plc4go/protocols/cbus/readwrite/model"
readWriteModel "github.com/apache/plc4x/plc4go/protocols/cbus/readwrite/model"
spiModel "github.com/apache/plc4x/plc4go/spi/model"
"github.com/stretchr/testify/assert"
- "testing"
- "time"
)
func TestNewSubscriber(t *testing.T) {
@@ -112,12 +113,19 @@ func TestSubscriber_Unsubscribe(t *testing.T) {
unsubscriptionRequest apiModel.PlcUnsubscriptionRequest
}
tests := []struct {
- name string
- fields fields
- args args
- want <-chan apiModel.PlcUnsubscriptionRequestResult
+ name string
+ fields fields
+ args args
+ wantAsserter func(t *testing.T, results <-chan apiModel.PlcUnsubscriptionRequestResult) bool
}{
- // TODO: Add test cases.
+ {
+ name: "just do it",
+ wantAsserter: func(t *testing.T, results <-chan apiModel.PlcUnsubscriptionRequestResult) bool {
+ assert.NotNil(t, results)
+ // TODO: add tests once implemented
+ return true
+ },
+ },
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
@@ -125,7 +133,7 @@ func TestSubscriber_Unsubscribe(t *testing.T) {
connection: tt.fields.connection,
consumers: tt.fields.consumers,
}
- assert.Equalf(t, tt.want, m.Unsubscribe(tt.args.ctx, tt.args.unsubscriptionRequest), "Unsubscribe(%v, %v)", tt.args.ctx, tt.args.unsubscriptionRequest)
+ assert.Truef(t, tt.wantAsserter(t, m.Unsubscribe(tt.args.ctx, tt.args.unsubscriptionRequest)), "Unsubscribe(%v, %v)", tt.args.ctx, tt.args.unsubscriptionRequest)
})
}
}
@@ -1385,7 +1393,12 @@ func TestSubscriber_Unregister(t *testing.T) {
fields fields
args args
}{
- // TODO: Add test cases.
+ {
+ name: "just do it",
+ args: args{
+ registration: spiModel.NewDefaultPlcConsumerRegistration(nil, nil),
+ },
+ },
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
diff --git a/plc4go/internal/cbus/Util.go b/plc4go/internal/cbus/Util.go
index 33952d4173..ed33905610 100644
--- a/plc4go/internal/cbus/Util.go
+++ b/plc4go/internal/cbus/Util.go
@@ -63,7 +63,7 @@ func CreateRequestContextWithInfoCallback(cBusMessage readWriteModel.CBusMessage
return readWriteModel.NewRequestContext(sendIdentifyRequestBefore)
}
case readWriteModel.CBusMessageToClientExactly:
- // We received a request so we need to reset our flags
+ // We received a request, so we need to reset our flags
return readWriteModel.NewRequestContext(false)
}
return readWriteModel.NewRequestContext(false)
diff --git a/plc4go/internal/cbus/Util_test.go b/plc4go/internal/cbus/Util_test.go
index 67d9dba876..b08425ebb1 100644
--- a/plc4go/internal/cbus/Util_test.go
+++ b/plc4go/internal/cbus/Util_test.go
@@ -233,7 +233,7 @@ func TestCreateRequestContextWithInfoCallback(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- assert.Equalf(t, tt.want, CreateRequestContextWithInfoCallback(tt.args.cBusMessage, tt.args.infoCallBack), "CreateRequestContextWithInfoCallback(%v, %v)", tt.args.cBusMessage, tt.args.infoCallBack)
+ assert.Equalf(t, tt.want, CreateRequestContextWithInfoCallback(tt.args.cBusMessage, tt.args.infoCallBack), "CreateRequestContextWithInfoCallback(%v, fun())", tt.args.cBusMessage)
})
}
}