refactor(plc4go/cbus): fix small code issues

apache · May 3, 2023 · 88fbf2c · 88fbf2c
1 parent 5985eca
commit 88fbf2c
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,20 +113,27 @@ 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) {
 			m := &Subscriber{
 				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
@@ -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
@@ -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)
 		})
 	}
 }