From 4068b46ba6a5882b50320229b521bcbf076c7ff0 Mon Sep 17 00:00:00 2001 From: Jihoon Son Date: Wed, 20 Apr 2016 14:55:47 +0900 Subject: [PATCH] TAJO-2123 --- .../src/test/java/org/apache/tajo/QueryTestCaseBase.java | 3 ++- .../java/org/apache/tajo/datum/TestArithmeticOperator.java | 2 +- .../tajo/engine/planner/physical/TestExternalSortExec.java | 2 +- .../org/apache/tajo/engine/query/TestGroupByQuery.java | 2 +- .../java/org/apache/tajo/engine/query/TestJoinQuery.java | 2 +- .../java/org/apache/tajo/engine/query/TestSimpleQuery.java | 7 +++---- .../java/org/apache/tajo/engine/query/TestSortQuery.java | 2 +- .../org/apache/tajo/engine/query/TestTablePartitions.java | 3 ++- .../java/org/apache/tajo/engine/query/TestTimezone.java | 3 ++- .../org/apache/tajo/storage/TestCompressionStorages.java | 3 ++- .../java/org/apache/tajo/storage/TestMergeScanner.java | 2 +- .../test/java/org/apache/tajo/storage/TestStorages.java | 3 ++- .../java/org/apache/tajo/storage/index/TestBSTIndex.java | 3 ++- .../org/apache/tajo/storage/raw/TestDirectRawFile.java | 3 ++- 14 files changed, 23 insertions(+), 17 deletions(-) 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 e1d01c0ce6..116990f6fe 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 @@ protected String getMethodName() { 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; } 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 42623bd3d8..a4b6812e38 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 TestArithmeticOperator(String option) { this.option = option; } - @Parameters + @Parameters(name = "{index}: {0}") public static Collection generateParameters() { return Arrays.asList(new Object[][]{ {"Zero_Null"}, 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 788ebebd2f..ad4dd496d8 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 TestExternalSortExec(String sortAlgorithm) { this.sortAlgorithmString = sortAlgorithm; } - @Parameters + @Parameters(name = "{index}: {0}") public static Collection generateParameters() { return Arrays.asList(new Object[][]{ {SortAlgorithm.TIM.name()}, 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 b346d0833e..7d2cab6dfb 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 static void tearDown() throws Exception { client.unsetSessionVariables(Arrays.asList(SessionVars.GROUPBY_MULTI_LEVEL_ENABLED.keyname())); } - @Parameters + @Parameters(name = "{index}: {0}") public static Collection generateParameters() { return Arrays.asList(new Object[][]{ {"MultiLevel"}, 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 34f26a67e9..19c5d8faf8 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 TestJoinQuery(String joinOption) throws Exception { } } - @Parameters + @Parameters(name = "{index}: {0}") public static Collection generateParameters() { return Arrays.asList(new Object[][]{ {"Hash_NoBroadcast"}, 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 4c180973b1..f62bb2378b 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.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 TestSimpleQuery(NodeType nodeType) throws IOException { } } - @Parameterized.Parameters + @Parameters(name = "{index}: {0}") public static Collection generateParameters() { return Arrays.asList(new Object[][]{ //type 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 ef3336d85d..e1efb52fc5 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 static void tearDown() throws Exception { client.unsetSessionVariables(Arrays.asList(SessionVars.SORT_ALGORITHM.keyname())); } - @Parameters + @Parameters(name = "{index}: {0}") public static Collection generateParameters() { return Arrays.asList(new Object[][]{ {"TIM"}, 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 3438759086..63dd0f536f 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 @@ -42,6 +42,7 @@ 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; @@ -61,7 +62,7 @@ public TestTablePartitions(NodeType nodeType) throws IOException { this.nodeType = nodeType; } - @Parameterized.Parameters + @Parameters(name = "{index}: {0}") public static Collection generateParameters() { return Arrays.asList(new Object[][] { //type 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 1167c169a5..5034008c12 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.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 void testToChar() throws TajoException, SQLException, IOException { } } - @Parameterized.Parameters + @Parameters(name = "{index}: {0}") public static Collection getParameters() { return Arrays.asList(new Object[][]{ {"GMT"}, 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 d18961feea..172a2fbbe7 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.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 TestCompressionStorages(String type) throws IOException { fs = testDir.getFileSystem(conf); } - @Parameterized.Parameters + @Parameters(name = "{index}: {0}") public static Collection generateParameters() { return Arrays.asList(new Object[][]{ {BuiltinStorages.TEXT}, 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 a04867e7fa..9dea23ad4d 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 TestMergeScanner(String dataFormat) { this.dataFormat = dataFormat; } - @Parameters + @Parameters(name = "{index}: {0}") public static Collection generateParameters() { return Arrays.asList(new Object[][] { {"TEXT"}, 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 2e88398371..438333fb0d 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.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 TestStorages(String type, boolean splitable, boolean statsable, boolean s fs = testDir.getFileSystem(conf); } - @Parameterized.Parameters + @Parameters(name = "{index}: {0}") public static Collection generateParameters() { return Arrays.asList(new Object[][] { //type, splitable, statsable, seekable, internalType 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 18d5012479..48e7f826ba 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.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 TestBSTIndex(String type) { } - @Parameterized.Parameters + @Parameters(name = "{index}: {0}") public static Collection generateParameters() { return Arrays.asList(new Object[][]{ {"RAW"}, 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 1a5a41e696..4484e7dc92 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.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 generateParameters() throws IOException { return Arrays.asList(new Object[][]{ {false},