From 27cba75a50077041378055111f0b1811ca2ed5e8 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 6 Nov 2019 14:17:16 +0000 Subject: [PATCH] Fix test expectations. --- .../versioning/ClientVersioningManagerImplTest.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java index 197d5a167..93cf97dcc 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java @@ -60,6 +60,8 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { private final ClientId clientId = getClientId(); private final long now = System.currentTimeMillis(); private final Transaction txn = new Transaction(null, false); + private final BdfDictionary groupMeta = BdfDictionary.of( + new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt())); private ClientVersioningManagerImpl createInstance() { context.checking(new Expectations() {{ @@ -107,8 +109,6 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { } private void expectAddingContact() throws Exception { - BdfDictionary groupMeta = BdfDictionary.of( - new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt())); long now = System.currentTimeMillis(); BdfList localUpdateBody = BdfList.of(new BdfList(), 1L); Message localUpdate = getMessage(contactGroup.getId()); @@ -459,6 +459,10 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { // Delete the old remote update oneOf(db).deleteMessage(txn, oldRemoteUpdateId); oneOf(db).deleteMessageMetadata(txn, oldRemoteUpdateId); + // Get contact ID + oneOf(clientHelper).getGroupMetadataAsDictionary(txn, + contactGroup.getId()); + will(returnValue(groupMeta)); // No states or visibilities have changed }}); @@ -488,6 +492,10 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { // Load the latest local update oneOf(clientHelper).getMessageAsList(txn, oldLocalUpdateId); will(returnValue(oldLocalUpdateBody)); + // Get client ID + oneOf(clientHelper).getGroupMetadataAsDictionary(txn, + contactGroup.getId()); + will(returnValue(groupMeta)); // No states or visibilities have changed }});