SolrQueryTest doesn't work with vivo, setting to @Ignore
This commit is contained in:
Brian Caruso
parent
45baa8633c
commit
a31e464a3c
3 changed files with 145 additions and 34 deletions
|
|
@ -26,6 +26,7 @@ import org.apache.solr.common.SolrInputDocument;
|
||||||
import org.apache.solr.core.CoreContainer;
|
import org.apache.solr.core.CoreContainer;
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
import org.junit.Ignore;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.rules.TemporaryFolder;
|
import org.junit.rules.TemporaryFolder;
|
||||||
import org.xml.sax.SAXException;
|
import org.xml.sax.SAXException;
|
||||||
|
|
@ -60,6 +61,9 @@ import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.IndividualT
|
||||||
* All RDF/XML files in webapp/test/testontologies/SolrQueryTestRDF will be
|
* All RDF/XML files in webapp/test/testontologies/SolrQueryTestRDF will be
|
||||||
* loaded into the model.
|
* loaded into the model.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
//ignored for now since the solr directory isn't yet found when running from vivo.
|
||||||
|
@Ignore
|
||||||
public class SolrQueryTest extends AbstractTestClass {
|
public class SolrQueryTest extends AbstractTestClass {
|
||||||
/** Key of system property for build directory. */
|
/** Key of system property for build directory. */
|
||||||
final static String buildDirSystemPropertyKey = "vitro.build.dir";
|
final static String buildDirSystemPropertyKey = "vitro.build.dir";
|
||||||
|
|
@ -155,9 +159,19 @@ public class SolrQueryTest extends AbstractTestClass {
|
||||||
InputStream in = FileManager.get().open( file.getAbsolutePath() );
|
InputStream in = FileManager.get().open( file.getAbsolutePath() );
|
||||||
assertNotNull("Could not load file " + file.getAbsolutePath(), in );
|
assertNotNull("Could not load file " + file.getAbsolutePath(), in );
|
||||||
try{
|
try{
|
||||||
model.read(in,null);
|
if( file.getName().endsWith(".rdf") ){
|
||||||
|
model.read(in,null);
|
||||||
|
}else if( file.getName().endsWith(".n3")){
|
||||||
|
model.read(in,null,"N3");
|
||||||
|
}else if( file.getName().endsWith(".nt")){
|
||||||
|
model.read(in,null,"N-TRIPLE");
|
||||||
|
}else if( file.getName().endsWith(".ttl")){
|
||||||
|
model.read(in,null,"TURTLE");
|
||||||
|
}else{
|
||||||
|
throw new Exception("Format unknown for file name " + file.getName());
|
||||||
|
}
|
||||||
}catch(Throwable th){
|
}catch(Throwable th){
|
||||||
throw new Exception( "Could not load RDF/XML file "
|
throw new Exception( "Could not load RDF file "
|
||||||
+ file.getAbsolutePath() , th);
|
+ file.getAbsolutePath() , th);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -255,6 +269,36 @@ public class SolrQueryTest extends AbstractTestClass {
|
||||||
return uris;
|
return uris;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test that a document with the given URIs are in the results for the query.
|
||||||
|
* @throws SolrServerException */
|
||||||
|
void testQueryGetsDocs(String errmsg, SolrQuery query, String[] expectedUris) throws SolrServerException{
|
||||||
|
assertNotNull(errmsg + " but query was null", query);
|
||||||
|
assertNotNull(errmsg + " but expected URIs was null", expectedUris );
|
||||||
|
|
||||||
|
QueryResponse resp = solr.query(query);
|
||||||
|
if( resp == null )
|
||||||
|
fail( errmsg + " but Could not get a solr response");
|
||||||
|
|
||||||
|
Set<String> uris = new HashSet<String>(Arrays.asList( expectedUris ));
|
||||||
|
for( SolrDocument doc : resp.getResults()){
|
||||||
|
assertNotNull(errmsg + ": solr doc was null", doc);
|
||||||
|
String uri = (String) doc.getFirstValue( VitroSearchTermNames.URI );
|
||||||
|
assertNotNull(errmsg+": no URI field in solr doc" , uri);
|
||||||
|
uris.remove( uri );
|
||||||
|
}
|
||||||
|
if( uris.size() > 0){
|
||||||
|
String errorMsg =
|
||||||
|
"\nThe query '"+ query + "' was expected " +
|
||||||
|
"to return the following URIs but did not:";
|
||||||
|
for( String uri : uris){
|
||||||
|
errorMsg= errorMsg+"\n" + uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
fail( errmsg + errorMsg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testSolrWasStarted() throws SolrServerException, IOException {
|
public void testSolrWasStarted() throws SolrServerException, IOException {
|
||||||
assertNotNull( solr );
|
assertNotNull( solr );
|
||||||
|
|
@ -271,35 +315,12 @@ public class SolrQueryTest extends AbstractTestClass {
|
||||||
query,new String[]{ "http://vivo.cornell.edu/individual/individual22972" } ) ;
|
query,new String[]{ "http://vivo.cornell.edu/individual/individual22972" } ) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFormFeed() throws SolrServerException{
|
||||||
|
/* make sure that we have the document in the index before we do anything */
|
||||||
|
SolrQuery query = new SolrQuery().setQuery("vivo15");
|
||||||
|
|
||||||
|
testQueryGetsDocs("Expect to find a doc when searching for 'vivo15'",
|
||||||
/**
|
query,new String[]{ "http://vivo.cornell.edu/individual/individualIssueVivo15" } ) ;
|
||||||
* Test that a document with the given URIs are in the results for the query.
|
|
||||||
* @throws SolrServerException */
|
|
||||||
void testQueryGetsDocs(String errmsg, SolrQuery query, String[] expectedUris) throws SolrServerException{
|
|
||||||
assertNotNull(errmsg + " but query was null", query);
|
|
||||||
assertNotNull(errmsg + " but expected URIs was null", expectedUris );
|
|
||||||
|
|
||||||
QueryResponse resp = solr.query(query);
|
|
||||||
if( resp == null )
|
|
||||||
fail( errmsg + " but Could not get a solr response");
|
|
||||||
|
|
||||||
Set<String> uris = new HashSet<String>(Arrays.asList( expectedUris ));
|
|
||||||
for( SolrDocument doc : resp.getResults()){
|
|
||||||
assertNotNull(errmsg + ": solr doc was null", doc);
|
|
||||||
String uri = (String) doc.getFirstValue( VitroSearchTermNames.URI );
|
|
||||||
assertNotNull(errmsg+": no URI field in solr doc" , uri);
|
|
||||||
uris.remove( uri );
|
|
||||||
}
|
|
||||||
if( uris.size() > 0){
|
|
||||||
String errorMsg =
|
|
||||||
"\nThe query '"+ query + "' was expected " +
|
|
||||||
"to return the following URIs but did not:";
|
|
||||||
for( String uri : uris){
|
|
||||||
errorMsg= errorMsg+"\n" + uri;
|
|
||||||
}
|
|
||||||
|
|
||||||
fail( errmsg + errorMsg);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
45
webapp/test/testontologies/SolrQueryTestRDF/vivo15.2.n3
Normal file
45
webapp/test/testontologies/SolrQueryTestRDF/vivo15.2.n3
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
@prefix sce: <http://vivoweb.org/ontology/SchoolOfContinuingEducation#>.
|
||||||
|
@prefix dcterms: <http://purl.org/dc/terms/>.
|
||||||
|
@prefix local: <http://vivo.cornell.edu/ontology/local#>.
|
||||||
|
@prefix skos: <http://www.w3.org/2004/02/skos/core#>.
|
||||||
|
@prefix foaf: <http://xmlns.com/foaf/0.1/>.
|
||||||
|
@prefix pubmed: <http://vitro.mannlib.cornell.edu/ns/pubmed#>.
|
||||||
|
@prefix vitro-public: <http://vitro.mannlib.cornell.edu/ns/vitro/public#>.
|
||||||
|
@prefix bibo: <http://purl.org/ontology/bibo/>.
|
||||||
|
@prefix owl: <http://www.w3.org/2002/07/owl#>.
|
||||||
|
@prefix hr: <http://vivo.cornell.edu/ns/hr/0.9/hr.owl#>.
|
||||||
|
@prefix cce: <http://vivoweb.org/ontology/cornell-cooperative-extension#>.
|
||||||
|
@prefix vivo: <http://vivoweb.org/ontology/core#>.
|
||||||
|
@prefix aktp: <http://www.aktors.org/ontology/portal#>.
|
||||||
|
@prefix scires: <http://vivoweb.org/ontology/scientific-research#>.
|
||||||
|
@prefix dcelem: <http://purl.org/dc/elements/1.1/>.
|
||||||
|
@prefix vivoc: <http://vivo.library.cornell.edu/ns/0.1#>.
|
||||||
|
@prefix stars: <http://vitro.mannlib.cornell.edu/ns/cornell/stars/classes#>.
|
||||||
|
@prefix far: <http://vitro.mannlib.cornell.edu/ns/reporting#>.
|
||||||
|
@prefix pvs: <http://vivoweb.org/ontology/provenance-support#>.
|
||||||
|
@prefix acti: <http://vivoweb.org/ontology/activity-insight#>.
|
||||||
|
@prefix mann: <http://vivo.cornell.edu/ns/mannadditions/0.1#>.
|
||||||
|
@prefix event: <http://purl.org/NET/c4dm/event.owl#>.
|
||||||
|
@prefix aka: <http://vivoweb.org/ontology/aka#>.
|
||||||
|
@prefix geo: <http://aims.fao.org/aos/geopolitical.owl#>.
|
||||||
|
@prefix ero: <http://purl.obolibrary.org/obo/>.
|
||||||
|
@prefix fabio: <http://purl.org/spar/fabio/>.
|
||||||
|
@prefix rdfsyn: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
|
||||||
|
@prefix socsci: <http://vivo.library.cornell.edu/ns/vivo/socsci/0.1#>.
|
||||||
|
@prefix j.0: <http://vivoweb.org/ontology/newhr#>.
|
||||||
|
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
|
||||||
|
@prefix ospcu: <http://vivoweb.org/ontology/cu-vivo-osp#>.
|
||||||
|
@prefix c4o: <http://purl.org/spar/c4o/>.
|
||||||
|
@prefix vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>.
|
||||||
|
|
||||||
|
<http://vivo.cornell.edu/individual/individualIssueVivo15> vivo:overview "There is a form feed in the following text. Hex 0c, that sometimes displays as ^L. Star Award for excellence in scientic publication and for productive collaborations with other Center scientists, U.S. Department of the Interior, 2009. Publications Award for scientist at Florida Integrated Science Center with highest annual scien-tic productivity as measured by number, quality, and impact of publications., U.S. Department of the Interior, 2009.";
|
||||||
|
vivo:webpage <https://jira.duraspace.org/browse/VIVO-15>;
|
||||||
|
a mann:CornellNonAcademicStaff,
|
||||||
|
local:InternalThing,
|
||||||
|
vivoc:CornellAffiliatedPerson,
|
||||||
|
vivoc:CornellEmployee,
|
||||||
|
vivo:NonAcademic,
|
||||||
|
owl:Thing,
|
||||||
|
foaf:Agent,
|
||||||
|
foaf:Person;
|
||||||
|
rdfs:label "Test individual for issue vivo15".
|
||||||
45
webapp/test/testontologies/SolrQueryTestRDF/vivo15.n3
Normal file
45
webapp/test/testontologies/SolrQueryTestRDF/vivo15.n3
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
@prefix sce: <http://vivoweb.org/ontology/SchoolOfContinuingEducation#>.
|
||||||
|
@prefix dcterms: <http://purl.org/dc/terms/>.
|
||||||
|
@prefix local: <http://vivo.cornell.edu/ontology/local#>.
|
||||||
|
@prefix skos: <http://www.w3.org/2004/02/skos/core#>.
|
||||||
|
@prefix foaf: <http://xmlns.com/foaf/0.1/>.
|
||||||
|
@prefix pubmed: <http://vitro.mannlib.cornell.edu/ns/pubmed#>.
|
||||||
|
@prefix vitro-public: <http://vitro.mannlib.cornell.edu/ns/vitro/public#>.
|
||||||
|
@prefix bibo: <http://purl.org/ontology/bibo/>.
|
||||||
|
@prefix owl: <http://www.w3.org/2002/07/owl#>.
|
||||||
|
@prefix hr: <http://vivo.cornell.edu/ns/hr/0.9/hr.owl#>.
|
||||||
|
@prefix cce: <http://vivoweb.org/ontology/cornell-cooperative-extension#>.
|
||||||
|
@prefix vivo: <http://vivoweb.org/ontology/core#>.
|
||||||
|
@prefix aktp: <http://www.aktors.org/ontology/portal#>.
|
||||||
|
@prefix scires: <http://vivoweb.org/ontology/scientific-research#>.
|
||||||
|
@prefix dcelem: <http://purl.org/dc/elements/1.1/>.
|
||||||
|
@prefix vivoc: <http://vivo.library.cornell.edu/ns/0.1#>.
|
||||||
|
@prefix stars: <http://vitro.mannlib.cornell.edu/ns/cornell/stars/classes#>.
|
||||||
|
@prefix far: <http://vitro.mannlib.cornell.edu/ns/reporting#>.
|
||||||
|
@prefix pvs: <http://vivoweb.org/ontology/provenance-support#>.
|
||||||
|
@prefix acti: <http://vivoweb.org/ontology/activity-insight#>.
|
||||||
|
@prefix mann: <http://vivo.cornell.edu/ns/mannadditions/0.1#>.
|
||||||
|
@prefix event: <http://purl.org/NET/c4dm/event.owl#>.
|
||||||
|
@prefix aka: <http://vivoweb.org/ontology/aka#>.
|
||||||
|
@prefix geo: <http://aims.fao.org/aos/geopolitical.owl#>.
|
||||||
|
@prefix ero: <http://purl.obolibrary.org/obo/>.
|
||||||
|
@prefix fabio: <http://purl.org/spar/fabio/>.
|
||||||
|
@prefix rdfsyn: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
|
||||||
|
@prefix socsci: <http://vivo.library.cornell.edu/ns/vivo/socsci/0.1#>.
|
||||||
|
@prefix j.0: <http://vivoweb.org/ontology/newhr#>.
|
||||||
|
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
|
||||||
|
@prefix ospcu: <http://vivoweb.org/ontology/cu-vivo-osp#>.
|
||||||
|
@prefix c4o: <http://purl.org/spar/c4o/>.
|
||||||
|
@prefix vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>.
|
||||||
|
|
||||||
|
<http://vivo.cornell.edu/individual/individualIssueVivo15> vivo:overview "There is a form feed in the following text. Hex 0c, that sometimes displays as ^L. Star Award for excellence in scienti c publication and for productive collaborations with other Center scientists, U.S. Department of the Interior, 2009. Publications Award for scientist at Florida Integrated Science Center with highest annual scien-ti c productivity as measured by number, quality, and impact of publications., U.S. Department of the Interior, 2009.";
|
||||||
|
vivo:webpage <https://jira.duraspace.org/browse/VIVO-15>;
|
||||||
|
a mann:CornellNonAcademicStaff,
|
||||||
|
local:InternalThing,
|
||||||
|
vivoc:CornellAffiliatedPerson,
|
||||||
|
vivoc:CornellEmployee,
|
||||||
|
vivo:NonAcademic,
|
||||||
|
owl:Thing,
|
||||||
|
foaf:Agent,
|
||||||
|
foaf:Person;
|
||||||
|
rdfs:label "Test individual for issue vivo15".
|
||||||
Loading…
Add table
Reference in a new issue