Updates for G Maintenance release

[nonrtric/plt/sme.git] / capifcore / internal / securityservice / security_test.go

diff --git a/capifcore/internal/securityservice/security_test.go b/capifcore/internal/securityservice/security_test.go
index 2abc33b..7043cca 100644 (file)
--- a/capifcore/internal/securityservice/security_test.go
+++ b/capifcore/internal/securityservice/security_test.go
@@ -54,16 +54,20 @@ func TestPostSecurityIdTokenInvokerRegistered(t *testing.T) {
        invokerRegisterMock.On("VerifyInvokerSecret", mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(true)
        serviceRegisterMock := servicemocks.ServiceRegister{}
        serviceRegisterMock.On("IsFunctionRegistered", mock.AnythingOfType("string")).Return(true)
-       apiRegisterMock := publishmocks.APIRegister{}
-       apiRegisterMock.On("IsAPIRegistered", mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(true)
+       publishRegisterMock := publishmocks.PublishRegister{}
+       publishRegisterMock.On("IsAPIPublished", mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(true)
 
-       requestHandler := getEcho(&serviceRegisterMock, &apiRegisterMock, &invokerRegisterMock)
+       requestHandler := getEcho(&serviceRegisterMock, &publishRegisterMock, &invokerRegisterMock)
 
        data := url.Values{}
-       data.Set("client_id", "id")
-       data.Add("client_secret", "secret")
+       clientId := "id"
+       clientSecret := "secret"
+       aefId := "aefId"
+       path := "path"
+       data.Set("client_id", clientId)
+       data.Add("client_secret", clientSecret)
        data.Add("grant_type", "client_credentials")
-       data.Add("scope", "scope#aefId:path")
+       data.Add("scope", "scope#"+aefId+":"+path)
        encodedData := data.Encode()
 
        result := testutil.NewRequest().Post("/securities/invokerId/token").WithContentType("application/x-www-form-urlencoded").WithBody([]byte(encodedData)).Go(t, requestHandler)
@@ -73,13 +77,13 @@ func TestPostSecurityIdTokenInvokerRegistered(t *testing.T) {
        err := result.UnmarshalBodyToObject(&resultResponse)
        assert.NoError(t, err, "error unmarshaling response")
        assert.NotEmpty(t, resultResponse.AccessToken)
-       assert.Equal(t, "scope#aefId:path", *resultResponse.Scope)
+       assert.Equal(t, "scope#"+aefId+":"+path, *resultResponse.Scope)
        assert.Equal(t, securityapi.AccessTokenRspTokenTypeBearer, resultResponse.TokenType)
        assert.Equal(t, common29122.DurationSec(0), resultResponse.ExpiresIn)
-       invokerRegisterMock.AssertCalled(t, "IsInvokerRegistered", "id")
-       invokerRegisterMock.AssertCalled(t, "VerifyInvokerSecret", "id", "secret")
-       serviceRegisterMock.AssertCalled(t, "IsFunctionRegistered", "aefId")
-       apiRegisterMock.AssertCalled(t, "IsAPIRegistered", "aefId", "path")
+       invokerRegisterMock.AssertCalled(t, "IsInvokerRegistered", clientId)
+       invokerRegisterMock.AssertCalled(t, "VerifyInvokerSecret", clientId, clientSecret)
+       serviceRegisterMock.AssertCalled(t, "IsFunctionRegistered", aefId)
+       publishRegisterMock.AssertCalled(t, "IsAPIPublished", aefId, path)
 }
 
 func TestPostSecurityIdTokenInvokerNotRegistered(t *testing.T) {
@@ -167,10 +171,10 @@ func TestPostSecurityIdTokenAPINotPublished(t *testing.T) {
        invokerRegisterMock.On("VerifyInvokerSecret", mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(true)
        serviceRegisterMock := servicemocks.ServiceRegister{}
        serviceRegisterMock.On("IsFunctionRegistered", mock.AnythingOfType("string")).Return(true)
-       apiRegisterMock := publishmocks.APIRegister{}
-       apiRegisterMock.On("IsAPIRegistered", mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(false)
+       publishRegisterMock := publishmocks.PublishRegister{}
+       publishRegisterMock.On("IsAPIPublished", mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(false)
 
-       requestHandler := getEcho(&serviceRegisterMock, &apiRegisterMock, &invokerRegisterMock)
+       requestHandler := getEcho(&serviceRegisterMock, &publishRegisterMock, &invokerRegisterMock)
 
        data := url.Values{}
        data.Set("client_id", "id")
@@ -191,7 +195,7 @@ func TestPostSecurityIdTokenAPINotPublished(t *testing.T) {
        assert.Equal(t, &errMsg, problemDetails.Cause)
 }
 
-func getEcho(serviceRegister providermanagement.ServiceRegister, apiRegister publishservice.APIRegister, invokerRegister invokermanagement.InvokerRegister) *echo.Echo {
+func getEcho(serviceRegister providermanagement.ServiceRegister, publishRegister publishservice.PublishRegister, invokerRegister invokermanagement.InvokerRegister) *echo.Echo {
        swagger, err := securityapi.GetSwagger()
        if err != nil {
                fmt.Fprintf(os.Stderr, "Error loading swagger spec\n: %s", err)
@@ -200,7 +204,7 @@ func getEcho(serviceRegister providermanagement.ServiceRegister, apiRegister pub
 
        swagger.Servers = nil
 
-       s := NewSecurity(serviceRegister, apiRegister, invokerRegister)
+       s := NewSecurity(serviceRegister, publishRegister, invokerRegister)
 
        e := echo.New()
        e.Use(echomiddleware.Logger())