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/11/25 18:29:38 UTC

[4/4] jena git commit: JENA-624: Parameterize and run on both "general" and "txn mem" datasets.

JENA-624: Parameterize and run on both "general" and "txn mem" datasets.


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

Branch: refs/heads/master
Commit: b65974f7cff91712def03bfc3ea253b6ec20ff68
Parents: b208922
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Nov 25 17:25:53 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Nov 25 17:29:15 2015 +0000

----------------------------------------------------------------------
 .../apache/jena/sparql/graph/TestDatasets.java  | 33 +++++++++++++++-----
 1 file changed, 26 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/b65974f7/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java b/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java
index c8dc89e..3b224d7 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestDatasets.java
@@ -19,7 +19,10 @@
 package org.apache.jena.sparql.graph;
 
 import java.util.ArrayList ;
+import java.util.Arrays ;
+import java.util.Collection ;
 import java.util.List ;
+import java.util.function.Supplier ;
 
 import org.apache.jena.query.* ;
 import org.apache.jena.sparql.core.DatasetGraph ;
@@ -31,25 +34,41 @@ import org.apache.jena.update.UpdateRequest ;
 import org.junit.Assert ;
 import org.junit.Before ;
 import org.junit.Test ;
+import org.junit.runner.RunWith ;
+import org.junit.runners.Parameterized ;
+import org.junit.runners.Parameterized.Parameters ;
 
+@RunWith(Parameterized.class)
 public class TestDatasets {
-		
+    @Parameters(name = "{index}: {0}")
+    public static Collection<Object[]> data() {
+        Supplier<Dataset> datasetGeneralMaker = ()-> DatasetFactory.createGeneral() ; 
+        Supplier<Dataset> datasetTxnMemMaker = ()-> DatasetFactory.createTxnMem() ;
+        return Arrays.asList(new Object[][] { { "General",  datasetGeneralMaker },
+                                              { "TxnMem",   datasetTxnMemMaker} });
+    }	
+    
+    
 	private static final String data = "INSERT DATA { <ex:default> <ex:default> <ex:default>.\n"
 									   + "GRAPH <ex:from> { <ex:from> <ex:from> <ex:from> }\n"
 									   + "GRAPH <ex:named> { <ex:named> <ex:named> <ex:named> }\n"
 									   + "GRAPH <ex:other> { <ex:other> <ex:other> <ex:other> }\n"
 									   + "}";
 
-	private Dataset ds;
-	private DatasetGraph gs;
+    private final Supplier<Dataset> maker;
+	private final Dataset ds;
+	private final DatasetGraph dsg;
+	
+	public TestDatasets(String name, Supplier<Dataset> maker) {
+	    this.maker = maker ;
+        this.ds = maker.get() ;
+        this.dsg = ds.asDatasetGraph() ;
+	}
 	
 	@Before
 	public void setup() {
-		this.ds = DatasetFactory.createMem();
-		this.gs = ds.asDatasetGraph() ;
-		
 		UpdateRequest up = UpdateFactory.create(TestDatasets.data);
-		UpdateProcessor processor = UpdateExecutionFactory.create(up, this.gs);
+		UpdateProcessor processor = UpdateExecutionFactory.create(up, this.dsg);
 		processor.execute();
 	}