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 2015/06/02 12:41:08 UTC

[5/6] jena git commit: Tests for with and without a threshold.

Tests for with and without a threshold.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fecd9783
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fecd9783
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fecd9783

Branch: refs/heads/master
Commit: fecd9783264f874503885330a29d3be56b612b8d
Parents: a5f3c8e
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jun 2 11:34:41 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jun 2 11:34:41 2015 +0100

----------------------------------------------------------------------
 .../engine/iterator/TS_QueryIterators.java      |  1 +
 .../engine/iterator/TestDistinctDataBag.java    |  8 +---
 .../iterator/TestDistinctDataBagLimited.java    | 40 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/fecd9783/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java
index 2d3148c..d0eb2ac 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TS_QueryIterators.java
@@ -26,6 +26,7 @@ import org.junit.runners.Suite ;
     TestQueryIterSort.class
     , TestDistinctMem.class
     , TestDistinctDataBag.class 
+    , TestDistinctDataBagLimited.class 
 })
 public class TS_QueryIterators {
 

http://git-wip-us.apache.org/repos/asf/jena/blob/fecd9783/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestDistinctDataBag.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestDistinctDataBag.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestDistinctDataBag.java
index 1b70334..34fa75d 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestDistinctDataBag.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestDistinctDataBag.java
@@ -20,20 +20,16 @@ package org.apache.jena.sparql.engine.iterator;
 
 import java.util.List ;
 
-import org.apache.jena.query.ARQ ;
-import org.apache.jena.sparql.engine.ExecutionContext ;
 import org.apache.jena.sparql.engine.QueryIterator ;
 import org.apache.jena.sparql.engine.binding.Binding ;
-import org.apache.jena.sparql.util.Context ;
 
 public class TestDistinctDataBag extends AbstractTestDistinctReduced {
 
     @Override
     protected QueryIterator createQueryIter(List<Binding> data) {
         QueryIterator qIter = new QueryIterPlainWrapper(data.iterator()) ;
-        Context cxt = new Context() ;
-        cxt.set(ARQ.spillToDiskThreshold, 2L);
-        return new QueryIterDistinct(qIter, new ExecutionContext(cxt, null, null, null)) ;
+        // Default setting - no threshold.
+        return new QueryIterDistinct(qIter, null) ;
     }
 
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/fecd9783/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestDistinctDataBagLimited.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestDistinctDataBagLimited.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestDistinctDataBagLimited.java
new file mode 100644
index 0000000..b528525
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestDistinctDataBagLimited.java
@@ -0,0 +1,40 @@
+/**
+ * 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.sparql.engine.iterator;
+
+import java.util.List ;
+
+import org.apache.jena.query.ARQ ;
+import org.apache.jena.sparql.engine.ExecutionContext ;
+import org.apache.jena.sparql.engine.QueryIterator ;
+import org.apache.jena.sparql.engine.binding.Binding ;
+import org.apache.jena.sparql.util.Context ;
+
+public class TestDistinctDataBagLimited extends AbstractTestDistinctReduced {
+
+    @Override
+    protected QueryIterator createQueryIter(List<Binding> data) {
+        QueryIterator qIter = new QueryIterPlainWrapper(data.iterator()) ;
+        Context cxt = new Context() ;
+        cxt.set(ARQ.spillToDiskThreshold, 2L);
+        return new QueryIterDistinct(qIter, new ExecutionContext(cxt, null, null, null)) ;
+    }
+
+}
+