YARN-1880. Cleanup TestApplicationClientProtocolOnHA. Contributed by ozawa.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fbceb3b4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fbceb3b4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fbceb3b4 Branch: refs/heads/HDFS-7285 Commit: fbceb3b41834d6899c4353fb24f12ba3ecf67faf Parents: 970ee3f Author: Harsh J <ha...@cloudera.com> Authored: Tue Mar 24 11:57:28 2015 +0530 Committer: Harsh J <ha...@cloudera.com> Committed: Tue Mar 24 11:57:58 2015 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../client/TestApplicationClientProtocolOnHA.java | 16 ++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fbceb3b4/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 3d9f271..8a5e142 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -58,6 +58,9 @@ Release 2.8.0 - UNRELEASED IMPROVEMENTS + YARN-1880. Cleanup TestApplicationClientProtocolOnHA + (ozawa via harsh) + YARN-3243. CapacityScheduler should pass headroom from parent to children to make sure ParentQueue obey its capacity limits. (Wangda Tan via jianhe) http://git-wip-us.apache.org/repos/asf/hadoop/blob/fbceb3b4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestApplicationClientProtocolOnHA.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestApplicationClientProtocolOnHA.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestApplicationClientProtocolOnHA.java index bfc6656..8e00554 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestApplicationClientProtocolOnHA.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestApplicationClientProtocolOnHA.java @@ -93,7 +93,8 @@ public class TestApplicationClientProtocolOnHA extends ProtocolHATestBase { public void testGetApplicationsOnHA() throws Exception { List<ApplicationReport> reports = client.getApplications(); - Assert.assertTrue(reports != null && !reports.isEmpty()); + Assert.assertTrue(reports != null); + Assert.assertFalse(reports.isEmpty()); Assert.assertEquals(cluster.createFakeAppReports(), reports); } @@ -101,7 +102,8 @@ public class TestApplicationClientProtocolOnHA extends ProtocolHATestBase { @Test(timeout = 15000) public void testGetClusterNodesOnHA() throws Exception { List<NodeReport> reports = client.getNodeReports(NodeState.RUNNING); - Assert.assertTrue(reports != null && !reports.isEmpty()); + Assert.assertTrue(reports != null); + Assert.assertFalse(reports.isEmpty()); Assert.assertEquals(cluster.createFakeNodeReports(), reports); } @@ -117,8 +119,8 @@ public class TestApplicationClientProtocolOnHA extends ProtocolHATestBase { @Test(timeout = 15000) public void testGetQueueUserAclsOnHA() throws Exception { List<QueueUserACLInfo> queueUserAclsList = client.getQueueAclsInfo(); - Assert.assertTrue(queueUserAclsList != null - && !queueUserAclsList.isEmpty()); + Assert.assertTrue(queueUserAclsList != null); + Assert.assertFalse(queueUserAclsList.isEmpty()); Assert.assertEquals(cluster.createFakeQueueUserACLInfoList(), queueUserAclsList); } @@ -136,7 +138,8 @@ public class TestApplicationClientProtocolOnHA extends ProtocolHATestBase { public void testGetApplicationAttemptsOnHA() throws Exception { List<ApplicationAttemptReport> reports = client.getApplicationAttempts(cluster.createFakeAppId()); - Assert.assertTrue(reports != null && !reports.isEmpty()); + Assert.assertTrue(reports != null); + Assert.assertFalse(reports.isEmpty()); Assert.assertEquals(cluster.createFakeApplicationAttemptReports(), reports); } @@ -153,7 +156,8 @@ public class TestApplicationClientProtocolOnHA extends ProtocolHATestBase { public void testGetContainersOnHA() throws Exception { List<ContainerReport> reports = client.getContainers(cluster.createFakeApplicationAttemptId()); - Assert.assertTrue(reports != null && !reports.isEmpty()); + Assert.assertTrue(reports != null); + Assert.assertFalse(reports.isEmpty()); Assert.assertEquals(cluster.createFakeContainerReports(), reports); }
