From 4f1524a7117c3c02c4e9d79325c431c0346435fb Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Mon, 15 Jul 2019 15:28:50 -0400 Subject: [PATCH] OutputCapture should be updated to OutputCaptureRule resolves #615 In Boot 2.2.x they change the of OutputCapture and thus it was deprecated. --- .../org/springframework/cloud/task/TaskCoreTests.java | 4 ++-- .../cloud/task/listener/TaskLifecycleListenerTests.java | 4 ++-- .../cloud/task/util/TestVerifierUtils.java | 2 +- .../test/java/io/spring/BatchJobApplicationTests.java | 9 +++++---- .../src/test/java/io/spring/JpaApplicationTests.java | 4 ++-- .../java/io/spring/MultiDataSourcesApplicationTests.java | 4 ++-- .../cloud/task/timestamp/TaskApplicationTests.java | 4 ++-- 7 files changed, 16 insertions(+), 15 deletions(-) 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 f10b0c0f..1e3956f1 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 @@ -24,7 +24,7 @@ import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration; import org.springframework.context.ApplicationContextException; @@ -62,7 +62,7 @@ public class TaskCoreTests { * Used to capture the log output from the test task. */ @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); private ConfigurableApplicationContext applicationContext; diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java index f6985976..a1211406 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java @@ -34,7 +34,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.event.ApplicationReadyEvent; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import org.springframework.cloud.task.repository.TaskExecution; import org.springframework.cloud.task.repository.TaskExplorer; import org.springframework.cloud.task.util.TestDefaultConfiguration; @@ -66,7 +66,7 @@ public class TaskLifecycleListenerTests { * Used to capture the log output from the test task. */ @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); private AnnotationConfigApplicationContext context; diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestVerifierUtils.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestVerifierUtils.java index 4f93e7e0..5c13a636 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestVerifierUtils.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestVerifierUtils.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; import org.springframework.cloud.task.repository.TaskExecution; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.argThat; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java b/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java index 271d7f6b..2e9ff779 100644 --- a/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java +++ b/spring-cloud-task-samples/batch-job/src/test/java/io/spring/BatchJobApplicationTests.java @@ -23,10 +23,11 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; + +import static junit.framework.TestCase.assertTrue; +import static org.junit.Assert.assertEquals; /** * Verifies that the Task Application outputs the correct task log entries. @@ -36,7 +37,7 @@ import static junit.framework.Assert.assertTrue; public class BatchJobApplicationTests { @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); @Test public void testBatchJobApp() throws Exception { diff --git a/spring-cloud-task-samples/jpa-sample/src/test/java/io/spring/JpaApplicationTests.java b/spring-cloud-task-samples/jpa-sample/src/test/java/io/spring/JpaApplicationTests.java index 7d746720..e01f36cf 100644 --- a/spring-cloud-task-samples/jpa-sample/src/test/java/io/spring/JpaApplicationTests.java +++ b/spring-cloud-task-samples/jpa-sample/src/test/java/io/spring/JpaApplicationTests.java @@ -28,7 +28,7 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DriverManagerDataSource; @@ -60,7 +60,7 @@ public class JpaApplicationTests { } @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); private ConfigurableApplicationContext context; private DataSource dataSource; private Server server; diff --git a/spring-cloud-task-samples/multiple-datasources/src/test/java/io/spring/MultiDataSourcesApplicationTests.java b/spring-cloud-task-samples/multiple-datasources/src/test/java/io/spring/MultiDataSourcesApplicationTests.java index 849fa825..022b9424 100644 --- a/spring-cloud-task-samples/multiple-datasources/src/test/java/io/spring/MultiDataSourcesApplicationTests.java +++ b/spring-cloud-task-samples/multiple-datasources/src/test/java/io/spring/MultiDataSourcesApplicationTests.java @@ -20,7 +20,7 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import static org.assertj.core.api.Assertions.assertThat; @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class MultiDataSourcesApplicationTests { @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); @Test public void testTimeStampApp() throws Exception { diff --git a/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TaskApplicationTests.java b/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TaskApplicationTests.java index aa5b5a38..7d947fdf 100644 --- a/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TaskApplicationTests.java +++ b/spring-cloud-task-samples/timestamp/src/test/java/org/springframework/cloud/task/timestamp/TaskApplicationTests.java @@ -23,7 +23,7 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import static org.assertj.core.api.Assertions.assertThat; @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TaskApplicationTests { @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); @Test public void testTimeStampApp() throws Exception {