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 2012/08/22 18:26:03 UTC
svn commit: r1376127 - in /jena/trunk/jena-arq: ./
src/test/java/com/hp/hpl/jena/sparql/
src/test/java/com/hp/hpl/jena/sparql/algebra/
src/test/java/com/hp/hpl/jena/sparql/modify/
src/test/java/com/hp/hpl/jena/sparql/syntax/
Author: andy
Date: Wed Aug 22 16:26:02 2012
New Revision: 1376127
URL: http://svn.apache.org/viewvc?rev=1376127&view=rev
Log:
Tidy test suite.
Added:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_Scripted.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java
- copied, changed from r1376087, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java
- copied, changed from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraph.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraphMgt.java
- copied, changed from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgt.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS_Update.java
Removed:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/algebra/TC_Algebra.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS3_Update.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraph.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgt.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TS3_Syntax.java
Modified:
jena/trunk/jena-arq/pom.xml
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_SPARQL11.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMem.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgtMem.java
Modified: jena/trunk/jena-arq/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/pom.xml?rev=1376127&r1=1376126&r2=1376127&view=diff
==============================================================================
--- jena/trunk/jena-arq/pom.xml (original)
+++ jena/trunk/jena-arq/pom.xml Wed Aug 22 16:26:02 2012
@@ -147,7 +147,12 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
- <include>**/TS_*.java</include>
+ <!-- Test collections -->
+ <!-- TC_General, TC_Riot, TC_Atlas-->
+ <include>**/TS_*.java</include>
+ <include>**/TC_Scripted.java</include>
+ <include>**/TC_DAWG.java</include>
+ <!--<include>**/TC_SPARQL11.java</include>-->
</includes>
</configuration>
</plugin>
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=1376127&r1=1376126&r2=1376127&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 Wed Aug 22 16:26:02 2012
@@ -30,9 +30,6 @@ import com.hp.hpl.jena.sparql.engine.mai
import com.hp.hpl.jena.sparql.engine.ref.QueryEngineRef ;
import com.hp.hpl.jena.sparql.expr.E_Function ;
import com.hp.hpl.jena.sparql.expr.NodeValue ;
-import com.hp.hpl.jena.sparql.junit.ScriptTestSuiteFactory ;
-import com.hp.hpl.jena.sparql.modify.TS3_Update ;
-import com.hp.hpl.jena.sparql.syntax.TS3_Syntax ;
/**
* All the ARQ tests
@@ -40,16 +37,15 @@ import com.hp.hpl.jena.sparql.syntax.TS3
public class ARQTestSuite extends TestSuite
{
+ public static final String testDirARQ = "testing/ARQ" ;
+ public static final String testDirUpdate = "testing/Update" ;
+
// Log4j for testing.
public static final String log4jPropertiesResourceName = "log4j-testing.properties" ;
static { System.getProperty("log4j.configuration", log4jPropertiesResourceName) ; }
- public static final String testDirARQ = "testing/ARQ" ;
-
static public TestSuite suite()
{
- // See also TC_General.
-
TestSuite ts = new ARQTestSuite() ;
// No warnings (e.g. bad lexical forms).
@@ -62,37 +58,16 @@ public class ARQTestSuite extends TestSu
// Main ARQ internal test suite.
ts.addTest(new JUnit4TestAdapter(TC_General.class)) ;
+ ts.addTest(TC_Scripted.suite()) ;
+ ts.addTest(TC_DAWG.suite()) ;
+ //ts.addTest(TC_SPARQL11.suite()) ;
+
// Fiddle around with the config if necessary
if ( false )
{
QueryEngineMain.unregister() ;
QueryEngineRef.register() ;
}
-
- // JUnit3 style.
- ts.addTest(TS3_Syntax.suite()) ;
- ts.addTest(TS3_Update.suite()) ;
- ts.addTest(TS3_Syntax.suite()) ;
-
- // Tests should be silent.
- NodeValue.VerboseWarnings = false ;
- E_Function.WarnOnUnknownFunction = false ;
-
- // Lower level
-
- // Scripted tests for SPARQL
- ts.addTest(ScriptTestSuiteFactory.make(testDirARQ+"/manifest-arq.ttl")) ;
-
- // SPARQL 1.1 test suite (when finalized)
- // ts.addTest(TC_SPARQL11.suite()) ;
-
- // Scripted tests for ARQ features outside SPARQL syntax
- // Currently at end of manifest-arq.ttl
-// ts.addTest(QueryTestSuiteFactory.make(testDirARQ+"/manifest-ext.ttl")) ;
-
- // The DAWG official tests (some may be duplicated in ARQ test suite
- // but this should be the untouched versions)
- ts.addTest(TC_DAWG.suite()) ;
return ts ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java?rev=1376127&r1=1376126&r2=1376127&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java Wed Aug 22 16:26:02 2012
@@ -20,6 +20,8 @@ package com.hp.hpl.jena.sparql;
import junit.framework.TestSuite ;
+import org.junit.AfterClass ;
+import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
@@ -29,9 +31,12 @@ import com.hp.hpl.jena.sparql.api.TS_API
import com.hp.hpl.jena.sparql.core.TS_Core ;
import com.hp.hpl.jena.sparql.engine.TS_Engine ;
import com.hp.hpl.jena.sparql.engine.binding.TS_Binding ;
+import com.hp.hpl.jena.sparql.expr.E_Function ;
+import com.hp.hpl.jena.sparql.expr.NodeValue ;
import com.hp.hpl.jena.sparql.expr.TS_Expr ;
import com.hp.hpl.jena.sparql.graph.TS_Graph ;
import com.hp.hpl.jena.sparql.lang.TS_Lang ;
+import com.hp.hpl.jena.sparql.modify.TS_Update ;
import com.hp.hpl.jena.sparql.path.TS_Path ;
import com.hp.hpl.jena.sparql.resultset.TS_ResultSet ;
import com.hp.hpl.jena.sparql.solver.TS_Solver ;
@@ -50,7 +55,6 @@ import com.hp.hpl.jena.sparql.util.TS_Ut
TS_Expr.class ,
TS_ResultSet.class ,
TS_Binding.class ,
- TS_ParamString.class ,
TS_Engine.class ,
TS_Solver.class ,
TS_Algebra.class ,
@@ -60,10 +64,20 @@ import com.hp.hpl.jena.sparql.util.TS_Ut
TS_API.class ,
TS_Core.class ,
TS_Path.class ,
- TS_ParamString.class
+ TS_ParamString.class ,
+ TS_Update.class
})
public class TC_General extends TestSuite
{
-
+ @BeforeClass public static void beforeClass()
+ {
+ NodeValue.VerboseWarnings = false ;
+ E_Function.WarnOnUnknownFunction = false ;
+ }
+
+ @AfterClass public static void afterClass()
+ {
+
+ }
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_SPARQL11.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_SPARQL11.java?rev=1376127&r1=1376126&r2=1376127&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_SPARQL11.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_SPARQL11.java Wed Aug 22 16:26:02 2012
@@ -28,4 +28,9 @@ public class TC_SPARQL11 extends TestSui
static public TestSuite suite() { return new TC_SPARQL11(); }
// SPARQL 1.1 test suite (when ready)
+
+ public TC_SPARQL11()
+ {
+ super(TC_SPARQL11.class.getName()) ;
+ }
}
Added: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_Scripted.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_Scripted.java?rev=1376127&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_Scripted.java (added)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_Scripted.java Wed Aug 22 16:26:02 2012
@@ -0,0 +1,42 @@
+/**
+ * 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 com.hp.hpl.jena.sparql;
+
+import junit.framework.TestSuite ;
+
+import com.hp.hpl.jena.sparql.expr.E_Function ;
+import com.hp.hpl.jena.sparql.expr.NodeValue ;
+import com.hp.hpl.jena.sparql.junit.ScriptTestSuiteFactory ;
+
+public class TC_Scripted extends TestSuite
+{
+ static public TestSuite suite()
+ {
+ TestSuite ts = new TC_Scripted() ;
+ ts.addTest(ScriptTestSuiteFactory.make(ARQTestSuite.testDirARQ+"/manifest-arq.ttl")) ;
+ ts.addTest(ScriptTestSuiteFactory.make(ARQTestSuite.testDirARQ+"/Syntax/manifest-syntax.ttl")) ;
+ return ts ;
+ }
+
+ public TC_Scripted()
+ {
+ NodeValue.VerboseWarnings = false ;
+ E_Function.WarnOnUnknownFunction = false ;
+ }
+}
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java (from r1376087, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java&p1=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java&r1=1376087&r2=1376127&rev=1376127&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateBase.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateBase.java Wed Aug 22 16:26:02 2012
@@ -23,11 +23,12 @@ import org.openjena.atlas.junit.BaseTest
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.sparql.ARQTestSuite ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.UpdateAction ;
-public abstract class TestUpdateBase extends BaseTest
+public abstract class AbstractTestUpdateBase extends BaseTest
{
protected abstract GraphStore getEmptyGraphStore() ;
@@ -51,7 +52,7 @@ public abstract class TestUpdateBase ext
g.getBulkUpdateHandler().add(data) ;
}
- protected static final String FileBase = TS3_Update.testDirUpdate ;
+ protected static final String FileBase = ARQTestSuite.testDirUpdate ;
protected static void script(GraphStore gStore, String filename)
{
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java (from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraph.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java&p1=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraph.java&r1=1372890&r2=1376127&rev=1376127&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraph.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java Wed Aug 22 16:26:02 2012
@@ -41,7 +41,7 @@ import com.hp.hpl.jena.sparql.syntax.Ele
import com.hp.hpl.jena.sparql.util.NodeFactory ;
import com.hp.hpl.jena.update.* ;
-public abstract class TestUpdateGraph extends TestUpdateBase
+public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
{
protected static Node s = NodeFactory.parseNode("<http://example/r>") ;
protected static Node p = NodeFactory.parseNode("<http://example/p>") ;
Copied: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraphMgt.java (from r1372890, jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgt.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraphMgt.java?p2=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraphMgt.java&p1=jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgt.java&r1=1372890&r2=1376127&rev=1376127&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgt.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraphMgt.java Wed Aug 22 16:26:02 2012
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.update.Update ;
import com.hp.hpl.jena.update.UpdateAction ;
import com.hp.hpl.jena.update.UpdateException ;
-public abstract class TestUpdateGraphMgt extends TestUpdateBase
+public abstract class AbstractTestUpdateGraphMgt extends AbstractTestUpdateBase
{
static final Node graphIRI = Node.createURI("http://example/graph") ;
Added: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS_Update.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS_Update.java?rev=1376127&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS_Update.java (added)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TS_Update.java Wed Aug 22 16:26:02 2012
@@ -0,0 +1,33 @@
+/**
+ * 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 com.hp.hpl.jena.sparql.modify;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+import org.junit.runners.Suite.SuiteClasses ;
+
+@RunWith(Suite.class)
+@SuiteClasses( {
+ TestUpdateGraphMem.class ,
+ TestUpdateGraphMgtMem.class
+})
+public class TS_Update
+{
+}
+
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMem.java?rev=1376127&r1=1376126&r2=1376127&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMem.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMem.java Wed Aug 22 16:26:02 2012
@@ -23,7 +23,7 @@ import junit.framework.JUnit4TestAdapter
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.GraphStoreFactory ;
-public class TestUpdateGraphMem extends TestUpdateGraph
+public class TestUpdateGraphMem extends AbstractTestUpdateGraph
{
public static junit.framework.Test suite()
{
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgtMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgtMem.java?rev=1376127&r1=1376126&r2=1376127&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgtMem.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateGraphMgtMem.java Wed Aug 22 16:26:02 2012
@@ -23,7 +23,7 @@ import junit.framework.JUnit4TestAdapter
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.GraphStoreFactory ;
-public class TestUpdateGraphMgtMem extends TestUpdateGraphMgt
+public class TestUpdateGraphMgtMem extends AbstractTestUpdateGraphMgt
{
public static junit.framework.Test suite()
{