From 562b360b12b01a019c44170c6172c451277b5c85 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Fri, 24 Nov 2023 14:03:46 +0000
Subject: [PATCH] adjust tests to fix errors
---
cli/adapter/PndAdapter_test.go | 2 +-
controller/api/apiIntegration_test.go | 1 +
controller/api/initialise_test.go | 1 +
.../networkElementFilesystemStore_test.go | 18 +++++++++---------
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/cli/adapter/PndAdapter_test.go b/cli/adapter/PndAdapter_test.go
index e8e7928a3..017e7477e 100644
--- a/cli/adapter/PndAdapter_test.go
+++ b/cli/adapter/PndAdapter_test.go
@@ -93,7 +93,7 @@ func TestPndAdapter_AddNetworkElement(t *testing.T) {
id: tt.fields.id,
endpoint: tt.fields.endpoint,
}
- if _, err := p.AddNetworkElement(context.TODO(), tt.args.name, tt.args.opts, tt.args.sid); (err != nil) != tt.wantErr {
+ if _, err := p.AddNetworkElement(context.TODO(), tt.args.name, tt.args.opts, tt.args.sid, [][]string{}); (err != nil) != tt.wantErr {
t.Errorf("PndAdapter.AddNetworkElement() error = %v, wantErr %v", err, tt.wantErr)
}
})
diff --git a/controller/api/apiIntegration_test.go b/controller/api/apiIntegration_test.go
index 53c51140d..f8cb0e03c 100644
--- a/controller/api/apiIntegration_test.go
+++ b/controller/api/apiIntegration_test.go
@@ -76,6 +76,7 @@ func TestApiIntegration(t *testing.T) {
opt,
suid,
puid,
+ [][]string{},
); (err != nil) != tt.wantErr {
t.Errorf("gosdn cli add-networkElement error = %v, wantErr %v", err, tt.wantErr)
return
diff --git a/controller/api/initialise_test.go b/controller/api/initialise_test.go
index 51fd84aa3..4fa24cb91 100644
--- a/controller/api/initialise_test.go
+++ b/controller/api/initialise_test.go
@@ -203,6 +203,7 @@ func bootstrapUnitTest() {
},
pndUUID,
pluginMock,
+ [][]string{},
conflict.Metadata{ResourceVersion: 0})
_ = networkElementService.Add(mne)
diff --git a/controller/nucleus/networkElementFilesystemStore_test.go b/controller/nucleus/networkElementFilesystemStore_test.go
index 5050219fd..540234b2b 100644
--- a/controller/nucleus/networkElementFilesystemStore_test.go
+++ b/controller/nucleus/networkElementFilesystemStore_test.go
@@ -40,7 +40,7 @@ func TestAddNetworkElement(t *testing.T) {
plugin1.On("Model", mock.Anything).Return([]byte{}, nil)
networkElementStore := NewNetworkElementStore()
- mne, _ := NewNetworkElement("testNetworkElement", mneID, &trop, defaultPndID, plugin1, conflict.Metadata{})
+ mne, _ := NewNetworkElement("testNetworkElement", mneID, &trop, defaultPndID, plugin1, [][]string{}, conflict.Metadata{})
err := networkElementStore.Add(mne)
if err != nil {
@@ -63,12 +63,12 @@ func TestGetAllNetworkElements(t *testing.T) {
transportOptions := returnBasicTransportOption()
- mne1, err := NewNetworkElement("testname", mneID1, &transportOptions, defaultPndID, plugin, conflict.Metadata{})
+ mne1, err := NewNetworkElement("testname", mneID1, &transportOptions, defaultPndID, plugin, [][]string{}, conflict.Metadata{})
if err != nil {
t.Error(err)
}
- mne2, err := NewNetworkElement("testname2", mneID2, &transportOptions, defaultPndID, plugin, conflict.Metadata{})
+ mne2, err := NewNetworkElement("testname2", mneID2, &transportOptions, defaultPndID, plugin, [][]string{}, conflict.Metadata{})
if err != nil {
t.Error(err)
}
@@ -117,12 +117,12 @@ func TestGetNetworkElement(t *testing.T) {
trop := returnBasicTransportOption()
- mne1, err := NewNetworkElement("testname", mneID1, &trop, defaultPndID, plugin, conflict.Metadata{})
+ mne1, err := NewNetworkElement("testname", mneID1, &trop, defaultPndID, plugin, [][]string{}, conflict.Metadata{})
if err != nil {
t.Error(err)
}
- mne2, err := NewNetworkElement("testname2", mneID2, &trop, defaultPndID, plugin, conflict.Metadata{})
+ mne2, err := NewNetworkElement("testname2", mneID2, &trop, defaultPndID, plugin, [][]string{}, conflict.Metadata{})
if err != nil {
t.Error(err)
}
@@ -164,14 +164,14 @@ func TestUpdateNetworkElement(t *testing.T) {
plugin1.On("Model", mock.Anything).Return([]byte{}, nil)
networkElementStore := NewNetworkElementStore()
- mne, _ := NewNetworkElement("testNetworkElement", mneID, &trop, defaultPndID, plugin1, conflict.Metadata{})
+ mne, _ := NewNetworkElement("testNetworkElement", mneID, &trop, defaultPndID, plugin1, [][]string{}, conflict.Metadata{})
err := networkElementStore.Add(mne)
if err != nil {
t.Error(err)
}
- mne, _ = NewNetworkElement(updatedNetworkElementName, mneID, &trop, defaultPndID, plugin1, conflict.Metadata{})
+ mne, _ = NewNetworkElement(updatedNetworkElementName, mneID, &trop, defaultPndID, plugin1, [][]string{}, conflict.Metadata{})
err = networkElementStore.Update(mne)
if err != nil {
@@ -206,12 +206,12 @@ func TestDeleteNetworkElement(t *testing.T) {
trop := returnBasicTransportOption()
- mne1, err := NewNetworkElement("testname", mneID1, &trop, defaultPndID, plugin, conflict.Metadata{})
+ mne1, err := NewNetworkElement("testname", mneID1, &trop, defaultPndID, plugin, [][]string{}, conflict.Metadata{})
if err != nil {
t.Error(err)
}
- mne2, err := NewNetworkElement("testname2", mneID2, &trop, defaultPndID, plugin, conflict.Metadata{})
+ mne2, err := NewNetworkElement("testname2", mneID2, &trop, defaultPndID, plugin, [][]string{}, conflict.Metadata{})
if err != nil {
t.Error(err)
}
--
GitLab