resolve merge conflicts

cli/grpc_test.go

@@ -10,7 +10,6 @@ import (
 	pb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
 	ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
 	spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
-	"code.fbi.h-da.de/cocsn/gosdn/forks/google/gnmi"
 	nbi "code.fbi.h-da.de/cocsn/gosdn/northbound/server"
 	"code.fbi.h-da.de/cocsn/gosdn/nucleus"
 	"github.com/google/uuid"
@@ -526,92 +525,3 @@ func Test_getAllCore(t *testing.T) {
 		})
 	}
 }
-
-func Test_newServer(t *testing.T) {
-	type args struct {
-		model  *gnmi.Model
-		config []byte
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    *server
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := newServer(tt.args.model, tt.args.config)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("newServer() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("newServer() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_sendChangeRequest(t *testing.T) {
-	type args struct {
-		addr string
-		pid  string
-		req  *ppb.ChangeRequest
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    *ppb.SetResponse
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := sendChangeRequest(tt.args.addr, tt.args.pid, tt.args.req)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("sendChangeRequest() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("sendChangeRequest() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_server_Get(t *testing.T) {
-	type fields struct {
-		Server *gnmi.Server
-	}
-	type args struct {
-		ctx context.Context
-		req *pb.GetRequest
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		want    *pb.GetResponse
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := &server{
-				Server: tt.fields.Server,
-			}
-			got, err := s.Get(tt.args.ctx, tt.args.req)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("Get() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("Get() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

nucleus/device_test.go

@@ -52,11 +52,7 @@ func TestNewDevice(t *testing.T) {
 	sbi := &OpenConfig{}
 	type args struct {
 		sbi  SouthboundInterface
-<<<<<<< HEAD
 		opts *tpb.TransportOption
-=======
-		opts TransportOptions
->>>>>>> develop
 		name string
 	}
 	tests := []struct {