Fix for Submgr crash added

[ric-plt/submgr.git] / pkg / control / duplicate_test.go

diff --git a/pkg/control/duplicate_test.go b/pkg/control/duplicate_test.go
index 0b33906..1498af0 100644 (file)
--- a/pkg/control/duplicate_test.go
+++ b/pkg/control/duplicate_test.go
@@ -36,7 +36,7 @@ func TestDefaultUseCase(t *testing.T) {
 
        fmt.Println("#####################  TestRetransmissionChecker  #####################")
 
-       var retransCtrl duplicateCtrl
+       var retransCtrl DuplicateCtrl
        restSubdId := "898dfkjashntgkjasgho4"
        var name string = "yolo"
        var someVal int64 = 98765
@@ -44,21 +44,24 @@ func TestDefaultUseCase(t *testing.T) {
 
        retransCtrl.Init()
 
-       _, duplicate, md5sum := retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, data)
+       md5sum, err := CalculateRequestMd5sum(data)
+       assert.Empty(t, err)
+
+       duplicate := retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, md5sum)
 
-       assert.Equal(t, 1, len(retransCtrl.retransMap))
+       assert.Equal(t, 1, len(retransCtrl.ongoingRequestMap))
        assert.Equal(t, false, duplicate)
 
        retransCtrl.TransactionComplete(md5sum)
 
-       assert.Equal(t, 0, len(retransCtrl.retransMap))
+       assert.Equal(t, 0, len(retransCtrl.ongoingRequestMap))
 }
 
 func TestDuplicate(t *testing.T) {
 
        fmt.Println("#####################  TestDuplicate  #####################")
 
-       var retransCtrl duplicateCtrl
+       var retransCtrl DuplicateCtrl
        restSubdId := "898dfkjashntgkjasgho4"
        var name string = "yolo"
        var someVal int64 = 98765
@@ -75,24 +78,30 @@ func TestDuplicate(t *testing.T) {
 
        retransCtrl.Init()
 
-       _, duplicate, md5sum := retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, data)
-       assert.Equal(t, 1, len(retransCtrl.retransMap))
+       md5sum, err := CalculateRequestMd5sum(data)
+       assert.Empty(t, err)
+
+       duplicate := retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, md5sum)
+       assert.Equal(t, 1, len(retransCtrl.ongoingRequestMap))
        assert.Equal(t, false, duplicate)
 
-       _, duplicate, md5sum = retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, data2)
-       assert.Equal(t, 1, len(retransCtrl.retransMap))
+       md5sum, err = CalculateRequestMd5sum(data2)
+       assert.Empty(t, err)
+
+       duplicate = retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, md5sum)
+       assert.Equal(t, 1, len(retransCtrl.ongoingRequestMap))
        assert.Equal(t, true, duplicate)
 
        retransCtrl.TransactionComplete(md5sum)
 
-       assert.Equal(t, 0, len(retransCtrl.retransMap))
+       assert.Equal(t, 0, len(retransCtrl.ongoingRequestMap))
 }
 
 func TestNoneDuplicate(t *testing.T) {
 
        fmt.Println("#####################  TestNoneDuplicate  #####################")
 
-       var retransCtrl duplicateCtrl
+       var retransCtrl DuplicateCtrl
        restSubdId := "898dfkjashntgkjasgho4"
        var name string = "yolo"
        var someVal int64 = 98765
@@ -109,48 +118,54 @@ func TestNoneDuplicate(t *testing.T) {
 
        retransCtrl.Init()
 
-       _, duplicate, md5sum := retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, data)
-       assert.Equal(t, 1, len(retransCtrl.retransMap))
+       md5sum, err := CalculateRequestMd5sum(data)
+       assert.Empty(t, err)
+
+       duplicate := retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, md5sum)
+       assert.Equal(t, 1, len(retransCtrl.ongoingRequestMap))
        assert.Equal(t, false, duplicate)
 
