From e1ca887907c1735c75f1487adae73a72f076eb06 Mon Sep 17 00:00:00 2001 From: benjamin <ben@elixxir.io> Date: Thu, 27 Oct 2022 10:31:07 -0700 Subject: [PATCH] fixed tests --- connect/utils_test.go | 38 ++++++++++++++++------------ dummy/mockCmix_test.go | 5 +++- e2e/fpGenerator_test.go | 4 +++ e2e/rekey/utils_test.go | 5 ++++ e2e/utils_test.go | 4 +++ fileTransfer/connect/utils_test.go | 10 +++++--- fileTransfer/e2e/utils_test.go | 5 ++++ fileTransfer/groupChat/utils_test.go | 18 ++++++++----- fileTransfer/utils_test.go | 10 +++++--- groupChat/networkManager_test.go | 5 ++++ ud/networkManager_test.go | 7 +++-- xxdk/utilsInterfaces_test.go | 4 +++ 12 files changed, 84 insertions(+), 31 deletions(-) diff --git a/connect/utils_test.go b/connect/utils_test.go index 9e38793d8..edbf629f8 100644 --- a/connect/utils_test.go +++ b/connect/utils_test.go @@ -180,22 +180,24 @@ func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { return identity.TrackedID{Creation: netTime.Now().Add(-time.Minute)}, nil } -func (m *mockCmix) AddFingerprint(*id.ID, format.Fingerprint, message.Processor) error { return nil } -func (m *mockCmix) DeleteFingerprint(*id.ID, format.Fingerprint) {} -func (m *mockCmix) DeleteClientFingerprints(*id.ID) {} -func (m *mockCmix) AddService(*id.ID, message.Service, message.Processor) {} -func (m *mockCmix) IncreaseParallelNodeRegistration(int) func() (stoppable.Stoppable, error) {return nil} -func (m *mockCmix) DeleteService(*id.ID, message.Service, message.Processor) {} -func (m *mockCmix) DeleteClientService(*id.ID) {} -func (m *mockCmix) TrackServices(message.ServicesTracker) {} -func (m *mockCmix) CheckInProgressMessages() {} -func (m *mockCmix) IsHealthy() bool { return true } -func (m *mockCmix) WasHealthy() bool { return true } -func (m *mockCmix) AddHealthCallback(func(bool)) uint64 { return 0 } -func (m *mockCmix) RemoveHealthCallback(uint64) {} -func (m *mockCmix) HasNode(*id.ID) bool { return true } -func (m *mockCmix) NumRegisteredNodes() int { return 24 } -func (m *mockCmix) TriggerNodeRegistration(*id.ID) {} +func (m *mockCmix) AddFingerprint(*id.ID, format.Fingerprint, message.Processor) error { return nil } +func (m *mockCmix) DeleteFingerprint(*id.ID, format.Fingerprint) {} +func (m *mockCmix) DeleteClientFingerprints(*id.ID) {} +func (m *mockCmix) AddService(*id.ID, message.Service, message.Processor) {} +func (m *mockCmix) IncreaseParallelNodeRegistration(int) func() (stoppable.Stoppable, error) { + return nil +} +func (m *mockCmix) DeleteService(*id.ID, message.Service, message.Processor) {} +func (m *mockCmix) DeleteClientService(*id.ID) {} +func (m *mockCmix) TrackServices(message.ServicesTracker) {} +func (m *mockCmix) CheckInProgressMessages() {} +func (m *mockCmix) IsHealthy() bool { return true } +func (m *mockCmix) WasHealthy() bool { return true } +func (m *mockCmix) AddHealthCallback(func(bool)) uint64 { return 0 } +func (m *mockCmix) RemoveHealthCallback(uint64) {} +func (m *mockCmix) HasNode(*id.ID) bool { return true } +func (m *mockCmix) NumRegisteredNodes() int { return 24 } +func (m *mockCmix) TriggerNodeRegistration(*id.ID) {} func (m *mockCmix) GetRoundResults(_ time.Duration, roundCallback cmix.RoundEventCallback, _ ...id.Round) { roundCallback(true, false, nil) @@ -215,6 +217,10 @@ func (m *mockCmix) RegisterAddressSpaceNotification(string) (chan uint8, error) func (m *mockCmix) UnregisterAddressSpaceNotification(string) {} func (m *mockCmix) GetInstance() *network.Instance { return m.instance } func (m *mockCmix) GetVerboseRounds() string { return "" } +func (m *mockCmix) PauseNodeRegistrations(timeout time.Duration) error { return nil } +func (m *mockCmix) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Duration) error { + return nil +} //////////////////////////////////////////////////////////////////////////////// // Misc set-up utils // diff --git a/dummy/mockCmix_test.go b/dummy/mockCmix_test.go index 60e7de512..34b7d5b36 100644 --- a/dummy/mockCmix_test.go +++ b/dummy/mockCmix_test.go @@ -131,7 +131,6 @@ func (m mockCmix) IncreaseParallelNodeRegistration(int) func() (stoppable.Stoppa panic("implement me") } - func (m mockCmix) DeleteService(clientID *id.ID, toDelete message.Service, processor message.Processor) { //TODO implement me panic("implement me") @@ -241,3 +240,7 @@ func (m mockCmix) GetVerboseRounds() string { //TODO implement me panic("implement me") } +func (m *mockCmix) PauseNodeRegistrations(timeout time.Duration) error { return nil } +func (m *mockCmix) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Duration) error { + return nil +} diff --git a/e2e/fpGenerator_test.go b/e2e/fpGenerator_test.go index adb178e66..75b03c161 100644 --- a/e2e/fpGenerator_test.go +++ b/e2e/fpGenerator_test.go @@ -191,3 +191,7 @@ func (m *mockFpgCmix) RegisterAddressSpaceNotification(string) (chan uint8, erro func (m *mockFpgCmix) UnregisterAddressSpaceNotification(string) {} func (m *mockFpgCmix) GetInstance() *network.Instance { return nil } func (m *mockFpgCmix) GetVerboseRounds() string { return "" } +func (m *mockFpgCmix) PauseNodeRegistrations(timeout time.Duration) error { return nil } +func (m *mockFpgCmix) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Duration) error { + return nil +} diff --git a/e2e/rekey/utils_test.go b/e2e/rekey/utils_test.go index 58512b33a..08c7ec154 100644 --- a/e2e/rekey/utils_test.go +++ b/e2e/rekey/utils_test.go @@ -351,3 +351,8 @@ func (m *mockNetManager) GetInstance() *network2.Instance { func (m *mockNetManager) GetVerboseRounds() string { return "" } + +func (m *mockNetManager) PauseNodeRegistrations(timeout time.Duration) error { return nil } +func (m *mockNetManager) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Duration) error { + return nil +} diff --git a/e2e/utils_test.go b/e2e/utils_test.go index 8ba510fe0..52579e528 100644 --- a/e2e/utils_test.go +++ b/e2e/utils_test.go @@ -270,6 +270,10 @@ func (m *mockCmix) RegisterAddressSpaceNotification(string) (chan uint8, error) func (m *mockCmix) UnregisterAddressSpaceNotification(string) { return } func (m *mockCmix) GetInstance() *network.Instance { return m.instance } func (m *mockCmix) GetVerboseRounds() string { return "" } +func (m *mockCmix) PauseNodeRegistrations(timeout time.Duration) error { return nil } +func (m *mockCmix) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Duration) error { + return nil +} //////////////////////////////////////////////////////////////////////////////// // NDF // diff --git a/fileTransfer/connect/utils_test.go b/fileTransfer/connect/utils_test.go index 14707813e..eb365c0ec 100644 --- a/fileTransfer/connect/utils_test.go +++ b/fileTransfer/connect/utils_test.go @@ -214,9 +214,13 @@ func (m *mockCmix) GetAddressSpace() uint8 { panic("implement me") } func (m *mockCmix) RegisterAddressSpaceNotification(string) (chan uint8, error) { panic("implement me") } -func (m *mockCmix) UnregisterAddressSpaceNotification(string) { panic("implement me") } -func (m *mockCmix) GetInstance() *network.Instance { panic("implement me") } -func (m *mockCmix) GetVerboseRounds() string { panic("implement me") } +func (m *mockCmix) UnregisterAddressSpaceNotification(string) { panic("implement me") } +func (m *mockCmix) GetInstance() *network.Instance { panic("implement me") } +func (m *mockCmix) GetVerboseRounds() string { panic("implement me") } +func (m *mockCmix) PauseNodeRegistrations(timeout time.Duration) error { return nil } +func (m *mockCmix) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Duration) error { + return nil +} //////////////////////////////////////////////////////////////////////////////// // Mock Connection Handler // diff --git a/fileTransfer/e2e/utils_test.go b/fileTransfer/e2e/utils_test.go index b77985aed..7635d9a88 100644 --- a/fileTransfer/e2e/utils_test.go +++ b/fileTransfer/e2e/utils_test.go @@ -220,6 +220,11 @@ func (m *mockCmix) UnregisterAddressSpaceNotification(string) { panic("implement func (m *mockCmix) GetInstance() *network.Instance { panic("implement me") } func (m *mockCmix) GetVerboseRounds() string { panic("implement me") } +func (m *mockCmix) PauseNodeRegistrations(timeout time.Duration) error { return nil } +func (m *mockCmix) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Duration) error { + return nil +} + //////////////////////////////////////////////////////////////////////////////// // Mock E2E Handler // //////////////////////////////////////////////////////////////////////////////// diff --git a/fileTransfer/groupChat/utils_test.go b/fileTransfer/groupChat/utils_test.go index 4475c6a0d..ee03acb23 100644 --- a/fileTransfer/groupChat/utils_test.go +++ b/fileTransfer/groupChat/utils_test.go @@ -155,9 +155,11 @@ func (m *mockCmix) DeleteFingerprint(_ *id.ID, fp format.Fingerprint) { m.handler.Unlock() } -func (m *mockCmix) DeleteClientFingerprints(*id.ID) { panic("implement me") } -func (m *mockCmix) AddService(*id.ID, message.Service, message.Processor) { panic("implement me") } -func (m *mockCmix) IncreaseParallelNodeRegistration(int) func() (stoppable.Stoppable, error) {panic("implement me")} +func (m *mockCmix) DeleteClientFingerprints(*id.ID) { panic("implement me") } +func (m *mockCmix) AddService(*id.ID, message.Service, message.Processor) { panic("implement me") } +func (m *mockCmix) IncreaseParallelNodeRegistration(int) func() (stoppable.Stoppable, error) { + panic("implement me") +} func (m *mockCmix) DeleteService(*id.ID, message.Service, message.Processor) { panic("implement me") } func (m *mockCmix) DeleteClientService(*id.ID) { panic("implement me") } func (m *mockCmix) TrackServices(message.ServicesTracker) { panic("implement me") } @@ -209,9 +211,13 @@ func (m *mockCmix) GetAddressSpace() uint8 { panic("implement me") } func (m *mockCmix) RegisterAddressSpaceNotification(string) (chan uint8, error) { panic("implement me") } -func (m *mockCmix) UnregisterAddressSpaceNotification(string) { panic("implement me") } -func (m *mockCmix) GetInstance() *network.Instance { panic("implement me") } -func (m *mockCmix) GetVerboseRounds() string { panic("implement me") } +func (m *mockCmix) UnregisterAddressSpaceNotification(string) { panic("implement me") } +func (m *mockCmix) GetInstance() *network.Instance { panic("implement me") } +func (m *mockCmix) GetVerboseRounds() string { panic("implement me") } +func (m *mockCmix) PauseNodeRegistrations(timeout time.Duration) error { return nil } +func (m *mockCmix) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Duration) error { + return nil +} //////////////////////////////////////////////////////////////////////////////// // Mock Group Chat Manager // diff --git a/fileTransfer/utils_test.go b/fileTransfer/utils_test.go index 3c884076a..6eb83a34d 100644 --- a/fileTransfer/utils_test.go +++ b/fileTransfer/utils_test.go @@ -267,9 +267,13 @@ func (m *mockCmix) GetAddressSpace() uint8 { panic("implement me") } func (m *mockCmix) RegisterAddressSpaceNotification(string) (chan uint8, error) { panic("implement me") } -func (m *mockCmix) UnregisterAddressSpaceNotification(string) { panic("implement me") } -func (m *mockCmix) GetInstance() *network.Instance { panic("implement me") } -func (m *mockCmix) GetVerboseRounds() string { panic("implement me") } +func (m *mockCmix) UnregisterAddressSpaceNotification(string) { panic("implement me") } +func (m *mockCmix) GetInstance() *network.Instance { panic("implement me") } +func (m *mockCmix) GetVerboseRounds() string { panic("implement me") } +func (m *mockCmix) PauseNodeRegistrations(timeout time.Duration) error { return nil } +func (m *mockCmix) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Duration) error { + return nil +} //////////////////////////////////////////////////////////////////////////////// // Mock Storage Session // diff --git a/groupChat/networkManager_test.go b/groupChat/networkManager_test.go index 2cdd1a28a..108ae47a5 100644 --- a/groupChat/networkManager_test.go +++ b/groupChat/networkManager_test.go @@ -236,3 +236,8 @@ func (tnm *testNetworkManager) GetVerboseRounds() string { func (tnm *testNetworkManager) GetMaxMessageLength() int { return format.NewMessage(tnm.grp.GetP().ByteLen()).ContentsSize() } + +func (tnm *testNetworkManager) PauseNodeRegistrations(timeout time.Duration) error { return nil } +func (tnm *testNetworkManager) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Duration) error { + return nil +} diff --git a/ud/networkManager_test.go b/ud/networkManager_test.go index 9cb6866c5..56186c12c 100644 --- a/ud/networkManager_test.go +++ b/ud/networkManager_test.go @@ -115,8 +115,6 @@ func (tnm *testNetworkManager) AddService(clientID *id.ID, return } -func (tnm *testNetworkManager) IncreaseParallelNodeRegistration(int) func() (stoppable.Stoppable, error) {return nil} - func (tnm *testNetworkManager) CheckInProgressMessages() { return } @@ -271,3 +269,8 @@ func (tnm *testNetworkManager) UnregisterAddressSpaceNotification(tag string) { //TODO implement me panic("implement me") } + +func (tnm *testNetworkManager) PauseNodeRegistrations(timeout time.Duration) error { return nil } +func (tnm *testNetworkManager) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Duration) error { + return nil +} diff --git a/xxdk/utilsInterfaces_test.go b/xxdk/utilsInterfaces_test.go index da4afd172..ba0862204 100644 --- a/xxdk/utilsInterfaces_test.go +++ b/xxdk/utilsInterfaces_test.go @@ -224,3 +224,7 @@ func (t *testNetworkManagerGeneric) TriggerNodeRegistration(nid *id.ID) {} func (t *testNetworkManagerGeneric) UnregisterAddressSpaceNotification( tag string) { } +func (t *testNetworkManagerGeneric) PauseNodeRegistrations(timeout time.Duration) error { return nil } +func (t *testNetworkManagerGeneric) ChangeNumberOfNodeRegistrations(toRun int, timeout time.Duration) error { + return nil +} -- GitLab