mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

[TESTS] Clean up remove verification helpers

Browse source 
Now that there are cases where the SequenceNumberMap and Broadcast
are called, but no other internal state is updated, the existing helper
functions conflate too many decisions. Remove them in favor of explicitly
defining each state change expected.
This commit is contained in:
Julian Knutsen 2019-11-22 08:42:58 -08:00
parent 0472ffc794
commit 6e2ea6e3ed
No known key found for this signature in database
GPG key ID: D85F536DB3615B2D
1 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageProtectedStorageEntryTest.java
View file

@ -202,15 +202,10 @@ public class P2PDataStorageProtectedStorageEntryTest {
void doProtectedStorageRemoveAndVerify(ProtectedStorageEntry entry, void doProtectedStorageRemoveAndVerify(ProtectedStorageEntry entry,
boolean expectedReturnValue, boolean expectedReturnValue,
boolean expectInternalStateChange) { boolean expectedHashMapAndDataStoreUpdated,
boolean expectedListenersSignaled,
doProtectedStorageRemoveAndVerify(entry, expectedReturnValue, expectInternalStateChange, expectInternalStateChange); boolean expectedBroadcast,
} boolean expectedSeqNrWrite) {
void doProtectedStorageRemoveAndVerify(ProtectedStorageEntry entry,
boolean expectedReturnValue,
boolean expectInternalStateChange,
boolean expectSeqNrWrite) {
SavedTestState beforeState = this.testState.saveTestState(entry); SavedTestState beforeState = this.testState.saveTestState(entry);
@ -219,7 +214,7 @@ public class P2PDataStorageProtectedStorageEntryTest {
if (!this.useMessageHandler) if (!this.useMessageHandler)
Assert.assertEquals(expectedReturnValue, addResult); Assert.assertEquals(expectedReturnValue, addResult);
this.testState.verifyProtectedStorageRemove(beforeState, entry, expectInternalStateChange, expectInternalStateChange, expectSeqNrWrite, expectSeqNrWrite, this.expectIsDataOwner()); this.testState.verifyProtectedStorageRemove(beforeState, entry, expectedHashMapAndDataStoreUpdated, expectedListenersSignaled, expectedBroadcast, expectedSeqNrWrite, this.expectIsDataOwner());
} }
/// Valid Add Tests (isValidForAdd() and matchesRelevantPubKey() return true) /// Valid Add Tests (isValidForAdd() and matchesRelevantPubKey() return true)
@ -272,7 +267,7 @@ public class P2PDataStorageProtectedStorageEntryTest {
ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(1); ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(1);
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
doProtectedStorageRemoveAndVerify(entryForRemove, false, false); doProtectedStorageRemoveAndVerify(entryForRemove, false, false, false, false, false);
doProtectedStorageAddAndVerify(entryForAdd, false, false); doProtectedStorageAddAndVerify(entryForAdd, false, false);
} }
@ -320,7 +315,7 @@ public class P2PDataStorageProtectedStorageEntryTest {
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
doProtectedStorageRemoveAndVerify(entryForRemove, false, false); doProtectedStorageRemoveAndVerify(entryForRemove, false, false, false, false, false);
} }
// TESTCASE: Removing an item after successfully added (remove seq # > add seq #) // TESTCASE: Removing an item after successfully added (remove seq # > add seq #)
@ -330,15 +325,15 @@ public class P2PDataStorageProtectedStorageEntryTest {
ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2); ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2);
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
doProtectedStorageRemoveAndVerify(entryForRemove, true, true); doProtectedStorageRemoveAndVerify(entryForRemove, true, true, true, true, true);
} }
// TESTCASE: Removing an item before it was added. This triggers a SequenceNumberMap write, but nothing else // TESTCASE: Removing an item before it was added. This triggers a SequenceNumberMap write and broadcast
@Test @Test
public void remove_notExists() { public void remove_notExists() {
ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(1); ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(1);
doProtectedStorageRemoveAndVerify(entryForRemove, true, false, true); doProtectedStorageRemoveAndVerify(entryForRemove, true, false, false, true, true);
} }
// TESTCASE: Removing an item after successfully adding (remove seq # < add seq #) // TESTCASE: Removing an item after successfully adding (remove seq # < add seq #)
@ -348,7 +343,7 @@ public class P2PDataStorageProtectedStorageEntryTest {
ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(1); ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(1);
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
doProtectedStorageRemoveAndVerify(entryForRemove, false, false); doProtectedStorageRemoveAndVerify(entryForRemove, false, false, false, false, false);
} }
// TESTCASE: Add after removed (same seq #) // TESTCASE: Add after removed (same seq #)
@ -358,7 +353,7 @@ public class P2PDataStorageProtectedStorageEntryTest {
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2); ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2);
doProtectedStorageRemoveAndVerify(entryForRemove, true, true); doProtectedStorageRemoveAndVerify(entryForRemove, true, true, true, true, true);
doProtectedStorageAddAndVerify(entryForAdd, false, false); doProtectedStorageAddAndVerify(entryForAdd, false, false);
} }
@ -370,7 +365,7 @@ public class P2PDataStorageProtectedStorageEntryTest {
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2); ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2);
doProtectedStorageRemoveAndVerify(entryForRemove, true, true); doProtectedStorageRemoveAndVerify(entryForRemove, true, true, true, true, true);
entryForAdd = this.getProtectedStorageEntryForAdd(3); entryForAdd = this.getProtectedStorageEntryForAdd(3);
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
@ -385,7 +380,7 @@ public class P2PDataStorageProtectedStorageEntryTest {
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2, false, true); ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2, false, true);
doProtectedStorageRemoveAndVerify(entryForRemove, false, false); doProtectedStorageRemoveAndVerify(entryForRemove, false, false, false, false, false);
} }
// TESTCASE: Remove fails if Entry is valid for remove, but metadata doesn't match remove target // TESTCASE: Remove fails if Entry is valid for remove, but metadata doesn't match remove target
@ -395,7 +390,7 @@ public class P2PDataStorageProtectedStorageEntryTest {
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2, true, false); ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2, true, false);
doProtectedStorageRemoveAndVerify(entryForRemove, false, false); doProtectedStorageRemoveAndVerify(entryForRemove, false, false, false, false, false);
} }
// TESTCASE: Remove fails if Entry is not valid for remove and metadata doesn't match remove target // TESTCASE: Remove fails if Entry is not valid for remove and metadata doesn't match remove target
@ -405,7 +400,7 @@ public class P2PDataStorageProtectedStorageEntryTest {
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2, false, false); ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2, false, false);
doProtectedStorageRemoveAndVerify(entryForRemove, false, false); doProtectedStorageRemoveAndVerify(entryForRemove, false, false, false, false, false);
} }
@ -416,7 +411,7 @@ public class P2PDataStorageProtectedStorageEntryTest {
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(3); ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(3);
doProtectedStorageRemoveAndVerify(entryForRemove, true, true); doProtectedStorageRemoveAndVerify(entryForRemove, true, true, true, true, true);
entryForAdd = this.getProtectedStorageEntryForAdd(1); entryForAdd = this.getProtectedStorageEntryForAdd(1);
doProtectedStorageAddAndVerify(entryForAdd, false, false); doProtectedStorageAddAndVerify(entryForAdd, false, false);
@ -567,7 +562,7 @@ public class P2PDataStorageProtectedStorageEntryTest {
ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2); ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2);
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
doProtectedStorageRemoveAndVerify(entryForRemove, true, true); doProtectedStorageRemoveAndVerify(entryForRemove, true, true, true, true, true);
doRefreshTTLAndVerify(buildRefreshOfferMessage(entryForAdd, this.payloadOwnerKeys,3), false, false); doRefreshTTLAndVerify(buildRefreshOfferMessage(entryForAdd, this.payloadOwnerKeys,3), false, false);
} }
@ -664,7 +659,7 @@ public class P2PDataStorageProtectedStorageEntryTest {
doProtectedStorageAddAndVerify(entryForAdd, true, true); doProtectedStorageAddAndVerify(entryForAdd, true, true);
ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2); ProtectedStorageEntry entryForRemove = this.getProtectedStorageEntryForRemove(2);
doProtectedStorageRemoveAndVerify(entryForRemove, true, true); doProtectedStorageRemoveAndVerify(entryForRemove, true, true, true, true, true);
entryForAdd = this.getProtectedStorageEntryForAdd(3); entryForAdd = this.getProtectedStorageEntryForAdd(3);
doProtectedStorageAddAndVerify(entryForAdd, false, false); doProtectedStorageAddAndVerify(entryForAdd, false, false);