From 6d491a19bb074d9a70d17d33925ee4b2637538fc Mon Sep 17 00:00:00 2001 From: "qianhao.zhou" Date: Wed, 10 Dec 2014 10:36:40 +0800 Subject: [PATCH 1/2] fix CI issue --- .../com/kylinolap/rest/controller/JobControllerTest.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java b/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java index 9e963e2..6583ebe 100644 --- a/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java +++ b/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java @@ -21,10 +21,12 @@ import java.util.List; import java.util.Map; +import com.kylinolap.common.KylinConfig; import com.kylinolap.cube.CubeDescManager; import com.kylinolap.cube.CubeInstance; import com.kylinolap.cube.CubeManager; import com.kylinolap.cube.model.CubeDesc; +import com.kylinolap.job.JobDAO; import com.kylinolap.metadata.MetadataManager; import com.kylinolap.rest.exception.InternalErrorException; import com.kylinolap.rest.exception.NotFoundException; @@ -77,11 +79,12 @@ public void setup() throws Exception { @Test public void testBasics() throws IOException { - CubeManager cubeManager = CubeManager.getInstance(getTestConfig()); + KylinConfig testConfig = getTestConfig(); + CubeManager cubeManager = CubeManager.getInstance(testConfig); if (cubeManager.getCube(CUBE_NAME) != null) { cubeManager.dropCube(CUBE_NAME, false); } - CubeDescManager cubeDescManager = CubeDescManager.getInstance(getTestConfig()); + CubeDescManager cubeDescManager = CubeDescManager.getInstance(testConfig); CubeDesc cubeDesc = cubeDescManager.getCubeDesc("test_kylin_cube_with_slr_left_join_desc"); CubeInstance cube = cubeManager.createCube(CUBE_NAME, "DEFAULT", cubeDesc, "test"); assertNotNull(cube); @@ -91,7 +94,7 @@ public void testBasics() throws IOException { JobBuildRequest jobBuildRequest = new JobBuildRequest(); jobBuildRequest.setBuildType("BUILD"); - jobBuildRequest.setStartTime(1386806400000L); + jobBuildRequest.setStartTime(0L); jobBuildRequest.setEndTime(new Date().getTime()); JobInstance job = cubeController.rebuild(CUBE_NAME, jobBuildRequest); @@ -99,11 +102,7 @@ public void testBasics() throws IOException { Assert.assertNotNull(jobSchedulerController.get(job.getId())); Map output = jobSchedulerController.getStepOutput(job.getId(), 0); Assert.assertNotNull(output); - try { - jobSchedulerController.cancel(job.getId()); - } catch (InternalErrorException e) { - - } + JobDAO.getInstance(testConfig).deleteJob(job); // jobSchedulerController.cancel(job.getId()); } From aca05648924147002034817d57555faa46cf4817 Mon Sep 17 00:00:00 2001 From: "qianhao.zhou" Date: Thu, 11 Dec 2014 14:20:02 +0800 Subject: [PATCH 2/2] fix CI issue --- .../rest/controller/JobControllerTest.java | 53 ++++++++++++---------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java b/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java index 6583ebe..ddf7ac8 100644 --- a/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java +++ b/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java @@ -16,38 +16,29 @@ package com.kylinolap.rest.controller; -import java.io.IOException; -import java.util.Date; -import java.util.List; -import java.util.Map; - import com.kylinolap.common.KylinConfig; import com.kylinolap.cube.CubeDescManager; import com.kylinolap.cube.CubeInstance; import com.kylinolap.cube.CubeManager; import com.kylinolap.cube.model.CubeDesc; import com.kylinolap.job.JobDAO; -import com.kylinolap.metadata.MetadataManager; -import com.kylinolap.rest.exception.InternalErrorException; -import com.kylinolap.rest.exception.NotFoundException; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.authentication.TestingAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; - import com.kylinolap.job.JobInstance; import com.kylinolap.rest.request.JobBuildRequest; import com.kylinolap.rest.request.JobListRequest; import com.kylinolap.rest.service.CubeService; import com.kylinolap.rest.service.JobService; import com.kylinolap.rest.service.ServiceTestBase; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import java.io.IOException; +import java.util.Date; +import java.util.Map; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; /** * @author xduo @@ -63,6 +54,10 @@ CubeService cubeService; private static final String CUBE_NAME = "new_job_controller"; + private CubeManager cubeManager; + private CubeDescManager cubeDescManager; + private JobDAO jobDAO; + @Before public void setup() throws Exception { @@ -73,18 +68,23 @@ public void setup() throws Exception { cubeController = new CubeController(); cubeController.setJobService(jobService); cubeController.setCubeService(cubeService); + KylinConfig testConfig = getTestConfig(); + cubeManager = CubeManager.getInstance(testConfig); + cubeDescManager = CubeDescManager.getInstance(testConfig); - } + jobDAO = JobDAO.getInstance(testConfig); - @Test - public void testBasics() throws IOException { + } - KylinConfig testConfig = getTestConfig(); - CubeManager cubeManager = CubeManager.getInstance(testConfig); + @After + public void tearDown() throws Exception { if (cubeManager.getCube(CUBE_NAME) != null) { cubeManager.dropCube(CUBE_NAME, false); } - CubeDescManager cubeDescManager = CubeDescManager.getInstance(testConfig); + } + + @Test + public void testBasics() throws IOException { CubeDesc cubeDesc = cubeDescManager.getCubeDesc("test_kylin_cube_with_slr_left_join_desc"); CubeInstance cube = cubeManager.createCube(CUBE_NAME, "DEFAULT", cubeDesc, "test"); assertNotNull(cube); @@ -102,7 +102,10 @@ public void testBasics() throws IOException { Assert.assertNotNull(jobSchedulerController.get(job.getId())); Map output = jobSchedulerController.getStepOutput(job.getId(), 0); Assert.assertNotNull(output); - JobDAO.getInstance(testConfig).deleteJob(job); + jobDAO.deleteJob(job); + if (cubeManager.getCube(CUBE_NAME) != null) { + cubeManager.dropCube(CUBE_NAME, false); + } // jobSchedulerController.cancel(job.getId()); }