From 924f6f120ae80e3d7472abdfca6f2acf6502d0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Borov=C4=8Danin?= Date: Tue, 20 Mar 2018 09:14:54 +0100 Subject: [PATCH] Fix blinker tests (#193) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix blinker tests Signed-off-by: Dušan Borovčanin * Add protobuf generated files to .gitignore Signed-off-by: Dušan Borovčanin --- .gitignore | 1 + manager/manager_test.go | 28 +++++++++++++++------------- manager/postgres/channels_test.go | 17 +++++++++-------- manager/postgres/users_test.go | 11 ++++++----- 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 378eac25..4bdd69b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ build +*.pb.go diff --git a/manager/manager_test.go b/manager/manager_test.go index 8dcd3ec2..b014f86f 100644 --- a/manager/manager_test.go +++ b/manager/manager_test.go @@ -30,17 +30,18 @@ func newService() manager.Service { func TestRegister(t *testing.T) { svc := newService() - cases := map[string]struct { + cases := []struct { + desc string user manager.User err error }{ - "register new user": {user, nil}, - "register existing user": {user, manager.ErrConflict}, + {"register new user", user, nil}, + {"register existing user", user, manager.ErrConflict}, } - for desc, tc := range cases { + for _, tc := range cases { err := svc.Register(tc.user) - assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s\n", desc, tc.err, err)) + assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err)) } } @@ -311,22 +312,23 @@ func TestDisconnect(t *testing.T) { svc.Connect(key, chanId, clientId) - cases := map[string]struct { + cases := []struct { + desc string key string chanId string clientId string err error }{ - "disconnect connected client": {key, chanId, clientId, nil}, - "disconnect disconnected client": {key, chanId, clientId, manager.ErrNotFound}, - "disconnect client with wrong credentials": {wrong, chanId, clientId, manager.ErrUnauthorizedAccess}, - "disconnect client from non-existing channel": {key, wrong, clientId, manager.ErrNotFound}, - "disconnect non-existing client": {key, chanId, wrong, manager.ErrNotFound}, + {"disconnect connected client", key, chanId, clientId, nil}, + {"disconnect disconnected client", key, chanId, clientId, manager.ErrNotFound}, + {"disconnect client with wrong credentials", wrong, chanId, clientId, manager.ErrUnauthorizedAccess}, + {"disconnect client from non-existing channel", key, wrong, clientId, manager.ErrNotFound}, + {"disconnect non-existing client", key, chanId, wrong, manager.ErrNotFound}, } - for desc, tc := range cases { + for _, tc := range cases { err := svc.Disconnect(tc.key, tc.chanId, tc.clientId) - assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s\n", desc, tc.err, err)) + assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err)) } } diff --git a/manager/postgres/channels_test.go b/manager/postgres/channels_test.go index fd31eb36..07f45059 100644 --- a/manager/postgres/channels_test.go +++ b/manager/postgres/channels_test.go @@ -192,22 +192,23 @@ func TestChannelDisconnect(t *testing.T) { chanRepo.Connect(email, chanId, client.ID) - cases := map[string]struct { + cases := []struct { + desc string owner string chanId string clientId string err error }{ - "connected client": {email, chanId, client.ID, nil}, - "non-connected client": {email, chanId, client.ID, manager.ErrNotFound}, - "non-existing user": {wrong, chanId, client.ID, manager.ErrNotFound}, - "non-existing channel": {email, wrong, client.ID, manager.ErrNotFound}, - "non-existing client": {email, chanId, wrong, manager.ErrNotFound}, + {"connected client", email, chanId, client.ID, nil}, + {"non-connected client", email, chanId, client.ID, manager.ErrNotFound}, + {"non-existing user", wrong, chanId, client.ID, manager.ErrNotFound}, + {"non-existing channel", email, wrong, client.ID, manager.ErrNotFound}, + {"non-existing client", email, chanId, wrong, manager.ErrNotFound}, } - for desc, tc := range cases { + for _, tc := range cases { err := chanRepo.Disconnect(tc.owner, tc.chanId, tc.clientId) - assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s\n", desc, tc.err, err)) + assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err)) } } diff --git a/manager/postgres/users_test.go b/manager/postgres/users_test.go index b4f41342..ce3c2b2d 100644 --- a/manager/postgres/users_test.go +++ b/manager/postgres/users_test.go @@ -12,19 +12,20 @@ import ( func TestUserSave(t *testing.T) { email := "user-save@example.com" - cases := map[string]struct { + cases := []struct { + desc string user manager.User err error }{ - "new user": {manager.User{email, "pass"}, nil}, - "duplicate user": {manager.User{email, "pass"}, manager.ErrConflict}, + {"new user", manager.User{email, "pass"}, nil}, + {"duplicate user", manager.User{email, "pass"}, manager.ErrConflict}, } repo := postgres.NewUserRepository(db) - for desc, tc := range cases { + for _, tc := range cases { err := repo.Save(tc.user) - assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s\n", desc, tc.err, err)) + assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err)) } }