Author: fpj
Date: Wed Oct 28 21:54:09 2015
New Revision: 1711151
URL: http://svn.apache.org/viewvc?rev=1711151&view=rev
Log:
ZOOKEEPER-2302: Some test cases are not running because wrongly named (Arshad Mohammad via
fpj)
Added:
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerConfigTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/RemotePeerBeanTest.java
Removed:
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/TestQuorumPeerConfig.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/TestRemotePeerBean.java
Modified:
zookeeper/trunk/CHANGES.txt
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1711151&r1=1711150&r2=1711151&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Oct 28 21:54:09 2015
@@ -190,6 +190,9 @@ BUGFIXES:
ZOOKEEPER-1460: IPv6 literal address not supported for quorum members
(Joseph Walton via cnauroth)
+ ZOOKEEPER-2302: Some test cases are not running because wrongly named
+ (Arshad Mohammad via fpj)
+
IMPROVEMENTS:
ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)
Added: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerConfigTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerConfigTest.java?rev=1711151&view=auto
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerConfigTest.java
(added)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerConfigTest.java
Wed Oct 28 21:54:09 2015
@@ -0,0 +1,76 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.zookeeper.server.quorum;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
+import org.junit.Test;
+
+public class QuorumPeerConfigTest {
+
+ /**
+ * test case for https://issues.apache.org/jira/browse/ZOOKEEPER-2264
+ */
+ @Test
+ public void testErrorMessageWhensecureClientPortNotSetButsecureClientPortAddressSet()
+ throws IOException, ConfigException {
+ QuorumPeerConfig quorumPeerConfig = new QuorumPeerConfig();
+ try {
+ Properties zkProp = getDefaultZKProperties();
+ zkProp.setProperty("secureClientPortAddress", "localhost");
+ quorumPeerConfig.parseProperties(zkProp);
+ fail("IllegalArgumentException is expected");
+ } catch (IllegalArgumentException e) {
+ String expectedMessage = "secureClientPortAddress is set but secureClientPort
is not set";
+ assertEquals(expectedMessage, e.getMessage());
+ }
+ }
+
+ /**
+ *
+ * Test case for https://issues.apache.org/jira/browse/ZOOKEEPER-2264
+ */
+ @Test
+ public void testErrorMessageWhenclientPortNotSetButclientPortAddressSet()
+ throws IOException, ConfigException {
+ QuorumPeerConfig quorumPeerConfig = new QuorumPeerConfig();
+ try {
+ Properties zkProp = getDefaultZKProperties();
+ zkProp.setProperty("clientPortAddress", "localhost");
+ quorumPeerConfig.parseProperties(zkProp);
+ fail("IllegalArgumentException is expected");
+ } catch (IllegalArgumentException e) {
+ String expectedMessage = "clientPortAddress is set but clientPort is not set";
+ assertEquals(expectedMessage, e.getMessage());
+ }
+ }
+
+ private Properties getDefaultZKProperties() {
+ Properties zkProp = new Properties();
+ zkProp.setProperty("dataDir", new File("myDataDir").getAbsolutePath());
+ return zkProp;
+ }
+
+}
Added: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/RemotePeerBeanTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/RemotePeerBeanTest.java?rev=1711151&view=auto
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/RemotePeerBeanTest.java
(added)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/RemotePeerBeanTest.java
Wed Oct 28 21:54:09 2015
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.zookeeper.server.quorum;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.net.InetSocketAddress;
+
+import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
+import org.junit.Test;
+
+public class RemotePeerBeanTest {
+
+ /**
+ * Test case for https://issues.apache.org/jira/browse/ZOOKEEPER-2269
+ */
+ @Test
+ public void testGetClientAddressShouldReturnEmptyStringWhenClientAddressIsNull() {
+ InetSocketAddress peerCommunicationAddress = null;
+ // Here peerCommunicationAddress is null, also clientAddr is null
+ QuorumServer peer = new QuorumServer(1, peerCommunicationAddress);
+ RemotePeerBean remotePeerBean = new RemotePeerBean(peer);
+ String clientAddress = remotePeerBean.getClientAddress();
+ assertNotNull(clientAddress);
+ assertEquals(0, clientAddress.length());
+ }
+
+}
|