X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=internal%2Fsdlgoredis%2Fsdlgoredis_test.go;h=039a208ad1dfae7158b1eb2e9351117a18c10c91;hb=725e2204f7256de05686d380b4e30a72e9dea8b4;hp=ce7260764d4f88d5741cd8c005f589909dd3b975;hpb=97445fe7e6737da5536c5f7a6909821a1612f66c;p=ric-plt%2Fsdlgo.git

diff --git a/internal/sdlgoredis/sdlgoredis_test.go b/internal/sdlgoredis/sdlgoredis_test.go
index ce72607..039a208 100644
--- a/internal/sdlgoredis/sdlgoredis_test.go
+++ b/internal/sdlgoredis/sdlgoredis_test.go
@@ -353,9 +353,9 @@ func TestSetIECommandMissing(t *testing.T) {
 
 func TestSetIEPubKeyExists(t *testing.T) {
 	_, r, db := setup(true)
-	expectedMessage := []interface{}{"SETIEPUB", "key", "newdata", "olddata", "channel", "message"}
+	expectedMessage := []interface{}{"SETIEMPUB", "key", "newdata", "olddata", "channel", "message"}
 	r.On("Do", expectedMessage).Return(redis.NewCmdResult("OK", nil))
-	result, err := db.SetIEPub("channel", "message", "key", "olddata", "newdata")
+	result, err := db.SetIEPub([]string{"channel", "message"}, "key", "olddata", "newdata")
 	assert.True(t, result)
 	assert.Nil(t, err)
 	r.AssertExpectations(t)
@@ -363,9 +363,9 @@ func TestSetIEPubKeyExists(t *testing.T) {
 
 func TestSetIEPubKeyDoesntExists(t *testing.T) {
 	_, r, db := setup(true)
-	expectedMessage := []interface{}{"SETIEPUB", "key", "newdata", "olddata", "channel", "message"}
+	expectedMessage := []interface{}{"SETIEMPUB", "key", "newdata", "olddata", "channel", "message"}
 	r.On("Do", expectedMessage).Return(redis.NewCmdResult(nil, nil))
-	result, err := db.SetIEPub("channel", "message", "key", "olddata", "newdata")
+	result, err := db.SetIEPub([]string{"channel", "message"}, "key", "olddata", "newdata")
 	assert.False(t, result)
 	assert.Nil(t, err)
 	r.AssertExpectations(t)
@@ -373,9 +373,9 @@ func TestSetIEPubKeyDoesntExists(t *testing.T) {
 
 func TestSetIEPubFailure(t *testing.T) {
 	_, r, db := setup(true)
-	expectedMessage := []interface{}{"SETIEPUB", "key", "newdata", "olddata", "channel", "message"}
+	expectedMessage := []interface{}{"SETIEMPUB", "key", "newdata", "olddata", "channel", "message"}
 	r.On("Do", expectedMessage).Return(redis.NewCmdResult(nil, errors.New("Some error")))
-	result, err := db.SetIEPub("channel", "message", "key", "olddata", "newdata")
+	result, err := db.SetIEPub([]string{"channel", "message"}, "key", "olddata", "newdata")
 	assert.False(t, result)
 	assert.NotNil(t, err)
 	r.AssertExpectations(t)
@@ -383,9 +383,9 @@ func TestSetIEPubFailure(t *testing.T) {
 
 func TestSetIEPubCommandMissing(t *testing.T) {
 	_, r, db := setup(false)
-	expectedMessage := []interface{}{"SETIEPUB", "key", "newdata", "olddata", "channel", "message"}
+	expectedMessage := []interface{}{"SETIEMPUB", "key", "newdata", "olddata", "channel", "message"}
 	r.AssertNotCalled(t, "Do", expectedMessage)
-	result, err := db.SetIEPub("channel", "message", "key", "olddata", "newdata")
+	result, err := db.SetIEPub([]string{"channel", "message"}, "key", "olddata", "newdata")
 	assert.False(t, result)
 	assert.NotNil(t, err)
 	r.AssertExpectations(t)
@@ -393,9 +393,9 @@ func TestSetIEPubCommandMissing(t *testing.T) {
 
 func TestSetNXPubKeyDoesntExist(t *testing.T) {
 	_, r, db := setup(true)
-	expectedMessage := []interface{}{"SETNXPUB", "key", "data", "channel", "message"}
+	expectedMessage := []interface{}{"SETNXMPUB", "key", "data", "channel", "message"}
 	r.On("Do", expectedMessage).Return(redis.NewCmdResult("OK", nil))
-	result, err := db.SetNXPub("channel", "message", "key", "data")
+	result, err := db.SetNXPub([]string{"channel", "message"}, "key", "data")
 	assert.True(t, result)
 	assert.Nil(t, err)
 	r.AssertExpectations(t)
@@ -403,9 +403,9 @@ func TestSetNXPubKeyDoesntExist(t *testing.T) {
 
 func TestSetNXPubKeyExists(t *testing.T) {
 	_, r, db := setup(true)
-	expectedMessage := []interface{}{"SETNXPUB", "key", "data", "channel", "message"}
+	expectedMessage := []interface{}{"SETNXMPUB", "key", "data", "channel", "message"}
 	r.On("Do", expectedMessage).Return(redis.NewCmdResult(nil, nil))
-	result, err := db.SetNXPub("channel", "message", "key", "data")
+	result, err := db.SetNXPub([]string{"channel", "message"}, "key", "data")
 	assert.False(t, result)
 	assert.Nil(t, err)
 	r.AssertExpectations(t)
@@ -413,9 +413,9 @@ func TestSetNXPubKeyExists(t *testing.T) {
 
 func TestSetNXPubFailure(t *testing.T) {
 	_, r, db := setup(true)
-	expectedMessage := []interface{}{"SETNXPUB", "key", "data", "channel", "message"}
+	expectedMessage := []interface{}{"SETNXMPUB", "key", "data", "channel", "message"}
 	r.On("Do", expectedMessage).Return(redis.NewCmdResult(nil, errors.New("Some error")))
-	result, err := db.SetNXPub("channel", "message", "key", "data")
+	result, err := db.SetNXPub([]string{"channel", "message"}, "key", "data")
 	assert.False(t, result)
 	assert.NotNil(t, err)
 	r.AssertExpectations(t)
@@ -423,9 +423,9 @@ func TestSetNXPubFailure(t *testing.T) {
 
 func TestSetNXPubCommandMissing(t *testing.T) {
 	_, r, db := setup(false)
-	expectedMessage := []interface{}{"SETNXPUB", "key", "data", "channel", "message"}
+	expectedMessage := []interface{}{"SETNXMPUB", "key", "data", "channel", "message"}
 	r.AssertNotCalled(t, "Do", expectedMessage)
-	result, err := db.SetNXPub("channel", "message", "key", "data")
+	result, err := db.SetNXPub([]string{"channel", "message"}, "key", "data")
 	assert.False(t, result)
 	assert.NotNil(t, err)
 	r.AssertExpectations(t)
@@ -467,9 +467,9 @@ func TestSetNXFailure(t *testing.T) {
 
 func TestDelIEPubKeyDoesntExist(t *testing.T) {
 	_, r, db := setup(true)
-	expectedMessage := []interface{}{"DELIEPUB", "key", "data", "channel", "message"}
-	r.On("Do", expectedMessage).Return(redis.NewCmdResult(0, nil))
-	result, err := db.DelIEPub("channel", "message", "key", "data")
+	expectedMessage := []interface{}{"DELIEMPUB", "key", "data", "channel", "message"}
+	r.On("Do", expectedMessage).Return(redis.NewCmdResult(int64(0), nil))
+	result, err := db.DelIEPub([]string{"channel", "message"}, "key", "data")
 	assert.False(t, result)
 	assert.Nil(t, err)
 	r.AssertExpectations(t)
@@ -477,9 +477,19 @@ func TestDelIEPubKeyDoesntExist(t *testing.T) {
 
 func TestDelIEPubKeyExists(t *testing.T) {
 	_, r, db := setup(true)
-	expectedMessage := []interface{}{"DELIEPUB", "key", "data", "channel", "message"}
+	expectedMessage := []interface{}{"DELIEMPUB", "key", "data", "channel", "message"}
+	r.On("Do", expectedMessage).Return(redis.NewCmdResult(int64(1), nil))
+	result, err := db.DelIEPub([]string{"channel", "message"}, "key", "data")
+	assert.True(t, result)
+	assert.Nil(t, err)
+	r.AssertExpectations(t)
+}
+
+func TestDelIEPubKeyExistsIntTypeRedisValue(t *testing.T) {
+	_, r, db := setup(true)
+	expectedMessage := []interface{}{"DELIEMPUB", "key", "data", "channel", "message"}
 	r.On("Do", expectedMessage).Return(redis.NewCmdResult(1, nil))
-	result, err := db.DelIEPub("channel", "message", "key", "data")
+	result, err := db.DelIEPub([]string{"channel", "message"}, "key", "data")
 	assert.True(t, result)
 	assert.Nil(t, err)
 	r.AssertExpectations(t)
@@ -487,9 +497,9 @@ func TestDelIEPubKeyExists(t *testing.T) {
 
 func TestDelIEPubFailure(t *testing.T) {
 	_, r, db := setup(true)
-	expectedMessage := []interface{}{"DELIEPUB", "key", "data", "channel", "message"}
-	r.On("Do", expectedMessage).Return(redis.NewCmdResult(0, errors.New("Some error")))
-	result, err := db.DelIEPub("channel", "message", "key", "data")
+	expectedMessage := []interface{}{"DELIEMPUB", "key", "data", "channel", "message"}
+	r.On("Do", expectedMessage).Return(redis.NewCmdResult(int64(0), errors.New("Some error")))
+	result, err := db.DelIEPub([]string{"channel", "message"}, "key", "data")
 	assert.False(t, result)
 	assert.NotNil(t, err)
 	r.AssertExpectations(t)
@@ -497,9 +507,9 @@ func TestDelIEPubFailure(t *testing.T) {
 
 func TestDelIEPubCommandMissing(t *testing.T) {
 	_, r, db := setup(false)
-	expectedMessage := []interface{}{"DELIEPUB", "key", "data", "channel", "message"}
+	expectedMessage := []interface{}{"DELIEMPUB", "key", "data", "channel", "message"}
 	r.AssertNotCalled(t, "Do", expectedMessage)
-	result, err := db.DelIEPub("channel", "message", "key", "data")
+	result, err := db.DelIEPub([]string{"channel", "message"}, "key", "data")
 	assert.False(t, result)
 	assert.NotNil(t, err)
 	r.AssertExpectations(t)
@@ -508,7 +518,7 @@ func TestDelIEPubCommandMissing(t *testing.T) {
 func TestDelIEKeyDoesntExist(t *testing.T) {
 	_, r, db := setup(true)
 	expectedMessage := []interface{}{"DELIE", "key", "data"}
-	r.On("Do", expectedMessage).Return(redis.NewCmdResult(0, nil))
+	r.On("Do", expectedMessage).Return(redis.NewCmdResult(int64(0), nil))
 	result, err := db.DelIE("key", "data")
 	assert.False(t, result)
 	assert.Nil(t, err)
@@ -516,6 +526,16 @@ func TestDelIEKeyDoesntExist(t *testing.T) {
 }
 
 func TestDelIEKeyExists(t *testing.T) {
+	_, r, db := setup(true)
+	expectedMessage := []interface{}{"DELIE", "key", "data"}
+	r.On("Do", expectedMessage).Return(redis.NewCmdResult(int64(1), nil))
+	result, err := db.DelIE("key", "data")
+	assert.True(t, result)
+	assert.Nil(t, err)
+	r.AssertExpectations(t)
+}
+
+func TestDelIEKeyExistsIntTypeRedisValue(t *testing.T) {
 	_, r, db := setup(true)
 	expectedMessage := []interface{}{"DELIE", "key", "data"}
 	r.On("Do", expectedMessage).Return(redis.NewCmdResult(1, nil))
@@ -528,7 +548,7 @@ func TestDelIEKeyExists(t *testing.T) {
 func TestDelIEFailure(t *testing.T) {
 	_, r, db := setup(true)
 	expectedMessage := []interface{}{"DELIE", "key", "data"}
-	r.On("Do", expectedMessage).Return(redis.NewCmdResult(0, errors.New("Some error")))
+	r.On("Do", expectedMessage).Return(redis.NewCmdResult(int64(0), errors.New("Some error")))
 	result, err := db.DelIE("key", "data")
 	assert.False(t, result)
 	assert.NotNil(t, err)
@@ -715,6 +735,7 @@ func TestSubscribeChannelDBSubscribeTwoUnsubscribeOne(t *testing.T) {
 		receivedChannel2 = channel
 	}, "{prefix}", "---", "{prefix}channel2")
 
+	time.Sleep(1 * time.Second)
 	db.UnsubscribeChannelDB("{prefix}channel1")
 	ch <- &msg2
 	db.UnsubscribeChannelDB("{prefix}channel2")
@@ -726,6 +747,42 @@ func TestSubscribeChannelDBSubscribeTwoUnsubscribeOne(t *testing.T) {
 	ps.AssertExpectations(t)
 }
 
+func TestSubscribeChannelReDBSubscribeAfterUnsubscribe(t *testing.T) {
+	ps, r, db := setup(true)
+	ch := make(chan *redis.Message)
+	msg := redis.Message{
+		Channel: "{prefix}channel",
+		Pattern: "pattern",
+		Payload: "event",
+	}
+	ps.On("Channel").Return(ch)
+	ps.On("Unsubscribe").Return(nil)
+	ps.On("Close").Return(nil)
+	count := 0
+	receivedChannel := ""
+
+	db.SubscribeChannelDB(func(channel string, payload ...string) {
+		count++
+		receivedChannel = channel
+	}, "{prefix}", "---", "{prefix}channel")
+	ch <- &msg
+	db.UnsubscribeChannelDB("{prefix}channel")
+	time.Sleep(1 * time.Second)
+
+	db.SubscribeChannelDB(func(channel string, payload ...string) {
+		count++
+		receivedChannel = channel
+	}, "{prefix}", "---", "{prefix}channel")
+	ch <- &msg
+	db.UnsubscribeChannelDB("{prefix}channel")
+
+	time.Sleep(1 * time.Second)
+	assert.Equal(t, 2, count)
+	assert.Equal(t, "channel", receivedChannel)
+	r.AssertExpectations(t)
+	ps.AssertExpectations(t)
+}
+
 func TestPTTLSuccessfully(t *testing.T) {
 	_, r, db := setup(true)
 	expectedKey := "key"