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 12:42:14 UTC
svn commit: r1498086 - in /jena/trunk: jena-fuseki/
jena-fuseki/src/main/java/org/apache/jena/fuseki/
jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/
jena-fuseki/src/test/java/org/apache/jena/fuseki/
jena-fuseki/src/test/java/org/apache/jena...
Author: andy
Date: Sun Jun 30 10:42:14 2013
New Revision: 1498086
URL: http://svn.apache.org/r1498086
Log:
Align to changes in ARQ.
Added:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java
Removed:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/BaseTest.java
Modified:
jena/trunk/jena-fuseki/pom.xml
jena/trunk/jena-fuseki/soh
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/BaseServerTest.java
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/TestProtocol.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphAccessorTDB.java
Modified: jena/trunk/jena-fuseki/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/pom.xml?rev=1498086&r1=1498085&r2=1498086&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/pom.xml (original)
+++ jena/trunk/jena-fuseki/pom.xml Sun Jun 30 10:42:14 2013
@@ -74,7 +74,8 @@
<assembly.soh.name>${this.root}</assembly.soh.name>
<assembly.zip.name>${this.root}</assembly.zip.name>
- <ver.jetty>8.1.8.v20121106</ver.jetty> <!-- Has stray print "Null identity service..." -->
+ <ver.jetty>8.1.11.v20130520</ver.jetty>
+ <!--<ver.jetty>8.1.8.v20121106</ver.jetty> < ! - - Has stray print "Null identity service..." -->
<!-- <ver.jetty>8.1.7.v20120910</ver.jetty> -->
<ver.velocity>1.7</ver.velocity>
Modified: jena/trunk/jena-fuseki/soh
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/soh?rev=1498086&r1=1498085&r2=1498086&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/soh (original)
+++ jena/trunk/jena-fuseki/soh Sun Jun 30 10:42:14 2013
@@ -110,16 +110,13 @@ $accept_charset=nil
## soh query .....
$cmd = File.basename($0)
+$cmd = (ARGV.size == 0) ? 'soh' : ARGV.shift
+
if ! $cmd.start_with?('s-')
# If you don't have start_with? ...
# if ! $cmd.match(/^s-/)
# "soh query ..."
- if ARGV.size == 0
- $cmd = 'soh'
- else
- $cmd = ARGV.shift
- $cmd = 's-'+$cmd
- end
+ $cmd = 's-'+$cmd
end
## --------
@@ -378,8 +375,12 @@ def cmd_soh(command=nil)
requiredFile=false
when "PUT", "POST"
requiredFile=true
+ when "QUERY"
+ cmd_sparql_query
+ when "UPDATE"
+ cmd_sparql_update
else
- warn_exit "Unknown command: #{cmdPrint}", 2
+ warn_exit "Unknown command: #{command}", 2
end
if requiredFile
@@ -680,7 +681,6 @@ end
## -------
-
case $cmd
when "s-http", "sparql-http", "soh"
$banner="#{$cmd} [get|post|put|delete] datasetURI graph [file]"
@@ -703,5 +703,5 @@ when "s-update", "sparql-update"
when "s-update-form", "sparql-update-form"
cmd_sparql_update false
else
- warn_exit "Unknown: "+$0, 1
+ warn_exit "Unknown: "+$cmd, 1
end
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java?rev=1498086&r1=1498085&r2=1498086&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java Sun Jun 30 10:42:14 2013
@@ -29,6 +29,7 @@ import org.apache.jena.atlas.web.MediaTy
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.util.Convert ;
@@ -111,6 +112,7 @@ public class FusekiLib
// Do the addition directly on the dataset
public static void addDataInto(Graph data, DatasetGraph dsg, Node graphName)
{
+ //Prefixes?
if ( graphName == null )
graphName = Quad.defaultGraphNodeGenerated ;
@@ -120,8 +122,9 @@ public class FusekiLib
Triple t = iter.next();
dsg.add(graphName, t.getSubject(), t.getPredicate(), t.getObject()) ;
}
+
+ PrefixMapping pmapSrc = data.getPrefixMapping() ;
+ PrefixMapping pmapDest = dsg.getDefaultGraph().getPrefixMapping() ;
+ pmapDest.withDefaultMappings(pmapSrc) ;
}
-
-
-
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1498086&r1=1498085&r2=1498086&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java Sun Jun 30 10:42:14 2013
@@ -372,7 +372,7 @@ public abstract class SPARQL_Query exten
private String getRemoteString(String queryURI)
{
- return HttpOp.execHttpGet(queryURI, null) ;
+ return HttpOp.execHttpGetString(queryURI) ;
}
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1498086&r1=1498085&r2=1498086&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Sun Jun 30 10:42:14 2013
@@ -347,7 +347,7 @@ public abstract class SPARQL_REST extend
errorBadRequest("No content type: "+contentTypeHeader) ;
// lang = Lang.guess(action.request.getRequestURI()) ;
- ContentType ct = ContentType.parse(contentTypeHeader) ;
+ ContentType ct = ContentType.create(contentTypeHeader) ;
String base = wholeRequestURL(action.request) ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1498086&r1=1498085&r2=1498086&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java Sun Jun 30 10:42:14 2013
@@ -177,7 +177,7 @@ public class SPARQL_Upload extends SPARQ
errorBadRequest("No name for content - can't determine RDF syntax") ;
String contentTypeHeader = item.getContentType() ;
- ct = ContentType.parse(contentTypeHeader) ;
+ ct = ContentType.create(contentTypeHeader) ;
lang = WebContent.contentTypeToLang(ct.getContentType()) ;
if ( lang == null )
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/BaseServerTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/BaseServerTest.java?rev=1498086&r1=1498085&r2=1498086&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/BaseServerTest.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/BaseServerTest.java Sun Jun 30 10:42:14 2013
@@ -18,6 +18,8 @@
package org.apache.jena.fuseki;
+import org.apache.jena.atlas.junit.BaseTest ;
+
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.NodeFactory ;
@@ -28,22 +30,23 @@ import com.hp.hpl.jena.sparql.sse.SSE ;
public class BaseServerTest extends BaseTest
{
public static final int port = 3535 ;
+ public static final String urlRoot = "http://localhost:"+ServerTest.port+"/" ;
public static final String datasetPath = "/dataset" ;
public static final String serviceUpdate = "http://localhost:"+ServerTest.port+datasetPath+"/update" ;
public static final String serviceQuery = "http://localhost:"+ServerTest.port+datasetPath+"/query" ;
public static final String serviceREST = "http://localhost:"+ServerTest.port+datasetPath+"/data" ; // ??????
- protected static final String gn1 = "http://graph/1" ;
- protected static final String gn2 = "http://graph/2" ;
- protected static final String gn99 = "http://graph/99" ;
+ public static final String gn1 = "http://graph/1" ;
+ public static final String gn2 = "http://graph/2" ;
+ public static final String gn99 = "http://graph/99" ;
- protected static final Node n1 = NodeFactory.createURI("http://graph/1") ;
- protected static final Node n2 = NodeFactory.createURI("http://graph/2") ;
- protected static final Node n99 = NodeFactory.createURI("http://graph/99") ;
+ public static final Node n1 = NodeFactory.createURI("http://graph/1") ;
+ public static final Node n2 = NodeFactory.createURI("http://graph/2") ;
+ public static final Node n99 = NodeFactory.createURI("http://graph/99") ;
- protected static final Graph graph1 = SSE.parseGraph("(base <http://example/> (graph (<x> <p> 1)))") ;
- protected static final Graph graph2 = SSE.parseGraph("(base <http://example/> (graph (<x> <p> 2)))") ;
+ public static final Graph graph1 = SSE.parseGraph("(base <http://example/> (graph (<x> <p> 1)))") ;
+ public static final Graph graph2 = SSE.parseGraph("(base <http://example/> (graph (<x> <p> 2)))") ;
- protected static final Model model1 = ModelFactory.createModelForGraph(graph1) ;
- protected static final Model model2 = ModelFactory.createModelForGraph(graph2) ;
+ public static final Model model1 = ModelFactory.createModelForGraph(graph1) ;
+ public static final Model model2 = ModelFactory.createModelForGraph(graph2) ;
}
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=1498086&r1=1498085&r2=1498086&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 10:42:14 2013
@@ -21,7 +21,6 @@ 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.web.TestDatasetGraphAccessorMem ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
@@ -31,7 +30,6 @@ import org.junit.runners.Suite ;
@RunWith(Suite.class)
@Suite.SuiteClasses( {
TestProtocol.class
- , TestDatasetGraphAccessorMem.class
, TestDatasetGraphAccessorHTTP.class
, TestDatasetAccessorHTTP.class
, TestUpdate.class
Modified: 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/TestProtocol.java?rev=1498086&r1=1498085&r2=1498086&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/TestProtocol.java Sun Jun 30 10:42:14 2013
@@ -26,7 +26,10 @@ import com.hp.hpl.jena.query.DatasetAcce
import com.hp.hpl.jena.query.DatasetAccessorFactory ;
import com.hp.hpl.jena.sparql.util.Convert ;
-// generally poke the server.
+// Generally poke the server.
+// SPARQL Query
+// SPARQL Update
+// GSP is done in TestDatasetAccessorHTTP
public class TestProtocol extends BaseServerTest
{
@BeforeClass public static void beforeClass()
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java?rev=1498086&r1=1498085&r2=1498086&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java Sun Jun 30 10:42:14 2013
@@ -22,16 +22,14 @@ import java.io.IOException ;
import java.net.HttpURLConnection ;
import java.net.URL ;
-import org.junit.Assert ;
import org.junit.AfterClass ;
+import org.junit.Assert ;
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.core.Var;
-import com.hp.hpl.jena.sparql.engine.binding.Binding;
+import com.hp.hpl.jena.sparql.core.Var ;
+import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.resultset.ResultSetCompare ;
import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.SSE ;
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java?rev=1498086&r1=1498085&r2=1498086&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java Sun Jun 30 10:42:14 2013
@@ -28,6 +28,7 @@ import org.apache.http.client.methods.Ht
import org.apache.http.client.methods.HttpUriRequest ;
import org.apache.http.impl.client.DefaultHttpClient ;
import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.junit.BaseTest ;
public class WebTest extends BaseTest
{
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=1498086&r1=1498085&r2=1498086&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 10:42:14 2013
@@ -18,7 +18,7 @@
package org.apache.jena.fuseki.http;
-import org.apache.jena.fuseki.BaseServerTest ;
+import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.fuseki.ServerTest ;
import org.apache.jena.fuseki.WebTest ;
import org.junit.AfterClass ;
@@ -30,14 +30,16 @@ import com.hp.hpl.jena.query.DatasetAcce
import com.hp.hpl.jena.query.DatasetAccessorFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import static org.apache.jena.fuseki.BaseServerTest.* ;
-public class TestDatasetAccessorHTTP extends BaseServerTest
+
+public class TestDatasetAccessorHTTP extends BaseTest
{
//Model level testing.
static final String datasetURI_not_1 = "http://localhost:"+ServerTest.port+"/junk" ;
static final String datasetURI_not_2 = serviceREST+"/not" ;
- static final String datasetURI_not_3 = "http://localhost:"+ServerTest.port+datasetPath+"/not/data" ;
+ static final String datasetURI_not_3 = "http://localhost:"+ServerTest.port+ServerTest.datasetPath+"/not/data" ;
@BeforeClass public static void beforeClass() { ServerTest.allocServer() ; }
@AfterClass public static void afterClass() { ServerTest.freeServer() ; }
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java?rev=1498086&r1=1498085&r2=1498086&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java Sun Jun 30 10:42:14 2013
@@ -22,16 +22,18 @@ import org.apache.jena.fuseki.BaseServer
import org.apache.jena.fuseki.ServerTest ;
import org.apache.jena.web.DatasetGraphAccessor ;
import org.apache.jena.web.DatasetGraphAccessorHTTP ;
-import org.apache.jena.web.TestDatasetGraphAccessorBase ;
+import org.apache.jena.web.AbstractTestDatasetGraphAccessor ;
import org.junit.AfterClass ;
import org.junit.Before ;
import org.junit.BeforeClass ;
-public class TestDatasetGraphAccessorHTTP extends TestDatasetGraphAccessorBase
+public class TestDatasetGraphAccessorHTTP extends AbstractTestDatasetGraphAccessor
{
@BeforeClass public static void beforeClass() { ServerTest.allocServer() ; }
@AfterClass public static void afterClass() { ServerTest.freeServer() ; }
- @Before public void before() { ServerTest.resetServer() ; }
+ @Before public void before() {
+ ServerTest.resetServer() ;
+ }
@Override
Added: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java?rev=1498086&view=auto
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java (added)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java Sun Jun 30 10:42:14 2013
@@ -0,0 +1,66 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.fuseki.http;
+
+import java.io.IOException ;
+
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.web.HttpException ;
+import org.apache.jena.fuseki.ServerTest ;
+import org.apache.jena.riot.web.HttpOp ;
+import org.apache.jena.web.HttpSC ;
+import org.junit.AfterClass ;
+import org.junit.BeforeClass ;
+import org.junit.Test ;
+
+import com.hp.hpl.jena.util.FileUtils ;
+
+public class TestHttpOp extends BaseTest {
+ // Test HttpOp from ARQ
+
+ static String pingURL = ServerTest.urlRoot+"ping.txt" ;
+ @BeforeClass public static void beforeClass() { ServerTest.allocServer() ; }
+ @AfterClass public static void afterClass() { ServerTest.freeServer() ; }
+
+ @Test public void httpGet_01() {
+ HttpOp.execHttpGet(pingURL) ;
+ }
+
+ @Test public void httpGet_02() {
+ try {
+ HttpOp.execHttpGet(ServerTest.urlRoot+"does-not-exist") ;
+ fail("No exception") ;
+ } catch(HttpException ex) {
+ assertEquals(HttpSC.NOT_FOUND_404, ex.getResponseCode()) ;
+ }
+ }
+
+ @Test public void httpGet_03() throws IOException {
+ String x = HttpOp.execHttpGetString(pingURL) ;
+ String y = FileUtils.readWholeFileAsUTF8("pages/ping.txt") ;
+ assertEquals(y,x) ;
+ }
+
+ @Test public void httpGet_04() {
+ String x = HttpOp.execHttpGetString(ServerTest.urlRoot+"does-not-exist") ;
+ assertNull(x) ;
+ }
+
+}
+
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphAccessorTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphAccessorTDB.java?rev=1498086&r1=1498085&r2=1498086&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphAccessorTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestDatasetGraphAccessorTDB.java Sun Jun 30 10:42:14 2013
@@ -19,13 +19,13 @@
package com.hp.hpl.jena.tdb.graph;
import org.apache.jena.web.DatasetGraphAccessor ;
-import org.apache.jena.web.TestDatasetGraphAccessorBase ;
+import org.apache.jena.web.AbstractTestDatasetGraphAccessor ;
import com.hp.hpl.jena.query.DatasetAccessorFactory ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.tdb.TDBFactory ;
-public class TestDatasetGraphAccessorTDB extends TestDatasetGraphAccessorBase
+public class TestDatasetGraphAccessorTDB extends AbstractTestDatasetGraphAccessor
{
@Override
protected DatasetGraphAccessor getDatasetUpdater()