Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-13 02:35:52 +00:00
Code Issues Projects Releases Wiki Activity

Make PeerGroup startup blocking in the unit tests.

Browse Source
This commit is contained in:
Mike Hearn 2012-12-24 21:27:49 +00:00
parent 7d7e76a3b0
commit 2a55c58460
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/test/java/com/google/bitcoin/core/PeerGroupTest.java
View File

@ -100,7 +100,7 @@ public class PeerGroupTest extends TestWithNetworkConnections {
public void shutdown() { public void shutdown() {
} }
}); });
peerGroup.start(); peerGroup.startAndWait();
sem.acquire(); sem.acquire();
// Check that we did indeed throw an exception. If we got here it means we threw and then PeerGroup tried // Check that we did indeed throw an exception. If we got here it means we threw and then PeerGroup tried
// again a bit later. // again a bit later.
@ -111,7 +111,7 @@ public class PeerGroupTest extends TestWithNetworkConnections {
@Test @Test
public void receiveTxBroadcast() throws Exception { public void receiveTxBroadcast() throws Exception {
// Check that when we receive transactions on all our peers, we do the right thing. // Check that when we receive transactions on all our peers, we do the right thing.
peerGroup.start(); peerGroup.startAndWait();
// Create a couple of peers. // Create a couple of peers.
peerGroup.addWallet(wallet); peerGroup.addWallet(wallet);
@ -156,7 +156,7 @@ public class PeerGroupTest extends TestWithNetworkConnections {
@Test @Test
public void singleDownloadPeer1() throws Exception { public void singleDownloadPeer1() throws Exception {
// Check that we don't attempt to retrieve blocks on multiple peers. // Check that we don't attempt to retrieve blocks on multiple peers.
peerGroup.start(); peerGroup.startAndWait();
// Create a couple of peers. // Create a couple of peers.
FakeChannel p1 = connectPeer(1); FakeChannel p1 = connectPeer(1);
@ -191,7 +191,7 @@ public class PeerGroupTest extends TestWithNetworkConnections {
// Check that we don't attempt multiple simultaneous block chain downloads, when adding a new peer in the // Check that we don't attempt multiple simultaneous block chain downloads, when adding a new peer in the
// middle of an existing chain download. // middle of an existing chain download.
// Create a couple of peers. // Create a couple of peers.
peerGroup.start(); peerGroup.startAndWait();
// Create a couple of peers. // Create a couple of peers.
FakeChannel p1 = connectPeer(1); FakeChannel p1 = connectPeer(1);
@ -372,7 +372,7 @@ public class PeerGroupTest extends TestWithNetworkConnections {
@Test @Test
public void noPings() throws Exception { public void noPings() throws Exception {
peerGroup.start(); peerGroup.startAndWait();
peerGroup.setPingIntervalMsec(0); peerGroup.setPingIntervalMsec(0);
VersionMessage versionMessage = new VersionMessage(params, 2); VersionMessage versionMessage = new VersionMessage(params, 2);
versionMessage.clientVersion = Pong.MIN_PROTOCOL_VERSION; versionMessage.clientVersion = Pong.MIN_PROTOCOL_VERSION;
@ -382,7 +382,7 @@ public class PeerGroupTest extends TestWithNetworkConnections {
@Test @Test
public void pings() throws Exception { public void pings() throws Exception {
peerGroup.start(); peerGroup.startAndWait();
peerGroup.setPingIntervalMsec(100); peerGroup.setPingIntervalMsec(100);
VersionMessage versionMessage = new VersionMessage(params, 2); VersionMessage versionMessage = new VersionMessage(params, 2);
versionMessage.clientVersion = Pong.MIN_PROTOCOL_VERSION; versionMessage.clientVersion = Pong.MIN_PROTOCOL_VERSION;