From 890e3bdd3f0deecd80565a20b0192f213516a8fb Mon Sep 17 00:00:00 2001 From: Jonathan Wei Date: Tue, 9 Aug 2016 22:24:48 -0700 Subject: [PATCH] More informative query unit test names (#3342) --- .../ApproximateHistogramGroupByQueryTest.java | 34 ++++++++-- .../ApproximateHistogramTopNQueryTest.java | 2 +- .../variance/VarianceGroupByQueryTest.java | 6 +- .../variance/VarianceTopNQueryTest.java | 2 +- .../druid/query/MultiValuedDimensionTest.java | 3 +- .../io/druid/query/QueryRunnerTestHelper.java | 62 ++++++++++++++----- .../DataSourceMetadataQueryTest.java | 3 +- .../query/groupby/GroupByQueryRunnerTest.java | 47 ++++++++++++-- .../GroupByTimeseriesQueryRunnerTest.java | 8 ++- .../query/metadata/SegmentAnalyzerTest.java | 4 +- .../metadata/SegmentMetadataQueryTest.java | 6 +- .../SegmentMetadataUnionQueryTest.java | 8 ++- .../query/search/SearchQueryRunnerTest.java | 2 +- .../search/SearchQueryRunnerWithCaseTest.java | 8 +-- .../TimeBoundaryQueryRunnerTest.java | 2 +- .../topn/TopNQueryQueryToolChestTest.java | 3 +- .../query/topn/TopNQueryRunnerBenchmark.java | 9 ++- .../druid/query/topn/TopNQueryRunnerTest.java | 2 +- .../druid/query/topn/TopNUnionQueryTest.java | 2 +- .../segment/realtime/RealtimeManagerTest.java | 6 +- 20 files changed, 167 insertions(+), 52 deletions(-) diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java b/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java index c846acd906e..c055d08cd3f 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java +++ b/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramGroupByQueryTest.java @@ -51,11 +51,19 @@ public class ApproximateHistogramGroupByQueryTest { private final QueryRunner runner; private GroupByQueryRunnerFactory factory; + private String testName; - @Parameterized.Parameters + @Parameterized.Parameters(name="{0}") public static Iterable constructorFeeder() throws IOException { - final GroupByQueryConfig defaultConfig = new GroupByQueryConfig(); + final GroupByQueryConfig defaultConfig = new GroupByQueryConfig() + { + @Override + public String toString() + { + return "default"; + } + }; final GroupByQueryConfig singleThreadedConfig = new GroupByQueryConfig() { @Override @@ -63,6 +71,12 @@ public class ApproximateHistogramGroupByQueryTest { return true; } + + @Override + public String toString() + { + return "singleThreaded"; + } }; final GroupByQueryConfig v2Config = new GroupByQueryConfig() { @@ -71,6 +85,12 @@ public class ApproximateHistogramGroupByQueryTest { return GroupByStrategySelector.STRATEGY_V2; } + + @Override + public String toString() + { + return "v2"; + } }; defaultConfig.setMaxIntermediateRows(10000); @@ -86,15 +106,21 @@ public class ApproximateHistogramGroupByQueryTest for (GroupByQueryConfig config : configs) { final GroupByQueryRunnerFactory factory = GroupByQueryRunnerTest.makeQueryRunnerFactory(config); for (QueryRunner runner : QueryRunnerTestHelper.makeQueryRunners(factory)) { - constructors.add(new Object[]{factory, runner}); + final String testName = String.format( + "config=%s, runner=%s", + config.toString(), + runner.toString() + ); + constructors.add(new Object[]{testName, factory, runner}); } } return constructors; } - public ApproximateHistogramGroupByQueryTest(GroupByQueryRunnerFactory factory, QueryRunner runner) + public ApproximateHistogramGroupByQueryTest(String testName, GroupByQueryRunnerFactory factory, QueryRunner runner) { + this.testName = testName; this.factory = factory; this.runner = runner; } diff --git a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java b/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java index 1b79415796f..52170e75b1b 100644 --- a/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java +++ b/extensions-core/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java @@ -54,7 +54,7 @@ import java.util.Map; @RunWith(Parameterized.class) public class ApproximateHistogramTopNQueryTest { - @Parameterized.Parameters + @Parameterized.Parameters(name="{0}") public static Iterable constructorFeeder() throws IOException { return QueryRunnerTestHelper.transformToConstructionFeeder( diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceGroupByQueryTest.java b/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceGroupByQueryTest.java index a45901bf742..452774cc6fb 100644 --- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceGroupByQueryTest.java +++ b/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceGroupByQueryTest.java @@ -60,15 +60,17 @@ public class VarianceGroupByQueryTest private final GroupByQueryConfig config; private final QueryRunner runner; private final GroupByQueryRunnerFactory factory; + private final String testName; - @Parameterized.Parameters + @Parameterized.Parameters(name="{0}") public static Collection constructorFeeder() throws IOException { return GroupByQueryRunnerTest.constructorFeeder(); } - public VarianceGroupByQueryTest(GroupByQueryConfig config, GroupByQueryRunnerFactory factory, QueryRunner runner) + public VarianceGroupByQueryTest(String testName, GroupByQueryConfig config, GroupByQueryRunnerFactory factory, QueryRunner runner) { + this.testName = testName; this.config = config; this.factory = factory; this.runner = factory.mergeRunners(MoreExecutors.sameThreadExecutor(), ImmutableList.>of(runner)); diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTopNQueryTest.java b/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTopNQueryTest.java index eb2665d3793..0926e77621d 100644 --- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTopNQueryTest.java +++ b/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceTopNQueryTest.java @@ -50,7 +50,7 @@ import java.util.Map; @RunWith(Parameterized.class) public class VarianceTopNQueryTest { - @Parameterized.Parameters + @Parameterized.Parameters(name="{0}") public static Iterable constructorFeeder() throws IOException { return TopNQueryRunnerTest.constructorFeeder(); diff --git a/processing/src/test/java/io/druid/query/MultiValuedDimensionTest.java b/processing/src/test/java/io/druid/query/MultiValuedDimensionTest.java index 7387cf2c134..344f03f8edd 100644 --- a/processing/src/test/java/io/druid/query/MultiValuedDimensionTest.java +++ b/processing/src/test/java/io/druid/query/MultiValuedDimensionTest.java @@ -299,7 +299,8 @@ public class MultiValuedDimensionTest ); QueryRunner> runner = QueryRunnerTestHelper.makeQueryRunner( factory, - new QueryableIndexSegment("sid1", queryableIndex) + new QueryableIndexSegment("sid1", queryableIndex), + null ); Map context = Maps.newHashMap(); Sequence> result = runner.run(query, context); diff --git a/processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java b/processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java index 7a64d9910be..d1004da7938 100644 --- a/processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java +++ b/processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java @@ -330,11 +330,11 @@ public class QueryRunnerTestHelper final QueryableIndex noRollupMMappedTestIndex = TestIndex.getNoRollupMMappedTestIndex(); final QueryableIndex mergedRealtimeIndex = TestIndex.mergedRealtimeIndex(); return ImmutableList.of( - makeQueryRunner(factory, new IncrementalIndexSegment(rtIndex, segmentId)), - makeQueryRunner(factory, new IncrementalIndexSegment(noRollupRtIndex, segmentId)), - makeQueryRunner(factory, new QueryableIndexSegment(segmentId, mMappedTestIndex)), - makeQueryRunner(factory, new QueryableIndexSegment(segmentId, noRollupMMappedTestIndex)), - makeQueryRunner(factory, new QueryableIndexSegment(segmentId, mergedRealtimeIndex)) + makeQueryRunner(factory, new IncrementalIndexSegment(rtIndex, segmentId), "rtIndex"), + makeQueryRunner(factory, new IncrementalIndexSegment(noRollupRtIndex, segmentId), "noRollupRtIndex"), + makeQueryRunner(factory, new QueryableIndexSegment(segmentId, mMappedTestIndex), "mMappedTestIndex"), + makeQueryRunner(factory, new QueryableIndexSegment(segmentId, noRollupMMappedTestIndex), "noRollupMMappedTestIndex"), + makeQueryRunner(factory, new QueryableIndexSegment(segmentId, mergedRealtimeIndex), "mergedRealtimeIndex") ); } @@ -350,11 +350,12 @@ public class QueryRunnerTestHelper final QueryableIndex mergedRealtimeIndex = TestIndex.mergedRealtimeIndex(); return Arrays.asList( - makeUnionQueryRunner(factory, new IncrementalIndexSegment(rtIndex, segmentId)), - makeUnionQueryRunner(factory, new QueryableIndexSegment(segmentId, mMappedTestIndex)), + makeUnionQueryRunner(factory, new IncrementalIndexSegment(rtIndex, segmentId), "rtIndex"), + makeUnionQueryRunner(factory, new QueryableIndexSegment(segmentId, mMappedTestIndex), "mMappedTestIndex"), makeUnionQueryRunner( factory, - new QueryableIndexSegment(segmentId, mergedRealtimeIndex) + new QueryableIndexSegment(segmentId, mergedRealtimeIndex), + "mergedRealtimeIndex" ) ); } @@ -415,28 +416,32 @@ public class QueryRunnerTestHelper public static > QueryRunner makeQueryRunner( QueryRunnerFactory factory, - String resourceFileName + String resourceFileName, + final String runnerName ) { return makeQueryRunner( factory, segmentId, - new IncrementalIndexSegment(TestIndex.makeRealtimeIndex(resourceFileName), segmentId) + new IncrementalIndexSegment(TestIndex.makeRealtimeIndex(resourceFileName), segmentId), + runnerName ); } public static > QueryRunner makeQueryRunner( QueryRunnerFactory factory, - Segment adapter + Segment adapter, + final String runnerName ) { - return makeQueryRunner(factory, segmentId, adapter); + return makeQueryRunner(factory, segmentId, adapter, runnerName); } public static > QueryRunner makeQueryRunner( QueryRunnerFactory factory, String segmentId, - Segment adapter + Segment adapter, + final String runnerName ) { return new FinalizeResultsQueryRunner( @@ -444,16 +449,24 @@ public class QueryRunnerTestHelper segmentId, adapter.getDataInterval().getStart(), factory.createRunner(adapter) ), - (QueryToolChest>)factory.getToolchest() - ); + (QueryToolChest>) factory.getToolchest() + ) + { + @Override + public String toString() + { + return runnerName; + } + }; } public static QueryRunner makeUnionQueryRunner( QueryRunnerFactory> factory, - Segment adapter + Segment adapter, + final String runnerName ) { - return new FluentQueryRunnerBuilder(factory.getToolchest()) + final QueryRunner qr = new FluentQueryRunnerBuilder(factory.getToolchest()) .create( new UnionQueryRunner( new BySegmentQueryRunner( @@ -464,6 +477,21 @@ public class QueryRunnerTestHelper ) .mergeResults() .applyPostMergeDecoration(); + + return new QueryRunner() + { + @Override + public Sequence run(Query query, Map responseContext) + { + return qr.run(query, responseContext); + } + + @Override + public String toString() + { + return runnerName; + } + }; } public static QueryRunner makeFilteringQueryRunner( diff --git a/processing/src/test/java/io/druid/query/datasourcemetadata/DataSourceMetadataQueryTest.java b/processing/src/test/java/io/druid/query/datasourcemetadata/DataSourceMetadataQueryTest.java index e925e2ffdbe..8641c322923 100644 --- a/processing/src/test/java/io/druid/query/datasourcemetadata/DataSourceMetadataQueryTest.java +++ b/processing/src/test/java/io/druid/query/datasourcemetadata/DataSourceMetadataQueryTest.java @@ -118,7 +118,8 @@ public class DataSourceMetadataQueryTest final QueryRunner runner = QueryRunnerTestHelper.makeQueryRunner( (QueryRunnerFactory) new DataSourceMetadataQueryRunnerFactory( QueryRunnerTestHelper.NOOP_QUERYWATCHER - ), new IncrementalIndexSegment(rtIndex, "test") + ), new IncrementalIndexSegment(rtIndex, "test"), + null ); DateTime timestamp = new DateTime(System.currentTimeMillis()); rtIndex.add( diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java b/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java index f147a1f8323..237cad40962 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java @@ -131,6 +131,7 @@ public class GroupByQueryRunnerTest private final QueryRunner runner; private GroupByQueryRunnerFactory factory; private GroupByQueryConfig config; + private final String testName; @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -203,10 +204,16 @@ public class GroupByQueryRunnerTest ); } - @Parameterized.Parameters + @Parameterized.Parameters(name = "{0}") public static Collection constructorFeeder() throws IOException { - final GroupByQueryConfig defaultConfig = new GroupByQueryConfig(); + final GroupByQueryConfig defaultConfig = new GroupByQueryConfig() { + @Override + public String toString() + { + return "default"; + } + }; final GroupByQueryConfig singleThreadedConfig = new GroupByQueryConfig() { @Override @@ -214,6 +221,12 @@ public class GroupByQueryRunnerTest { return true; } + + @Override + public String toString() + { + return "singleThreaded"; + } }; final GroupByQueryConfig v2Config = new GroupByQueryConfig() { @@ -222,6 +235,12 @@ public class GroupByQueryRunnerTest { return GroupByStrategySelector.STRATEGY_V2; } + + @Override + public String toString() + { + return "v2"; + } }; final GroupByQueryConfig v2SmallBufferConfig = new GroupByQueryConfig() { @@ -242,6 +261,12 @@ public class GroupByQueryRunnerTest { return 10L * 1024 * 1024; } + + @Override + public String toString() + { + return "v2SmallBuffer"; + } }; final GroupByQueryConfig epinephelinaeSmallDictionaryConfig = new GroupByQueryConfig() { @@ -262,6 +287,12 @@ public class GroupByQueryRunnerTest { return 10L * 1024 * 1024; } + + @Override + public String toString() + { + return "epinephelinaeSmallDictionary"; + } }; defaultConfig.setMaxIntermediateRows(10000); @@ -279,15 +310,23 @@ public class GroupByQueryRunnerTest for (GroupByQueryConfig config : configs) { final GroupByQueryRunnerFactory factory = makeQueryRunnerFactory(config); for (QueryRunner runner : QueryRunnerTestHelper.makeQueryRunners(factory)) { - constructors.add(new Object[]{config, factory, runner}); + final String testName = String.format( + "config=%s, runner=%s", + config.toString(), + runner.toString() + ); + constructors.add(new Object[]{testName, config, factory, runner}); } } return constructors; } - public GroupByQueryRunnerTest(GroupByQueryConfig config, GroupByQueryRunnerFactory factory, QueryRunner runner) + public GroupByQueryRunnerTest( + String testName, GroupByQueryConfig config, GroupByQueryRunnerFactory factory, QueryRunner runner + ) { + this.testName = testName; this.config = config; this.factory = factory; this.runner = factory.mergeRunners(MoreExecutors.sameThreadExecutor(), ImmutableList.>of(runner)); diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByTimeseriesQueryRunnerTest.java b/processing/src/test/java/io/druid/query/groupby/GroupByTimeseriesQueryRunnerTest.java index d0e0d97a7dc..6d2ad8839e8 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByTimeseriesQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/groupby/GroupByTimeseriesQueryRunnerTest.java @@ -51,7 +51,7 @@ import java.util.Map; public class GroupByTimeseriesQueryRunnerTest extends TimeseriesQueryRunnerTest { @SuppressWarnings("unchecked") - @Parameterized.Parameters + @Parameterized.Parameters(name="{0}") public static Iterable constructorFeeder() throws IOException { GroupByQueryConfig config = new GroupByQueryConfig(); @@ -100,6 +100,12 @@ public class GroupByTimeseriesQueryRunnerTest extends TimeseriesQueryRunnerTest } ); } + + @Override + public String toString() + { + return input.toString(); + } }; } } diff --git a/processing/src/test/java/io/druid/query/metadata/SegmentAnalyzerTest.java b/processing/src/test/java/io/druid/query/metadata/SegmentAnalyzerTest.java index b7beeebeed4..e1e5c32d7f8 100644 --- a/processing/src/test/java/io/druid/query/metadata/SegmentAnalyzerTest.java +++ b/processing/src/test/java/io/druid/query/metadata/SegmentAnalyzerTest.java @@ -167,7 +167,9 @@ public class SegmentAnalyzerTest (QueryRunnerFactory) new SegmentMetadataQueryRunnerFactory( new SegmentMetadataQueryQueryToolChest(new SegmentMetadataQueryConfig()), QueryRunnerTestHelper.NOOP_QUERYWATCHER - ), index + ), + index, + null ); final SegmentMetadataQuery query = new SegmentMetadataQuery( diff --git a/processing/src/test/java/io/druid/query/metadata/SegmentMetadataQueryTest.java b/processing/src/test/java/io/druid/query/metadata/SegmentMetadataQueryTest.java index a3a3c5d585d..63dff115fbe 100644 --- a/processing/src/test/java/io/druid/query/metadata/SegmentMetadataQueryTest.java +++ b/processing/src/test/java/io/druid/query/metadata/SegmentMetadataQueryTest.java @@ -88,7 +88,8 @@ public class SegmentMetadataQueryTest return QueryRunnerTestHelper.makeQueryRunner( factory, segmentId, - new QueryableIndexSegment(segmentId, index) + new QueryableIndexSegment(segmentId, index), + null ); } @@ -103,7 +104,8 @@ public class SegmentMetadataQueryTest return QueryRunnerTestHelper.makeQueryRunner( factory, segmentId, - new IncrementalIndexSegment(index, segmentId) + new IncrementalIndexSegment(index, segmentId), + null ); } diff --git a/processing/src/test/java/io/druid/query/metadata/SegmentMetadataUnionQueryTest.java b/processing/src/test/java/io/druid/query/metadata/SegmentMetadataUnionQueryTest.java index 1e1f2e9839d..929fdfcb506 100644 --- a/processing/src/test/java/io/druid/query/metadata/SegmentMetadataUnionQueryTest.java +++ b/processing/src/test/java/io/druid/query/metadata/SegmentMetadataUnionQueryTest.java @@ -74,8 +74,9 @@ public class SegmentMetadataUnionQueryTest new QueryableIndexSegment( QueryRunnerTestHelper.segmentId, TestIndex.getMMappedTestIndex() - ) - ), true + ), + null + ), true, }, new Object[]{ QueryRunnerTestHelper.makeUnionQueryRunner( @@ -83,7 +84,8 @@ public class SegmentMetadataUnionQueryTest new IncrementalIndexSegment( TestIndex.getIncrementalTestIndex(), QueryRunnerTestHelper.segmentId - ) + ), + null ), false } ); diff --git a/processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java b/processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java index 8b7620314fb..b801f3b3899 100644 --- a/processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java @@ -67,7 +67,7 @@ public class SearchQueryRunnerTest QueryRunnerTestHelper.NoopIntervalChunkingQueryRunnerDecorator() ); - @Parameterized.Parameters + @Parameterized.Parameters(name="{0}") public static Iterable constructorFeeder() throws IOException { return QueryRunnerTestHelper.transformToConstructionFeeder( diff --git a/processing/src/test/java/io/druid/query/search/SearchQueryRunnerWithCaseTest.java b/processing/src/test/java/io/druid/query/search/SearchQueryRunnerWithCaseTest.java index c9332adf536..ef375244f07 100644 --- a/processing/src/test/java/io/druid/query/search/SearchQueryRunnerWithCaseTest.java +++ b/processing/src/test/java/io/druid/query/search/SearchQueryRunnerWithCaseTest.java @@ -91,10 +91,10 @@ public class SearchQueryRunnerWithCaseTest return transformToConstructionFeeder( Arrays.asList( - makeQueryRunner(factory, "index1", new IncrementalIndexSegment(index1, "index1")), - makeQueryRunner(factory, "index2", new IncrementalIndexSegment(index2, "index2")), - makeQueryRunner(factory, "index3", new QueryableIndexSegment("index3", index3)), - makeQueryRunner(factory, "index4", new QueryableIndexSegment("index4", index4)) + makeQueryRunner(factory, "index1", new IncrementalIndexSegment(index1, "index1"), "index1"), + makeQueryRunner(factory, "index2", new IncrementalIndexSegment(index2, "index2"), "index2"), + makeQueryRunner(factory, "index3", new QueryableIndexSegment("index3", index3), "index3"), + makeQueryRunner(factory, "index4", new QueryableIndexSegment("index4", index4), "index4") ) ); } diff --git a/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java b/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java index 3d484ddfb74..f7b5ec34d4c 100644 --- a/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java @@ -45,7 +45,7 @@ import java.util.Map; @RunWith(Parameterized.class) public class TimeBoundaryQueryRunnerTest { - @Parameterized.Parameters + @Parameterized.Parameters(name="{0}") public static Iterable constructorFeeder() throws IOException { return QueryRunnerTestHelper.transformToConstructionFeeder( diff --git a/processing/src/test/java/io/druid/query/topn/TopNQueryQueryToolChestTest.java b/processing/src/test/java/io/druid/query/topn/TopNQueryQueryToolChestTest.java index 5cf2071b8ff..5219a09e6bf 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNQueryQueryToolChestTest.java +++ b/processing/src/test/java/io/druid/query/topn/TopNQueryQueryToolChestTest.java @@ -121,7 +121,8 @@ public class TopNQueryQueryToolChestTest ); QueryRunner> runner = QueryRunnerTestHelper.makeQueryRunner( factory, - new IncrementalIndexSegment(TestIndex.getIncrementalTestIndex(), segmentId) + new IncrementalIndexSegment(TestIndex.getIncrementalTestIndex(), segmentId), + null ); Map context = Maps.newHashMap(); diff --git a/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerBenchmark.java b/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerBenchmark.java index 4a865f8275c..6a9391e8135 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerBenchmark.java +++ b/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerBenchmark.java @@ -106,21 +106,24 @@ public class TopNQueryRunnerBenchmark extends AbstractBenchmark TestCases.rtIndex, QueryRunnerTestHelper.makeQueryRunner( factory, - new IncrementalIndexSegment(TestIndex.getIncrementalTestIndex(), segmentId) + new IncrementalIndexSegment(TestIndex.getIncrementalTestIndex(), segmentId), + null ) ); testCaseMap.put( TestCases.mMappedTestIndex, QueryRunnerTestHelper.makeQueryRunner( factory, - new QueryableIndexSegment(segmentId, TestIndex.getMMappedTestIndex()) + new QueryableIndexSegment(segmentId, TestIndex.getMMappedTestIndex()), + null ) ); testCaseMap.put( TestCases.mergedRealtimeIndex, QueryRunnerTestHelper.makeQueryRunner( factory, - new QueryableIndexSegment(segmentId, TestIndex.mergedRealtimeIndex()) + new QueryableIndexSegment(segmentId, TestIndex.mergedRealtimeIndex()), + null ) ); //Thread.sleep(10000); diff --git a/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java b/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java index e6cab9493c6..cdfc2c1ec71 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java @@ -90,7 +90,7 @@ import java.util.Map; @RunWith(Parameterized.class) public class TopNQueryRunnerTest { - @Parameterized.Parameters + @Parameterized.Parameters(name="{0}") public static Iterable constructorFeeder() throws IOException { List>> retVal = Lists.newArrayList(); diff --git a/processing/src/test/java/io/druid/query/topn/TopNUnionQueryTest.java b/processing/src/test/java/io/druid/query/topn/TopNUnionQueryTest.java index a7b27c0f0f3..2125c907049 100644 --- a/processing/src/test/java/io/druid/query/topn/TopNUnionQueryTest.java +++ b/processing/src/test/java/io/druid/query/topn/TopNUnionQueryTest.java @@ -57,7 +57,7 @@ public class TopNUnionQueryTest this.runner = runner; } - @Parameterized.Parameters + @Parameterized.Parameters(name="{0}") public static Iterable constructorFeeder() throws IOException { return QueryRunnerTestHelper.cartesian( diff --git a/server/src/test/java/io/druid/segment/realtime/RealtimeManagerTest.java b/server/src/test/java/io/druid/segment/realtime/RealtimeManagerTest.java index 456185d0e75..23fc6a71b2e 100644 --- a/server/src/test/java/io/druid/segment/realtime/RealtimeManagerTest.java +++ b/server/src/test/java/io/druid/segment/realtime/RealtimeManagerTest.java @@ -606,13 +606,15 @@ public class RealtimeManagerTest interval_26_28, QueryRunnerTestHelper.makeQueryRunner( factory, - "druid.sample.tsv.top" + "druid.sample.tsv.top", + null ) , interval_28_29, QueryRunnerTestHelper.makeQueryRunner( factory, - "druid.sample.tsv.bottom" + "druid.sample.tsv.bottom", + null ) ); plumber.setRunners(runnerMap);