You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/09/03 06:37:14 UTC
[07/50] [abbrv] kylin git commit: KYLIN-1909 Fix test and style
KYLIN-1909 Fix test and style
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4c897dd2
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4c897dd2
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4c897dd2
Branch: refs/heads/1.5.x-HBase1.x
Commit: 4c897dd2e8b008c3baaa970d8a0f50d88137026b
Parents: f41f8c5
Author: lidongsjtu <li...@apache.org>
Authored: Mon Aug 22 13:39:29 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Mon Aug 22 13:39:29 2016 +0800
----------------------------------------------------------------------
.../org/apache/kylin/rest/controller/CubeController.java | 8 +++++++-
.../org/apache/kylin/rest/controller/CubeControllerTest.java | 6 ++++++
.../java/org/apache/kylin/rest/service/CubeServiceTest.java | 5 +----
3 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/4c897dd2/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java
index ecdab40..7081d02 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/controller/CubeController.java
@@ -20,7 +20,13 @@ package org.apache.kylin.rest.controller;
import java.io.IOException;
import java.net.UnknownHostException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
import org.apache.commons.lang.StringUtils;
import org.apache.kylin.common.util.JsonUtil;
http://git-wip-us.apache.org/repos/asf/kylin/blob/4c897dd2/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java b/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java
index f6db8c1..6319899 100644
--- a/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java
+++ b/server/src/test/java/org/apache/kylin/rest/controller/CubeControllerTest.java
@@ -163,4 +163,10 @@ public class CubeControllerTest extends ServiceTestBase {
Assert.assertTrue(segNumber == newSegNumber + 1);
}
+ @Test
+ public void testGetCubes() {
+ List<CubeInstance> cubes = cubeController.getCubes(null, null, null, 1, 0);
+ Assert.assertTrue(cubes.size() == 1);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/4c897dd2/server/src/test/java/org/apache/kylin/rest/service/CubeServiceTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/kylin/rest/service/CubeServiceTest.java b/server/src/test/java/org/apache/kylin/rest/service/CubeServiceTest.java
index a3c983d..f98d6b9 100644
--- a/server/src/test/java/org/apache/kylin/rest/service/CubeServiceTest.java
+++ b/server/src/test/java/org/apache/kylin/rest/service/CubeServiceTest.java
@@ -48,12 +48,9 @@ public class CubeServiceTest extends ServiceTestBase {
Assert.assertNotNull(cubeService.getMetadataManager());
Assert.assertNotNull(cacheService.getOLAPDataSource(ProjectInstance.DEFAULT_PROJECT_NAME));
- List<CubeInstance> cubes = cubeService.getCubes(null, null, null, null, null);
+ List<CubeInstance> cubes = cubeService.listAllCubes(null, null, null);
Assert.assertNotNull(cubes);
CubeInstance cube = cubes.get(0);
cubeService.isCubeDescFreeEditable(cube.getDescriptor());
-
- cubes = cubeService.getCubes(null, null, null, 1, 0);
- Assert.assertTrue(cubes.size() == 1);
}
}