Stronger test for TestIntersectionDatasetCollector
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dc0ab921 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dc0ab921 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dc0ab921 Branch: refs/heads/master Commit: dc0ab921af85e594e411363c68988dbf431467c5 Parents: bd9a452 Author: ajs6f <[email protected]> Authored: Sun Dec 31 14:26:34 2017 -0500 Committer: ajs6f <[email protected]> Committed: Fri Jan 5 09:32:55 2018 -0500 ---------------------------------------------------------------------- .../query/util/TestIntersectionDatasetCollector.java | 3 ++- .../jena/query/util/TestUnionDatasetCollector.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/dc0ab921/jena-arq/src/test/java/org/apache/jena/query/util/TestIntersectionDatasetCollector.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/query/util/TestIntersectionDatasetCollector.java b/jena-arq/src/test/java/org/apache/jena/query/util/TestIntersectionDatasetCollector.java index a0dcfa0..1e30f54 100644 --- a/jena-arq/src/test/java/org/apache/jena/query/util/TestIntersectionDatasetCollector.java +++ b/jena-arq/src/test/java/org/apache/jena/query/util/TestIntersectionDatasetCollector.java @@ -51,7 +51,8 @@ public class TestIntersectionDatasetCollector extends TestDatasetCollector { ds1.addNamedModel(graphName3, m3); ds2.addNamedModel(graphName3, m3); - Dataset ds = Stream.<Dataset>builder().add(ds1).add(ds2).build().collect(testInstance()); + final Stream<Dataset> stream = Stream.<Dataset>builder().add(ds1).add(ds2).build(); + Dataset ds = stream.collect(testInstance()); assertTrue(ds.getDefaultModel().isEmpty()); assertTrue(ds.getNamedModel(graphName1).isEmpty()); http://git-wip-us.apache.org/repos/asf/jena/blob/dc0ab921/jena-arq/src/test/java/org/apache/jena/query/util/TestUnionDatasetCollector.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/query/util/TestUnionDatasetCollector.java b/jena-arq/src/test/java/org/apache/jena/query/util/TestUnionDatasetCollector.java index cc5a08a..2682435 100644 --- a/jena-arq/src/test/java/org/apache/jena/query/util/TestUnionDatasetCollector.java +++ b/jena-arq/src/test/java/org/apache/jena/query/util/TestUnionDatasetCollector.java @@ -21,6 +21,7 @@ package org.apache.jena.query.util; import static org.apache.jena.rdf.model.ModelFactory.createModelForGraph; import static org.apache.jena.sparql.sse.SSE.parseGraph; +import java.util.List; import java.util.stream.Stream; import org.apache.jena.atlas.iterator.Iter; @@ -29,6 +30,7 @@ import org.apache.jena.graph.NodeFactory; import org.apache.jena.query.Dataset; import org.apache.jena.query.DatasetFactory; import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Statement; import org.junit.Assert; import org.junit.Test; @@ -51,13 +53,19 @@ public class TestUnionDatasetCollector extends TestDatasetCollector { final Model m2 = createModelForGraph(g2); final String graphName2 = NodeFactory.createBlankNode().toString(); dsg2.addNamedModel(graphName2, m2); - Dataset dataset = Stream.<Dataset>builder().add(dsg1).add(dsg2).build().collect(testInstance()); + final Stream<Dataset> stream = Stream.<Dataset>builder().add(dsg1).add(dsg2).build(); + Dataset dataset = stream.collect(testInstance()); assertEquals(2, Iter.count(dataset.listNames())); assertTrue(m1.isIsomorphicWith(dataset.getNamedModel(graphName1))); assertTrue(m2.isIsomorphicWith(dataset.getNamedModel(graphName2))); + // all statements in any input should be present in the union m1.listStatements().mapWith(dataset.getDefaultModel()::contains).forEachRemaining(Assert::assertTrue); m2.listStatements().mapWith(dataset.getDefaultModel()::contains).forEachRemaining(Assert::assertTrue); + // all statements in the union should be present in an input + List<Statement> leftovers = dataset.getDefaultModel().listStatements() + .filterDrop(m1::contains) + .filterDrop(m2::contains).toList(); + assertTrue(leftovers.isEmpty()); } - }
