This commit is contained in:
Livio Amstutz 2020-10-20 07:39:36 +02:00
parent 06dcac4c2f
commit 3acc62e79e
2 changed files with 4 additions and 23 deletions

View file

@ -38,12 +38,6 @@ func NewMockStorageAny(t *testing.T) op.Storage {
return m return m
} }
func NewMockStorageSigningKeyError(t *testing.T) op.Storage {
m := NewStorage(t)
ExpectSigningKeyError(m)
return m
}
func NewMockStorageSigningKeyInvalid(t *testing.T) op.Storage { func NewMockStorageSigningKeyInvalid(t *testing.T) op.Storage {
m := NewStorage(t) m := NewStorage(t)
ExpectSigningKeyInvalid(m) ExpectSigningKeyInvalid(m)
@ -89,19 +83,10 @@ func ExpectValidClientID(s op.Storage) {
}) })
} }
func ExpectSigningKeyError(s op.Storage) {
mockS := s.(*MockStorage)
mockS.EXPECT().GetSigningKey(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).DoAndReturn(
func(_ context.Context, keyCh chan<- jose.SigningKey, errCh chan<- error, _ <-chan bool) {
errCh <- errors.New("error")
},
)
}
func ExpectSigningKeyInvalid(s op.Storage) { func ExpectSigningKeyInvalid(s op.Storage) {
mockS := s.(*MockStorage) mockS := s.(*MockStorage)
mockS.EXPECT().GetSigningKey(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).DoAndReturn( mockS.EXPECT().GetSigningKey(gomock.Any(), gomock.Any()).DoAndReturn(
func(_ context.Context, keyCh chan<- jose.SigningKey, errCh chan<- error, _ <-chan bool) { func(_ context.Context, keyCh chan<- jose.SigningKey) {
keyCh <- jose.SigningKey{} keyCh <- jose.SigningKey{}
}, },
) )
@ -109,8 +94,8 @@ func ExpectSigningKeyInvalid(s op.Storage) {
func ExpectSigningKey(s op.Storage) { func ExpectSigningKey(s op.Storage) {
mockS := s.(*MockStorage) mockS := s.(*MockStorage)
mockS.EXPECT().GetSigningKey(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).DoAndReturn( mockS.EXPECT().GetSigningKey(gomock.Any(), gomock.Any()).DoAndReturn(
func(_ context.Context, keyCh chan<- jose.SigningKey, errCh chan<- error, _ <-chan bool) { func(_ context.Context, keyCh chan<- jose.SigningKey) {
keyCh <- jose.SigningKey{Algorithm: jose.HS256, Key: []byte("key")} keyCh <- jose.SigningKey{Algorithm: jose.HS256, Key: []byte("key")}
}, },
) )

View file

@ -39,10 +39,6 @@ type Storage interface {
Health(context.Context) error Health(context.Context) error
} }
type StorageNotFoundError interface {
IsNotFound()
}
type AuthRequest interface { type AuthRequest interface {
GetID() string GetID() string
GetACR() string GetACR() string