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

HBASE-19020 HBase Rest test for xml parsing external entities should not rely on implementation of java XML APIs. 

Signed-off-by: Chia-Ping Tsai <chia7712@gmail.com>
This commit is contained in:
Sean Busbey 2017-10-16 16:11:39 -05:00
parent 7a66685801
commit 12f9398038
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestXmlParsing.java
View File

@ -23,7 +23,10 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import java.io.IOException; import java.io.IOException;
import javax.xml.bind.UnmarshalException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.rest.Constants; import org.apache.hadoop.hbase.rest.Constants;
import org.apache.hadoop.hbase.rest.model.StorageClusterVersionModel; import org.apache.hadoop.hbase.rest.model.StorageClusterVersionModel;
@ -37,6 +40,7 @@ import org.junit.experimental.categories.Category;
*/ */
@Category(SmallTests.class) @Category(SmallTests.class)
public class TestXmlParsing { public class TestXmlParsing {
private static final Log LOG = LogFactory.getLog(TestXmlParsing.class);
@Test @Test
public void testParsingClusterVersion() throws Exception { public void testParsingClusterVersion() throws Exception {
@ -68,8 +72,12 @@ public class TestXmlParsing {
admin.getClusterVersion(); admin.getClusterVersion();
fail("Expected getClusterVersion() to throw an exception"); fail("Expected getClusterVersion() to throw an exception");
} catch (IOException e) { } catch (IOException e) {
assertEquals("Cause of exception ought to be a failure to parse the stream due to our " +
"invalid external entity. Make sure this isn't just a false positive due to " +
"implementation. see HBASE-19020.", UnmarshalException.class, e.getCause().getClass());
final String exceptionText = StringUtils.stringifyException(e); final String exceptionText = StringUtils.stringifyException(e);
final String expectedText = "The entity \"xee\" was referenced, but not declared."; final String expectedText = "\"xee\"";
LOG.debug("exception text: '" + exceptionText + "'", e);
assertTrue("Exception does not contain expected text", exceptionText.contains(expectedText)); assertTrue("Exception does not contain expected text", exceptionText.contains(expectedText));
} }
} }