Repository: kylin Updated Branches: refs/heads/v1.6.0-rc2 79909baf5 -> 8b37b81ba
KYLIN-2178 fix UT Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8b37b81b Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8b37b81b Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8b37b81b Branch: refs/heads/v1.6.0-rc2 Commit: 8b37b81ba8eceb50644daf25da2536d4062b1dd8 Parents: 79909ba Author: shaofengshi <shaofeng...@apache.org> Authored: Sat Nov 19 17:20:01 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Sat Nov 19 17:20:01 2016 +0800 ---------------------------------------------------------------------- .../kylin/cube/AggregationGroupRuleTest.java | 25 ++++++++++---------- .../org/apache/kylin/cube/CubeDescTest.java | 1 + .../ut_cube_desc_combination_int_overflow.json | 4 ++-- 3 files changed, 16 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8b37b81b/core-cube/src/test/java/org/apache/kylin/cube/AggregationGroupRuleTest.java ---------------------------------------------------------------------- diff --git a/core-cube/src/test/java/org/apache/kylin/cube/AggregationGroupRuleTest.java b/core-cube/src/test/java/org/apache/kylin/cube/AggregationGroupRuleTest.java index 563e139..4f42693 100644 --- a/core-cube/src/test/java/org/apache/kylin/cube/AggregationGroupRuleTest.java +++ b/core-cube/src/test/java/org/apache/kylin/cube/AggregationGroupRuleTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; +import java.io.FileNotFoundException; import java.io.IOException; import java.util.Arrays; @@ -112,20 +112,21 @@ public class AggregationGroupRuleTest { IValidatorRule<CubeDesc> rule = getAggregationGroupRule(); rule.validate(desc, vContext); vContext.print(System.out); - assertEquals(1, vContext.getResults().length); assertEquals("Aggregation group 0 joint dimensions has overlap with more than 1 dimensions in same hierarchy: [CATEG_LVL2_NAME, META_CATEG_NAME]", (vContext.getResults()[0].getMessage())); } - @Test - public void testCombinationIntOverflow() throws IOException { - ValidateContext vContext = new ValidateContext(); - CubeDesc desc = JsonUtil.readValue(new FileInputStream(LocalFileMetadataTestCase.LOCALMETA_TEST_DATA + "/cube_desc/ut_cube_desc_combination_int_overflow.json"), CubeDesc.class); - - IValidatorRule<CubeDesc> rule = getAggregationGroupRule(); - rule.validate(desc, vContext); - assertEquals(1, vContext.getResults().length); - } - + @Test + public void testCombinationIntOverflow() throws IOException { + ValidateContext vContext = new ValidateContext(); + CubeDesc desc = JsonUtil.readValue(new FileInputStream(LocalFileMetadataTestCase.LOCALMETA_TEST_DATA + "/cube_desc/ut_cube_desc_combination_int_overflow.json"), CubeDesc.class); + + desc.getAggregationGroups().get(0).getSelectRule().joint_dims = new String[][] { }; + + IValidatorRule<CubeDesc> rule = getAggregationGroupRule(); + rule.validate(desc, vContext); + assertEquals(1, vContext.getResults().length); + } + public AggregationGroupRule getAggregationGroupRule() { AggregationGroupRule rule = new AggregationGroupRule() { @Override http://git-wip-us.apache.org/repos/asf/kylin/blob/8b37b81b/core-cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java ---------------------------------------------------------------------- diff --git a/core-cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java b/core-cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java index ca7ae50..01e5090 100644 --- a/core-cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java +++ b/core-cube/src/test/java/org/apache/kylin/cube/CubeDescTest.java @@ -196,6 +196,7 @@ public class CubeDescTest extends LocalFileMetadataTestCase { public void testCombinationIntOverflow() throws Exception { thrown.expect(IllegalStateException.class); CubeDesc cubeDesc = CubeDescManager.getInstance(getTestConfig()).getCubeDesc("ut_cube_desc_combination_int_overflow"); + cubeDesc.getAggregationGroups().get(0).getSelectRule().joint_dims = new String[][] { }; cubeDesc.init(getTestConfig()); } http://git-wip-us.apache.org/repos/asf/kylin/blob/8b37b81b/examples/test_case_data/localmeta/cube_desc/ut_cube_desc_combination_int_overflow.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/ut_cube_desc_combination_int_overflow.json b/examples/test_case_data/localmeta/cube_desc/ut_cube_desc_combination_int_overflow.json index ec6f8f4..e8e2a52 100644 --- a/examples/test_case_data/localmeta/cube_desc/ut_cube_desc_combination_int_overflow.json +++ b/examples/test_case_data/localmeta/cube_desc/ut_cube_desc_combination_int_overflow.json @@ -376,8 +376,8 @@ "includes" : [ "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "AA", "AB", "AC", "AD", "AE", "AF", "AG", "AH"], "select_rule" : { "hierarchy_dims" : [ ], - "mandatory_dims" : [ ], - "joint_dims" : [ ] + "mandatory_dims" : [ "A" ], + "joint_dims" : [ ["L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "AA", "AB", "AC", "AD", "AE", "AF", "AG", "AH"] ] } }], "signature" : "4NqJVcVIYRF5PkJ0jS+9Rg==",
