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

Apply changes to test classes

Browse source
This commit is contained in:
chimp1984 2020-10-01 15:13:31 -05:00
parent 65de106df0
commit 8ea6da01da
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageBuildGetDataResponseTest.java
View file

@ -44,6 +44,9 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -53,11 +56,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings; import static org.mockito.Mockito.withSettings;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
public class P2PDataStorageBuildGetDataResponseTest { public class P2PDataStorageBuildGetDataResponseTest {
abstract static class P2PDataStorageBuildGetDataResponseTestBase { abstract static class P2PDataStorageBuildGetDataResponseTestBase {
// GIVEN null & non-null supportedCapabilities // GIVEN null & non-null supportedCapabilities
@ -240,7 +238,10 @@ public class P2PDataStorageBuildGetDataResponseTest {
Assert.assertEquals(getDataRequest instanceof GetUpdatedDataRequest, getDataResponse.isGetUpdatedDataResponse()); Assert.assertEquals(getDataRequest instanceof GetUpdatedDataRequest, getDataResponse.isGetUpdatedDataResponse());
Assert.assertEquals(getDataResponse.getSupportedCapabilities(), Capabilities.app); Assert.assertEquals(getDataResponse.getSupportedCapabilities(), Capabilities.app);
Assert.assertEquals(1, getDataResponse.getPersistableNetworkPayloadSet().size()); Assert.assertEquals(1, getDataResponse.getPersistableNetworkPayloadSet().size());
Assert.assertTrue(getDataResponse.getPersistableNetworkPayloadSet().contains(onlyLocal1)); Set<PersistableNetworkPayload> persistableNetworkPayloadSet = getDataResponse.getPersistableNetworkPayloadSet();
// We use a set at the filter so it is not deterministic which item get truncated
Assert.assertEquals(1, persistableNetworkPayloadSet.size());
Assert.assertTrue(getDataResponse.getDataSet().isEmpty()); Assert.assertTrue(getDataResponse.getDataSet().isEmpty());
} }

8
p2p/src/test/java/bisq/network/p2p/storage/P2PDataStorageRequestDataTest.java
View file

@ -35,13 +35,15 @@ import java.security.NoSuchAlgorithmException;
import java.util.Set; import java.util.Set;
import org.mockito.MockitoAnnotations;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockito.MockitoAnnotations; import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.when;
public class P2PDataStorageRequestDataTest { public class P2PDataStorageRequestDataTest {
private TestState testState; private TestState testState;

8
p2p/src/test/java/bisq/network/p2p/storage/mocks/AppendOnlyDataStoreServiceFake.java
View file

@ -21,7 +21,6 @@ import bisq.network.p2p.storage.P2PDataStorage;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload; import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService; import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
@ -31,17 +30,16 @@ import java.util.Map;
* @see <a href="https://martinfowler.com/articles/mocksArentStubs.html#TheDifferenceBetweenMocksAndStubs">Reference</a> * @see <a href="https://martinfowler.com/articles/mocksArentStubs.html#TheDifferenceBetweenMocksAndStubs">Reference</a>
*/ */
public class AppendOnlyDataStoreServiceFake extends AppendOnlyDataStoreService { public class AppendOnlyDataStoreServiceFake extends AppendOnlyDataStoreService {
private final Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> map;
public AppendOnlyDataStoreServiceFake() { public AppendOnlyDataStoreServiceFake() {
map = new HashMap<>(); addService(new MapStoreServiceFake());
} }
public Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> getMap() { public Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> getMap() {
return map; return super.getMap();
} }
public void put(P2PDataStorage.ByteArray hashAsByteArray, PersistableNetworkPayload payload) { public void put(P2PDataStorage.ByteArray hashAsByteArray, PersistableNetworkPayload payload) {
map.put(hashAsByteArray, payload); super.put(hashAsByteArray, payload);
} }
} }