ZOOKEEPER-1076. some quorum tests are unnecessarily extending QuorumBase (phunt via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1152141 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -361,6 +361,8 @@ IMPROVEMENTS:
   ZOOKEEPER-1095. Simple leader election recipe
   (Eric Sammer via henry and phunt)
 
+  ZOOKEEPER-1076. some quorum tests are unnecessarily extending QuorumBase (phunt via mahadev)
+
 NEW FEATURES:
   ZOOKEEPER-729. Java client API to recursively delete a subtree.
   (Kay Kay via henry)

src/java/test/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java

@@ -28,14 +28,12 @@ import java.util.HashSet;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.log4j.Logger;
 import org.apache.zookeeper.AsyncCallback;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
+import org.apache.zookeeper.ZKTestCase;
 import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.server.ZKDatabase;
@@ -44,7 +42,7 @@ import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
 import org.junit.Test;
 
 
-public class FollowerResyncConcurrencyTest extends QuorumBase {
+public class FollowerResyncConcurrencyTest extends ZKTestCase {
     volatile int counter = 0;
     volatile int errors = 0; 
 

src/java/test/org/apache/zookeeper/test/QuorumHammerTest.java

@@ -17,13 +17,14 @@
  */
 
 package org.apache.zookeeper.test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.zookeeper.ZKTestCase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class QuorumHammerTest extends QuorumBase {
+public class QuorumHammerTest extends ZKTestCase {
     protected static final Logger LOG = LoggerFactory.getLogger(QuorumHammerTest.class);
     public static final long CONNECTION_TIMEOUT = ClientTest.CONNECTION_TIMEOUT;
 
@@ -31,7 +32,6 @@ public class QuorumHammerTest extends QuorumBase {
     protected final ClientHammerTest cht = new ClientHammerTest();
 
     @Before
-    @Override
     public void setUp() throws Exception {
         qb.setUp();
         cht.hostPort = qb.hostPort;
@@ -39,7 +39,6 @@ public class QuorumHammerTest extends QuorumBase {
     }
 
     @After
-    @Override
     public void tearDown() throws Exception {
         cht.tearDownAll();
         qb.tearDown();

src/java/test/org/apache/zookeeper/test/QuorumTest.java

@@ -18,15 +18,12 @@
 
 package org.apache.zookeeper.test;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.AsyncCallback;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
@@ -35,19 +32,23 @@ import org.apache.zookeeper.OpResult;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
+import org.apache.zookeeper.ZKTestCase;
 import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
 import org.apache.zookeeper.server.quorum.Leader;
 import org.apache.zookeeper.server.quorum.LearnerHandler;
+import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class QuorumTest extends QuorumBase {
+public class QuorumTest extends ZKTestCase {
     private static final Logger LOG = LoggerFactory.getLogger(QuorumTest.class);
     public static final long CONNECTION_TIMEOUT = ClientTest.CONNECTION_TIMEOUT;
 
@@ -55,7 +56,6 @@ public class QuorumTest extends QuorumBase {
     private final ClientTest ct = new ClientTest();
 
     @Before
-    @Override
     public void setUp() throws Exception {
         qb.setUp();
         ct.hostPort = qb.hostPort;
@@ -63,7 +63,6 @@ public class QuorumTest extends QuorumBase {
     }
 
     @After
-    @Override
     public void tearDown() throws Exception {
         ct.tearDownAll();
         qb.tearDown();

src/java/test/org/apache/zookeeper/test/ReadOnlyModeTest.java

@@ -37,25 +37,25 @@ import org.apache.zookeeper.KeeperException.NotReadOnlyException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
+import org.apache.zookeeper.ZKTestCase;
 import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.ZooKeeper.States;
+import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-public class ReadOnlyModeTest extends QuorumBase {
-
+public class ReadOnlyModeTest extends ZKTestCase {
+    private static int CONNECTION_TIMEOUT = QuorumBase.CONNECTION_TIMEOUT;
     private QuorumUtil qu = new QuorumUtil(1);
 
     @Before
-    @Override
     public void setUp() throws Exception {
         qu.startQuorum();
     }
 
     @After
-    @Override
     public void tearDown() throws Exception {
         qu.tearDown();
     }

src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java

@@ -22,11 +22,10 @@ import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
+import org.apache.zookeeper.ZKTestCase;
 import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.server.SyncRequestProcessor;
@@ -37,22 +36,22 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class ZkDatabaseCorruptionTest extends QuorumBase {
+public class ZkDatabaseCorruptionTest extends ZKTestCase {
     protected static final Logger LOG = LoggerFactory.getLogger(ZkDatabaseCorruptionTest.class);
     public static final long CONNECTION_TIMEOUT = ClientTest.CONNECTION_TIMEOUT;
 
     private final QuorumBase qb = new QuorumBase();
 
     @Before
-    @Override
     public void setUp() throws Exception {
         LOG.info("STARTING quorum " + getClass().getName());
         qb.setUp();
     }
 
     @After
-    @Override
     public void tearDown() throws Exception {
         LOG.info("STOPPING quorum " + getClass().getName());
     }