From d08d34be398783a07cf2542aa86fb5f8a153898c Mon Sep 17 00:00:00 2001 From: Sunil G Date: Tue, 6 Feb 2018 14:57:02 +0530 Subject: [PATCH] YARN-7860 --- .../webapp/TestRMWebServiceAppsNodelabel.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java index c8afd4bc8cb..3815fb9d06c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java @@ -213,13 +213,18 @@ private String getResource(int memory, int vcore) { private void verifyResource(JSONObject partition, String partitionName, String amused, String used, String reserved) throws JSONException { + JSONObject amusedObject = (JSONObject) partition.get("amUsed"); + JSONObject usedObject = (JSONObject) partition.get("used"); + JSONObject reservedObject = (JSONObject) partition.get("reserved"); assertEquals("Partition expected", partitionName, partition.get("partitionName")); - assertEquals("partition amused", amused, - partition.get("amUsed").toString()); - assertEquals("partition used", used, partition.get("used").toString()); + assertEquals("partition amused", amused, getResource( + (int) amusedObject.get("memory"), (int) amusedObject.get("vCores"))); + assertEquals("partition used", used, getResource( + (int) usedObject.get("memory"), (int) usedObject.get("vCores"))); assertEquals("partition reserved", reserved, - partition.get("reserved").toString()); + getResource((int) reservedObject.get("memory"), + (int) reservedObject.get("vCores"))); } @SuppressWarnings("unchecked") -- 2.14.3 (Apple Git-98)