litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move to solr 4 plus corrections to SparqlQueryExecutorTest with newlines and white space characters

Browse source
This commit is contained in:
hudajkhan 2014-04-25 13:54:42 -04:00
parent b642f30391
commit 120be1e6b8
122 changed files with 17422 additions and 5288 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/build.xml
View file

@ -420,7 +420,7 @@
</copy>
<!-- create an unpacked image of the Solr WAR, with our config options -->
<unwar src="${solr.template.dir}/apache-solr-3.6.2.war" dest="${solr.webapp.dir}" />
<unwar src="${solr.template.dir}/solr-4.7.2.war" dest="${solr.webapp.dir}" />
<copy todir="${solr.webapp.dir}/WEB-INF/classes">
<fileset dir="${appbase.dir}/config/solr/" />
</copy>

14
webapp/test/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java
View file

@ -40,12 +40,12 @@ public class SparqlQueryApiExecutorTest extends AbstractTestClass {
+ "| <http://here.edu/subject> | <http://here.edu/predicate> | <http://here.edu/object> |\n"
+ "| <http://here.edu/s2> | <http://here.edu/p2> | <http://here.edu/o2> |\n"
+ "--------------------------------------------------------------------------------------\n";
private static final String SELECT_RESULT_CSV = "s,p,o\r\n"
+ "http://here.edu/subject,http://here.edu/predicate,http://here.edu/object\r\n"
+ "http://here.edu/s2,http://here.edu/p2,http://here.edu/o2\r\n";
private static final String SELECT_RESULT_TSV = "s\tp\to\r\n"
+ "http://here.edu/subject\thttp://here.edu/predicate\thttp://here.edu/object\r\n"
+ "http://here.edu/s2\thttp://here.edu/p2\thttp://here.edu/o2\r\n";
private static final String SELECT_RESULT_CSV = "s,p,o\n"
+ "http://here.edu/subject,http://here.edu/predicate,http://here.edu/object\n"
+ "http://here.edu/s2,http://here.edu/p2,http://here.edu/o2\n";
private static final String SELECT_RESULT_TSV = "s\tp\to\n"
+ "http://here.edu/subject\thttp://here.edu/predicate\thttp://here.edu/object\n"
+ "http://here.edu/s2\thttp://here.edu/p2\thttp://here.edu/o2\n";
private static final String SELECT_RESULT_XML = "" //
+ "<?xml version=\"1.0\"?>\n" //
+ "<sparql xmlns=\"http://www.w3.org/2005/sparql-results#\">\n" //
@ -424,7 +424,7 @@ public class SparqlQueryApiExecutorTest extends AbstractTestClass {
rdfService, queryString, acceptHeader);
executor.executeAndFormat(out);
assertEquals(message, expected, out.toString());
assertEquals(message, expected, out.toString().replace("\r", ""));
}
private void executeWithInvalidAcceptHeader(String message,