KYLIN-1168 Update CubeControllerTest and JobControllerTest Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e568c46d Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e568c46d Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e568c46d
Branch: refs/heads/1.x-HBase1.1.3 Commit: e568c46d9c390db40b3680dcfd7e68b6eeb0d5c6 Parents: 4c7bb8d Author: shaofengshi <shaofeng...@apache.org> Authored: Fri Dec 4 11:10:51 2015 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Fri Dec 4 11:10:51 2015 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/rest/controller/CubeController.java | 2 -- .../org/apache/kylin/rest/controller/CubeControllerTest.java | 4 ++++ .../java/org/apache/kylin/rest/controller/JobControllerTest.java | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/e568c46d/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java b/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java index 42cf206..b94ded3 100644 --- a/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java +++ b/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java @@ -27,7 +27,6 @@ import java.util.Map; import java.util.UUID; import org.apache.commons.lang.StringUtils; -import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.util.JsonUtil; import org.apache.kylin.cube.CubeInstance; import org.apache.kylin.cube.CubeSegment; @@ -43,7 +42,6 @@ import org.apache.kylin.metadata.model.SegmentStatusEnum; import org.apache.kylin.metadata.project.ProjectInstance; import org.apache.kylin.metadata.project.ProjectManager; import org.apache.kylin.metadata.realization.RealizationType; -import org.apache.kylin.rest.exception.BadRequestException; import org.apache.kylin.rest.exception.ForbiddenException; import org.apache.kylin.rest.exception.InternalErrorException; import org.apache.kylin.rest.exception.NotFoundException; http://git-wip-us.apache.org/repos/asf/kylin/blob/e568c46d/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 bb8cb65..09ce6c5 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 @@ -28,6 +28,7 @@ import org.apache.kylin.cube.model.CubeDesc; import org.apache.kylin.cube.model.RowKeyColDesc; import org.apache.kylin.metadata.model.DataModelDesc; import org.apache.kylin.rest.request.CubeRequest; +import org.apache.kylin.rest.service.AccessService; import org.apache.kylin.rest.service.CubeService; import org.apache.kylin.rest.service.JobService; import org.apache.kylin.rest.service.ServiceTestBase; @@ -52,6 +53,8 @@ public class CubeControllerTest extends ServiceTestBase { CubeService cubeService; @Autowired JobService jobService; + @Autowired + private AccessService accessService; @Before public void setUp() throws Exception { @@ -59,6 +62,7 @@ public class CubeControllerTest extends ServiceTestBase { cubeController = new CubeController(); cubeController.setCubeService(cubeService); cubeController.setJobService(jobService); + cubeController.setAccessService(accessService); cubeDescController = new CubeDescController(); cubeDescController.setCubeService(cubeService); http://git-wip-us.apache.org/repos/asf/kylin/blob/e568c46d/server/src/test/java/org/apache/kylin/rest/controller/JobControllerTest.java ---------------------------------------------------------------------- diff --git a/server/src/test/java/org/apache/kylin/rest/controller/JobControllerTest.java b/server/src/test/java/org/apache/kylin/rest/controller/JobControllerTest.java index fccb294..24de879 100644 --- a/server/src/test/java/org/apache/kylin/rest/controller/JobControllerTest.java +++ b/server/src/test/java/org/apache/kylin/rest/controller/JobControllerTest.java @@ -33,6 +33,7 @@ import org.apache.kylin.job.dao.ExecutableDao; import org.apache.kylin.job.exception.PersistentException; import org.apache.kylin.rest.request.JobBuildRequest; import org.apache.kylin.rest.request.JobListRequest; +import org.apache.kylin.rest.service.AccessService; import org.apache.kylin.rest.service.CubeService; import org.apache.kylin.rest.service.JobService; import org.apache.kylin.rest.service.ServiceTestBase; @@ -51,6 +52,8 @@ public class JobControllerTest extends ServiceTestBase { private CubeController cubeController; @Autowired JobService jobService; + @Autowired + private AccessService accessService; @Autowired CubeService cubeService; @@ -69,6 +72,7 @@ public class JobControllerTest extends ServiceTestBase { cubeController = new CubeController(); cubeController.setJobService(jobService); cubeController.setCubeService(cubeService); + cubeController.setAccessService(accessService); KylinConfig testConfig = getTestConfig(); cubeManager = CubeManager.getInstance(testConfig); cubeDescManager = CubeDescManager.getInstance(testConfig);
