Add ut cases to make sure yaml.loadXXX parse file correctly

apache · May 14, 2024 · 0847512 · 0847512
1 parent f6544fe
commit 0847512
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 11 deletions.
diff --git a/.../dolphinscheduler/plugin/task/api/loop/template/http/parser/HttpTaskDefinitionParser.java b/.../dolphinscheduler/plugin/task/api/loop/template/http/parser/HttpTaskDefinitionParser.java
@@ -63,16 +63,16 @@ public class HttpTaskDefinitionParser implements TaskDefinitionParser<HttpLoopTa
     protected @NonNull LoopTaskYamlDefinition parseYamlConfigFile(@NonNull String yamlConfigFile) throws IOException {
         try (FileReader fileReader = new FileReader(yamlConfigFile)) {
             return new Yaml(new ClassFilterConstructor(new Class[]{
-                LoopTaskYamlDefinition.class,
-                LoopTaskYamlDefinition.LoopTaskServiceYamlDefinition.class,
-                LoopTaskYamlDefinition.LoopTaskAPIYamlDefinition.class,
-                LoopTaskYamlDefinition.LoopTaskSubmitMethodYamlDefinition.class,
-                LoopTaskYamlDefinition.LoopTaskQueryStateYamlDefinition.class,
-                LoopTaskYamlDefinition.LoopTaskCancelYamlDefinition.class,
-                LoopTaskYamlDefinition.LoopTaskMethodYamlDefinition.class,
-                LoopTaskYamlDefinition.LoopTaskQueryStateYamlDefinition.class,
-                Map.class,
-                String.class
+                    LoopTaskYamlDefinition.class,
+                    LoopTaskYamlDefinition.LoopTaskServiceYamlDefinition.class,
+                    LoopTaskYamlDefinition.LoopTaskAPIYamlDefinition.class,
+                    LoopTaskYamlDefinition.LoopTaskSubmitMethodYamlDefinition.class,
+                    LoopTaskYamlDefinition.LoopTaskQueryStateYamlDefinition.class,
+                    LoopTaskYamlDefinition.LoopTaskCancelYamlDefinition.class,
+                    LoopTaskYamlDefinition.LoopTaskMethodYamlDefinition.class,
+                    LoopTaskYamlDefinition.LoopTaskQueryStateYamlDefinition.class,
+                    Map.class,
+                    String.class
             }))
                     .loadAs(fileReader, LoopTaskYamlDefinition.class);
         }

diff --git a/...pi/src/test/java/org/apache/dolphinscheduler/plugin/task/api/k8s/K8sTaskExecutorTest.java b/...pi/src/test/java/org/apache/dolphinscheduler/plugin/task/api/k8s/K8sTaskExecutorTest.java
@@ -24,6 +24,7 @@
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.Assertions;
@@ -99,4 +100,12 @@ public void testWaitTimeoutNormal() {
         }
     }
 
+    @Test
+    public void testLoadYamlCorrectly() {
+        List<String> expectedCommands = Arrays.asList("perl", "-Mbignum=bpi", "-wle", "print bpi(2000)");
+        List<String> actualCommands =
+                k8sTaskExecutor.getJob().getSpec().getTemplate().getSpec().getContainers().get(0).getCommand();
+        Assertions.assertEquals(expectedCommands, actualCommands);
+    }
+
 }
diff --git a/...phinscheduler/plugin/task/api/loop/template/http/parser/HttpTaskDefinitionParserTest.java b/...phinscheduler/plugin/task/api/loop/template/http/parser/HttpTaskDefinitionParserTest.java
@@ -20,6 +20,8 @@
 import org.apache.dolphinscheduler.plugin.task.api.loop.template.LoopTaskYamlDefinition;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -32,13 +34,24 @@ public class HttpTaskDefinitionParserTest {
     @Test
     public void parseYamlConfigFile() throws IOException {
         LoopTaskYamlDefinition loopTaskYamlDefinition = new HttpTaskDefinitionParser().parseYamlConfigFile(yamlFile);
+        // check not null
         Assertions.assertNotNull(loopTaskYamlDefinition);
         Assertions.assertNotNull(loopTaskYamlDefinition.getService());
+        Assertions.assertNotNull(loopTaskYamlDefinition.getService().getName());
+        Assertions.assertNotNull(loopTaskYamlDefinition.getService().getType());
+        Assertions.assertNotNull(loopTaskYamlDefinition.getService().getApi());
+        Assertions.assertNotNull(loopTaskYamlDefinition.getService().getApi().getSubmit());
+        Assertions.assertNotNull(loopTaskYamlDefinition.getService().getApi().getQueryState());
+        Assertions.assertNotNull(loopTaskYamlDefinition.getService().getApi().getCancel());
+        // check data consistency
         LoopTaskYamlDefinition.LoopTaskServiceYamlDefinition service = loopTaskYamlDefinition.getService();
         Assertions.assertEquals("MockService", service.getName());
         Assertions.assertEquals("Http", service.getType());
+        Map<String, String> expectedHeaders = new HashMap<>();
+        expectedHeaders.put("Content-Type", "text/html");
+        expectedHeaders.put("Content-Length", "1234");
         Assertions.assertEquals("/api/v1/submit", service.getApi().getSubmit().getUrl());
-        Assertions.assertNotNull(service.getApi());
+        Assertions.assertEquals(expectedHeaders, service.getApi().getSubmit().getHttpHeaders());
     }
 
     @Test

diff --git a/...hinscheduler-task-plugin/dolphinscheduler-task-api/src/test/resources/mock_loop_task.yaml b/...hinscheduler-task-plugin/dolphinscheduler-task-api/src/test/resources/mock_loop_task.yaml
@@ -22,6 +22,7 @@ service:
       url: /api/v1/submit
       method: POST
       dataType: Json
+      httpHeaders: { "Content-Type": "text/html", "Content-Length": "1234" }
       requestParams: { "taskId": "704" }
       taskInstanceIdJPath: "$.taskInstanceId[0]"
     queryState: