Skip to content

Commit

Permalink
fixup! Make mocks being automatically generated
Browse files Browse the repository at this point in the history
  • Loading branch information
fperot74 committed May 16, 2019
1 parent 87c2316 commit c3dd594
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 24 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ bin/*
**/debug
**/*.coverprofile
configs/DEV/*
mock/
2 changes: 0 additions & 2 deletions pkg/management/authorization_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package management

//go:generate mockgen -destination=./mock/logging.go -package=mock -mock_names=Logger=Logger github.com/go-kit/kit/log Logger

import (
"context"
"testing"
Expand Down
13 changes: 5 additions & 8 deletions pkg/management/component_test.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package management

//go:generate mockgen -destination=./mock/keycloak_client.go -package=mock -mock_names=KeycloakClient=KeycloakClient github.com/cloudtrust/keycloak-bridge/pkg/management KeycloakClient
//go:generate mockgen -destination=./mock/module.go -package=mock -mock_names=ConfigurationDBModule=ConfigurationDBModule github.com/cloudtrust/keycloak-bridge/pkg/management ConfigurationDBModule

import (
"context"
"errors"
Expand Down Expand Up @@ -706,11 +703,11 @@ func TestUpdateUser(t *testing.T) {

// update without attributes
var userRepWithoutAttr = api.UserRepresentation{
Username: &username,
Email: &email,
Enabled: &enabled,
FirstName: &firstName,
LastName: &lastName,
Username: &username,
Email: &email,
Enabled: &enabled,
FirstName: &firstName,
LastName: &lastName,
}

mockKeycloakClient.EXPECT().GetUser(accessToken, realmName, id).Return(oldkcUserRep2, nil).Times(1)
Expand Down
6 changes: 2 additions & 4 deletions pkg/management/endpoint_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package management

//go:generate mockgen -destination=./mock/component.go -package=mock -mock_names=ManagementComponent=ManagementComponent github.com/cloudtrust/keycloak-bridge/pkg/management ManagementComponent

import (
"context"
"encoding/json"
Expand Down Expand Up @@ -266,7 +264,7 @@ func TestGetUsersEndpoint(t *testing.T) {
req["toto"] = "tutu" // Check this param is not transmitted
req["groupIds"] = "123-784dsf-sdf567"

mockManagementComponent.EXPECT().GetUsers(ctx, realm, []string{req["groupIds"]}, "email", req["email"], "firstName", req["firstName"], "lastName", req["lastName"], "username", req["username"], "search", req["search"],).Return([]api.UserRepresentation{}, nil).Times(1)
mockManagementComponent.EXPECT().GetUsers(ctx, realm, []string{req["groupIds"]}, "email", req["email"], "firstName", req["firstName"], "lastName", req["lastName"], "username", req["username"], "search", req["search"]).Return([]api.UserRepresentation{}, nil).Times(1)
var res, err = e(ctx, req)
assert.Nil(t, err)
assert.NotNil(t, res)
Expand Down Expand Up @@ -851,6 +849,6 @@ func TestConvertLocationUrl(t *testing.T) {

res, err = convertLocationUrl("http://localhost:8080/toto", "https", "ct-bridge.services.com")
assert.Equal(t, "InvalidLocation", res)
assert.Equal(t, ConvertLocationError{Location:"http://localhost:8080/toto"},err)
assert.Equal(t, ConvertLocationError{Location: "http://localhost:8080/toto"}, err)

}
2 changes: 0 additions & 2 deletions pkg/management/instrumenting.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package management

//go:generate mockgen -destination=./mock/instrumenting.go -package=mock -mock_names=Histogram=Histogram github.com/go-kit/kit/metrics Histogram

import (
"context"
"time"
Expand Down
2 changes: 0 additions & 2 deletions pkg/management/logging.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package management

//go:generate mockgen -destination=./mock/logging.go -package=mock -mock_names=Logger=Logger github.com/go-kit/kit/log Logger

import (
"context"
"time"
Expand Down
2 changes: 0 additions & 2 deletions pkg/management/logging_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package management

//go:generate mockgen -destination=./mock/logging.go -package=mock -mock_names=Logger=Logger github.com/go-kit/kit/log Logger

import (
"context"
"math/rand"
Expand Down
10 changes: 10 additions & 0 deletions pkg/management/mock_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package management

//go:generate mockgen -destination=./mock/component.go -package=mock -mock_names=ManagementComponent=ManagementComponent github.com/cloudtrust/keycloak-bridge/pkg/management ManagementComponent
//go:generate mockgen -destination=./mock/configuration_db.go -package=mock -mock_names=DBConfiguration=DBConfiguration github.com/cloudtrust/keycloak-bridge/pkg/management DBConfiguration
//go:generate mockgen -destination=./mock/eventsdbmodule.go -package=mock -mock_names=EventsDBModule=EventsDBModule github.com/cloudtrust/keycloak-bridge/pkg/event EventsDBModule
//go:generate mockgen -destination=./mock/instrumenting.go -package=mock -mock_names=Histogram=Histogram github.com/go-kit/kit/metrics Histogram
//go:generate mockgen -destination=./mock/keycloak_client.go -package=mock -mock_names=KeycloakClient=KeycloakClient github.com/cloudtrust/keycloak-bridge/pkg/management KeycloakClient
//go:generate mockgen -destination=./mock/logging.go -package=mock -mock_names=Logger=Logger github.com/go-kit/kit/log Logger
//go:generate mockgen -destination=./mock/module.go -package=mock -mock_names=ConfigurationDBModule=ConfigurationDBModule github.com/cloudtrust/keycloak-bridge/pkg/management ConfigurationDBModule
//go:generate mockgen -destination=./mock/tracing.go -package=mock -mock_names=Tracer=Tracer,Span=Span,SpanContext=SpanContext github.com/opentracing/opentracing-go Tracer,Span,SpanContext
2 changes: 0 additions & 2 deletions pkg/management/module_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package management

//go:generate mockgen -destination=./mock/configuration_db.go -package=mock -mock_names=DBConfiguration=DBConfiguration github.com/cloudtrust/keycloak-bridge/pkg/management DBConfiguration

import (
"context"
"testing"
Expand Down
2 changes: 0 additions & 2 deletions pkg/management/tracing.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package management

//go:generate mockgen -destination=./mock/tracing.go -package=mock -mock_names=Tracer=Tracer,Span=Span,SpanContext=SpanContext github.com/opentracing/opentracing-go Tracer,Span,SpanContext

import (
"context"

Expand Down

0 comments on commit c3dd594

Please sign in to comment.