Skip to content

Commit 3f2d819

Browse files
committed
[Improve][SeaTunnel-Web] Change JobStatus to enum type to avoid hard coding
1 parent 3cc90ad commit 3f2d819

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

seatunnel-web-it/src/test/java/org/apache/seatunnel/app/test/JobControllerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.seatunnel.app.domain.response.job.JobRes;
3030
import org.apache.seatunnel.app.domain.response.metrics.JobPipelineDetailMetricsRes;
3131
import org.apache.seatunnel.app.utils.JobTestingUtils;
32+
import org.apache.seatunnel.engine.core.job.JobStatus;
3233
import org.apache.seatunnel.server.common.SeatunnelErrorEnum;
3334

3435
import org.junit.jupiter.api.AfterAll;
@@ -73,7 +74,7 @@ public void createJobWithSingleAPI_shouldExecuteSuccessfully() {
7374
Result<List<JobPipelineDetailMetricsRes>> listResult =
7475
JobTestingUtils.waitForJobCompletion(result.getData());
7576
assertEquals(1, listResult.getData().size());
76-
assertEquals("FINISHED", listResult.getData().get(0).getStatus());
77+
assertEquals(JobStatus.FINISHED, listResult.getData().get(0).getStatus());
7778
assertEquals(5, listResult.getData().get(0).getReadRowCount());
7879
assertEquals(5, listResult.getData().get(0).getWriteRowCount());
7980
}

seatunnel-web-it/src/test/java/org/apache/seatunnel/app/test/JobExecutorControllerTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void executeJob_shouldReturnSuccess_whenValidRequest() {
7373
Result<List<JobPipelineDetailMetricsRes>> listResult =
7474
JobTestingUtils.waitForJobCompletion(result.getData());
7575
assertEquals(1, listResult.getData().size());
76-
assertEquals("FINISHED", listResult.getData().get(0).getStatus());
76+
assertEquals(JobStatus.FINISHED, listResult.getData().get(0).getStatus());
7777
assertEquals(5, listResult.getData().get(0).getReadRowCount());
7878
assertEquals(5, listResult.getData().get(0).getWriteRowCount());
7979
}
@@ -88,7 +88,7 @@ public void executeJobWithParameters() {
8888
Result<List<JobPipelineDetailMetricsRes>> listResult =
8989
JobTestingUtils.waitForJobCompletion(result.getData());
9090
assertEquals(1, listResult.getData().size());
91-
assertEquals("FINISHED", listResult.getData().get(0).getStatus());
91+
assertEquals(JobStatus.FINISHED, listResult.getData().get(0).getStatus());
9292
assertEquals(5, listResult.getData().get(0).getReadRowCount());
9393
assertEquals(5, listResult.getData().get(0).getWriteRowCount());
9494
String generatedJobFile = getGenerateJobFile(String.valueOf(jobVersionId));
@@ -122,7 +122,7 @@ public void executeJobWithParameters() {
122122
assertTrue(result.getData() > 0);
123123
listResult = JobTestingUtils.waitForJobCompletion(result.getData());
124124
assertEquals(1, listResult.getData().size());
125-
assertEquals("FINISHED", listResult.getData().get(0).getStatus());
125+
assertEquals(JobStatus.FINISHED, listResult.getData().get(0).getStatus());
126126
assertEquals(numberOfRecords, listResult.getData().get(0).getReadRowCount());
127127
assertEquals(numberOfRecords, listResult.getData().get(0).getWriteRowCount());
128128

@@ -281,7 +281,7 @@ public void executeJob_JobStatusUpdate_WhenSubmissionFailed() {
281281
Result<JobExecutionStatus> jobExecutionStatusResult =
282282
jobExecutorControllerWrapper.getJobExecutionStatus(jobInstanceId);
283283
assertTrue(jobExecutionStatusResult.isSuccess());
284-
assertEquals(JobStatus.FAILED.name(), jobExecutionStatusResult.getData().getJobStatus());
284+
assertEquals(JobStatus.FAILED, jobExecutionStatusResult.getData().getJobStatus());
285285
assertNotNull(jobExecutionStatusResult.getData().getErrorMessage());
286286

287287
// Invalid jobInstanceId
@@ -306,7 +306,7 @@ public void storeErrorMessageWhenJobFailed() throws InterruptedException {
306306
Result<SeaTunnelJobInstanceDto> jobExecutionDetailResult =
307307
jobExecutorControllerWrapper.getJobExecutionDetail(jobInstanceId);
308308
assertTrue(jobExecutionDetailResult.isSuccess());
309-
assertEquals(JobStatus.FAILED.name(), jobExecutionDetailResult.getData().getJobStatus());
309+
assertEquals(JobStatus.FAILED, jobExecutionDetailResult.getData().getJobStatus());
310310
assertNotNull(jobExecutionDetailResult.getData().getErrorMessage());
311311
assertNotNull(jobExecutionDetailResult.getData().getJobDefineName());
312312

seatunnel-web-it/src/test/java/org/apache/seatunnel/app/test/TaskInstanceControllerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.seatunnel.app.domain.dto.job.SeaTunnelJobInstanceDto;
2626
import org.apache.seatunnel.app.domain.response.metrics.JobPipelineDetailMetricsRes;
2727
import org.apache.seatunnel.app.utils.JobTestingUtils;
28+
import org.apache.seatunnel.engine.core.job.JobStatus;
2829

2930
import org.junit.jupiter.api.AfterAll;
3031
import org.junit.jupiter.api.BeforeAll;
@@ -75,7 +76,7 @@ private static void extractedJob1(String jobName) {
7576
Result<List<JobPipelineDetailMetricsRes>> listResult =
7677
JobTestingUtils.waitForJobCompletion(execuitonResult.getData());
7778
assertEquals(1, listResult.getData().size());
78-
assertEquals("FINISHED", listResult.getData().get(0).getStatus());
79+
assertEquals(JobStatus.FINISHED, listResult.getData().get(0).getStatus());
7980
}
8081

8182
@AfterAll

0 commit comments

Comments
 (0)