From 2dccb628fb7f061778a042658437de972dcbdb89 Mon Sep 17 00:00:00 2001 From: Lukasz Janyst Date: Tue, 10 May 2022 15:45:55 +0200 Subject: [PATCH] cleanup: Get rid of unused events in tests Issue #13 --- pkg/serverutil/test/controller_test.go | 23 +++-------------------- pkg/users/user_credentials_test.go | 25 ------------------------- pkg/users/user_new_test.go | 2 -- pkg/users/users_clear_test.go | 3 --- pkg/users/users_delete_test.go | 6 +----- pkg/users/users_login_test.go | 4 ---- pkg/users/users_new_test.go | 2 -- pkg/users/users_test.go | 4 ---- 8 files changed, 4 insertions(+), 65 deletions(-) diff --git a/pkg/serverutil/test/controller_test.go b/pkg/serverutil/test/controller_test.go index 2a2f844..f8c5c78 100644 --- a/pkg/serverutil/test/controller_test.go +++ b/pkg/serverutil/test/controller_test.go @@ -23,8 +23,8 @@ import ( "time" "github.com/ljanyst/peroxide/pkg/events" - "github.com/ljanyst/peroxide/pkg/serverutil" "github.com/ljanyst/peroxide/pkg/listener" + "github.com/ljanyst/peroxide/pkg/serverutil" "github.com/stretchr/testify/require" ) @@ -38,9 +38,7 @@ func setup(t *testing.T) (*require.Assertions, *testServer, listener.Listener, s } func TestControllerListernServeClose(t *testing.T) { - r, s, l, c := setup(t) - - errorCh := l.ProvideChannel(events.ErrorEvent) + r, s, _, c := setup(t) r.True(s.portIsFree()) go c.ListenAndServe() @@ -53,17 +51,10 @@ func TestControllerListernServeClose(t *testing.T) { c.Close() r.Eventually(s.portIsFree, time.Second, 50*time.Millisecond) - - select { - case msg := <-errorCh: - r.Fail("Expected no error but have %q", msg) - case <-time.Tick(100 * time.Millisecond): - break - } } func TestControllerFailOnBusyPort(t *testing.T) { - r, s, l, c := setup(t) + r, s, _, c := setup(t) ocupator := http.Server{Addr: s.Address()} defer ocupator.Close() //nolint[errcheck] @@ -71,17 +62,9 @@ func TestControllerFailOnBusyPort(t *testing.T) { go ocupator.ListenAndServe() //nolint[errcheck] r.Eventually(s.portIsOccupied, time.Second, 50*time.Millisecond) - errorCh := l.ProvideChannel(events.ErrorEvent) go c.ListenAndServe() r.Eventually(s.portIsOccupied, time.Second, 50*time.Millisecond) - - select { - case <-errorCh: - break - case <-time.Tick(time.Second): - r.Fail("Expected error but have none.") - } } func TestControllerCallDisconnectUser(t *testing.T) { diff --git a/pkg/users/user_credentials_test.go b/pkg/users/user_credentials_test.go index 358b4fb..1bff673 100644 --- a/pkg/users/user_credentials_test.go +++ b/pkg/users/user_credentials_test.go @@ -41,7 +41,6 @@ func TestUpdateUser(t *testing.T) { m.pmapiClient.EXPECT().Addresses().Return([]*pmapi.Address{testPMAPIAddress}), m.credentialsStore.EXPECT().UpdateEmails("user", []string{testPMAPIAddress.Email}).Return(testCredentials, nil), - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "user"), ) r.NoError(t, user.UpdateUser(context.Background())) @@ -69,7 +68,6 @@ func TestUserSwitchAddressMode(t *testing.T) { m.pmapiClient.EXPECT().CountMessages(gomock.Any(), "").Return([]*pmapi.MessagesCount{}, nil), m.pmapiClient.EXPECT().Addresses().Return([]*pmapi.Address{testPMAPIAddress}), m.credentialsStore.EXPECT().SwitchAddressMode("user").Return(testCredentialsSplit, nil), - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "user"), ) // Check switch to split mode. @@ -87,7 +85,6 @@ func TestUserSwitchAddressMode(t *testing.T) { m.pmapiClient.EXPECT().CountMessages(gomock.Any(), "").Return([]*pmapi.MessagesCount{}, nil), m.pmapiClient.EXPECT().Addresses().Return([]*pmapi.Address{testPMAPIAddress}), m.credentialsStore.EXPECT().SwitchAddressMode("user").Return(testCredentials, nil), - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "user"), ) // Check switch to combined mode. @@ -108,7 +105,6 @@ func TestLogoutUser(t *testing.T) { m.pmapiClient.EXPECT().AuthDelete(gomock.Any()).Return(nil), m.credentialsStore.EXPECT().Logout("user").Return(testCredentialsDisconnected, nil), m.eventListener.EXPECT().Emit(events.CloseConnectionEvent, "user@pm.me"), - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "user"), ) err := user.Logout() @@ -127,7 +123,6 @@ func TestLogoutUserFailsLogout(t *testing.T) { m.credentialsStore.EXPECT().Logout("user").Return(nil, errors.New("logout failed")), m.credentialsStore.EXPECT().Delete("user").Return(nil), m.eventListener.EXPECT().Emit(events.CloseConnectionEvent, "user@pm.me"), - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "user"), ) err := user.Logout() @@ -145,23 +140,6 @@ func TestCheckBridgeLogin(t *testing.T) { r.NoError(t, err) } -func TestCheckBridgeLoginUpgradeApplication(t *testing.T) { - m := initMocks(t) - defer m.ctrl.Finish() - - user := testNewUser(t, m) - defer cleanUpUserData(user) - - m.eventListener.EXPECT().Emit(events.UpgradeApplicationEvent, "") - - isApplicationOutdated = true - - err := user.CheckBridgeLogin("any-pass") - r.Equal(t, pmapi.ErrUpgradeApplication, err) - - isApplicationOutdated = false -} - func TestCheckBridgeLoginLoggedOut(t *testing.T) { m := initMocks(t) defer m.ctrl.Finish() @@ -172,9 +150,6 @@ func TestCheckBridgeLoginLoggedOut(t *testing.T) { m.pmapiClient.EXPECT().AddAuthRefreshHandler(gomock.Any()), m.pmapiClient.EXPECT().ListLabels(gomock.Any()).Return(nil, pmapi.ErrUnauthorized), m.pmapiClient.EXPECT().Addresses().Return(nil), - - // Mock CheckBridgeLogin. - m.eventListener.EXPECT().Emit(events.LogoutEvent, "user"), ) user, _, err := newUser("user", m.eventListener, m.credentialsStore, m.storeMaker) diff --git a/pkg/users/user_new_test.go b/pkg/users/user_new_test.go index 15705da..9bbf3bf 100644 --- a/pkg/users/user_new_test.go +++ b/pkg/users/user_new_test.go @@ -53,8 +53,6 @@ func TestNewUserUnlockFails(t *testing.T) { m.pmapiClient.EXPECT().AuthDelete(gomock.Any()).Return(nil), m.credentialsStore.EXPECT().Logout("user").Return(testCredentialsDisconnected, nil), m.eventListener.EXPECT().Emit(events.CloseConnectionEvent, "user@pm.me"), - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "user"), - m.eventListener.EXPECT().Emit(events.LogoutEvent, "user"), ) checkNewUserHasCredentials(m, "failed to unlock user: bad password", testCredentialsDisconnected) diff --git a/pkg/users/users_clear_test.go b/pkg/users/users_clear_test.go index 6c95e73..a42651c 100644 --- a/pkg/users/users_clear_test.go +++ b/pkg/users/users_clear_test.go @@ -32,9 +32,6 @@ func TestClearData(t *testing.T) { users := testNewUsersWithUsers(t, m) defer cleanUpUsersData(users) - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "user") - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "users") - m.eventListener.EXPECT().Emit(events.CloseConnectionEvent, "user@pm.me") m.eventListener.EXPECT().Emit(events.CloseConnectionEvent, "users@pm.me") m.eventListener.EXPECT().Emit(events.CloseConnectionEvent, "anotheruser@pm.me") diff --git a/pkg/users/users_delete_test.go b/pkg/users/users_delete_test.go index eca6af6..3d161db 100644 --- a/pkg/users/users_delete_test.go +++ b/pkg/users/users_delete_test.go @@ -21,8 +21,8 @@ import ( "errors" "testing" - "github.com/ljanyst/peroxide/pkg/events" gomock "github.com/golang/mock/gomock" + "github.com/ljanyst/peroxide/pkg/events" r "github.com/stretchr/testify/require" ) @@ -38,9 +38,7 @@ func TestDeleteUser(t *testing.T) { m.credentialsStore.EXPECT().Logout("user").Return(testCredentialsDisconnected, nil), m.credentialsStore.EXPECT().Delete("user").Return(nil), ) - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "user") m.eventListener.EXPECT().Emit(events.CloseConnectionEvent, "user@pm.me") - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "user") err := users.DeleteUser("user", true) r.NoError(t, err) @@ -63,9 +61,7 @@ func TestDeleteUserWithFailingLogout(t *testing.T) { m.credentialsStore.EXPECT().Delete("user").Return(nil), ) - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "user") m.eventListener.EXPECT().Emit(events.CloseConnectionEvent, "user@pm.me") - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "user") err := users.DeleteUser("user", true) r.NoError(t, err) diff --git a/pkg/users/users_login_test.go b/pkg/users/users_login_test.go index 2f349c0..63d419e 100644 --- a/pkg/users/users_login_test.go +++ b/pkg/users/users_login_test.go @@ -21,7 +21,6 @@ import ( "testing" gomock "github.com/golang/mock/gomock" - "github.com/ljanyst/peroxide/pkg/events" "github.com/ljanyst/peroxide/pkg/pmapi" "github.com/pkg/errors" r "github.com/stretchr/testify/require" @@ -51,8 +50,6 @@ func TestUsersFinishLoginNewUser(t *testing.T) { mockAddingConnectedUser(t, m) mockEventLoopNoAction(m) - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, testCredentials.UserID) - checkUsersFinishLogin(t, m, testAuthRefresh, testCredentials.MailboxPassword, testCredentials.UserID, nil) } @@ -74,7 +71,6 @@ func TestUsersFinishLoginExistingDisconnectedUser(t *testing.T) { ) mockInitConnectedUser(t, m) mockEventLoopNoAction(m) - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, testCredentialsDisconnected.UserID) authRefresh := &pmapi.Auth{ UserID: testCredentialsDisconnected.UserID, diff --git a/pkg/users/users_new_test.go b/pkg/users/users_new_test.go index 5d3a020..c9c98b1 100644 --- a/pkg/users/users_new_test.go +++ b/pkg/users/users_new_test.go @@ -92,8 +92,6 @@ func TestNewUsersWithConnectedUserWithBadToken(t *testing.T) { m.credentialsStore.EXPECT().Get("user").Return(testCredentials, nil) m.credentialsStore.EXPECT().Logout("user").Return(testCredentialsDisconnected, nil) - m.eventListener.EXPECT().Emit(events.UserRefreshEvent, "user") - m.eventListener.EXPECT().Emit(events.LogoutEvent, "user") m.eventListener.EXPECT().Emit(events.CloseConnectionEvent, "user@pm.me") checkUsersNew(t, m, []*credentials.Credentials{testCredentialsDisconnected}) diff --git a/pkg/users/users_test.go b/pkg/users/users_test.go index cd8de10..d5e313f 100644 --- a/pkg/users/users_test.go +++ b/pkg/users/users_test.go @@ -27,7 +27,6 @@ import ( "time" gomock "github.com/golang/mock/gomock" - "github.com/ljanyst/peroxide/pkg/events" "github.com/ljanyst/peroxide/pkg/message" "github.com/ljanyst/peroxide/pkg/pmapi" pmapimocks "github.com/ljanyst/peroxide/pkg/pmapi/mocks" @@ -232,9 +231,6 @@ func testNewUsersWithUsers(t *testing.T, m mocks) *Users { } func testNewUsers(t *testing.T, m mocks) *Users { //nolint[unparam] - m.eventListener.EXPECT().ProvideChannel(events.UpgradeApplicationEvent) - m.eventListener.EXPECT().ProvideChannel(events.InternetOnEvent) - users := New(m.eventListener, m.clientManager, m.credentialsStore, m.storeMaker) waitForEvents()