From be4b75932bee39ed90ae886f22ca3dd40beb0b1c Mon Sep 17 00:00:00 2001 From: Brian Acton Date: Tue, 29 Oct 2019 18:20:03 -0700 Subject: [PATCH] since onCrawlChunk() is now protected, we need to invoke timeAndProcessChunk() in our unit tests --- .../textsecuregcm/tests/storage/AccountCleanerTest.java | 9 +++++---- .../tests/storage/ActiveUserCounterTest.java | 6 +++--- .../tests/storage/DirectoryReconcilerTest.java | 2 +- .../tests/storage/PushFeedbackProcessorTest.java | 9 +++++---- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountCleanerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountCleanerTest.java index baaeb28fd..d8692360c 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountCleanerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountCleanerTest.java @@ -21,6 +21,7 @@ import org.junit.Test; import org.whispersystems.textsecuregcm.sqs.DirectoryQueue; import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.storage.AccountCleaner; +import org.whispersystems.textsecuregcm.storage.AccountDatabaseCrawlerRestartException; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.tests.util.AuthHelper; @@ -85,10 +86,10 @@ public class AccountCleanerTest { } @Test - public void testAccounts() { + public void testAccounts() throws AccountDatabaseCrawlerRestartException { AccountCleaner accountCleaner = new AccountCleaner(accountsManager, directoryQueue); accountCleaner.onCrawlStart(); - accountCleaner.onCrawlChunk(Optional.empty(), Arrays.asList(deletedDisabledAccount, undeletedDisabledAccount, undeletedEnabledAccount)); + accountCleaner.timeAndProcessCrawlChunk(Optional.empty(), Arrays.asList(deletedDisabledAccount, undeletedDisabledAccount, undeletedEnabledAccount)); accountCleaner.onCrawlEnd(Optional.empty()); verify(deletedDisabledDevice, never()).setGcmId(any()); @@ -121,7 +122,7 @@ public class AccountCleanerTest { } @Test - public void testMaxAccountUpdates() { + public void testMaxAccountUpdates() throws AccountDatabaseCrawlerRestartException { List accounts = new LinkedList<>(); accounts.add(undeletedEnabledAccount); @@ -134,7 +135,7 @@ public class AccountCleanerTest { AccountCleaner accountCleaner = new AccountCleaner(accountsManager, directoryQueue); accountCleaner.onCrawlStart(); - accountCleaner.onCrawlChunk(Optional.empty(), accounts); + accountCleaner.timeAndProcessCrawlChunk(Optional.empty(), accounts); accountCleaner.onCrawlEnd(Optional.empty()); verify(undeletedDisabledDevice, times(AccountCleaner.MAX_ACCOUNT_UPDATES_PER_CHUNK)).setGcmId(isNull()); diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/ActiveUserCounterTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/ActiveUserCounterTest.java index 934da0fb4..0c3f67cf7 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/ActiveUserCounterTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/ActiveUserCounterTest.java @@ -145,7 +145,7 @@ public class ActiveUserCounterTest { @Test public void testCrawlChunkValidAccount() throws AccountDatabaseCrawlerRestartException { - activeUserCounter.onCrawlChunk(Optional.of(UUID_IOS), Arrays.asList(iosAccount)); + activeUserCounter.timeAndProcessCrawlChunk(Optional.of(UUID_IOS), Arrays.asList(iosAccount)); verify(iosAccount, times(1)).getMasterDevice(); verify(iosAccount, times(1)).getNumber(); @@ -174,7 +174,7 @@ public class ActiveUserCounterTest { @Test public void testCrawlChunkNoDeviceAccount() throws AccountDatabaseCrawlerRestartException { - activeUserCounter.onCrawlChunk(Optional.of(UUID_NODEVICE), Arrays.asList(noDeviceAccount)); + activeUserCounter.timeAndProcessCrawlChunk(Optional.of(UUID_NODEVICE), Arrays.asList(noDeviceAccount)); verify(noDeviceAccount, times(1)).getMasterDevice(); @@ -198,7 +198,7 @@ public class ActiveUserCounterTest { @Test public void testCrawlChunkMixedAccount() throws AccountDatabaseCrawlerRestartException { - activeUserCounter.onCrawlChunk(Optional.of(UUID_IOS), Arrays.asList(iosAccount, androidAccount, noDeviceAccount)); + activeUserCounter.timeAndProcessCrawlChunk(Optional.of(UUID_IOS), Arrays.asList(iosAccount, androidAccount, noDeviceAccount)); verify(iosAccount, times(1)).getMasterDevice(); verify(iosAccount, times(1)).getNumber(); diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/DirectoryReconcilerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/DirectoryReconcilerTest.java index f31d59769..28aca0ccb 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/DirectoryReconcilerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/DirectoryReconcilerTest.java @@ -70,7 +70,7 @@ public class DirectoryReconcilerTest { @Test public void testCrawlChunkValid() throws AccountDatabaseCrawlerRestartException { when(reconciliationClient.sendChunk(any())).thenReturn(successResponse); - directoryReconciler.onCrawlChunk(Optional.of(VALID_UUID), Arrays.asList(activeAccount, inactiveAccount)); + directoryReconciler.timeAndProcessCrawlChunk(Optional.of(VALID_UUID), Arrays.asList(activeAccount, inactiveAccount)); verify(activeAccount, atLeastOnce()).getUuid(); verify(activeAccount, atLeastOnce()).getNumber(); diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/PushFeedbackProcessorTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/PushFeedbackProcessorTest.java index 8a39a7c4a..2a542fd4c 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/PushFeedbackProcessorTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/PushFeedbackProcessorTest.java @@ -4,6 +4,7 @@ import org.junit.Before; import org.junit.Test; import org.whispersystems.textsecuregcm.sqs.DirectoryQueue; import org.whispersystems.textsecuregcm.storage.Account; +import org.whispersystems.textsecuregcm.storage.AccountDatabaseCrawlerRestartException; import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.PushFeedbackProcessor; @@ -61,18 +62,18 @@ public class PushFeedbackProcessorTest { @Test - public void testEmpty() { + public void testEmpty() throws AccountDatabaseCrawlerRestartException { PushFeedbackProcessor processor = new PushFeedbackProcessor(accountsManager, directoryQueue); - processor.onCrawlChunk(Optional.of(UUID.randomUUID()), Collections.emptyList()); + processor.timeAndProcessCrawlChunk(Optional.of(UUID.randomUUID()), Collections.emptyList()); verifyZeroInteractions(accountsManager); verifyZeroInteractions(directoryQueue); } @Test - public void testUpdate() { + public void testUpdate() throws AccountDatabaseCrawlerRestartException { PushFeedbackProcessor processor = new PushFeedbackProcessor(accountsManager, directoryQueue); - processor.onCrawlChunk(Optional.of(UUID.randomUUID()), List.of(uninstalledAccount, mixedAccount, stillActiveAccount, freshAccount, cleanAccount)); + processor.timeAndProcessCrawlChunk(Optional.of(UUID.randomUUID()), List.of(uninstalledAccount, mixedAccount, stillActiveAccount, freshAccount, cleanAccount)); verify(uninstalledDevice).setApnId(isNull()); verify(uninstalledDevice).setGcmId(isNull());