-       _, duplicate2, md5sum2 := retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, data2)
-       assert.Equal(t, 2, len(retransCtrl.retransMap))
+       md5sum2, err := CalculateRequestMd5sum(data2)
+       assert.Empty(t, err)
+
+       duplicate2 := retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, md5sum2)
+       assert.Equal(t, 2, len(retransCtrl.ongoingRequestMap))
        assert.Equal(t, false, duplicate2)
 
        retransCtrl.TransactionComplete(md5sum)
        retransCtrl.TransactionComplete(md5sum2)
 
-       assert.Equal(t, 0, len(retransCtrl.retransMap))
+       assert.Equal(t, 0, len(retransCtrl.ongoingRequestMap))
 }
 
 func TestEncodingError(t *testing.T) {
 
        fmt.Println("#####################  TestEncodingError  #####################")
 
-       var retransCtrl duplicateCtrl
-       restSubdId := "898dfkjashntgkjasgho4"
+       var retransCtrl DuplicateCtrl
        var data interface{}
 
        retransCtrl.Init()
 
-       err, duplicate, _ := retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, data)
+       _, err := CalculateRequestMd5sum(data)
        assert.NotEqual(t, err, nil)
-       assert.Equal(t, 0, len(retransCtrl.retransMap))
-       assert.Equal(t, false, duplicate)
 }
 
 func TestRemovalError(t *testing.T) {
 
        fmt.Println("#####################  TestRemovalError  #####################")
 
-       var retransCtrl duplicateCtrl
+       var retransCtrl DuplicateCtrl
        restSubdId := "898dfkjashntgkjasgho4"
        var data testData
 
        retransCtrl.Init()
 
-       err, duplicate, md5sum := retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, data)
-       assert.Equal(t, 1, len(retransCtrl.retransMap))
+       md5sum, err := CalculateRequestMd5sum(data)
+       assert.Empty(t, err)
+
+       duplicate := retransCtrl.IsDuplicateToOngoingTransaction(restSubdId, md5sum)
+       assert.Equal(t, 1, len(retransCtrl.ongoingRequestMap))
        assert.Equal(t, false, duplicate)
 
        err = retransCtrl.TransactionComplete(md5sum)
@@ -164,22 +179,28 @@ func TestXappRestReqDuplicate(t *testing.T) {
 
        fmt.Println("#####################  TestXappRestReqDuplicate  #####################")
 
-       var retransCtrl duplicateCtrl
+       var retransCtrl DuplicateCtrl
 
        msg1 := new(models.SubscriptionParams)
        msg2 := new(models.SubscriptionParams)
 
        retransCtrl.Init()
 
-       _, duplicate, md5sum := retransCtrl.IsDuplicateToOngoingTransaction("foobar", msg1)
-       assert.Equal(t, 1, len(retransCtrl.retransMap))
+       md5sum, err := CalculateRequestMd5sum(msg1)
+       assert.Empty(t, err)
+
+       duplicate := retransCtrl.IsDuplicateToOngoingTransaction("foobar", md5sum)
+       assert.Equal(t, 1, len(retransCtrl.ongoingRequestMap))
        assert.Equal(t, false, duplicate)
 
-       _, duplicate, md5sum = retransCtrl.IsDuplicateToOngoingTransaction("foobar", msg2)
-       assert.Equal(t, 1, len(retransCtrl.retransMap))
+       md5sum2, err := CalculateRequestMd5sum(msg2)
+       assert.Empty(t, err)
+
+       duplicate = retransCtrl.IsDuplicateToOngoingTransaction("foobar", md5sum2)
+       assert.Equal(t, 1, len(retransCtrl.ongoingRequestMap))
        assert.Equal(t, true, duplicate)
 
        retransCtrl.TransactionComplete(md5sum)
 
-       assert.Equal(t, 0, len(retransCtrl.retransMap))
+       assert.Equal(t, 0, len(retransCtrl.ongoingRequestMap))
 }