svn commit: r930194 - in /hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper: HQuorumPeerTest.java TestHQuorumPeer.java

[ap...@apache.org]

Author: apurtell
Date: Fri Apr  2 09:13:10 2010
New Revision: 930194

URL: http://svn.apache.org/viewvc?rev=930194&view=rev
Log:
HBASE-2392 upgrade to ZooKeeper 3.3.0; fix up HQuorumPeer test

Added:
    hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java
      - copied, changed from r930179, hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/HQuorumPeerTest.java
Removed:
    hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/HQuorumPeerTest.java

Copied: hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java (from r930179, hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/HQuorumPeerTest.java)
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java?p2=hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java&p1=hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/HQuorumPeerTest.java&r1=930179&r2=930194&rev=930194&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/HQuorumPeerTest.java (original)
+++ hadoop/hbase/branches/0.20/src/test/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java Fri Apr  2 09:13:10 2010
@@ -33,7 +33,7 @@ import org.apache.zookeeper.server.quoru
 /**
  * Test for HQuorumPeer.
  */
-public class HQuorumPeerTest extends HBaseTestCase {
+public class TestHQuorumPeer extends HBaseTestCase {
   private Path dataDir;
 
   @Override
@@ -63,9 +63,6 @@ public class HQuorumPeerTest extends HBa
   /** */
   public void testMakeZKProps() {
     Properties properties = HQuorumPeer.makeZKProps(conf);
-    assertEquals(2000, Integer.parseInt(properties.getProperty("tickTime")));
-    assertEquals(Integer.valueOf(10), Integer.valueOf(properties.getProperty("initLimit")));
-    assertEquals(Integer.valueOf(5), Integer.valueOf(properties.getProperty("syncLimit")));
     assertEquals(dataDir.toString(), properties.get("dataDir"));
     assertEquals(Integer.valueOf(21810), Integer.valueOf(properties.getProperty("clientPort")));
     assertEquals("localhost:2888:3888", properties.get("server.0"));
@@ -74,9 +71,6 @@ public class HQuorumPeerTest extends HBa
     String oldValue = conf.get(HConstants.ZOOKEEPER_QUORUM);
     conf.set(HConstants.ZOOKEEPER_QUORUM, "a.foo.bar,b.foo.bar,c.foo.bar");
     properties = HQuorumPeer.makeZKProps(conf);
-    assertEquals(2000, Integer.parseInt(properties.getProperty("tickTime")));
-    assertEquals(Integer.valueOf(10), Integer.valueOf(properties.getProperty("initLimit")));
-    assertEquals(Integer.valueOf(5), Integer.valueOf(properties.getProperty("syncLimit")));
     assertEquals(dataDir.toString(), properties.get("dataDir"));
     assertEquals(Integer.valueOf(21810), Integer.valueOf(properties.getProperty("clientPort")));
     assertEquals("a.foo.bar:2888:3888", properties.get("server.0"));
@@ -89,9 +83,6 @@ public class HQuorumPeerTest extends HBa
   /** @throws Exception */
   public void testConfigInjection() throws Exception {
     String s =
-      "tickTime=2000\n" +
-      "initLimit=10\n" +
-      "syncLimit=5\n" +
       "dataDir=${hbase.tmp.dir}/zookeeper\n" +
       "clientPort=2181\n" +
       "server.0=${hbase.master.hostname}:2888:3888\n";
@@ -100,9 +91,6 @@ public class HQuorumPeerTest extends HBa
     InputStream is = new ByteArrayInputStream(s.getBytes());
     Properties properties = HQuorumPeer.parseZooCfg(conf, is);
 
-    assertEquals(Integer.valueOf(2000), Integer.valueOf(properties.getProperty("tickTime")));
-    assertEquals(Integer.valueOf(10), Integer.valueOf(properties.getProperty("initLimit")));
-    assertEquals(Integer.valueOf(5), Integer.valueOf(properties.getProperty("syncLimit")));
     assertEquals(dataDir.toString(), properties.get("dataDir"));
     assertEquals(Integer.valueOf(2181), Integer.valueOf(properties.getProperty("clientPort")));
     assertEquals("localhost:2888:3888", properties.get("server.0"));
@@ -110,12 +98,6 @@ public class HQuorumPeerTest extends HBa
     QuorumPeerConfig config = new QuorumPeerConfig();
     config.parseProperties(properties);
 
-    int tickTime = config.getTickTime();
-    assertEquals(2000, tickTime);
-    int initLimit = config.getInitLimit();
-    assertEquals(10, initLimit);
-    int syncLimit = config.getSyncLimit();
-    assertEquals(5, syncLimit);
     assertEquals(dataDir.toString(), config.getDataDir());
     assertEquals(2181, config.getClientPortAddress().getPort());
     Map<Long,QuorumServer> servers = config.getServers();