SbloodyS commented on code in PR #10670: URL: https://github.com/apache/dolphinscheduler/pull/10670#discussion_r927320811
########## dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/pages/project/ProjectPage.java: ########## @@ -0,0 +1,97 @@ +/* + * Licensed to Apache Software Foundation (ASF) under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Apache Software Foundation (ASF) licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.dolphinscheduler.api.test.pages.project; + + +import com.sun.xml.internal.ws.api.model.ExceptionType; +import org.apache.dolphinscheduler.api.test.cases.ProjectAPITest; +import org.apache.dolphinscheduler.api.test.core.Constants; +import org.apache.dolphinscheduler.api.test.entity.HttpResponse; +import org.apache.dolphinscheduler.api.test.entity.ProjectListResponseData; +import org.apache.dolphinscheduler.api.test.entity.ProjectListResponseTotalList; +import org.apache.dolphinscheduler.api.test.utils.JSONUtils; +import org.apache.dolphinscheduler.api.test.utils.RequestClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashMap; +import java.util.Map; + +public final class ProjectPage { + private static final Logger logger = LoggerFactory.getLogger(ProjectPage.class); + + public HttpResponse createProject(String sessionId, String projectName, String description, String userName) { + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("projectName", projectName); + params.put("description", description); + params.put("userName", userName); + + headers.put(Constants.SESSION_ID_KEY, sessionId); + + RequestClient requestClient = new RequestClient(); + + try { + HttpResponse res = requestClient.post("/projects", headers, params); + return res; + } catch (Exception e) { + logger.error("create project fail, message:{}", e); Review Comment: Is it better to throw an exception directly so that the test can be stopped directly instead of continue. WDYT? ########## dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/pages/project/TaskInstancePage.java: ########## @@ -0,0 +1,99 @@ +/* + * Licensed to Apache Software Foundation (ASF) under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Apache Software Foundation (ASF) licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.dolphinscheduler.api.test.pages.project; + + +import org.apache.dolphinscheduler.api.test.cases.ProjectAPITest; +import org.apache.dolphinscheduler.api.test.core.Constants; +import org.apache.dolphinscheduler.api.test.entity.HttpResponse; +import org.apache.dolphinscheduler.api.test.entity.TaskInstanceResponseData; +import org.apache.dolphinscheduler.api.test.entity.TaskInstanceResponseTotalList; +import org.apache.dolphinscheduler.api.test.utils.JSONUtils; +import org.apache.dolphinscheduler.api.test.utils.RequestClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +import java.util.HashMap; +import java.util.Map; + +public final class TaskInstancePage { + private static final Logger logger = LoggerFactory.getLogger(TaskInstancePage.class); + private static String taskState = null; + private static Integer taskInstanceId = null; + + public String queryTaskInstance(String sessionId, String projectName, String workFlowName){ + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("pageSize", 10); + params.put("pageNo", 1); + params.put("searchVal", ""); + params.put("processInstanceId", ""); + params.put("host", ""); + params.put("stateType", ""); + params.put("startDate", ""); + params.put("endDate", ""); + params.put("executorName", ""); + params.put("processInstanceName", workFlowName); + + headers.put(Constants.SESSION_ID_KEY, sessionId); + RequestClient requestClient = new RequestClient(); + ProjectPage project = new ProjectPage(); + String projectCode = project.getProjectCode(sessionId, projectName); + + WorkFlowDefinitionPage workflow = new WorkFlowDefinitionPage(); + workflow.runWorkflow(sessionId, projectName, workFlowName); + + HttpResponse res = requestClient.get("/projects/"+projectCode+"/task-instances", headers, params); + + + for (TaskInstanceResponseTotalList taskInstanceRes : JSONUtils.convertValue(res.body().data(), TaskInstanceResponseData.class).totalList()) { + Review Comment: It's better to remove the blank line. ########## dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/pages/project/WorkFlowDefinitionPage.java: ########## @@ -0,0 +1,205 @@ +/* + * Licensed to Apache Software Foundation (ASF) under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Apache Software Foundation (ASF) licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.dolphinscheduler.api.test.pages.project; + + +import org.apache.dolphinscheduler.api.test.cases.TenantAPITest; +import org.apache.dolphinscheduler.api.test.core.Constants; +import org.apache.dolphinscheduler.api.test.entity.TaskParamsMap; +import org.apache.dolphinscheduler.api.test.entity.TaskDefinitionRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowRunRequestData; +import org.apache.dolphinscheduler.api.test.entity.HttpResponse; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowCreateRequestData; +import org.apache.dolphinscheduler.api.test.entity.TaskRelationRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseTotalList; +import org.apache.dolphinscheduler.api.test.utils.JSONUtils; +import org.apache.dolphinscheduler.api.test.utils.RequestClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + + +public final class WorkFlowDefinitionPage { + private static String genNumId = null; + private static String workFlowCode = null; + private static final Logger logger = LoggerFactory.getLogger(WorkFlowDefinitionPage.class); + + public void getGenNumId(String sessionId, String projectName) { + + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("genNum", 1); + headers.put(Constants.SESSION_ID_KEY, sessionId); + ProjectPage project = new ProjectPage(); + String projectCode = project.getProjectCode(sessionId, projectName); + RequestClient requestClient = new RequestClient(); + HttpResponse res = requestClient.get("/projects/"+projectCode+"/task-definition/gen-task-codes", headers, params); + ArrayList list = (ArrayList) res.body().data(); + genNumId = list.get(0).toString(); + + } + + + public HttpResponse createWorkflow(String sessionId, String projectName, String workFlowName) { + Map<String, String> headers = new HashMap<>(); + WorkFlowCreateRequestData workFlowCreateRequestData = new WorkFlowCreateRequestData(); + TaskDefinitionRequestData taskDefinitionRequestData = new TaskDefinitionRequestData(); + TaskRelationRequestData taskRelationRequestData = new TaskRelationRequestData(); + + TaskParamsMap taskParams = new TaskParamsMap(); + ArrayList<Object> localParams = new ArrayList<>(); + ArrayList<Object> resourceList = new ArrayList<>(); + taskParams.localParams(localParams); + taskParams.resourceList(resourceList); + taskParams.rawScript("echo 123"); Review Comment: We should turn this into an input to the method instead of hardcode it. ########## dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/pages/project/TaskInstancePage.java: ########## @@ -0,0 +1,99 @@ +/* + * Licensed to Apache Software Foundation (ASF) under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Apache Software Foundation (ASF) licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.dolphinscheduler.api.test.pages.project; + + +import org.apache.dolphinscheduler.api.test.cases.ProjectAPITest; +import org.apache.dolphinscheduler.api.test.core.Constants; +import org.apache.dolphinscheduler.api.test.entity.HttpResponse; +import org.apache.dolphinscheduler.api.test.entity.TaskInstanceResponseData; +import org.apache.dolphinscheduler.api.test.entity.TaskInstanceResponseTotalList; +import org.apache.dolphinscheduler.api.test.utils.JSONUtils; +import org.apache.dolphinscheduler.api.test.utils.RequestClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +import java.util.HashMap; +import java.util.Map; + +public final class TaskInstancePage { + private static final Logger logger = LoggerFactory.getLogger(TaskInstancePage.class); + private static String taskState = null; + private static Integer taskInstanceId = null; + + public String queryTaskInstance(String sessionId, String projectName, String workFlowName){ + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("pageSize", 10); + params.put("pageNo", 1); + params.put("searchVal", ""); + params.put("processInstanceId", ""); + params.put("host", ""); + params.put("stateType", ""); + params.put("startDate", ""); + params.put("endDate", ""); + params.put("executorName", ""); + params.put("processInstanceName", workFlowName); + + headers.put(Constants.SESSION_ID_KEY, sessionId); + RequestClient requestClient = new RequestClient(); + ProjectPage project = new ProjectPage(); + String projectCode = project.getProjectCode(sessionId, projectName); + + WorkFlowDefinitionPage workflow = new WorkFlowDefinitionPage(); + workflow.runWorkflow(sessionId, projectName, workFlowName); + + HttpResponse res = requestClient.get("/projects/"+projectCode+"/task-instances", headers, params); + + + for (TaskInstanceResponseTotalList taskInstanceRes : JSONUtils.convertValue(res.body().data(), TaskInstanceResponseData.class).totalList()) { + + taskState = taskInstanceRes.state(); + taskInstanceId = taskInstanceRes.id(); + } + + return taskState; + + } + + public HttpResponse queryTaskInstanceLog(String sessionId, String projectName, String workFlowName){ + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + + headers.put(Constants.SESSION_ID_KEY, sessionId); + RequestClient requestClient = new RequestClient(); + TaskInstancePage taskInstance = new TaskInstancePage(); + taskInstance.queryTaskInstance(sessionId, projectName, workFlowName); + + params.put("taskInstanceId", taskInstanceId); + params.put("limit", 1000); + params.put("skipLineNum", 0); + + HttpResponse res = requestClient.get("/log/detail", headers, params); + String res_log = (String) res.body().data(); + + logger.info("查询实例log：%s", res_log); Review Comment: Please remove unnessnary log. ########## dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/pages/project/WorkFlowDefinitionPage.java: ########## @@ -0,0 +1,205 @@ +/* + * Licensed to Apache Software Foundation (ASF) under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Apache Software Foundation (ASF) licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.dolphinscheduler.api.test.pages.project; + + +import org.apache.dolphinscheduler.api.test.cases.TenantAPITest; +import org.apache.dolphinscheduler.api.test.core.Constants; +import org.apache.dolphinscheduler.api.test.entity.TaskParamsMap; +import org.apache.dolphinscheduler.api.test.entity.TaskDefinitionRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowRunRequestData; +import org.apache.dolphinscheduler.api.test.entity.HttpResponse; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowCreateRequestData; +import org.apache.dolphinscheduler.api.test.entity.TaskRelationRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseTotalList; +import org.apache.dolphinscheduler.api.test.utils.JSONUtils; +import org.apache.dolphinscheduler.api.test.utils.RequestClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + + +public final class WorkFlowDefinitionPage { + private static String genNumId = null; + private static String workFlowCode = null; + private static final Logger logger = LoggerFactory.getLogger(WorkFlowDefinitionPage.class); + + public void getGenNumId(String sessionId, String projectName) { + + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("genNum", 1); + headers.put(Constants.SESSION_ID_KEY, sessionId); + ProjectPage project = new ProjectPage(); + String projectCode = project.getProjectCode(sessionId, projectName); + RequestClient requestClient = new RequestClient(); + HttpResponse res = requestClient.get("/projects/"+projectCode+"/task-definition/gen-task-codes", headers, params); + ArrayList list = (ArrayList) res.body().data(); + genNumId = list.get(0).toString(); + + } + + + public HttpResponse createWorkflow(String sessionId, String projectName, String workFlowName) { + Map<String, String> headers = new HashMap<>(); + WorkFlowCreateRequestData workFlowCreateRequestData = new WorkFlowCreateRequestData(); + TaskDefinitionRequestData taskDefinitionRequestData = new TaskDefinitionRequestData(); + TaskRelationRequestData taskRelationRequestData = new TaskRelationRequestData(); + + TaskParamsMap taskParams = new TaskParamsMap(); + ArrayList<Object> localParams = new ArrayList<>(); + ArrayList<Object> resourceList = new ArrayList<>(); + taskParams.localParams(localParams); + taskParams.resourceList(resourceList); + taskParams.rawScript("echo 123"); + + taskDefinitionRequestData.code(genNumId); + taskDefinitionRequestData.delayTime("0"); + taskDefinitionRequestData.description(""); + taskDefinitionRequestData.environmentCode("-1"); + taskDefinitionRequestData.failRetryInterval("1"); + taskDefinitionRequestData.failRetryTimes("0"); + taskDefinitionRequestData.flag("YES"); + taskDefinitionRequestData.name("echo_123"); + taskDefinitionRequestData.taskParams(taskParams); + taskDefinitionRequestData.taskPriority("MEDIUM"); + taskDefinitionRequestData.taskType("SHELL"); + taskDefinitionRequestData.timeout(0); + taskDefinitionRequestData.timeoutFlag("CLOSE"); + taskDefinitionRequestData.timeoutNotifyStrategy(""); + taskDefinitionRequestData.workerGroup("default"); Review Comment: Same as L75. ########## dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/pages/project/ProjectPage.java: ########## @@ -0,0 +1,97 @@ +/* + * Licensed to Apache Software Foundation (ASF) under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Apache Software Foundation (ASF) licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.dolphinscheduler.api.test.pages.project; + + +import com.sun.xml.internal.ws.api.model.ExceptionType; +import org.apache.dolphinscheduler.api.test.cases.ProjectAPITest; +import org.apache.dolphinscheduler.api.test.core.Constants; +import org.apache.dolphinscheduler.api.test.entity.HttpResponse; +import org.apache.dolphinscheduler.api.test.entity.ProjectListResponseData; +import org.apache.dolphinscheduler.api.test.entity.ProjectListResponseTotalList; +import org.apache.dolphinscheduler.api.test.utils.JSONUtils; +import org.apache.dolphinscheduler.api.test.utils.RequestClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashMap; +import java.util.Map; + +public final class ProjectPage { + private static final Logger logger = LoggerFactory.getLogger(ProjectPage.class); + + public HttpResponse createProject(String sessionId, String projectName, String description, String userName) { + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("projectName", projectName); + params.put("description", description); + params.put("userName", userName); + + headers.put(Constants.SESSION_ID_KEY, sessionId); + + RequestClient requestClient = new RequestClient(); + + try { + HttpResponse res = requestClient.post("/projects", headers, params); + return res; + } catch (Exception e) { + logger.error("create project fail, message:{}", e); + } + return null; + } + + public HttpResponse searchProject(String sessionId, String searchVal) { + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("pageSize", 10); + params.put("pageNo", 1); + params.put("searchVal", searchVal); + + headers.put(Constants.SESSION_ID_KEY, sessionId); + + RequestClient requestClient = new RequestClient(); + + return requestClient.get("/projects", headers, params); + } + + public String getProjectCode(String sessionId, String searchVal) { + String projectCode = null; + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("pageSize", 10); + params.put("pageNo", 1); + params.put("searchVal", searchVal); + + headers.put(Constants.SESSION_ID_KEY, sessionId); + + RequestClient requestClient = new RequestClient(); + + HttpResponse res = requestClient.get("/projects", headers, params); + + logger.info("project %s", res); Review Comment: Please remove unnessnary log. ########## dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/pages/project/WorkFlowDefinitionPage.java: ########## @@ -0,0 +1,205 @@ +/* + * Licensed to Apache Software Foundation (ASF) under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Apache Software Foundation (ASF) licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.dolphinscheduler.api.test.pages.project; + + +import org.apache.dolphinscheduler.api.test.cases.TenantAPITest; +import org.apache.dolphinscheduler.api.test.core.Constants; +import org.apache.dolphinscheduler.api.test.entity.TaskParamsMap; +import org.apache.dolphinscheduler.api.test.entity.TaskDefinitionRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowRunRequestData; +import org.apache.dolphinscheduler.api.test.entity.HttpResponse; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowCreateRequestData; +import org.apache.dolphinscheduler.api.test.entity.TaskRelationRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseTotalList; +import org.apache.dolphinscheduler.api.test.utils.JSONUtils; +import org.apache.dolphinscheduler.api.test.utils.RequestClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + + +public final class WorkFlowDefinitionPage { + private static String genNumId = null; + private static String workFlowCode = null; + private static final Logger logger = LoggerFactory.getLogger(WorkFlowDefinitionPage.class); + + public void getGenNumId(String sessionId, String projectName) { + + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("genNum", 1); + headers.put(Constants.SESSION_ID_KEY, sessionId); + ProjectPage project = new ProjectPage(); + String projectCode = project.getProjectCode(sessionId, projectName); + RequestClient requestClient = new RequestClient(); + HttpResponse res = requestClient.get("/projects/"+projectCode+"/task-definition/gen-task-codes", headers, params); + ArrayList list = (ArrayList) res.body().data(); + genNumId = list.get(0).toString(); + + } + + + public HttpResponse createWorkflow(String sessionId, String projectName, String workFlowName) { + Map<String, String> headers = new HashMap<>(); + WorkFlowCreateRequestData workFlowCreateRequestData = new WorkFlowCreateRequestData(); + TaskDefinitionRequestData taskDefinitionRequestData = new TaskDefinitionRequestData(); + TaskRelationRequestData taskRelationRequestData = new TaskRelationRequestData(); + + TaskParamsMap taskParams = new TaskParamsMap(); + ArrayList<Object> localParams = new ArrayList<>(); + ArrayList<Object> resourceList = new ArrayList<>(); + taskParams.localParams(localParams); + taskParams.resourceList(resourceList); + taskParams.rawScript("echo 123"); + + taskDefinitionRequestData.code(genNumId); + taskDefinitionRequestData.delayTime("0"); + taskDefinitionRequestData.description(""); + taskDefinitionRequestData.environmentCode("-1"); + taskDefinitionRequestData.failRetryInterval("1"); + taskDefinitionRequestData.failRetryTimes("0"); + taskDefinitionRequestData.flag("YES"); + taskDefinitionRequestData.name("echo_123"); + taskDefinitionRequestData.taskParams(taskParams); + taskDefinitionRequestData.taskPriority("MEDIUM"); + taskDefinitionRequestData.taskType("SHELL"); + taskDefinitionRequestData.timeout(0); + taskDefinitionRequestData.timeoutFlag("CLOSE"); + taskDefinitionRequestData.timeoutNotifyStrategy(""); + taskDefinitionRequestData.workerGroup("default"); + + ArrayList<Object> taskDefinitionRequestDataList = new ArrayList<>(); + taskDefinitionRequestDataList.add(taskDefinitionRequestData); + + HashMap<String, Object> conditionParams = new HashMap(); + + taskRelationRequestData.name(""); + taskRelationRequestData.preTaskCode(0); + taskRelationRequestData.preTaskVersion(0); + taskRelationRequestData.preTaskCode(0); + taskRelationRequestData.postTaskCode(genNumId); + taskRelationRequestData.conditionType("NONE"); + taskRelationRequestData.conditionParams(conditionParams); + ArrayList<Object> taskRelationRequestDataList = new ArrayList<>(); + taskRelationRequestDataList.add(taskRelationRequestData); + + HashMap<String, Object> locations = new HashMap(); + locations.put("taskCode", genNumId); + locations.put("x", 33.5); + locations.put("y", 38.5); + ArrayList<Object> locationsList = new ArrayList<>(); + locationsList.add(locations); + + workFlowCreateRequestData.locations(JSONUtils.toJsonString(locationsList)); + workFlowCreateRequestData.taskDefinitionJson(JSONUtils.toJsonString(taskDefinitionRequestDataList)); + workFlowCreateRequestData.taskRelationJson(JSONUtils.toJsonString(taskRelationRequestDataList)); + workFlowCreateRequestData.name(workFlowName); + workFlowCreateRequestData.tenantCode(TenantAPITest.tenantName); + workFlowCreateRequestData.executionType("PARALLEL"); + workFlowCreateRequestData.description(""); + workFlowCreateRequestData.globalParams("[]"); + workFlowCreateRequestData.timeout(0); Review Comment: Same as L75. ########## dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/pages/project/WorkFlowDefinitionPage.java: ########## @@ -0,0 +1,205 @@ +/* + * Licensed to Apache Software Foundation (ASF) under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Apache Software Foundation (ASF) licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.dolphinscheduler.api.test.pages.project; + + +import org.apache.dolphinscheduler.api.test.cases.TenantAPITest; +import org.apache.dolphinscheduler.api.test.core.Constants; +import org.apache.dolphinscheduler.api.test.entity.TaskParamsMap; +import org.apache.dolphinscheduler.api.test.entity.TaskDefinitionRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowRunRequestData; +import org.apache.dolphinscheduler.api.test.entity.HttpResponse; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowCreateRequestData; +import org.apache.dolphinscheduler.api.test.entity.TaskRelationRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseTotalList; +import org.apache.dolphinscheduler.api.test.utils.JSONUtils; +import org.apache.dolphinscheduler.api.test.utils.RequestClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + + +public final class WorkFlowDefinitionPage { + private static String genNumId = null; + private static String workFlowCode = null; + private static final Logger logger = LoggerFactory.getLogger(WorkFlowDefinitionPage.class); + + public void getGenNumId(String sessionId, String projectName) { + + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("genNum", 1); + headers.put(Constants.SESSION_ID_KEY, sessionId); + ProjectPage project = new ProjectPage(); + String projectCode = project.getProjectCode(sessionId, projectName); + RequestClient requestClient = new RequestClient(); + HttpResponse res = requestClient.get("/projects/"+projectCode+"/task-definition/gen-task-codes", headers, params); + ArrayList list = (ArrayList) res.body().data(); + genNumId = list.get(0).toString(); + + } + + + public HttpResponse createWorkflow(String sessionId, String projectName, String workFlowName) { + Map<String, String> headers = new HashMap<>(); + WorkFlowCreateRequestData workFlowCreateRequestData = new WorkFlowCreateRequestData(); + TaskDefinitionRequestData taskDefinitionRequestData = new TaskDefinitionRequestData(); + TaskRelationRequestData taskRelationRequestData = new TaskRelationRequestData(); + + TaskParamsMap taskParams = new TaskParamsMap(); + ArrayList<Object> localParams = new ArrayList<>(); + ArrayList<Object> resourceList = new ArrayList<>(); + taskParams.localParams(localParams); + taskParams.resourceList(resourceList); + taskParams.rawScript("echo 123"); + + taskDefinitionRequestData.code(genNumId); + taskDefinitionRequestData.delayTime("0"); + taskDefinitionRequestData.description(""); + taskDefinitionRequestData.environmentCode("-1"); + taskDefinitionRequestData.failRetryInterval("1"); + taskDefinitionRequestData.failRetryTimes("0"); + taskDefinitionRequestData.flag("YES"); + taskDefinitionRequestData.name("echo_123"); + taskDefinitionRequestData.taskParams(taskParams); + taskDefinitionRequestData.taskPriority("MEDIUM"); + taskDefinitionRequestData.taskType("SHELL"); + taskDefinitionRequestData.timeout(0); + taskDefinitionRequestData.timeoutFlag("CLOSE"); + taskDefinitionRequestData.timeoutNotifyStrategy(""); + taskDefinitionRequestData.workerGroup("default"); + + ArrayList<Object> taskDefinitionRequestDataList = new ArrayList<>(); + taskDefinitionRequestDataList.add(taskDefinitionRequestData); + + HashMap<String, Object> conditionParams = new HashMap(); + + taskRelationRequestData.name(""); + taskRelationRequestData.preTaskCode(0); + taskRelationRequestData.preTaskVersion(0); + taskRelationRequestData.preTaskCode(0); + taskRelationRequestData.postTaskCode(genNumId); + taskRelationRequestData.conditionType("NONE"); Review Comment: Same as L75. ########## dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/pages/project/WorkFlowInstancesPage.java: ########## @@ -0,0 +1,71 @@ +/* + * Licensed to Apache Software Foundation (ASF) under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Apache Software Foundation (ASF) licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.dolphinscheduler.api.test.pages.project; + + +import org.apache.dolphinscheduler.api.test.core.Constants; +import org.apache.dolphinscheduler.api.test.entity.HttpResponse; +import org.apache.dolphinscheduler.api.test.entity.TaskDefinitionRequestData; +import org.apache.dolphinscheduler.api.test.entity.TaskParamsMap; +import org.apache.dolphinscheduler.api.test.entity.TaskRelationRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowCreateRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowInstancesResponseData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowInstancesResponseTotalListData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseTotalList; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowRunRequestData; +import org.apache.dolphinscheduler.api.test.utils.JSONUtils; +import org.apache.dolphinscheduler.api.test.utils.RequestClient; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public final class WorkFlowInstancesPage { + private static String workFlowInstanceState = null; + private static final Logger logger = LoggerFactory.getLogger(WorkFlowInstancesPage.class); + + + public String queryWorkflowInstanceState(String sessionId, String projectName, String workFlowName) { + + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("pageSize",10); + params.put("pageNo",1); + params.put("searchVal",workFlowName); + headers.put(Constants.SESSION_ID_KEY, sessionId); + RequestClient requestClient = new RequestClient(); + ProjectPage project = new ProjectPage(); + String projectCode = project.getProjectCode(sessionId, projectName); + HttpResponse res = requestClient.get("/projects/"+ projectCode + "/process-instances", headers, params); + + for (WorkFlowInstancesResponseTotalListData workFlowInstanceList : JSONUtils.convertValue(res.body().data(), WorkFlowInstancesResponseData.class).totalList()) { + workFlowInstanceState = workFlowInstanceList.state(); + } + + return workFlowInstanceState; + } + + Review Comment: Please avoid meaningless blank line. ########## dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/pages/project/WorkFlowInstancesPage.java: ########## @@ -0,0 +1,71 @@ +/* + * Licensed to Apache Software Foundation (ASF) under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Apache Software Foundation (ASF) licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.dolphinscheduler.api.test.pages.project; + + +import org.apache.dolphinscheduler.api.test.core.Constants; +import org.apache.dolphinscheduler.api.test.entity.HttpResponse; +import org.apache.dolphinscheduler.api.test.entity.TaskDefinitionRequestData; +import org.apache.dolphinscheduler.api.test.entity.TaskParamsMap; +import org.apache.dolphinscheduler.api.test.entity.TaskRelationRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowCreateRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowInstancesResponseData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowInstancesResponseTotalListData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseTotalList; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowRunRequestData; +import org.apache.dolphinscheduler.api.test.utils.JSONUtils; +import org.apache.dolphinscheduler.api.test.utils.RequestClient; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public final class WorkFlowInstancesPage { + private static String workFlowInstanceState = null; + private static final Logger logger = LoggerFactory.getLogger(WorkFlowInstancesPage.class); + + Review Comment: Please avoid meaningless blank line. ########## dolphinscheduler-api-test/dolphinscheduler-api-test-case/src/test/java/org/apache/dolphinscheduler/api.test/pages/project/WorkFlowDefinitionPage.java: ########## @@ -0,0 +1,205 @@ +/* + * Licensed to Apache Software Foundation (ASF) under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Apache Software Foundation (ASF) licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.dolphinscheduler.api.test.pages.project; + + +import org.apache.dolphinscheduler.api.test.cases.TenantAPITest; +import org.apache.dolphinscheduler.api.test.core.Constants; +import org.apache.dolphinscheduler.api.test.entity.TaskParamsMap; +import org.apache.dolphinscheduler.api.test.entity.TaskDefinitionRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowRunRequestData; +import org.apache.dolphinscheduler.api.test.entity.HttpResponse; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowCreateRequestData; +import org.apache.dolphinscheduler.api.test.entity.TaskRelationRequestData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseData; +import org.apache.dolphinscheduler.api.test.entity.WorkFlowResponseTotalList; +import org.apache.dolphinscheduler.api.test.utils.JSONUtils; +import org.apache.dolphinscheduler.api.test.utils.RequestClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + + +public final class WorkFlowDefinitionPage { + private static String genNumId = null; + private static String workFlowCode = null; + private static final Logger logger = LoggerFactory.getLogger(WorkFlowDefinitionPage.class); + + public void getGenNumId(String sessionId, String projectName) { + + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("genNum", 1); + headers.put(Constants.SESSION_ID_KEY, sessionId); + ProjectPage project = new ProjectPage(); + String projectCode = project.getProjectCode(sessionId, projectName); + RequestClient requestClient = new RequestClient(); + HttpResponse res = requestClient.get("/projects/"+projectCode+"/task-definition/gen-task-codes", headers, params); + ArrayList list = (ArrayList) res.body().data(); + genNumId = list.get(0).toString(); + + } + + + public HttpResponse createWorkflow(String sessionId, String projectName, String workFlowName) { + Map<String, String> headers = new HashMap<>(); + WorkFlowCreateRequestData workFlowCreateRequestData = new WorkFlowCreateRequestData(); + TaskDefinitionRequestData taskDefinitionRequestData = new TaskDefinitionRequestData(); + TaskRelationRequestData taskRelationRequestData = new TaskRelationRequestData(); + + TaskParamsMap taskParams = new TaskParamsMap(); + ArrayList<Object> localParams = new ArrayList<>(); + ArrayList<Object> resourceList = new ArrayList<>(); + taskParams.localParams(localParams); + taskParams.resourceList(resourceList); + taskParams.rawScript("echo 123"); + + taskDefinitionRequestData.code(genNumId); + taskDefinitionRequestData.delayTime("0"); + taskDefinitionRequestData.description(""); + taskDefinitionRequestData.environmentCode("-1"); + taskDefinitionRequestData.failRetryInterval("1"); + taskDefinitionRequestData.failRetryTimes("0"); + taskDefinitionRequestData.flag("YES"); + taskDefinitionRequestData.name("echo_123"); + taskDefinitionRequestData.taskParams(taskParams); + taskDefinitionRequestData.taskPriority("MEDIUM"); + taskDefinitionRequestData.taskType("SHELL"); + taskDefinitionRequestData.timeout(0); + taskDefinitionRequestData.timeoutFlag("CLOSE"); + taskDefinitionRequestData.timeoutNotifyStrategy(""); + taskDefinitionRequestData.workerGroup("default"); + + ArrayList<Object> taskDefinitionRequestDataList = new ArrayList<>(); + taskDefinitionRequestDataList.add(taskDefinitionRequestData); + + HashMap<String, Object> conditionParams = new HashMap(); + + taskRelationRequestData.name(""); + taskRelationRequestData.preTaskCode(0); + taskRelationRequestData.preTaskVersion(0); + taskRelationRequestData.preTaskCode(0); + taskRelationRequestData.postTaskCode(genNumId); + taskRelationRequestData.conditionType("NONE"); + taskRelationRequestData.conditionParams(conditionParams); + ArrayList<Object> taskRelationRequestDataList = new ArrayList<>(); + taskRelationRequestDataList.add(taskRelationRequestData); + + HashMap<String, Object> locations = new HashMap(); + locations.put("taskCode", genNumId); + locations.put("x", 33.5); + locations.put("y", 38.5); + ArrayList<Object> locationsList = new ArrayList<>(); + locationsList.add(locations); + + workFlowCreateRequestData.locations(JSONUtils.toJsonString(locationsList)); + workFlowCreateRequestData.taskDefinitionJson(JSONUtils.toJsonString(taskDefinitionRequestDataList)); + workFlowCreateRequestData.taskRelationJson(JSONUtils.toJsonString(taskRelationRequestDataList)); + workFlowCreateRequestData.name(workFlowName); + workFlowCreateRequestData.tenantCode(TenantAPITest.tenantName); + workFlowCreateRequestData.executionType("PARALLEL"); + workFlowCreateRequestData.description(""); + workFlowCreateRequestData.globalParams("[]"); + workFlowCreateRequestData.timeout(0); + + headers.put(Constants.SESSION_ID_KEY, sessionId); + RequestClient requestClient = new RequestClient(); + ProjectPage project = new ProjectPage(); + String projectCode = project.getProjectCode(sessionId, projectName); + + HttpResponse res = requestClient.post("/projects/"+projectCode+"/process-definition", headers, JSONUtils.convertValue(workFlowCreateRequestData, Map.class)); + return res; + } + + public HttpResponse queryWorkflow(String sessionId, String projectName, String workFlowName) { + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("pageSize",10); + params.put("pageNo",1); + params.put("searchVal",workFlowName); + headers.put(Constants.SESSION_ID_KEY, sessionId); + RequestClient requestClient = new RequestClient(); + ProjectPage project = new ProjectPage(); + String projectCode = project.getProjectCode(sessionId, projectName); + HttpResponse res = requestClient.get("/projects/"+ projectCode + "/process-definition", headers, params); + + for (WorkFlowResponseTotalList workFlowList : JSONUtils.convertValue(res.body().data(), WorkFlowResponseData.class).totalList()) { + workFlowCode = workFlowList.code(); + } + + return res; + } + + public HttpResponse onLineWorkflow(String sessionId, String projectName, String workFlowName){ + WorkFlowDefinitionPage workflow = new WorkFlowDefinitionPage(); + workflow.queryWorkflow(sessionId, projectName, workFlowName); + Map<String, Object> params = new HashMap<>(); + Map<String, String> headers = new HashMap<>(); + params.put("name", workFlowName); + params.put("releaseState", "ONLINE"); + headers.put(Constants.SESSION_ID_KEY, sessionId); + RequestClient requestClient = new RequestClient(); + ProjectPage project = new ProjectPage(); + String projectCode = project.getProjectCode(sessionId, projectName); + HttpResponse res = requestClient.post("/projects/"+projectCode+"/process-definition/"+workFlowCode+"/release", headers, params); + + return res; + + } + + public HttpResponse runWorkflow(String sessionId, String projectName, String workFlowName){ + WorkFlowDefinitionPage workflow = new WorkFlowDefinitionPage(); + workflow.queryWorkflow(sessionId, projectName, workFlowName); + workflow.onLineWorkflow(sessionId, projectName, workFlowName); + Map<String, String> headers = new HashMap<>(); + + WorkFlowRunRequestData workFlowRunRequestData = new WorkFlowRunRequestData(); + + workFlowRunRequestData.processDefinitionCode(workFlowCode); + workFlowRunRequestData.startEndTime("2022-06-25T16:00:00.000Z"); + workFlowRunRequestData.scheduleTime("2022-06-26 00:00:00,2022-06-26 00:00:00"); + workFlowRunRequestData.failureStrategy("CONTINUE"); + workFlowRunRequestData.warningType("NONE"); + workFlowRunRequestData.warningGroupId(""); + workFlowRunRequestData.execType("START_PROCESS"); + workFlowRunRequestData.startNodeList(""); + workFlowRunRequestData.taskDependType("TASK_POST"); + workFlowRunRequestData.dependentMode("OFF_MODE"); + workFlowRunRequestData.runMode("RUN_MODE_SERIAL"); + workFlowRunRequestData.processInstancePriority("MEDIUM"); + workFlowRunRequestData.workerGroup("default"); + workFlowRunRequestData.environmentCode(""); + workFlowRunRequestData.startParams(""); + workFlowRunRequestData.expectedParallelismNumber(""); + workFlowRunRequestData.dryRun(0); Review Comment: Same as L75. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
