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/12/23 22:40:29 UTC
svn commit: r1425531 - in /jena/trunk/jena-arq/src:
main/java/com/hp/hpl/jena/sparql/engine/
main/java/com/hp/hpl/jena/sparql/engine/iterator/
test/java/com/hp/hpl/jena/sparql/core/
Author: andy
Date: Sun Dec 23 21:40:29 2012
New Revision: 1425531
URL: http://svn.apache.org/viewvc?rev=1425531&view=rev
Log:
Typos, tidying and repeated tests.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java?rev=1425531&r1=1425530&r2=1425531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java Sun Dec 23 21:40:29 2012
@@ -397,7 +397,6 @@ public class QueryExecutionBase implemen
public void proc(QueryExecution qExec)
{
qExec.abort() ;
-
}
} ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java?rev=1425531&r1=1425530&r2=1425531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/iterator/QueryIteratorBase.java Sun Dec 23 21:40:29 2012
@@ -200,7 +200,7 @@ public abstract class QueryIteratorBase
// Need to set the flags before allowing subclasses to handle requestCancel() in order
// to prevent a race condition. We want to be sure that calls to hasNext()/nextBinding()
// will definitely throw a QueryCancelledException in this class and not allow a
- // situation in which a subclass component thinks it is canceled, while this class does not.
+ // situation in which a subclass component thinks it is cancelled, while this class does not.
this.abortIterator = true ;
this.requestingCancel = true;
this.requestCancel() ;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java?rev=1425531&r1=1425530&r2=1425531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TS_Core.java Sun Dec 23 21:40:29 2012
@@ -26,12 +26,9 @@ import org.junit.runners.Suite ;
TestContext.class
, TestDatasetGraphMem.class
, TestDatasetGraphMemTriplesQuads.class
- , TestDatasetGraphMem.class
// Not ready , TestDynamicDatasetMem.class
})
public class TS_Core
-{
-
-}
+{}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java?rev=1425531&r1=1425530&r2=1425531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetGraphMemTriplesQuads.java Sun Dec 23 21:40:29 2012
@@ -18,15 +18,9 @@
package com.hp.hpl.jena.sparql.core;
-import junit.framework.JUnit4TestAdapter ;
public class TestDatasetGraphMemTriplesQuads extends AbstractDatasetGraphTests
{
- public static junit.framework.Test suite()
- {
- return new JUnit4TestAdapter(TestDatasetGraphMemTriplesQuads.class) ;
- }
-
@Override
protected DatasetGraph emptyDataset()
{
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java?rev=1425531&r1=1425530&r2=1425531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDatasetMem.java Sun Dec 23 21:40:29 2012
@@ -18,18 +18,11 @@
package com.hp.hpl.jena.sparql.core;
-import junit.framework.JUnit4TestAdapter ;
-
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
public class TestDatasetMem extends AbstractTestDataset
{
- public static junit.framework.Test suite()
- {
- return new JUnit4TestAdapter(TestDatasetMem.class) ;
- }
-
@Override
protected Dataset createFixed() { return DatasetFactory.createMem() ; }
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java?rev=1425531&r1=1425530&r2=1425531&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/TestDynamicDatasetMem.java Sun Dec 23 21:40:29 2012
@@ -18,12 +18,18 @@
package com.hp.hpl.jena.sparql.core;
+import org.junit.After ;
+import org.junit.Before ;
+
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
public class TestDynamicDatasetMem extends AbstractTestDynamicDataset
{
+ @Before public void before1() {}
+ @After public void after1() {}
+
@Override
protected Dataset createDataset()
{