svn commit: r1412818 [2/2] - in /zookeeper/bookkeeper/trunk: ./ bookkeeper-benchmark/ bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/ bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/ bookkeeper-server/src/test/java/org/...

[iv...@apache.org]

Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestDeadlock.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestDeadlock.java?rev=1412818&r1=1412817&r2=1412818&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestDeadlock.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestDeadlock.java Fri Nov 23 10:49:51 2012
@@ -54,14 +54,17 @@ public class TestDeadlock extends Hedwig
     ByteString topic = ByteString.copyFromUtf8("DeadLockTopic");
     ByteString subscriberId = ByteString.copyFromUtf8("dl");
 
+    public TestDeadlock() {
+        super(1);
+    }
+
     @Override
     @Before
     public void setUp() throws Exception {
-        numServers = 1;
         numBookies = 1;
         readDelay = 1000L; // 1s
         super.setUp();
-        client = new HedwigClient(new ClientConfiguration());
+        client = new HedwigClient(new HubClientConfiguration());
         publisher = client.getPublisher();
         subscriber = client.getSubscriber();
     }

Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestUpdateSubscriptionState.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestUpdateSubscriptionState.java?rev=1412818&r1=1412817&r2=1412818&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestUpdateSubscriptionState.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestUpdateSubscriptionState.java Fri Nov 23 10:49:51 2012
@@ -30,6 +30,7 @@ import org.apache.hedwig.server.HedwigHu
 import org.apache.hedwig.server.common.ServerConfiguration;
 import org.apache.hedwig.util.Callback;
 import org.apache.hedwig.util.ConcurrencyUtils;
+import org.apache.hedwig.util.HedwigSocketAddress;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -129,7 +130,7 @@ public class TestUpdateSubscriptionState
         return new NewHubServerConfiguration(serverPort, sslServerPort);
     }
 
-    protected class TestClientConfiguration extends ClientConfiguration {
+    protected class TestClientConfiguration extends HubClientConfiguration {
         @Override
         public boolean isAutoSendConsumeMessageEnabled() {
             return true;

Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestConcurrentTopicAcquisition.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestConcurrentTopicAcquisition.java?rev=1412818&r1=1412817&r2=1412818&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestConcurrentTopicAcquisition.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestConcurrentTopicAcquisition.java Fri Nov 23 10:49:51 2012
@@ -85,7 +85,7 @@ public class TestConcurrentTopicAcquisit
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        client = new HedwigClient(new ClientConfiguration());
+        client = new HedwigClient(new HubClientConfiguration());
 
         publisher = client.getPublisher();
         subscriber = client.getSubscriber();

Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/zookeeper/ZooKeeperTestBase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/zookeeper/ZooKeeperTestBase.java?rev=1412818&r1=1412817&r2=1412818&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/zookeeper/ZooKeeperTestBase.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/zookeeper/ZooKeeperTestBase.java Fri Nov 23 10:49:51 2012
@@ -29,6 +29,7 @@ import org.junit.Before;
 import org.apache.hedwig.exceptions.PubSubException;
 import org.apache.hedwig.util.ConcurrencyUtils;
 import org.apache.hedwig.util.Callback;
+import org.apache.bookkeeper.test.PortManager;
 
 /**
  * This is a base class for any tests that need a ZooKeeper client/server setup.
@@ -78,6 +79,7 @@ public abstract class ZooKeeperTestBase 
     @Override
     @Before
     public void setUp() throws Exception {
+        hostPort = "127.0.0.1:" + PortManager.nextFreePort();
         super.setUp();
         zk = createClient();
     }