You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/05/25 08:11:39 UTC
[07/11] incubator-kylin git commit: fix ci: new model API changed
fix ci: new model API changed
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/08eedde3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/08eedde3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/08eedde3
Branch: refs/heads/new697
Commit: 08eedde320fb54b0785dd436e4a41d3a7068995a
Parents: 4d323f8
Author: honma <ho...@ebay.com>
Authored: Mon May 25 10:33:23 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Mon May 25 11:24:16 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/rest/controller/CubeControllerTest.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/08eedde3/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 1ec27d5..d2a948b 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
@@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import org.apache.kylin.cube.CubeInstance;
import org.apache.kylin.cube.model.CubeDesc;
-import org.apache.kylin.metadata.model.DataModelDesc;
import org.apache.kylin.rest.request.CubeRequest;
import org.apache.kylin.rest.service.CubeService;
import org.apache.kylin.rest.service.JobService;
@@ -66,7 +65,7 @@ public class CubeControllerTest extends ServiceTestBase {
CubeDesc[] cubes = (CubeDesc[]) cubeDescController.getCube("test_kylin_cube_with_slr_ready");
Assert.assertNotNull(cubes);
Assert.assertNotNull(cubeController.getSql("test_kylin_cube_with_slr_ready", "20130331080000_20131212080000"));
- Assert.assertNotNull(cubeController.getCubes(null, null, null,0, 5));
+ Assert.assertNotNull(cubeController.getCubes(null, null, null, 0, 5));
CubeDesc cube = cubes[0];
CubeDesc newCube = new CubeDesc();
@@ -87,8 +86,6 @@ public class CubeControllerTest extends ServiceTestBase {
newCube.setConfig(cube.getConfig());
newCube.setRowkey(cube.getRowkey());
- String newModelName = newCubeName + "_model_desc";
- newCube.getModel().setName(newModelName);//generate a random model
newCube.getModel().setLastModified(0);
ObjectMapper cubeDescMapper = new ObjectMapper();
@@ -103,13 +100,12 @@ public class CubeControllerTest extends ServiceTestBase {
cubeRequest.setCubeDescData(cubeDescWriter.toString());
cubeRequest = cubeController.saveCubeDesc(cubeRequest);
-
List<String> notifyList = Lists.newArrayList();
notifyList.add("john@example.com");
cubeController.updateNotifyList(newCubeName, notifyList);
cubeController.updateCubeCost(newCubeName, 80);
- List<CubeInstance> cubeInstances = cubeController.getCubes(newCubeName, "default",null, 1, 0);
+ List<CubeInstance> cubeInstances = cubeController.getCubes(newCubeName, cube.getModelName(),"default", 1, 0);
CubeInstance cubeInstance = cubeInstances.get(0);
Assert.assertTrue(cubeInstance.getDescriptor().getNotifyList().contains("john@example.com"));