This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch CAMEL-13965 in repository https://gitbox.apache.org/repos/asf/camel.git
commit c1e9435dbb276cd031b15ab084eefac12557e2dd Author: aldettinger <aldettin...@gmail.com> AuthorDate: Mon Sep 16 15:44:40 2019 +0200 CAMEL-13965: Added links in the documentation --- .../camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc | 4 ++-- docs/components/modules/ROOT/nav.adoc | 1 + .../components/modules/ROOT/pages}/test-spring-junit5.adoc | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc b/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc index 62c92ad..58717f0 100644 --- a/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc +++ b/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc @@ -34,7 +34,7 @@ public class SimpleMockTest extends CamelSpringTestSupport { } ---- -This approach provides feature parity with `org.apache.camel.test.junit5.CamelTestSupport` from `camel-test-junit5` but does not support Spring annotations on the test class such as `@Autowired`, `@DirtiesContext`, and `@ContextConfiguration`. +This approach provides feature parity with `org.apache.camel.test.junit5.CamelTestSupport` from xref:components::test-junit5.adoc[camel-test-junit5] but does not support Spring annotations on the test class such as `@Autowired`, `@DirtiesContext`, and `@ContextConfiguration`. Instead of instantiating the `CamelContext` and routes programmatically, this class relies on a Spring context to wire the needed components together. If your test extends this class, you must provide the Spring context by implementing the following method. [source,java] @@ -134,7 +134,7 @@ Tips: It's possible to run JUnit 4 & JUnit 5 based Camel Spring tests side by si `camel-test-spring-junit5` and `junit-vintage-engine`. This configuration allows to migrate a Camel Spring test at once. === Typical migration steps linked to JUnit 5 support in Camel Test Spring -* Migration steps linked to JUnit 5 support in Camel Test itself should have been applied first +* Migration steps linked to xref:components::test-junit5.adoc[JUnit 5 support in Camel Test itself] should have been applied first * Imports of `org.apache.camel.test.spring.\*` should be replaced with `org.apache.camel.test.spring.junit5.*` * Usage of `@RunWith(CamelSpringRunner.class)` should be replaced with `@CamelSpringTest` * Usage of `@BootstrapWith(CamelTestContextBootstrapper.class)` should be replaced with `@CamelSpringTest` diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc index d983783..4389777 100644 --- a/docs/components/modules/ROOT/nav.adoc +++ b/docs/components/modules/ROOT/nav.adoc @@ -349,6 +349,7 @@ * xref:test-cdi.adoc[CDI Testing] * xref:test-junit5.adoc[Test Module] * xref:test-karaf.adoc[Test Karaf] +* xref:test-spring-junit5.adoc[Camel Test Spring JUnit 5] * xref:test-spring.adoc[Test Spring] * xref:test.adoc[Test Module] * xref:testcontainers-spring.adoc[Testcontainers Spring] diff --git a/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc b/docs/components/modules/ROOT/pages/test-spring-junit5.adoc similarity index 92% copy from components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc copy to docs/components/modules/ROOT/pages/test-spring-junit5.adoc index 62c92ad..dcf5242 100644 --- a/components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc +++ b/docs/components/modules/ROOT/pages/test-spring-junit5.adoc @@ -1,4 +1,5 @@ = Camel Test Spring JUnit 5 +:page-source: components/camel-test-spring-junit5/src/main/docs/test-spring-junit5.adoc *Available since 3.0* @@ -34,7 +35,7 @@ public class SimpleMockTest extends CamelSpringTestSupport { } ---- -This approach provides feature parity with `org.apache.camel.test.junit5.CamelTestSupport` from `camel-test-junit5` but does not support Spring annotations on the test class such as `@Autowired`, `@DirtiesContext`, and `@ContextConfiguration`. +This approach provides feature parity with `org.apache.camel.test.junit5.CamelTestSupport` from xref:components::test-junit5.adoc[camel-test-junit5] but does not support Spring annotations on the test class such as `@Autowired`, `@DirtiesContext`, and `@ContextConfiguration`. Instead of instantiating the `CamelContext` and routes programmatically, this class relies on a Spring context to wire the needed components together. If your test extends this class, you must provide the Spring context by implementing the following method. [source,java] @@ -134,7 +135,7 @@ Tips: It's possible to run JUnit 4 & JUnit 5 based Camel Spring tests side by si `camel-test-spring-junit5` and `junit-vintage-engine`. This configuration allows to migrate a Camel Spring test at once. === Typical migration steps linked to JUnit 5 support in Camel Test Spring -* Migration steps linked to JUnit 5 support in Camel Test itself should have been applied first +* Migration steps linked to xref:components::test-junit5.adoc[JUnit 5 support in Camel Test itself] should have been applied first * Imports of `org.apache.camel.test.spring.\*` should be replaced with `org.apache.camel.test.spring.junit5.*` * Usage of `@RunWith(CamelSpringRunner.class)` should be replaced with `@CamelSpringTest` * Usage of `@BootstrapWith(CamelTestContextBootstrapper.class)` should be replaced with `@CamelSpringTest`