- fix TestRMWebServicesNodeLabels

- replace expected string to const
- remove dead code

Author: K0K0V0K

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java

@@ -192,8 +192,6 @@ private void explicitFailover(MockRM rm) throws IOException {
 
   private void checkClusterMetricsInfo(String capability, int numNodes) {
     ClusterMetricsInfo clusterMetricsInfo = fromJson(capability, ClusterMetricsInfo.class);
-    System.err.println(capability);
-    System.err.println(clusterMetricsInfo.getTotalNodes());
     assertEquals(numNodes, clusterMetricsInfo.getTotalNodes());
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java

@@ -423,7 +423,7 @@ public void testAppsQueryStatesNone() throws JSONException, Exception {
         response.getMediaType().toString());
     JSONObject json = responseToJson(response);
     assertEquals(1, json.length(), "incorrect number of elements");
-    assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not empty");
+    assertEquals("{}", json.get("apps").toString(), "apps is not empty");
     rm.stop();
   }
 
@@ -443,7 +443,7 @@ public void testAppsQueryStateNone() throws JSONException, Exception {
         response.getMediaType().toString());
     JSONObject json = responseToJson(response);
     assertEquals(1, json.length(), "incorrect number of elements");
-    assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not empty");
+    assertEquals("{}", json.get("apps").toString(), "apps is not empty");
     rm.stop();
   }
 
@@ -557,7 +557,7 @@ public void testAppsQueryFinalStatusNone() throws JSONException, Exception {
         response.getMediaType().toString());
     JSONObject json = responseToJson(response);
     assertEquals(1, json.length(), "incorrect number of elements");
-    assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not null");
+    assertEquals("{}", json.get("apps").toString(), "apps is not null");
     rm.stop();
   }
 
@@ -844,7 +844,7 @@ public void testAppsQueryStartEnd() throws JSONException, Exception {
         response.getMediaType().toString());
     JSONObject json = responseToJson(response);
     assertEquals(1, json.length(), "incorrect number of elements");
-    assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not empty");
+    assertEquals("{}", json.get("apps").toString(), "apps is not empty");
     rm.stop();
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java

@@ -19,6 +19,7 @@
 package org.apache.hadoop.yarn.server.resourcemanager.webapp;
 
 import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson;
+import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -47,7 +48,6 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.Lists;
 
-import com.google.gson.Gson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.hadoop.http.JettyUtils;
@@ -209,9 +209,11 @@ private Response post(String path, String queryUserName, Object payload,
         webTarget = webTarget.queryParam(param.getKey(), value);
       }
     }
-    return webTarget.request(MediaType.APPLICATION_JSON)
-        .post(Entity.entity(toJson(payload, payloadClass),
-        MediaType.APPLICATION_JSON), Response.class);
+    Entity<String> entity = payload == null
+        ? null
+        : Entity.entity(toJson(payload, payloadClass) ,MediaType.APPLICATION_JSON);
+
+    return webTarget.request(MediaType.APPLICATION_JSON).post(entity, Response.class);
   }
 
   @Test
@@ -691,12 +693,4 @@ public void testNodeLabelPartitionInfo() throws Exception {
     assertNotNull(nodes.getPartitionInfo());
     assertNotNull(nodes.getPartitionInfo().getResourceAvailable());
   }
-
-  @SuppressWarnings("rawtypes")
-  private String toJson(Object obj, Class klass) throws Exception {
-    if (obj == null) {
-      return null;
-    }
-    return new Gson().toJson(obj, klass);
-  }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java

@@ -313,7 +313,7 @@ public void testNodesQueryStateNone() throws JSONException, Exception {
         response.getMediaType().toString());
     JSONObject json = responseToJson(response);
     assertEquals(1, json.length(), "incorrect number of elements");
-    assertEquals(new JSONObject().toString(), json.get("nodes").toString(), "nodes is not empty");
+    assertEquals("{}", json.get("nodes").toString(), "nodes is not empty");
   }
 
   @Test
@@ -442,7 +442,7 @@ public void testNodesQueryHealthyFalse() throws JSONException, Exception {
         response.getMediaType().toString());
     JSONObject json = responseToJson(response);
     assertEquals(1, json.length(), "incorrect number of elements");
-    assertEquals(new JSONObject().toString(), json.get("nodes").toString(), "nodes is not empty");
+    assertEquals("{}", json.get("nodes").toString(), "nodes is not empty");
   }
 
   public void testNodesHelper(String path, String media) throws JSONException,