RYA-390 Fixed a failing integration test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/3669972f Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/3669972f Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/3669972f Branch: refs/heads/master Commit: 3669972f15b56d0255e8ab70a19052821d18a817 Parents: a2ebefe Author: kchilton2 <[email protected]> Authored: Tue Oct 3 15:33:19 2017 -0400 Committer: Caleb Meier <[email protected]> Committed: Tue Oct 3 13:41:07 2017 -0700 ---------------------------------------------------------------------- .../accumulo/integration/AccumuloPcjStorageIT.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/3669972f/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPcjStorageIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPcjStorageIT.java b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPcjStorageIT.java index 2964d91..d2e954d 100644 --- a/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPcjStorageIT.java +++ b/extras/rya.indexing.pcj/src/test/java/org/apache/rya/indexing/pcj/storage/accumulo/integration/AccumuloPcjStorageIT.java @@ -27,6 +27,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; @@ -201,19 +202,19 @@ public class AccumuloPcjStorageIT extends AccumuloRyaITBase { final String pcjId = pcjStorage.createPcj(sparql); // Add some binding sets to it. - final Set<VisibilityBindingSet> expectedResults = new HashSet<>(); + final Set<VisibilityBindingSet> storedResults = new HashSet<>(); final MapBindingSet aliceBS = new MapBindingSet(); aliceBS.addBinding("a", new URIImpl("http://Alice";)); aliceBS.addBinding("b", new URIImpl("http://Person";)); - expectedResults.add( new VisibilityBindingSet(aliceBS, "") ); + storedResults.add( new VisibilityBindingSet(aliceBS, "") ); final MapBindingSet charlieBS = new MapBindingSet(); charlieBS.addBinding("a", new URIImpl("http://Charlie";)); charlieBS.addBinding("b", new URIImpl("http://Comedian";)); - expectedResults.add( new VisibilityBindingSet(charlieBS, "") ); + storedResults.add( new VisibilityBindingSet(charlieBS, "") ); - pcjStorage.addResults(pcjId, expectedResults); + pcjStorage.addResults(pcjId, storedResults); // List the results that were stored. final Set<BindingSet> results = new HashSet<>(); @@ -223,6 +224,11 @@ public class AccumuloPcjStorageIT extends AccumuloRyaITBase { } } + // The stored results are returned as normal binding sets, so unwrap them. + final Set<BindingSet> expectedResults = storedResults.stream() + .map(visBs -> visBs.getBindingSet() ) + .collect(Collectors.toSet()); + assertEquals(expectedResults, results); } }
