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:30:39 UTC
svn commit: r1498084 - in /jena/trunk/jena-arq/src/test/java:
com/hp/hpl/jena/sparql/ org/apache/jena/web/
Author: andy
Date: Sun Jun 30 10:30:39 2013
New Revision: 1498084
URL: http://svn.apache.org/r1498084
Log:
Test updates for recent changes.
Added:
jena/trunk/jena-arq/src/test/java/org/apache/jena/web/AbstractTestDatasetGraphAccessor.java
- copied, changed from r1493330, jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TS_Web.java
Removed:
jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java
Modified:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorMem.java
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java?rev=1498084&r1=1498083&r2=1498084&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java Sun Jun 30 10:30:39 2013
@@ -24,6 +24,7 @@ import org.apache.jena.atlas.TC_Atlas ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.common.TC_Common ;
import org.apache.jena.riot.TC_Riot ;
+import org.apache.jena.web.TS_Web ;
import arq.TS_Cmd ;
import com.hp.hpl.jena.query.ARQ ;
@@ -58,6 +59,7 @@ public class ARQTestSuite extends TestSu
ts.addTest(new JUnit4TestAdapter(TC_Riot.class)) ;
ts.addTest(new JUnit4TestAdapter(TS_Cmd.class)) ;
+ ts.addTest(new JUnit4TestAdapter(TS_Web.class)) ;
// Main ARQ internal test suite.
ts.addTest(new JUnit4TestAdapter(TC_General.class)) ;
Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/web/AbstractTestDatasetGraphAccessor.java (from r1493330, jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/web/AbstractTestDatasetGraphAccessor.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/web/AbstractTestDatasetGraphAccessor.java&p1=jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java&r1=1493330&r2=1498084&rev=1498084&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/web/AbstractTestDatasetGraphAccessor.java Sun Jun 30 10:30:39 2013
@@ -19,6 +19,8 @@
package org.apache.jena.web;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFDataMgr ;
import org.junit.Test ;
import com.hp.hpl.jena.graph.Graph ;
@@ -30,7 +32,7 @@ import com.hp.hpl.jena.rdf.model.ModelFa
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.sse.SSE ;
-public abstract class TestDatasetGraphAccessorBase extends BaseTest
+public abstract class AbstractTestDatasetGraphAccessor extends BaseTest
{
protected static final String gn1 = "http://graph/1" ;
protected static final String gn2 = "http://graph/2" ;
@@ -51,7 +53,12 @@ public abstract class TestDatasetGraphAc
private static void assertNullOrEmpty(Graph graph)
{
- if ( graph == null ) return ;
+ if ( graph == null ) return ;
+ if ( ! graph.isEmpty() ) {
+ System.out.println("----") ;
+ RDFDataMgr.write(System.out, graph, Lang.TTL) ;
+ }
+
assertTrue(graph.isEmpty()) ;
}
@@ -82,7 +89,7 @@ public abstract class TestDatasetGraphAc
@Test public void put_02()
- {
+ {
DatasetGraphAccessor updater = getDatasetUpdater() ;
updater.httpPut(n1, graph1) ;
Added: jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TS_Web.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TS_Web.java?rev=1498084&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TS_Web.java (added)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TS_Web.java Sun Jun 30 10:30:39 2013
@@ -0,0 +1,34 @@
+/**
+ * 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.web;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+import org.junit.runners.Suite.SuiteClasses ;
+
+@RunWith(Suite.class)
+@SuiteClasses(
+{
+ TestDatasetGraphAccessorMem.class
+})
+
+public class TS_Web {
+
+}
+
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorMem.java?rev=1498084&r1=1498083&r2=1498084&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorMem.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorMem.java Sun Jun 30 10:30:39 2013
@@ -23,7 +23,7 @@ import com.hp.hpl.jena.query.DatasetAcce
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
-public class TestDatasetGraphAccessorMem extends TestDatasetGraphAccessorBase
+public class TestDatasetGraphAccessorMem extends AbstractTestDatasetGraphAccessor
{
@Override
protected DatasetGraphAccessor getDatasetUpdater()