Repository: incubator-blur Updated Branches: refs/heads/master 2b0125ab2 -> 12b609c97
fix compilation issues with new combinercontext Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/12b609c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/12b609c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/12b609c9 Branch: refs/heads/master Commit: 12b609c97ce3902c2564d0f5fd3bd5deaefd2a5e Parents: 2b0125a Author: twilliams <[email protected]> Authored: Tue Sep 23 20:12:42 2014 -0400 Committer: twilliams <[email protected]> Committed: Tue Sep 23 20:12:42 2014 -0400 ---------------------------------------------------------------------- .../org/apache/blur/command/DocumentCountCombinerTest.java | 2 +- .../test/java/org/apache/blur/command/TermsCommandTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/12b609c9/blur-command/src/test/java/org/apache/blur/command/DocumentCountCombinerTest.java ---------------------------------------------------------------------- diff --git a/blur-command/src/test/java/org/apache/blur/command/DocumentCountCombinerTest.java b/blur-command/src/test/java/org/apache/blur/command/DocumentCountCombinerTest.java index 36b7083..adfc9ba 100644 --- a/blur-command/src/test/java/org/apache/blur/command/DocumentCountCombinerTest.java +++ b/blur-command/src/test/java/org/apache/blur/command/DocumentCountCombinerTest.java @@ -51,7 +51,7 @@ public class DocumentCountCombinerTest { Map<Shard, Integer> shardTotals = Maps .newHashMap(ImmutableMap .of(new Shard("t1","s1"), 10, new Shard("t1","s2"), 20, new Shard("t1","s3"), 30)); - long total = dc.combine(shardTotals); + long total = dc.combine(new TestCombiningContext(), shardTotals); assertEquals(60l, total); } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/12b609c9/blur-command/src/test/java/org/apache/blur/command/TermsCommandTest.java ---------------------------------------------------------------------- diff --git a/blur-command/src/test/java/org/apache/blur/command/TermsCommandTest.java b/blur-command/src/test/java/org/apache/blur/command/TermsCommandTest.java index 7787217..c106a05 100644 --- a/blur-command/src/test/java/org/apache/blur/command/TermsCommandTest.java +++ b/blur-command/src/test/java/org/apache/blur/command/TermsCommandTest.java @@ -61,7 +61,7 @@ public class TermsCommandTest { } @Test - public void combineShouldBeCorrect() throws IOException { + public void combineShouldBeCorrect() throws IOException, InterruptedException { Map<Shard, List<String>> execResults = Maps.newHashMap(); execResults.put(new Shard("t1", "s1"), Lists.newArrayList("aa", "cc")); execResults.put(new Shard("t1", "s2"), Lists.newArrayList("bb", "dd")); @@ -69,18 +69,18 @@ public class TermsCommandTest { List<String> expected = Lists.newArrayList("aa", "bb", "cc", "dd"); TermsCommand cmd = new TermsCommand(); - List<String> returned = cmd.combine(execResults); + List<String> returned = cmd.combine(new TestCombiningContext(), execResults); assertEquals(expected, returned); } @Test - public void combineEmptyShouldGiveNiceEmptyList() throws IOException { + public void combineEmptyShouldGiveNiceEmptyList() throws IOException, InterruptedException { Map<Shard, List<String>> execResults = Maps.newHashMap(); List<String> expected = Lists.newArrayList(); TermsCommand cmd = new TermsCommand(); - List<String> returned = cmd.combine(execResults); + List<String> returned = cmd.combine(new TestCombiningContext(), execResults); assertEquals(expected, returned); }
