From 14d6759803ec21f0ad8413f9a1bcde58d094355c Mon Sep 17 00:00:00 2001 From: Vladimir Eliezer Tokarev Date: Fri, 1 Apr 2016 04:12:21 -0700 Subject: [PATCH] The tests suing LocalBullteinBoardClient instead of the Cached one. --- .../src/test/java/SimpleRegistryTest.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/voter-registry/src/test/java/SimpleRegistryTest.java b/voter-registry/src/test/java/SimpleRegistryTest.java index 8b89abe..e0d6187 100644 --- a/voter-registry/src/test/java/SimpleRegistryTest.java +++ b/voter-registry/src/test/java/SimpleRegistryTest.java @@ -1,7 +1,6 @@ import com.google.common.util.concurrent.FutureCallback; import meerkat.AsyncRegistry; import meerkat.bulletinboard.BulletinBoardServer; -import meerkat.bulletinboard.CachedBulletinBoardClient; import meerkat.bulletinboard.LocalBulletinBoardClient; import meerkat.bulletinboard.sqlserver.BulletinBoardSQLServer; import meerkat.bulletinboard.sqlserver.H2QueryProvider; @@ -14,7 +13,6 @@ import meerkat.protobuf.VoterRegistry; import meerkat.protobuf.VoterRegistry.GroupID; import meerkat.protobuf.VoterRegistry.VoterID; import meerkat.protobuf.VoterRegistry.VoterInfo; -import meerkat.protobuf.Voting; import meerkat.registry.MessageCollectionUtils; import meerkat.registry.RegistryTags; import org.junit.Before; @@ -51,7 +49,7 @@ import static meerkat.util.BulletinBoardUtils.getLatestMessage; public class SimpleRegistryTest { private DigitalSignature signer; - private CachedBulletinBoardClient cachedBulletinBoardClient; + private LocalBulletinBoardClient cachedBulletinBoardClient; private SecureRandom random = new SecureRandom(); Semaphore jobSemaphore; @@ -134,16 +132,7 @@ public class SimpleRegistryTest { * @throws SQLException */ private void CommunicatorSetup() throws InstantiationException, IllegalAccessException, CommunicationException, SQLException { - LocalBulletinBoardClient localClient = CreateLocalBulletinBoardClient(); - cachedBulletinBoardClient = new CachedBulletinBoardClient(localClient, - THREAD_NUM, - FAIL_DELAY, - SUBSCRIPTION_DELAY); - - cachedBulletinBoardClient.init(Voting.BulletinBoardClientParams.newBuilder() - .setBulletinBoardAddress(0, LOCALHOST) - .setMinRedundancy(1) - .build()); + cachedBulletinBoardClient = CreateLocalBulletinBoardClient(); } /**