HDFS-11934. Add assertion to TestDefaultNameNodePort#testGetAddressFromConf. Contributed by Nikhil Navadiya.

hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/TestDefaultNameNodePort.java

@@ -32,35 +32,37 @@ public class TestDefaultNameNodePort {
 
   @Test
   public void testGetAddressFromString() throws Exception {
-    assertEquals(DFSUtilClient.getNNAddress("foo").getPort(),
-                 HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT);
-    assertEquals(DFSUtilClient.getNNAddress("hdfs://foo/").getPort(),
-                 HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT);
-    assertEquals(DFSUtilClient.getNNAddress("hdfs://foo:555").getPort(),
-                 555);
-    assertEquals(DFSUtilClient.getNNAddress("foo:555").getPort(),
-                 555);
+    assertEquals(HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT,
+        DFSUtilClient.getNNAddress("foo").getPort());
+    assertEquals(HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT,
+        DFSUtilClient.getNNAddress("hdfs://foo/").getPort());
+    assertEquals(555,
+        DFSUtilClient.getNNAddress("hdfs://foo:555").getPort());
+    assertEquals(555,
+        DFSUtilClient.getNNAddress("foo:555").getPort());
   }
 
   @Test
   public void testGetAddressFromConf() throws Exception {
     Configuration conf = new HdfsConfiguration();
     FileSystem.setDefaultUri(conf, "hdfs://foo/");
-    assertEquals(DFSUtilClient.getNNAddress(conf).getPort(),
-        HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT);
+    assertEquals(HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT,
+        DFSUtilClient.getNNAddress(conf).getPort());
     FileSystem.setDefaultUri(conf, "hdfs://foo:555/");
-    assertEquals(DFSUtilClient.getNNAddress(conf).getPort(), 555);
+    assertEquals(555, DFSUtilClient.getNNAddress(conf).getPort());
     FileSystem.setDefaultUri(conf, "foo");
-    assertEquals(DFSUtilClient.getNNAddress(conf).getPort(),
-        HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT);
+    assertEquals(HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT,
+        DFSUtilClient.getNNAddress(conf).getPort());
+    FileSystem.setDefaultUri(conf, "foo:555");
+    assertEquals(555, DFSUtilClient.getNNAddress(conf).getPort());
   }
 
   @Test
   public void testGetUri() {
-    assertEquals(DFSUtilClient.getNNUri(new InetSocketAddress("foo", 555)),
-                 URI.create("hdfs://foo:555"));
-    assertEquals(DFSUtilClient.getNNUri(new InetSocketAddress("foo",
-            HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT)),
-        URI.create("hdfs://foo"));
+    assertEquals(URI.create("hdfs://foo:555"),
+        DFSUtilClient.getNNUri(new InetSocketAddress("foo", 555)));
+    assertEquals(URI.create("hdfs://foo"),
+        DFSUtilClient.getNNUri(new InetSocketAddress("foo",
+            HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT)));
   }
 }