You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/06/30 18:52:23 UTC
svn commit: r1498152 - in
/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki:
TS_Fuseki.java TestProtocol.java TestSPARQLProtocol.java TestUpdate.java
WebTest.java http/TestDatasetAccessorHTTP.java
Author: andy
Date: Sun Jun 30 16:52:22 2013
New Revision: 1498152
URL: http://svn.apache.org/r1498152
Log:
more protocol level tests
Added:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestSPARQLProtocol.java
- copied, changed from r1498146, jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestProtocol.java
Removed:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestProtocol.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestUpdate.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java
Modified:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java?rev=1498152&r1=1498151&r2=1498152&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java Sun Jun 30 16:52:22 2013
@@ -21,6 +21,7 @@ package org.apache.jena.fuseki;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.fuseki.http.TestDatasetAccessorHTTP ;
import org.apache.jena.fuseki.http.TestDatasetGraphAccessorHTTP ;
+import org.apache.jena.fuseki.http.TestHttpOp ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
@@ -29,10 +30,10 @@ import org.junit.runners.Suite ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
- TestProtocol.class
+ TestHttpOp.class
+ , TestSPARQLProtocol.class
, TestDatasetGraphAccessorHTTP.class
, TestDatasetAccessorHTTP.class
- , TestUpdate.class
, TestQuery.class
, TestAuth.class
})
Copied: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestSPARQLProtocol.java (from r1498146, jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestProtocol.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestSPARQLProtocol.java?p2=jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestSPARQLProtocol.java&p1=jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestProtocol.java&r1=1498146&r2=1498152&rev=1498152&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestProtocol.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestSPARQLProtocol.java Sun Jun 30 16:52:22 2013
@@ -18,19 +18,26 @@
package org.apache.jena.fuseki;
+import static org.apache.jena.fuseki.ServerTest.* ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.WebContent ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
-import com.hp.hpl.jena.query.DatasetAccessor ;
-import com.hp.hpl.jena.query.DatasetAccessorFactory ;
+import com.hp.hpl.jena.query.* ;
+import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP ;
import com.hp.hpl.jena.sparql.util.Convert ;
-
-// Generally poke the server.
+import com.hp.hpl.jena.update.UpdateExecutionFactory ;
+import com.hp.hpl.jena.update.UpdateFactory ;
+import com.hp.hpl.jena.update.UpdateProcessor ;
+import com.hp.hpl.jena.update.UpdateRequest ;
+// Generally poke the server using Jena APIs
// SPARQL Query
// SPARQL Update
// GSP is done in TestDatasetAccessorHTTP
-public class TestProtocol extends ServerTest
+
+public class TestSPARQLProtocol extends BaseTest
{
@BeforeClass public static void beforeClass()
{
@@ -53,18 +60,36 @@ public class TestProtocol extends Server
return base+"?query="+Convert.encWWWForm(queryString) ;
}
- @Test public void protocol_01()
+ @Test public void query_01()
{
- // TODO
- String url = null ;
- String mimeType = null ;
- execGet(url, mimeType) ;
+ Query query = QueryFactory.create("SELECT * { ?s ?p ?o }") ;
+ QueryExecution qexec = QueryExecutionFactory.sparqlService(serviceQuery, query) ;
+ ResultSet rs = qexec.execSelect() ;
+ int x = ResultSetFormatter.consume(rs) ;
+ assertTrue( x != 0 ) ;
}
- private void execGet(String url, String mimeType)
- {}
-
- private void execPost(String url, String mimeType, String content)
- {}
+ @Test public void query_02()
+ {
+ Query query = QueryFactory.create("SELECT * { ?s ?p ?o }") ;
+ QueryEngineHTTP engine = QueryExecutionFactory.createServiceRequest(serviceQuery, query) ;
+ engine.setSelectContentType(WebContent.contentTypeResultsJSON) ;
+ ResultSet rs = engine.execSelect() ;
+ int x = ResultSetFormatter.consume(rs) ;
+ assertTrue( x != 0 ) ;
+ }
+ @Test public void update_01()
+ {
+ UpdateRequest update = UpdateFactory.create("INSERT DATA {}") ;
+ UpdateProcessor proc = UpdateExecutionFactory.createRemote(update, serviceUpdate) ;
+ proc.execute() ;
+ }
+
+ @Test public void update_02()
+ {
+ UpdateRequest update = UpdateFactory.create("INSERT DATA {}") ;
+ UpdateProcessor proc = UpdateExecutionFactory.createRemoteForm(update, serviceUpdate) ;
+ proc.execute() ;
+ }
}
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java?rev=1498152&r1=1498151&r2=1498152&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java Sun Jun 30 16:52:22 2013
@@ -20,8 +20,10 @@ package org.apache.jena.fuseki.http;
import static org.apache.jena.fuseki.ServerTest.* ;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.web.HttpException ;
import org.apache.jena.fuseki.ServerTest ;
-import org.apache.jena.fuseki.WebTest ;
+import org.apache.jena.riot.web.HttpOp ;
+import org.apache.jena.web.HttpSC ;
import org.junit.AfterClass ;
import org.junit.Before ;
import org.junit.BeforeClass ;
@@ -45,25 +47,41 @@ public class TestDatasetAccessorHTTP ext
@AfterClass public static void afterClass() { ServerTest.freeServer() ; }
@Before public void before() { ServerTest.resetServer() ; }
- @Test public void test_ds_1()
+ @Test(expected=HttpException.class)
+ public void test_ds_1()
{
// Can't GET the dataset service.
- WebTest.exec_get(serviceREST, 400, 404) ;
- }
-
- @Test public void test_ds_2()
- {
- // Random other URI
- WebTest.exec_get(datasetURI_not_1, 404) ;
- }
-
- @Test public void test_ds_3()
- {
- // Longer path URI.
- WebTest.exec_get(datasetURI_not_2, 404) ;
+ try {
+ HttpOp.execHttpGet(serviceREST) ;
+ } catch (HttpException ex) {
+ assertTrue(HttpSC.isClientError(ex.getResponseCode())) ;
+ throw ex ;
+ }
+ }
+
+ @Test(expected=HttpException.class)
+ public void test_ds_2()
+ {
+ try {
+ HttpOp.execHttpGet(datasetURI_not_1) ;
+ } catch (HttpException ex) {
+ assertEquals(HttpSC.NOT_FOUND_404, ex.getResponseCode()) ;
+ throw ex ;
+ }
+ }
+
+ @Test(expected=HttpException.class)
+ public void test_ds_3()
+ {
+ try {
+ HttpOp.execHttpGet(datasetURI_not_2) ;
+ } catch (HttpException ex) {
+ assertEquals(HttpSC.NOT_FOUND_404, ex.getResponseCode()) ;
+ throw ex ;
+ }
}
- @Test //(expected=FusekiNotFoundException.class)
+ @Test
public void test_404_1()
{
// Not the right service.
@@ -72,7 +90,7 @@ public class TestDatasetAccessorHTTP ext
assertNull(graph) ;
}
- @Test //(expected=FusekiNotFoundException.class)
+ @Test
public void test_404_2()
{
DatasetAccessor du = DatasetAccessorFactory.createHTTP(datasetURI_not_2) ;