From d721ab7c26d61e064473865564e35dc949c5f622 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Wed, 6 Mar 2024 08:40:28 -0500 Subject: [PATCH] Update tests to new format of exception messages --- .../handler/TaskJobLauncherApplicationRunnerTests.java | 9 ++++----- .../org/springframework/cloud/task/TaskCoreTests.java | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerTests.java b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerTests.java index 360101492..4746fc541 100644 --- a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerTests.java +++ b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunnerTests.java @@ -51,6 +51,7 @@ import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration; import org.springframework.cloud.task.configuration.SingleTaskConfiguration; +import org.springframework.cloud.task.listener.TaskException; import org.springframework.cloud.task.repository.TaskExecution; import org.springframework.cloud.task.repository.TaskExplorer; import org.springframework.context.ApplicationListener; @@ -71,8 +72,7 @@ */ public class TaskJobLauncherApplicationRunnerTests { - private static final String DEFAULT_ERROR_MESSAGE = "The following Jobs have failed: \n" - + "Job jobA failed during execution for job instance id 1 with jobExecutionId of 1 \n"; + private static final String DEFAULT_ERROR_MESSAGE = "Job jobA failed during execution for job instance id 1 with jobExecutionId of 1"; private ConfigurableApplicationContext applicationContext; @@ -171,9 +171,8 @@ private void validateForFail(String errorMessage, Class clazz, String[] enabl Executable executable = () -> this.applicationContext = SpringApplication .run(new Class[] { clazz, PropertyPlaceholderAutoConfiguration.class }, enabledArgs); - assertThatExceptionOfType(IllegalStateException.class).isThrownBy(executable::execute) - .havingCause() - .withMessage(errorMessage); + assertThatExceptionOfType(TaskException.class).isThrownBy(executable::execute) + .withMessageContaining(errorMessage); } @Component diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/TaskCoreTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/TaskCoreTests.java index d5577a54e..53a4f7ccd 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/TaskCoreTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/TaskCoreTests.java @@ -57,8 +57,7 @@ public class TaskCoreTests { private static final String EXCEPTION_INVALID_TASK_EXECUTION_ID = "java.lang.IllegalArgumentException: " + "Invalid TaskExecution, ID 55 not found"; - private static final String ERROR_MESSAGE = "errorMessage='java.lang.IllegalStateException: " - + "Failed to execute CommandLineRunner"; + private static final String ERROR_MESSAGE = "errorMessage='java.lang.IllegalStateException: " + "FOO EXCEPTION"; private ConfigurableApplicationContext applicationContext;