You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2018/01/22 18:46:11 UTC
hbase git commit: HBASE-19832 TestConfServlet#testWriteJson fails
against hadoop3 due to spelling change
Repository: hbase
Updated Branches:
refs/heads/master 9a45e0a9d -> 3a1e433ad
HBASE-19832 TestConfServlet#testWriteJson fails against hadoop3 due to spelling change
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3a1e433a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3a1e433a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3a1e433a
Branch: refs/heads/master
Commit: 3a1e433adfd4d7961cc04811c460ff71fa750d22
Parents: 9a45e0a
Author: tedyu <yu...@gmail.com>
Authored: Mon Jan 22 10:46:00 2018 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Mon Jan 22 10:46:00 2018 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/http/conf/TestConfServlet.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3a1e433a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java
----------------------------------------------------------------------
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java
index 8bd1e6d..174d635 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java
@@ -19,7 +19,9 @@ package org.apache.hadoop.hbase.http.conf;
import java.io.StringReader;
import java.io.StringWriter;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -60,6 +62,9 @@ public class TestConfServlet extends TestCase {
ConfServlet.writeResponse(getTestConf(), sw, "json");
String json = sw.toString();
boolean foundSetting = false;
+ Set<String> programSet = new HashSet<>();
+ programSet.add("programatically");
+ programSet.add("programmatically");
Object parsed = JSON.parse(json);
Object[] properties = ((Map<String, Object[]>)parsed).get("properties");
for (Object o : properties) {
@@ -69,7 +74,7 @@ public class TestConfServlet extends TestCase {
String resource = (String)propertyInfo.get("resource");
System.err.println("k: " + key + " v: " + val + " r: " + resource);
if (TEST_KEY.equals(key) && TEST_VAL.equals(val)
- && "programatically".equals(resource)) {
+ && programSet.contains(resource)) {
foundSetting = true;
}
}