status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fewer s.reinitMock() lines using SetupTest

This commit is contained in:
Caner Çıdam 2018-01-03 18:51:27 +03:00 committed by Frank Mueller
parent 2d4391704e
commit a3663fa1cc
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
geth/account/accounts_test.go
View File

@ -180,15 +180,19 @@ type testAccount struct {
// reinitMock is for reassigning a new mock node manager to account manager. // reinitMock is for reassigning a new mock node manager to account manager.
// Stating the amount of times for mock calls kills the flexibility for // Stating the amount of times for mock calls kills the flexibility for
// development so this is a good workaround to use with EXPECT().AnyTimes() // development so this is a good workaround to use with EXPECT().Func().AnyTimes()
func (s *ManagerTestSuite) reinitMock() { func (s *ManagerTestSuite) reinitMock() {
s.nodeManager = newMockNodeManager(s.T()) s.nodeManager = newMockNodeManager(s.T())
s.accManager.nodeManager = s.nodeManager s.accManager.nodeManager = s.nodeManager
} }
func (s *ManagerTestSuite) TestCreateAccount() { // SetupTest is used here for reinitializing the mock before every
// test function to avoid faulty execution.
func (s *ManagerTestSuite) SetupTest() {
s.reinitMock() s.reinitMock()
}
func (s *ManagerTestSuite) TestCreateAccount() {
// Don't fail on empty password // Don't fail on empty password
s.nodeManager.EXPECT().AccountKeyStore().Return(s.keyStore, nil) s.nodeManager.EXPECT().AccountKeyStore().Return(s.keyStore, nil)
_, _, _, err := s.accManager.CreateAccount(s.password) _, _, _, err := s.accManager.CreateAccount(s.password)
@ -200,8 +204,6 @@ func (s *ManagerTestSuite) TestCreateAccount() {
} }
func (s *ManagerTestSuite) TestRecoverAccount() { func (s *ManagerTestSuite) TestRecoverAccount() {
s.reinitMock()
s.nodeManager.EXPECT().AccountKeyStore().Return(s.keyStore, nil) s.nodeManager.EXPECT().AccountKeyStore().Return(s.keyStore, nil)
addr, pubKey, err := s.accManager.RecoverAccount(s.password, s.mnemonic) addr, pubKey, err := s.accManager.RecoverAccount(s.password, s.mnemonic)
s.NoError(err) s.NoError(err)
@ -214,8 +216,6 @@ func (s *ManagerTestSuite) TestRecoverAccount() {
} }
func (s *ManagerTestSuite) TestSelectAccount() { func (s *ManagerTestSuite) TestSelectAccount() {
s.reinitMock()
testCases := []struct { testCases := []struct {
name string name string
accountKeyStoreReturn []interface{} accountKeyStoreReturn []interface{}
@ -278,8 +278,6 @@ func (s *ManagerTestSuite) TestSelectAccount() {
} }
func (s *ManagerTestSuite) TestCreateChildAccount() { func (s *ManagerTestSuite) TestCreateChildAccount() {
s.reinitMock()
// First, test the negative case where an account is not selected // First, test the negative case where an account is not selected
// and an address is not provided. // and an address is not provided.
s.accManager.selectedAccount = nil s.accManager.selectedAccount = nil
@ -350,8 +348,6 @@ func (s *ManagerTestSuite) TestCreateChildAccount() {
} }
func (s *ManagerTestSuite) TestSelectedAndReSelectAccount() { func (s *ManagerTestSuite) TestSelectedAndReSelectAccount() {
s.reinitMock()
// Select the test account // Select the test account
s.nodeManager.EXPECT().AccountKeyStore().Return(s.keyStore, nil).AnyTimes() s.nodeManager.EXPECT().AccountKeyStore().Return(s.keyStore, nil).AnyTimes()
s.nodeManager.EXPECT().WhisperService().Return(s.shh, nil).AnyTimes() s.nodeManager.EXPECT().WhisperService().Return(s.shh, nil).AnyTimes()
@ -391,8 +387,6 @@ func (s *ManagerTestSuite) TestSelectedAndReSelectAccount() {
} }
func (s *ManagerTestSuite) TestLogout() { func (s *ManagerTestSuite) TestLogout() {
s.reinitMock()
s.nodeManager.EXPECT().WhisperService().Return(s.shh, nil) s.nodeManager.EXPECT().WhisperService().Return(s.shh, nil)
err := s.accManager.Logout() err := s.accManager.Logout()
s.NoError(err) s.NoError(err)
@ -404,8 +398,6 @@ func (s *ManagerTestSuite) TestLogout() {
// TestAccounts tests cases for (*Manager).Accounts // TestAccounts tests cases for (*Manager).Accounts
func (s *ManagerTestSuite) TestAccounts() { func (s *ManagerTestSuite) TestAccounts() {
s.reinitMock()
// Select the test account // Select the test account
s.nodeManager.EXPECT().AccountKeyStore().Return(s.keyStore, nil).AnyTimes() s.nodeManager.EXPECT().AccountKeyStore().Return(s.keyStore, nil).AnyTimes()
s.nodeManager.EXPECT().WhisperService().Return(s.shh, nil).AnyTimes() s.nodeManager.EXPECT().WhisperService().Return(s.shh, nil).AnyTimes()
@ -432,8 +424,6 @@ func (s *ManagerTestSuite) TestAccounts() {
} }
func (s *ManagerTestSuite) TestAddressToDecryptedAccount() { func (s *ManagerTestSuite) TestAddressToDecryptedAccount() {
s.reinitMock()
testCases := []struct { testCases := []struct {
name string name string
accountKeyStoreReturn []interface{} accountKeyStoreReturn []interface{}