fix unit test failure since the way of creating flow has been changed

Author: gy2006

core/src/main/java/com/flowci/core/flow/service/FlowServiceImpl.java

@@ -132,7 +132,9 @@ public List<Flow> listByCredential(String secretName) {
 
     @Override
     public Flow create(String name, CreateOption option) {
+        Objects.requireNonNull(option, "CreateOption is missing");
         Flow.validateName(name);
+
         var yamlContent = getYmlContent(option);
         var flow = new Flow(name);
         flow.getVars().put(Variables.Flow.Name, VarValue.of(flow.getName(), VarType.STRING, false));

core/src/test/java/com/flowci/core/test/api/OpenRestServiceTest.java

@@ -29,6 +29,7 @@
 import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.SpringScenario;
 import com.flowci.core.user.domain.User;
+import com.flowci.util.StringHelper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,6 +38,7 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.mock.web.MockMultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 
@@ -54,10 +56,17 @@ public class OpenRestServiceTest extends MockLoggedInScenario {
     @Autowired
     private OpenRestService openRestService;
 
+    private Flow flow;
+
+    @Before
+    public void init() throws IOException {
+        var yaml = StringHelper.toString(load("flow.yml"));
+        var option = new CreateOption().setRawYaml(StringHelper.toBase64(yaml));
+        flow = flowService.create("user-test", option);
+    }
+
     @Test
     public void should_list_all_flow_users() {
-        Flow flow = flowService.create("user-test", new CreateOption());
-
         List<User> users = openRestService.users(flow.getName());
         Assert.assertEquals(1, users.size());
 
@@ -74,10 +83,8 @@ public void should_list_all_flow_users() {
     }
 
     @Test
-    public void should_save_job_report() {
+    public void should_save_job_report() throws IOException {
         // given:
-        Flow flow = flowService.create("user-test", null);
-
         Job job = new Job();
         job.setId("12345");
         job.setFlowId(flow.getId());

core/src/test/java/com/flowci/core/test/job/CmdManagerTest.java

@@ -72,13 +72,14 @@ public class CmdManagerTest extends MockLoggedInScenario {
     @Test
     public void should_apply_flow_level_docker_option() throws IOException {
         // given: flow and job
-        Flow flow = flowService.create("hello", new CreateOption());
-        String yaml = StringHelper.toString(load("flow-with-root-docker.yml"));
-        Yml ymlObj = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
-        Job job = jobService.create(flow, ymlObj.getRaw(), Job.Trigger.MANUAL, new StringVars());
+        var yaml = StringHelper.toString(load("flow-with-root-docker.yml"));
+        var option = new CreateOption().setRawYaml(StringHelper.toBase64(yaml));
+        Flow flow = flowService.create("hello", option);
+
+        Job job = jobService.create(flow, yaml, Job.Trigger.MANUAL, new StringVars());
         Assert.assertNotNull(job);
 
-        FlowNode root = YmlParser.load(ymlObj.getRaw());
+        FlowNode root = YmlParser.load(yaml);
         NodeTree tree = NodeTree.create(root);
 
         // when: create first shell cmd
@@ -111,15 +112,15 @@ public void should_create_cmd_in_with_default_plugin_value() throws IOException
         Mockito.when(eventManager.publish(Mockito.any())).thenReturn(event);
 
         // given: flow and job
-        Flow flow = flowService.create("hello", new CreateOption());
-        String yaml = StringHelper.toString(load("flow-with-plugin.yml"));
-        Yml yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
+        var yaml = StringHelper.toString(load("flow-with-plugin.yml"));
+        var option = new CreateOption().setRawYaml(StringHelper.toBase64(yaml));
+        var flow = flowService.create("hello", option);
 
-        Job job = jobService.create(flow, yml.getRaw(), Job.Trigger.MANUAL, new StringVars());
+        Job job = jobService.create(flow, yaml, Job.Trigger.MANUAL, new StringVars());
         Assert.assertNotNull(job);
 
         // when: create shell cmd
-        FlowNode root = YmlParser.load(yml.getRaw());
+        FlowNode root = YmlParser.load(yaml);
         NodeTree tree = NodeTree.create(root);
         Node node = tree.get(NodePath.create(DEFAULT_ROOT_NAME, "plugin-test"));
         Step step = stepService.get(job.getId(), node.getPath().getPathInStr());
@@ -149,15 +150,15 @@ public void should_create_cmd_in_with_default_plugin_value() throws IOException
     @Test
     public void should_handle_step_in_step() throws IOException {
         // given: flow and job
-        Flow flow = flowService.create("hello", new CreateOption());
-        String yaml = StringHelper.toString(load("step-in-step.yml"));
-        Yml yml = ymlService.saveYml(flow, Yml.DEFAULT_NAME, yaml);
+        var yaml = StringHelper.toString(load("step-in-step.yml"));
+        var option = new CreateOption().setRawYaml(StringHelper.toBase64(yaml));
+        var flow = flowService.create("hello", option);
 
-        Job job = jobService.create(flow, yml.getRaw(), Job.Trigger.MANUAL, new StringVars());
+        Job job = jobService.create(flow, yaml, Job.Trigger.MANUAL, new StringVars());
         Assert.assertNotNull(job);
 
         // when: create shell cmd
-        FlowNode root = YmlParser.load(yml.getRaw());
+        FlowNode root = YmlParser.load(yaml);
         NodeTree tree = NodeTree.create(root);
 
         Node step2_1 = tree.get(NodePath.create(DEFAULT_ROOT_NAME, "step2", "step-2-1"));

core/src/test/java/com/flowci/core/test/user/UserControllerTest.java

@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.common.domain.StatusCode;
+import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.test.MockLoggedInScenario;
 import com.flowci.core.test.MockMvcHelper;
 import com.flowci.core.test.SpringScenario;
@@ -30,6 +31,7 @@
 import com.flowci.exception.ErrorCode;
 import com.flowci.exception.NotFoundException;
 import com.flowci.util.HashingHelper;
+import com.flowci.util.StringHelper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,7 +45,7 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 
-public class UserControllerTest extends MockLoggedInScenario {
+public class UserControllerTest extends SpringScenario {
 
     private static final TypeReference<ResponseMessage<User>> UserType =
             new TypeReference<>() {
@@ -55,8 +57,18 @@ public class UserControllerTest extends MockLoggedInScenario {
     @Autowired
     private ObjectMapper objectMapper;
 
+    @Autowired
+    private SessionManager sessionManager;
+
     @Test(expected = AuthenticationException.class)
     public void should_change_password_for_current_user_successfully() throws Exception {
+        var dummy = new User();
+        dummy.setId("1111");
+        dummy.setPasswordOnMd5(HashingHelper.md5("22222"));
+        dummy.setRole(User.Role.Admin);
+        dummy.setEmail("[email protected]");
+        sessionManager.set(dummy);
+
         User user = sessionManager.get();
 
         String newPwOnMd5 = HashingHelper.md5("11111");
@@ -66,7 +78,7 @@ public void should_change_password_for_current_user_successfully() throws Except
         body.setConfirm(newPwOnMd5);
 
         // when:
-        ResponseMessage message = mockMvcHelper.expectSuccessAndReturnClass(
+        var message = mockMvcHelper.expectSuccessAndReturnClass(
                 post("/users/change/password")
                         .content(objectMapper.writeValueAsBytes(body))
                         .contentType(MediaType.APPLICATION_JSON), ResponseMessage.class);