From 39b0d906fa23cea48d696f2a0293e4df387ad3f9 Mon Sep 17 00:00:00 2001
From: "qianhao.zhou" <qianzhou@ebay.com>
Date: Tue, 9 Dec 2014 20:16:02 +0800
Subject: [PATCH] fix CI issue

---
 .../rest/controller/JobControllerTest.java         | 52 +++++++++++++++-------
 .../rest/controller/ProjectControllerTest.java     | 11 +++++
 2 files changed, 46 insertions(+), 17 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 ee7357e..9e963e2 100644
--- a/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java
+++ b/server/src/test/java/com/kylinolap/rest/controller/JobControllerTest.java
@@ -18,8 +18,16 @@
 
 import java.io.IOException;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
+import com.kylinolap.cube.CubeDescManager;
+import com.kylinolap.cube.CubeInstance;
+import com.kylinolap.cube.CubeManager;
+import com.kylinolap.cube.model.CubeDesc;
+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;
@@ -36,9 +44,11 @@
 import com.kylinolap.rest.service.JobService;
 import com.kylinolap.rest.service.ServiceTestBase;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author xduo
- * 
  */
 public class JobControllerTest extends ServiceTestBase {
 
@@ -49,12 +59,8 @@
 
     @Autowired
     CubeService cubeService;
+    private static final String CUBE_NAME = "new_job_controller";
 
-    @BeforeClass
-    public static void setupResource() throws Exception {
-        Authentication authentication = new TestingAuthenticationToken("ADMIN", "ADMIN", "ROLE_ADMIN");
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-    }
 
     @Before
     public void setup() throws Exception {
@@ -65,27 +71,39 @@ public void setup() throws Exception {
         cubeController = new CubeController();
         cubeController.setJobService(jobService);
         cubeController.setCubeService(cubeService);
+
     }
 
     @Test
     public void testBasics() throws IOException {
+
+        CubeManager cubeManager = CubeManager.getInstance(getTestConfig());
+        if (cubeManager.getCube(CUBE_NAME) != null) {
+            cubeManager.dropCube(CUBE_NAME, false);
+        }
+        CubeDescManager cubeDescManager = CubeDescManager.getInstance(getTestConfig());
+        CubeDesc cubeDesc = cubeDescManager.getCubeDesc("test_kylin_cube_with_slr_left_join_desc");
+        CubeInstance cube = cubeManager.createCube(CUBE_NAME, "DEFAULT", cubeDesc, "test");
+        assertNotNull(cube);
+
         JobListRequest jobRequest = new JobListRequest();
         Assert.assertNotNull(jobSchedulerController.list(jobRequest));
 
-        JobInstance job = null;
-        try {
-            JobBuildRequest jobBuildRequest = new JobBuildRequest();
-            jobBuildRequest.setBuildType("BUILD");
-            jobBuildRequest.setStartTime(1386806400000L);
-            jobBuildRequest.setEndTime(new Date().getTime());
-            job = cubeController.rebuild("test_kylin_cube_with_slr_ready", jobBuildRequest);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        JobBuildRequest jobBuildRequest = new JobBuildRequest();
+        jobBuildRequest.setBuildType("BUILD");
+        jobBuildRequest.setStartTime(1386806400000L);
+        jobBuildRequest.setEndTime(new Date().getTime());
+        JobInstance job = cubeController.rebuild(CUBE_NAME, jobBuildRequest);
+
 
         Assert.assertNotNull(jobSchedulerController.get(job.getId()));
         Map<String, String> output = jobSchedulerController.getStepOutput(job.getId(), 0);
         Assert.assertNotNull(output);
+        try {
+            jobSchedulerController.cancel(job.getId());
+        } catch (InternalErrorException e) {
+
+        }
 
         // jobSchedulerController.cancel(job.getId());
     }
@@ -96,7 +114,7 @@ public void testResume() throws IOException {
         jobBuildRequest.setBuildType("BUILD");
         jobBuildRequest.setStartTime(20130331080000L);
         jobBuildRequest.setEndTime(20131212080000L);
-        JobInstance job = cubeController.rebuild("test_kylin_cube_with_slr_ready", jobBuildRequest);
+        JobInstance job = cubeController.rebuild(CUBE_NAME, jobBuildRequest);
 
         jobSchedulerController.resume(job.getId());
     }
diff --git a/server/src/test/java/com/kylinolap/rest/controller/ProjectControllerTest.java b/server/src/test/java/com/kylinolap/rest/controller/ProjectControllerTest.java
index 6dd31b4..e4dde42 100644
--- a/server/src/test/java/com/kylinolap/rest/controller/ProjectControllerTest.java
+++ b/server/src/test/java/com/kylinolap/rest/controller/ProjectControllerTest.java
@@ -32,6 +32,17 @@ public void setup() {
 
         projectController = new ProjectController();
         projectController.setProjectService(projectService);
+        try {
+            projectController.deleteProject("new_project");
+        } catch (InternalErrorException e) {
+            //project doesn't exist
+        }
+        try {
+            projectController.deleteProject("new_project_2");
+        } catch (InternalErrorException e) {
+            //project doesn't exist
+        }
+
     }
 
     @Test