From 80a153527f285329fdceb1da6fad5bfbbedb6eeb Mon Sep 17 00:00:00 2001 From: Michael Minella Date: Fri, 18 Nov 2016 10:33:41 -0600 Subject: [PATCH] Updated test based on new error message returned by Spring Framework 5 --- .../launch/support/CommandLineJobRunnerTests.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java index aae6fb5c9..e097b28f7 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java @@ -15,9 +15,6 @@ */ package org.springframework.batch.core.launch.support; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -50,6 +47,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.ClassUtils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * @author Lucas Ward * @@ -130,8 +130,9 @@ public class CommandLineJobRunnerTests { CommandLineJobRunner.main(args); assertEquals(1, StubSystemExiter.status); String errorMessage = CommandLineJobRunner.getErrorMessage(); - assertTrue("Wrong error message: " + errorMessage, errorMessage - .contains("No bean named 'no-such-job' is defined")); + assertTrue("Wrong error message: " + errorMessage, (errorMessage + .contains("No bean named 'no-such-job' is defined") || (errorMessage + .contains("No bean named 'no-such-job' available")))); } @Test