X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fsdl_restSubsDb_test.go;h=3db8a2d94e7f8061581e967f4534b77023ddb356;hb=93a5f9e27a6803adce055811c222632bfd69d11c;hp=ac3c8e3a558036859524af030afc66658a8acd48;hpb=268d715e3bceab8f7955d89945141efdb2c3b368;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/sdl_restSubsDb_test.go b/pkg/control/sdl_restSubsDb_test.go
index ac3c8e3..3db8a2d 100644
--- a/pkg/control/sdl_restSubsDb_test.go
+++ b/pkg/control/sdl_restSubsDb_test.go
@@ -94,7 +94,7 @@ func CreateRESTSubscription(t *testing.T) *RESTSubscription {
 	restSubscription.SubReqOngoing = true
 	restSubscription.SubDelReqOngoing = false
 	restSubscription.xAppIdToE2Id = make(map[int64]int64)
-	restSubscription.Md5sum = "856e9546f6f7b65a13a86996f2d1686a"
+	restSubscription.lastReqMd5sum = "856e9546f6f7b65b13a86956f2e16f6a"
 	return restSubscription
 }
 
@@ -120,6 +120,17 @@ func TestWriteRESTSubscriptionToSdl(t *testing.T) {
 		t.Errorf("TEST: %s", err.Error())
 	}
 	restSubsDbMock.AddRestSubIdsInDb(restSubId)
+	verifyRESTKeyCount(t, 1)
+}
+
+func verifyRESTKeyCount(t *testing.T, expectedCount int) {
+
+	count, err := mainCtrl.c.GetRESTKeyCount()
+	if err != nil {
+		t.Errorf("TEST: %s", err.Error())
+	} else {
+		assert.Equal(t, expectedCount, count)
+	}
 }
 
 func TestReadRESTSubscriptionFromSdl(t *testing.T) {
@@ -369,13 +380,17 @@ func TestRemoveAllRESTSubscriptionsFromSdlFail(t *testing.T) {
 	t.Log("TEST: All subscription removed from db")
 }
 
-func (m *RestSubsDbMock) Set(pairs ...interface{}) error {
+func (m *RestSubsDbMock) Set(ns string, pairs ...interface{}) error {
 	var key string
 	var val string
 
 	m.marshalLock.Lock()
 	defer m.marshalLock.Unlock()
 
+	if ns != restSubSdlNs {
+		return fmt.Errorf("Unexpected namespace '%s' error\n", ns)
+	}
+
 	if sdlRestShouldReturnError == true {
 		return GetSdlRestError()
 	}
@@ -412,8 +427,13 @@ func (m *RestSubsDbMock) Set(pairs ...interface{}) error {
 	return nil
 }
 
-func (m *RestSubsDbMock) Get(keys []string) (map[string]interface{}, error) {
+func (m *RestSubsDbMock) Get(ns string, keys []string) (map[string]interface{}, error) {
 	retMap := make(map[string]interface{})
+
+	if ns != restSubSdlNs {
+		return nil, fmt.Errorf("Unexpected namespace '%s' error\n", ns)
+	}
+
 	if len(keys) == 0 {
 		return nil, fmt.Errorf("Get() error: len(key) == 0\n")
 	}
@@ -432,7 +452,11 @@ func (m *RestSubsDbMock) Get(keys []string) (map[string]interface{}, error) {
 	return retMap, nil
 }
 
-func (m *RestSubsDbMock) GetAll() ([]string, error) {
+func (m *RestSubsDbMock) GetAll(ns string) ([]string, error) {
+
+	if ns != restSubSdlNs {
+		return nil, fmt.Errorf("Unexpected namespace '%s' error\n", ns)
+	}
 
 	if sdlRestShouldReturnError == true {
 		return nil, GetSdlRestError()
@@ -445,7 +469,12 @@ func (m *RestSubsDbMock) GetAll() ([]string, error) {
 	return keys, nil
 }
 
-func (m *RestSubsDbMock) Remove(keys []string) error {
+func (m *RestSubsDbMock) Remove(ns string, keys []string) error {
+
+	if ns != restSubSdlNs {
+		return fmt.Errorf("Unexpected namespace '%s' error\n", ns)
+	}
+
 	if len(keys) == 0 {
 		return fmt.Errorf("Remove() error: len(key) == 0\n")
 	}
@@ -460,7 +489,11 @@ func (m *RestSubsDbMock) Remove(keys []string) error {
 	return nil
 }
 
-func (m *RestSubsDbMock) RemoveAll() error {
+func (m *RestSubsDbMock) RemoveAll(ns string) error {
+
+	if ns != restSubSdlNs {
+		return fmt.Errorf("Unexpected namespace '%s' error\n", ns)
+	}
 
 	for key := range m.restSubsDb {