KYLIN-1353 fix unit test
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/73cfbef8 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/73cfbef8 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/73cfbef8 Branch: refs/heads/1.x-HBase1.1.3 Commit: 73cfbef88f6a19812e64a28aacaee7e3a16d4f01 Parents: dfdeb92 Author: shaofengshi <[email protected]> Authored: Sun Jan 24 16:17:41 2016 +0800 Committer: shaofengshi <[email protected]> Committed: Sun Jan 24 16:18:11 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/rest/service/CubeService.java | 8 +++----- .../org/apache/kylin/rest/service/CacheServiceTest.java | 10 ++++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/73cfbef8/server/src/main/java/org/apache/kylin/rest/service/CubeService.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/service/CubeService.java b/server/src/main/java/org/apache/kylin/rest/service/CubeService.java index 4440afd..52bbdc4 100644 --- a/server/src/main/java/org/apache/kylin/rest/service/CubeService.java +++ b/server/src/main/java/org/apache/kylin/rest/service/CubeService.java @@ -221,12 +221,10 @@ public class CubeService extends BasicService { throw new JobException("Cube schema shouldn't be changed with running job."); } - desc.init(getConfig(), getMetadataManager().getAllTablesMap()); - int cuboidCount = CuboidCLI.simulateCuboidGeneration(desc); - logger.info("Updated cube " + cube.getName() + " has " + cuboidCount + " cuboids"); - try { - + desc.init(getConfig(), getMetadataManager().getAllTablesMap()); + int cuboidCount = CuboidCLI.simulateCuboidGeneration(desc); + logger.info("Updated cube " + cube.getName() + " has " + cuboidCount + " cuboids"); CubeDesc updatedCubeDesc = getCubeDescManager().updateCubeDesc(desc); if (!updatedCubeDesc.getError().isEmpty()) { return updatedCubeDesc; http://git-wip-us.apache.org/repos/asf/kylin/blob/73cfbef8/server/src/test/java/org/apache/kylin/rest/service/CacheServiceTest.java ---------------------------------------------------------------------- diff --git a/server/src/test/java/org/apache/kylin/rest/service/CacheServiceTest.java b/server/src/test/java/org/apache/kylin/rest/service/CacheServiceTest.java index a14be1d..1a2b211 100644 --- a/server/src/test/java/org/apache/kylin/rest/service/CacheServiceTest.java +++ b/server/src/test/java/org/apache/kylin/rest/service/CacheServiceTest.java @@ -426,8 +426,14 @@ public class CacheServiceTest extends LocalFileMetadataTestCase { cubeRequest.setCubeName(newCubeName); cubeRequest.setModelDescData(JsonUtil.writeValueAsString(modelDescCopy)); cubeRequest.setCubeDescData(JsonUtil.writeValueAsString(invalidCubeDesc)); - cubeRequest = cubeController.updateCubeDesc(cubeRequest); - assertTrue(cubeRequest.getSuccessful() == false); + boolean throwException = false; + try { + cubeController.updateCubeDesc(cubeRequest); + } catch (Exception e) { + throwException = true; + } + + assertTrue(throwException); // 2 events, all for model assertEquals(2, broadcaster.getCounterAndClear()); waitForCounterAndClear(2);
