diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java index 9c724cd..3ab460e 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java @@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.rest; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.StringWriter; +import java.net.SocketException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -48,6 +49,7 @@ import org.apache.hadoop.hbase.rest.model.TestNamespacesInstanceModel; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.http.NoHttpResponseException; import static org.junit.Assert.*; @@ -268,15 +270,24 @@ public class TestNamespacesInstanceResource { response = client.post(namespacePath1, Constants.MIMETYPE_JSON, toXML(model1)); assertEquals(500, response.getCode()); String jsonString = jsonMapper.writeValueAsString(model2); - response = client.put(namespacePath2, Constants.MIMETYPE_XML, Bytes.toBytes(jsonString)); - assertEquals(400, response.getCode()); + try { + response = client.put(namespacePath2, Constants.MIMETYPE_XML, Bytes.toBytes(jsonString)); + fail("expecting socket exception"); + } catch (NoHttpResponseException e) { + // expected exception + } catch (SocketException se) { + } + // Create namespace via XML and JSON. + response = client.post(namespacePath1, Constants.MIMETYPE_XML, toXML(model1)); + assertEquals(201, response.getCode()); + response = client.post(namespacePath3, Constants.MIMETYPE_PROTOBUF, toXML(model3)); assertEquals(500, response.getCode()); NamespaceDescriptor nd1 = findNamespace(admin, NAMESPACE1); NamespaceDescriptor nd2 = findNamespace(admin, NAMESPACE2); NamespaceDescriptor nd3 = findNamespace(admin, NAMESPACE3); - assertNull(nd1); + assertNotNull(nd1); assertNull(nd2); assertNull(nd3); }