Skip to content

Commit 2660988

Browse files
段晓雄cursoragent
authored andcommitted
[Improvement-17986][task-plugin] Use assertEquals instead of assertTrue(contains) in Flink tests
- Replace assertTrue(contains) with assertEquals in FlinkTaskTest and FlinkStreamTaskTest - Remove class-level Javadoc per review Ref: PR #17987 Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 0ad461f commit 2660988

File tree

2 files changed

+9
-18
lines changed
  • dolphinscheduler-task-plugin

2 files changed

+9
-18
lines changed

dolphinscheduler-task-plugin/dolphinscheduler-task-flink-stream/src/test/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkStreamTaskTest.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
import org.junit.jupiter.api.Test;
3434
import org.junit.jupiter.api.io.TempDir;
3535

36-
/**
37-
* FlinkStreamTask unit test. Verifies parameter replacement in initScript and rawScript without Mockito.
38-
*/
3936
public class FlinkStreamTaskTest {
4037

4138
@TempDir
@@ -73,12 +70,10 @@ public void testParameterReplacementInScript() throws Exception {
7370
String initContent = Files.readString(Path.of(initScriptPath), StandardCharsets.UTF_8);
7471
String nodeContent = Files.readString(Path.of(nodeScriptPath), StandardCharsets.UTF_8);
7572

76-
Assertions.assertTrue(initContent.contains("SET 'date' = '20250601';"),
77-
"Expected ${bizdate} to be replaced, got: " + initContent);
78-
Assertions.assertTrue(nodeContent.contains("dt = '20250601'"),
79-
"Expected ${bizdate} to be replaced, got: " + nodeContent);
80-
Assertions.assertTrue(nodeContent.contains("env = 'prod'"),
81-
"Expected ${env} to be replaced, got: " + nodeContent);
73+
String expectedInitOptions = String.join(FlinkConstants.FLINK_SQL_NEWLINE,
74+
FlinkArgsUtils.buildInitOptionsForSql(flinkParameters)).concat(FlinkConstants.FLINK_SQL_NEWLINE);
75+
Assertions.assertEquals(expectedInitOptions + "SET 'date' = '20250601';", initContent);
76+
Assertions.assertEquals("SELECT * FROM logs WHERE dt = '20250601' AND env = 'prod'", nodeContent.trim());
8277
}
8378

8479
@Test
@@ -109,7 +104,6 @@ public void testParameterReplacementTimePlaceholder() throws Exception {
109104
String nodeScriptPath = String.format("%s/%s_node.sql", executePath, taskAppId);
110105
String nodeContent = Files.readString(Path.of(nodeScriptPath), StandardCharsets.UTF_8);
111106

112-
Assertions.assertTrue(nodeContent.contains("dt = '20210815'"),
113-
"Expected $[yyyyMMdd] to be replaced with 20210815, got: " + nodeContent);
107+
Assertions.assertEquals("INSERT INTO t SELECT * FROM s WHERE dt = '20210815'", nodeContent.trim());
114108
}
115109
}

dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/test/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkTaskTest.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
import org.junit.jupiter.api.Test;
3434
import org.junit.jupiter.api.io.TempDir;
3535

36-
/**
37-
* FlinkTask unit test. Verifies parameter replacement in initScript and rawScript without Mockito.
38-
*/
3936
public class FlinkTaskTest {
4037

4138
@TempDir
@@ -73,10 +70,10 @@ public void testParameterReplacementInScript() throws Exception {
7370
String initContent = Files.readString(Path.of(initScriptPath), StandardCharsets.UTF_8);
7471
String nodeContent = Files.readString(Path.of(nodeScriptPath), StandardCharsets.UTF_8);
7572

76-
Assertions.assertTrue(initContent.contains("set batch_size=1000;"),
77-
"Expected ${batch_size} to be replaced with 1000, got: " + initContent);
78-
Assertions.assertTrue(nodeContent.contains("dt='20201201'"),
79-
"Expected $[yyyyMMdd] to be replaced with 20201201, got: " + nodeContent);
73+
String expectedInitOptions = String.join(FlinkConstants.FLINK_SQL_NEWLINE,
74+
FlinkArgsUtils.buildInitOptionsForSql(flinkParameters)).concat(FlinkConstants.FLINK_SQL_NEWLINE);
75+
Assertions.assertEquals(expectedInitOptions + "set batch_size=1000;", initContent);
76+
Assertions.assertEquals("SELECT * FROM logs WHERE dt='20201201';", nodeContent.trim());
8077
}
8178

8279
@Test

0 commit comments

Comments
 (0)