You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/11/13 09:29:16 UTC
[camel-spring-boot-examples] branch master updated: CAMEL-15849:
Upgrade to Spring Boot 2.4.0
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git
The following commit(s) were added to refs/heads/master by this push:
new 838ecb7 CAMEL-15849: Upgrade to Spring Boot 2.4.0
838ecb7 is described below
commit 838ecb7bad5436c62fa75c4e768e623cfdeab4fe
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Nov 13 10:28:59 2020 +0100
CAMEL-15849: Upgrade to Spring Boot 2.4.0
---
.../src/test/java/sample/camel/SampleAmqApplicationTests.java | 3 ++-
.../src/test/java/sample/camel/SampleAmqApplicationTests.java | 4 ++--
.../org/apache/camel/example/springboot/geocoder/ApplicationTest.java | 3 +--
.../apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java | 2 --
.../src/test/java/CamelSpringBootUnitTests.java | 2 +-
.../src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java | 2 +-
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/camel-example-spring-boot-activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java b/camel-example-spring-boot-activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java
index 7b7e458..3f31691 100644
--- a/camel-example-spring-boot-activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java
+++ b/camel-example-spring-boot-activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java
@@ -27,7 +27,8 @@ import org.junit.jupiter.api.Disabled;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
@CamelSpringBootTest
@SpringBootTest(classes = SampleAmqApplication.class)
diff --git a/camel-example-spring-boot-amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java b/camel-example-spring-boot-amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java
index f71c368..9c6c6fc 100644
--- a/camel-example-spring-boot-amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java
+++ b/camel-example-spring-boot-amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java
@@ -21,13 +21,12 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
-import org.apache.camel.test.spring.junit5.EnableRouteCoverage;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Disabled;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@CamelSpringBootTest
@SpringBootTest(classes = SampleAmqApplication.class)
@@ -36,6 +35,7 @@ public class SampleAmqApplicationTests {
private CamelContext camelContext;
@Disabled("Requires a running activemq broker")
+// @Test
public void shouldProduceMessages() throws Exception {
NotifyBuilder notify = new NotifyBuilder(camelContext).whenDone(1).create();
diff --git a/camel-example-spring-boot-geocoder/src/test/java/org/apache/camel/example/springboot/geocoder/ApplicationTest.java b/camel-example-spring-boot-geocoder/src/test/java/org/apache/camel/example/springboot/geocoder/ApplicationTest.java
index 70e3234..00e4153 100644
--- a/camel-example-spring-boot-geocoder/src/test/java/org/apache/camel/example/springboot/geocoder/ApplicationTest.java
+++ b/camel-example-spring-boot-geocoder/src/test/java/org/apache/camel/example/springboot/geocoder/ApplicationTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.example.springboot.geocoder;
import com.google.maps.model.GeocodingResult;
import org.apache.camel.CamelContext;
import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
-import org.apache.camel.test.spring.junit5.EnableRouteCoverage;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -32,7 +31,7 @@ import org.springframework.http.ResponseEntity;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
@CamelSpringBootTest
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
diff --git a/camel-example-spring-boot-rest-jpa/src/test/java/org/apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java b/camel-example-spring-boot-rest-jpa/src/test/java/org/apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java
index a41e13e..391c01e 100644
--- a/camel-example-spring-boot-rest-jpa/src/test/java/org/apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java
+++ b/camel-example-spring-boot-rest-jpa/src/test/java/org/apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java
@@ -22,9 +22,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
-import org.apache.camel.test.spring.junit5.EnableRouteCoverage;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Disabled;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
diff --git a/camel-example-spring-boot-unit-testing/src/test/java/CamelSpringBootUnitTests.java b/camel-example-spring-boot-unit-testing/src/test/java/CamelSpringBootUnitTests.java
index dcad167..8354bbe 100644
--- a/camel-example-spring-boot-unit-testing/src/test/java/CamelSpringBootUnitTests.java
+++ b/camel-example-spring-boot-unit-testing/src/test/java/CamelSpringBootUnitTests.java
@@ -36,7 +36,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import static org.apache.camel.builder.Builder.body;
import static org.apache.camel.builder.Builder.simple;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
@CamelSpringBootTest
diff --git a/camel-example-spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java b/camel-example-spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java
index a11f87d..21c7a2a 100644
--- a/camel-example-spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java
+++ b/camel-example-spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java
@@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@CamelSpringBootTest
@SpringBootTest(classes = MyCamelApplication.class)