Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19832 TestConfServlet#testWriteJson fails against hadoop3 due to spelling change

This commit is contained in:
tedyu 2018-01-22 10:47:12 -08:00
parent dc6e02e485
commit 5f62041cb1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hbase-http/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java
View File

@ -19,7 +19,9 @@ package org.apache.hadoop.hbase.http.conf;
import java.io.StringReader; import java.io.StringReader;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
@ -60,6 +62,9 @@ public class TestConfServlet extends TestCase {
ConfServlet.writeResponse(getTestConf(), sw, "json"); ConfServlet.writeResponse(getTestConf(), sw, "json");
String json = sw.toString(); String json = sw.toString();
boolean foundSetting = false; boolean foundSetting = false;
Set<String> programSet = new HashSet<>();
programSet.add("programatically");
programSet.add("programmatically");
Object parsed = JSON.parse(json); Object parsed = JSON.parse(json);
Object[] properties = ((Map<String, Object[]>)parsed).get("properties"); Object[] properties = ((Map<String, Object[]>)parsed).get("properties");
for (Object o : properties) { for (Object o : properties) {
@ -69,7 +74,7 @@ public class TestConfServlet extends TestCase {
String resource = (String)propertyInfo.get("resource"); String resource = (String)propertyInfo.get("resource");
System.err.println("k: " + key + " v: " + val + " r: " + resource); System.err.println("k: " + key + " v: " + val + " r: " + resource);
if (TEST_KEY.equals(key) && TEST_VAL.equals(val) if (TEST_KEY.equals(key) && TEST_VAL.equals(val)
&& "programatically".equals(resource)) { && programSet.contains(resource)) {
foundSetting = true; foundSetting = true;
} }
} }