You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/09/26 17:05:52 UTC
[4/5] git commit: MARMOTTA-322: recovered integration tests for the
sparql endpoint
MARMOTTA-322: recovered integration tests for the sparql endpoint
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/5f0045d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/5f0045d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/5f0045d1
Branch: refs/heads/develop
Commit: 5f0045d1c39a1240256bff8e05ca8929c2240d9a
Parents: d1a4ab6
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Sep 26 16:47:13 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Sep 26 16:47:13 2013 +0200
----------------------------------------------------------------------
.../marmotta/platform/sparql/webservices/SparqlWebService.java | 3 +--
.../platform/sparql/webservices/SparqlWebServiceTest.java | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f0045d1/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
index 614868b..48e6e4c 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
@@ -219,8 +219,7 @@ public class SparqlWebService {
* @param request
* @return
*/
- private Response select(String query, String resultType,
- HttpServletRequest request) {
+ private Response select(String query, String resultType, HttpServletRequest request) {
try {
String acceptHeader = StringUtils.defaultString(request.getHeader("Accept"), "");
if (StringUtils.isBlank(query)) { //empty query
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f0045d1/platform/marmotta-sparql/src/test/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebServiceTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebServiceTest.java b/platform/marmotta-sparql/src/test/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebServiceTest.java
index 4f4d3f5..8d0486c 100644
--- a/platform/marmotta-sparql/src/test/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebServiceTest.java
+++ b/platform/marmotta-sparql/src/test/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebServiceTest.java
@@ -104,12 +104,12 @@ public class SparqlWebServiceTest {
get("/sparql/select");
}
- /*
@Test
public void testConstruct() throws IOException, InterruptedException {
expect().
log().ifError().
statusCode(200).
+ contentType("application/rdf+xml").
given().
param("query", "CONSTRUCT { <http://www.wikier.org/foaf#wikier> ?p ?o } WHERE { <http://www.wikier.org/foaf#wikier> ?p ?o }").
when().
@@ -137,7 +137,7 @@ public class SparqlWebServiceTest {
contentType("text/turtle").
given().
header("Accept", "plain/text").
- param("query", "CONSTRUCT { <http://www.wikier.org/foaf#wikier> ?p ?o } WHERE { <http://www.wikier.org/foaf#wikier> ?p ?o }").
+ param("query", "CONSTRUCT { <http://www.wikier.org/foaf#wikier2> ?p ?o } WHERE { <http://www.wikier.org/foaf#wikier> ?p ?o }").
when().
get("/sparql/select");
}
@@ -147,6 +147,7 @@ public class SparqlWebServiceTest {
expect().
log().ifError().
statusCode(200).
+ contentType("application/rdf+xml").
given().
param("query", "DESCRIBE <http://www.wikier.org/foaf#wikier>").
when().
@@ -178,6 +179,5 @@ public class SparqlWebServiceTest {
when().
get("/sparql/select");
}
- */
}