Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-13657: fix unsupported xpath test in TestXPathRecordReader 

* use expectThrows to verify the exception and the message
* fix NPE in the test
This commit is contained in:
Munendra S N 2019-07-29 22:17:40 +05:30
parent b8289abeeb
commit 1d303cee7f
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java
View File

@ -360,19 +360,13 @@ public class TestXPathRecordReader extends AbstractDataImportHandlerTestCase {
}
@Test
public void testUnsupported_Xpaths() {
String xml = "<root><b><a x=\"a/b\" h=\"hello-A\"/> </b></root>";
XPathRecordReader rr=null;
try {
rr = new XPathRecordReader("//b");
fail("A RuntimeException was expected: //b forEach cannot begin with '//'.");
}
catch (RuntimeException ex) { }
try {
rr.addField("bold" ,"b", false);
fail("A RuntimeException was expected: 'b' xpaths must begin with '/'.");
}
catch (RuntimeException ex) { }
public void testUnsupportedXPaths() {
RuntimeException ex = expectThrows(RuntimeException.class, () -> new XPathRecordReader("//b"));
assertEquals("forEach cannot start with '//': //b", ex.getMessage());
XPathRecordReader rr = new XPathRecordReader("/anyd/contenido");
ex = expectThrows(RuntimeException.class, () -> rr.addField("bold", "b", false));
assertEquals("xpath must start with '/' : b", ex.getMessage());
}
@Test
@ -590,9 +584,7 @@ public class TestXPathRecordReader extends AbstractDataImportHandlerTestCase {
XPathRecordReader rr = new XPathRecordReader("/root/node");
rr.addField("id", "/root/node/id", true);
rr.addField("desc", "/root/node/desc", true);
try {
rr.getAllRecords(new StringReader(malformedXml));
fail("A RuntimeException was expected: the input XML is invalid.");
} catch (Exception e) { }
RuntimeException e = expectThrows(RuntimeException.class, () -> rr.getAllRecords(new StringReader(malformedXml)));
assertTrue(e.getMessage().contains("Unexpected close tag </id>"));
}
}