Repository: tajo Updated Branches: refs/heads/master 4aef83a39 -> 96507607d
TAJO-2123: Print parameters for parameterized tests. Closes #1004 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/96507607 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/96507607 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/96507607 Branch: refs/heads/master Commit: 96507607d02fe993e26df5ddd2c5121897405d91 Parents: 4aef83a Author: Jihoon Son <[email protected]> Authored: Thu Apr 21 16:24:09 2016 +0900 Committer: Jihoon Son <[email protected]> Committed: Thu Apr 21 16:24:09 2016 +0900 ---------------------------------------------------------------------- .../src/test/java/org/apache/tajo/QueryTestCaseBase.java | 3 ++- .../java/org/apache/tajo/datum/TestArithmeticOperator.java | 2 +- .../tajo/engine/planner/physical/TestExternalSortExec.java | 2 +- .../java/org/apache/tajo/engine/query/TestGroupByQuery.java | 2 +- .../test/java/org/apache/tajo/engine/query/TestJoinQuery.java | 2 +- .../java/org/apache/tajo/engine/query/TestSimpleQuery.java | 7 +++---- .../test/java/org/apache/tajo/engine/query/TestSortQuery.java | 2 +- .../org/apache/tajo/engine/query/TestTablePartitions.java | 3 ++- .../test/java/org/apache/tajo/engine/query/TestTimezone.java | 3 ++- .../java/org/apache/tajo/storage/TestCompressionStorages.java | 3 ++- .../test/java/org/apache/tajo/storage/TestMergeScanner.java | 2 +- .../src/test/java/org/apache/tajo/storage/TestStorages.java | 3 ++- .../test/java/org/apache/tajo/storage/index/TestBSTIndex.java | 3 ++- .../java/org/apache/tajo/storage/raw/TestDirectRawFile.java | 3 ++- 14 files changed, 23 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-cluster-tests/src/test/java/org/apache/tajo/QueryTestCaseBase.java ---------------------------------------------------------------------- diff --git a/tajo-cluster-tests/src/test/java/org/apache/tajo/QueryTestCaseBase.java b/tajo-cluster-tests/src/test/java/org/apache/tajo/QueryTestCaseBase.java index e1d01c0..116990f 100644 --- a/tajo-cluster-tests/src/test/java/org/apache/tajo/QueryTestCaseBase.java +++ b/tajo-cluster-tests/src/test/java/org/apache/tajo/QueryTestCaseBase.java @@ -680,7 +680,8 @@ public class QueryTestCaseBase { String methodName = name.getMethodName(); // In the case of parameter execution name's pattern is methodName[0] if (methodName.endsWith("]")) { - methodName = methodName.substring(0, methodName.length() - 3); + int index = methodName.indexOf('['); + methodName = methodName.substring(0, index); } return methodName; } http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-common/src/test/java/org/apache/tajo/datum/TestArithmeticOperator.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/test/java/org/apache/tajo/datum/TestArithmeticOperator.java b/tajo-common/src/test/java/org/apache/tajo/datum/TestArithmeticOperator.java index 42623bd..a4b6812 100644 --- a/tajo-common/src/test/java/org/apache/tajo/datum/TestArithmeticOperator.java +++ b/tajo-common/src/test/java/org/apache/tajo/datum/TestArithmeticOperator.java @@ -40,7 +40,7 @@ public class TestArithmeticOperator { this.option = option; } - @Parameters + @Parameters(name = "{index}: {0}") public static Collection<Object[]> generateParameters() { return Arrays.asList(new Object[][]{ {"Zero_Null"}, http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java index d2d7810..5481d07 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java @@ -84,7 +84,7 @@ public class TestExternalSortExec { this.sortAlgorithmString = sortAlgorithm; } - @Parameters + @Parameters(name = "{index}: {0}") public static Collection<Object[]> generateParameters() { return Arrays.asList(new Object[][]{ {SortAlgorithm.TIM.name()}, http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java index 7f7b01f..5df969d 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java @@ -61,7 +61,7 @@ public class TestGroupByQuery extends QueryTestCaseBase { client.unsetSessionVariables(Arrays.asList(SessionVars.GROUPBY_MULTI_LEVEL_ENABLED.keyname())); } - @Parameters + @Parameters(name = "{index}: {0}") public static Collection<Object[]> generateParameters() { return Arrays.asList(new Object[][]{ {"MultiLevel"}, http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java index 4aaca65..749aad1 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java @@ -101,7 +101,7 @@ public class TestJoinQuery extends QueryTestCaseBase { } } - @Parameters + @Parameters(name = "{index}: {0}") public static Collection<Object[]> generateParameters() { return Arrays.asList(new Object[][]{ {"Hash_NoBroadcast"}, http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSimpleQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSimpleQuery.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSimpleQuery.java index 4c18097..f62bb23 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSimpleQuery.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSimpleQuery.java @@ -37,15 +37,14 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; import java.io.IOException; import java.sql.ResultSet; import java.util.Arrays; import java.util.Collection; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; @RunWith(Parameterized.class) public class TestSimpleQuery extends QueryTestCaseBase { @@ -64,7 +63,7 @@ public class TestSimpleQuery extends QueryTestCaseBase { } } - @Parameterized.Parameters + @Parameters(name = "{index}: {0}") public static Collection<Object[]> generateParameters() { return Arrays.asList(new Object[][]{ //type http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java index 0cc93da..3dc9d85 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java @@ -58,7 +58,7 @@ public class TestSortQuery extends QueryTestCaseBase { client.unsetSessionVariables(Arrays.asList(SessionVars.SORT_ALGORITHM.keyname())); } - @Parameters + @Parameters(name = "{index}: {0}") public static Collection<Object[]> generateParameters() { return Arrays.asList(new Object[][]{ {"TIM"}, http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java index 196b488..196f332 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java @@ -45,6 +45,7 @@ import org.apache.tajo.util.KeyValueSet; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; import java.io.IOException; import java.sql.ResultSet; @@ -64,7 +65,7 @@ public class TestTablePartitions extends QueryTestCaseBase { this.nodeType = nodeType; } - @Parameterized.Parameters + @Parameters(name = "{index}: {0}") public static Collection<Object[]> generateParameters() { return Arrays.asList(new Object[][] { //type http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTimezone.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTimezone.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTimezone.java index 1167c16..5034008 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTimezone.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestTimezone.java @@ -24,6 +24,7 @@ import org.apache.tajo.exception.TajoException; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; import java.io.IOException; import java.sql.ResultSet; @@ -84,7 +85,7 @@ public class TestTimezone extends QueryTestCaseBase { } } - @Parameterized.Parameters + @Parameters(name = "{index}: {0}") public static Collection<Object []> getParameters() { return Arrays.asList(new Object[][]{ {"GMT"}, http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestCompressionStorages.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestCompressionStorages.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestCompressionStorages.java index f1f1320..e9e6608 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestCompressionStorages.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestCompressionStorages.java @@ -44,6 +44,7 @@ import org.apache.tajo.util.CommonTestingUtil; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; import java.io.IOException; import java.util.Arrays; @@ -69,7 +70,7 @@ public class TestCompressionStorages { fs = testDir.getFileSystem(conf); } - @Parameterized.Parameters + @Parameters(name = "{index}: {0}") public static Collection<Object[]> generateParameters() { return Arrays.asList(new Object[][]{ {BuiltinStorages.TEXT}, http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java index ef264e9..eae8e15 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java @@ -73,7 +73,7 @@ public class TestMergeScanner { this.dataFormat = dataFormat; } - @Parameters + @Parameters(name = "{index}: {0}") public static Collection<Object[]> generateParameters() { return Arrays.asList(new Object[][] { {"TEXT"}, http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java index eb07034..bcbb6c3 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java @@ -53,6 +53,7 @@ import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; import java.io.IOException; import java.util.Arrays; @@ -147,7 +148,7 @@ public class TestStorages { fs = testDir.getFileSystem(conf); } - @Parameterized.Parameters + @Parameters(name = "{index}: {0}") public static Collection<Object[]> generateParameters() { return Arrays.asList(new Object[][] { //type, splitable, statsable, seekable, internalType http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java index 1eb28b6..93052f2 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java @@ -35,6 +35,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; import java.io.IOException; import java.util.Arrays; @@ -70,7 +71,7 @@ public class TestBSTIndex { } - @Parameterized.Parameters + @Parameters(name = "{index}: {0}") public static Collection<Object[]> generateParameters() { return Arrays.asList(new Object[][]{ {"RAW"}, http://git-wip-us.apache.org/repos/asf/tajo/blob/96507607/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/raw/TestDirectRawFile.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/raw/TestDirectRawFile.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/raw/TestDirectRawFile.java index 01fbc67..19e3e95 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/raw/TestDirectRawFile.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/raw/TestDirectRawFile.java @@ -49,6 +49,7 @@ import org.junit.Test; import org.junit.rules.Timeout; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; import java.io.IOException; import java.util.Arrays; @@ -75,7 +76,7 @@ public class TestDirectRawFile { @Rule public Timeout timeout = new Timeout(120, TimeUnit.SECONDS); - @Parameterized.Parameters + @Parameters(name = "{index}: isLocal: {0}") public static Collection<Object[]> generateParameters() throws IOException { return Arrays.asList(new Object[][]{ {false},
