Skip to content
Snippets Groups Projects
Commit b9071ae2 authored by ko_oler's avatar ko_oler
Browse files

fix tests

parent 47566e65
No related branches found
No related tags found
No related merge requests found
...@@ -121,10 +121,10 @@ func TestServer_Action(t *testing.T) { ...@@ -121,10 +121,10 @@ func TestServer_Action(t *testing.T) {
services map[string]Extension services map[string]Extension
in *ActionRequest in *ActionRequest
want *ActionResponse want *ActionResponse
wantErr assert.ErrorAssertionFunc wantErr string
}{ }{
{ {
name: "OK (grpc)", name: "GRPC",
services: map[string]Extension{"test-extension": getDummyExtension("test-extension")}, services: map[string]Extension{"test-extension": getDummyExtension("test-extension")},
in: &ActionRequest{ in: &ActionRequest{
Action: "grpc:///test-extension/test-action", Action: "grpc:///test-extension/test-action",
...@@ -132,10 +132,20 @@ func TestServer_Action(t *testing.T) { ...@@ -132,10 +132,20 @@ func TestServer_Action(t *testing.T) {
EnvId: "env", EnvId: "env",
}, },
want: &ActionResponse{State: ResponseDone}, want: &ActionResponse{State: ResponseDone},
wantErr: assert.NoError,
}, },
{ {
name: "OK (deprecated call)", name: "invalid schema",
services: map[string]Extension{"test-extension": getDummyExtension("test-extension")},
in: &ActionRequest{
Action: "some:///space/env/coll",
SpaceId: "sp",
EnvId: "env",
},
want: &ActionResponse{State: ResponseDone},
wantErr: "extension ID required",
},
{
name: "Deprecated call",
services: map[string]Extension{"test-extension": getDummyExtension("test-extension")}, services: map[string]Extension{"test-extension": getDummyExtension("test-extension")},
in: &ActionRequest{ in: &ActionRequest{
Action: "test-action", Action: "test-action",
...@@ -144,10 +154,9 @@ func TestServer_Action(t *testing.T) { ...@@ -144,10 +154,9 @@ func TestServer_Action(t *testing.T) {
Extension: "test-extension", Extension: "test-extension",
}, },
want: &ActionResponse{State: ResponseDone}, want: &ActionResponse{State: ResponseDone},
wantErr: assert.NoError,
}, },
{ {
name: "Error (unknown extension)", name: "unknown extension",
services: map[string]Extension{"test-extension": getDummyExtension("test-extension")}, services: map[string]Extension{"test-extension": getDummyExtension("test-extension")},
in: &ActionRequest{ in: &ActionRequest{
Action: "grpc:///test-extension-2/test-action", Action: "grpc:///test-extension-2/test-action",
...@@ -155,10 +164,10 @@ func TestServer_Action(t *testing.T) { ...@@ -155,10 +164,10 @@ func TestServer_Action(t *testing.T) {
EnvId: "env", EnvId: "env",
}, },
want: nil, want: nil,
wantErr: assert.Error, wantErr: ErrUnknownExtension.Error(),
}, },
{ {
name: "Error (deprecated call, no extension)", name: "Deprecated call, without extension",
services: map[string]Extension{"test-extension": getDummyExtension("test-extension")}, services: map[string]Extension{"test-extension": getDummyExtension("test-extension")},
in: &ActionRequest{ in: &ActionRequest{
Action: "test-action", Action: "test-action",
...@@ -166,17 +175,17 @@ func TestServer_Action(t *testing.T) { ...@@ -166,17 +175,17 @@ func TestServer_Action(t *testing.T) {
EnvId: "env", EnvId: "env",
}, },
want: nil, want: nil,
wantErr: assert.Error, wantErr: "extension ID required",
}, },
{ {
name: "Error (deprecated call, no action and extension)", name: "Deprecated call, without action and extension)",
services: map[string]Extension{"test-extension": getDummyExtension("test-extension")}, services: map[string]Extension{"test-extension": getDummyExtension("test-extension")},
in: &ActionRequest{ in: &ActionRequest{
SpaceId: "sp", SpaceId: "sp",
EnvId: "env", EnvId: "env",
}, },
want: nil, want: nil,
wantErr: assert.Error, wantErr: "extension ID required",
}, },
} }
for _, tt := range tests { for _, tt := range tests {
...@@ -186,7 +195,8 @@ func TestServer_Action(t *testing.T) { ...@@ -186,7 +195,8 @@ func TestServer_Action(t *testing.T) {
services: tt.services, services: tt.services,
} }
got, err := srv.Action(context.Background(), tt.in) got, err := srv.Action(context.Background(), tt.in)
if !tt.wantErr(t, err, fmt.Sprintf("Action(%v)", tt.in)) { if tt.wantErr != "" {
assert.EqualErrorf(t, err, tt.wantErr, fmt.Sprintf("Action(%v)", tt.in))
return return
} }
assert.Equalf(t, tt.want, got, "Action(%v)", tt.in) assert.Equalf(t, tt.want, got, "Action(%v)", tt.in)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment