修改stop返回值改变的测试

Author: yunheli

platform-api/src/main/java/com/flow/platform/api/service/job/JobServiceImpl.java

@@ -265,6 +265,7 @@ public void delete(String path) {
     }
 
     private void stopAllJobs(String path) {
+        LOGGER.trace("before delete flow, first stop all jobs");
         List<Job> jobs = jobDao.listByPath(Arrays.asList(path));
         List<Job> sessionCreateJobs = new LinkedList<>();
         List<Job> runningJobs = new LinkedList<>();
@@ -288,6 +289,7 @@ private void stopAllJobs(String path) {
         for (Job runningJob : runningJobs) {
             stop(path, runningJob.getNumber());
         }
+        LOGGER.trace("before delete flow, finish stop all jobs");
     }
 
 

platform-api/src/test/java/com/flow/platform/api/test/controller/AgentControllerTest.java

@@ -66,11 +66,6 @@ public void should_close_agent_success() throws Throwable {
             .content(new AgentPath("default", "machine").toJson())
             .contentType(MediaType.APPLICATION_JSON_VALUE)).andExpect(status().isOk()).andReturn();
 
-
-        String contentAsString = result.getResponse().getContentAsString();
-        BooleanValue booleanValue = BooleanValue.parse(contentAsString, BooleanValue.class);
-        Assert.assertEquals(true, booleanValue.getValue());
-
         CountMatchingStrategy countStrategy = new CountMatchingStrategy(CountMatchingStrategy.EQUAL_TO, 1);
         verify(countStrategy, postRequestedFor(urlEqualTo("/cmd/send")));
     }

platform-api/src/test/java/com/flow/platform/api/test/controller/JobControllerTest.java

@@ -82,10 +82,6 @@ public void should_stop_job_success() throws Exception {
                 .contentType(MediaType.APPLICATION_JSON)
         ).andExpect(status().isOk()).andReturn();
 
-        String response = mvcResult.getResponse().getContentAsString();
-        Job jobLoaded = Jsonable.GSON_CONFIG.fromJson(response, Job.class);
-        Assert.assertNotNull(jobLoaded);
-
         Job loadedJob = requestToShowJob(job.getNodePath(), job.getNumber());
         Assert.assertEquals(NodeStatus.STOPPED, loadedJob.getRootResult().getStatus());
     }

platform-api/src/test/java/com/flow/platform/api/test/service/AgentServiceTest.java

@@ -31,6 +31,7 @@
 import com.flow.platform.api.util.CommonUtil;
 import com.flow.platform.domain.Agent;
 import com.flow.platform.domain.AgentPath;
+import com.flow.platform.domain.AgentStatus;
 import com.flow.platform.domain.Jsonable;
 import com.google.common.collect.Lists;
 import java.util.List;
@@ -82,6 +83,7 @@ public void should_list_agent_for_job() throws Throwable {
 
     private Agent createMockAgent(String sessionId) {
         Agent agent = new Agent("zone", "name");
+        agent.setStatus(AgentStatus.BUSY);
         agent.setSessionId(sessionId);
         return agent;
     }