This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d7919fc Remove deleted camel-testng component from Spring test
documentation.
d7919fc is described below
commit d7919fcc3df35ca26565289edea06c19700bd5a4
Author: Pascal Schumacher <pascalschumac...@gmx.net>
AuthorDate: Thu Sep 12 10:47:47 2019 +0200
Remove deleted camel-testng component from Spring test documentation.
---
.../src/main/docs/test-spring.adoc | 23 +++-----------
.../components/modules/ROOT/pages/test-spring.adoc | 24 +++-----------
.../ROOT/pages/faq/using-camel-core-testsjar.adoc | 2 +-
.../modules/ROOT/pages/spring-testing.adoc | 37 ++++++++--------------
docs/user-manual/modules/ROOT/pages/testing.adoc | 13 +-------
5 files changed, 26 insertions(+), 73 deletions(-)
diff --git a/components/camel-test-spring/src/main/docs/test-spring.adoc
b/components/camel-test-spring/src/main/docs/test-spring.adoc
index 016191a..5a6e770 100644
--- a/components/camel-test-spring/src/main/docs/test-spring.adoc
+++ b/components/camel-test-spring/src/main/docs/test-spring.adoc
@@ -9,7 +9,7 @@ Allows to test Camel with Spring applications such as Spring
XML files or Spring
This documentation is old and needs to be updated
====
-xref:manual::testing.adoc[Testing] is a crucial part of any development or
integration work. The Spring Framework offers a number of features that makes
it easy to test while using Spring for Inversion of Control which works with
JUnit 3.x, JUnit 4.x, and http://testng.org[TestNG].
+xref:manual::testing.adoc[Testing] is a crucial part of any development or
integration work. The Spring Framework offers a number of features that makes
it easy to test while using Spring for Inversion of Control which works with
JUnit 3.x and JUnit 4.x.
We can use Spring for IoC and the Camel
xref:components::mock-component.adoc[Mock] and xref:components::test.adoc[Test]
endpoints to create sophisticated integration/unit tests that are easy to run
and debug inside your IDE. There are three supported approaches for testing
with Spring in Camel.
[width="100%",cols="1,1,4,1",options="header",]
@@ -18,26 +18,22 @@ We can use Spring for IoC and the Camel
xref:components::mock-component.adoc[Moc
|<<camel-spring-test-support,Camel Spring Test Support>> a|
* JUnit 3.x (deprecated)
* JUnit 4.x
-* TestNG
a|
Provided by:
* `org.apache.camel.test.CamelSpringTestSupport`
* `org.apache.camel.test.junit4.CamelSpringTestSupport`
-* `org.apache.camel.testng.CamelSpringTestSupport`
These base classes provide feature parity with the simple `CamelTestSupport`
classes from xref:components::test.adoc[Camel Test] but do not support Spring
annotations on the test class such as `@Autowired`, `@DirtiesContext`, and
`@ContextConfiguration`.
a|
* JUnit 3.x (deprecated) - camel-test-spring
* JUnit 4.x - camel-test-spring
-* TestNG - camel-test-ng
|<<plain-spring-test, Plain Spring Test>> a|
* JUnit 3.x
* JUnit 4.x
-* TestNG
a|
Either extend the abstract base classes:
@@ -52,27 +48,20 @@ These approaches support both the Camel annotations and
Spring annotations. Howe
* `org.apache.camel.test.CamelTestSupport`
* `org.apache.camel.test.junit4.CamelTestSupport`
-* `org.apache.camel.testng.CamelSpringTestSupport`
a|
* JUnit 3.x (deprecated) - None
* JUnit 4.x - None
-* TestNG - None
|<<camel-enhanced-spring-test,Camel Enhanced Spring Test>> a|
* JUnit 4.x
-* TestNG
a|
-Either:
-
-* use the `org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner` runner
with the `@RunWith` annotation,
-* or extend `org.apache.camel.testng.AbstractCamelTestNGSpringContextTests` to
enable
http://camel.apache.org/camel-test.html#CamelTest-FeaturesProvidedbyCamelTestSupport[feature
parity] with `org.apache.camel.test.CamelTestSupport` and
`org.apache.camel.test.junit4.CamelTestSupport`. These classes support the full
suite of Spring Test annotations such as `@Autowired`, `@DirtiesContext`, and
`@ContextConfiguration`.
+* use the `org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner` runner
with the `@RunWith` annotation to enable
http://camel.apache.org/camel-test.html#CamelTest-FeaturesProvidedbyCamelTestSupport[feature
parity] with `org.apache.camel.test.CamelTestSupport` and
`org.apache.camel.test.junit4.CamelTestSupport`. These classes support the full
suite of Spring Test annotations such as `@Autowired`, `@DirtiesContext`, and
`@ContextConfiguration`.
a|
* JUnit 3.x (deprecated) - camel-test-spring
* JUnit 4.x - camel-test-spring
-* TestNG - camel-test-ng
|=======================================================================
[#camel-spring-test-support]
@@ -81,14 +70,12 @@ a|
The following Spring test support classes:
* `org.apache.camel.test.CamelSpringTestSupport`
-* `org.apache.camel.test.junit4.CamelSpringTestSupport`, and
-* `org.apache.camel.testng.CamelSpringTestSupport`
+* `org.apache.camel.test.junit4.CamelSpringTestSupport`
extend their non-Spring aware counterparts:
* `org.apache.camel.test.CamelTestSupport`
-* `org.apache.camel.test.junit4.CamelTestSupport`, and
-* `org.apache.camel.testng.CamelTestSupport`
+* `org.apache.camel.test.junit4.CamelTestSupport`
and deliver integration with Spring into your test classes.
@@ -294,7 +281,7 @@ public class MyCamelTest {
[#camel-enhanced-spring-test]
== Camel Enhanced Spring Test
-Using the `org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner` runner
with the `@RunWith` annotation or extending
`org.apache.camel.testng.AbstractCamelTestNGSpringContextTests` provides the
full feature set of Spring Test with support for the feature set provided in
the `CamelTestSupport` classes.
+Using the `org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner` runner
with the `@RunWith` annotation provides the full feature set of Spring Test
with support for the feature set provided in the `CamelTestSupport` classes.
A number of Camel specific annotations have been developed in order to provide
for declarative manipulation of the Camel context(s) involved in the test.
These annotations free your test classes from having to inherit from the
`CamelSpringTestSupport` classes and also reduce the amount of code required to
customize the tests.
[width="100%",cols="1,1,4,1,1",options="header",]
diff --git a/docs/components/modules/ROOT/pages/test-spring.adoc
b/docs/components/modules/ROOT/pages/test-spring.adoc
index d76e9d4..5a6e770 100644
--- a/docs/components/modules/ROOT/pages/test-spring.adoc
+++ b/docs/components/modules/ROOT/pages/test-spring.adoc
@@ -1,5 +1,4 @@
= Test Spring
-:page-source: components/camel-test-spring/src/main/docs/test-spring.adoc
*Available since 2.10*
@@ -10,7 +9,7 @@ Allows to test Camel with Spring applications such as Spring
XML files or Spring
This documentation is old and needs to be updated
====
-xref:manual::testing.adoc[Testing] is a crucial part of any development or
integration work. The Spring Framework offers a number of features that makes
it easy to test while using Spring for Inversion of Control which works with
JUnit 3.x, JUnit 4.x, and http://testng.org[TestNG].
+xref:manual::testing.adoc[Testing] is a crucial part of any development or
integration work. The Spring Framework offers a number of features that makes
it easy to test while using Spring for Inversion of Control which works with
JUnit 3.x and JUnit 4.x.
We can use Spring for IoC and the Camel
xref:components::mock-component.adoc[Mock] and xref:components::test.adoc[Test]
endpoints to create sophisticated integration/unit tests that are easy to run
and debug inside your IDE. There are three supported approaches for testing
with Spring in Camel.
[width="100%",cols="1,1,4,1",options="header",]
@@ -19,26 +18,22 @@ We can use Spring for IoC and the Camel
xref:components::mock-component.adoc[Moc
|<<camel-spring-test-support,Camel Spring Test Support>> a|
* JUnit 3.x (deprecated)
* JUnit 4.x
-* TestNG
a|
Provided by:
* `org.apache.camel.test.CamelSpringTestSupport`
* `org.apache.camel.test.junit4.CamelSpringTestSupport`
-* `org.apache.camel.testng.CamelSpringTestSupport`
These base classes provide feature parity with the simple `CamelTestSupport`
classes from xref:components::test.adoc[Camel Test] but do not support Spring
annotations on the test class such as `@Autowired`, `@DirtiesContext`, and
`@ContextConfiguration`.
a|
* JUnit 3.x (deprecated) - camel-test-spring
* JUnit 4.x - camel-test-spring
-* TestNG - camel-test-ng
|<<plain-spring-test, Plain Spring Test>> a|
* JUnit 3.x
* JUnit 4.x
-* TestNG
a|
Either extend the abstract base classes:
@@ -53,27 +48,20 @@ These approaches support both the Camel annotations and
Spring annotations. Howe
* `org.apache.camel.test.CamelTestSupport`
* `org.apache.camel.test.junit4.CamelTestSupport`
-* `org.apache.camel.testng.CamelSpringTestSupport`
a|
* JUnit 3.x (deprecated) - None
* JUnit 4.x - None
-* TestNG - None
|<<camel-enhanced-spring-test,Camel Enhanced Spring Test>> a|
* JUnit 4.x
-* TestNG
a|
-Either:
-
-* use the `org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner` runner
with the `@RunWith` annotation,
-* or extend `org.apache.camel.testng.AbstractCamelTestNGSpringContextTests` to
enable
http://camel.apache.org/camel-test.html#CamelTest-FeaturesProvidedbyCamelTestSupport[feature
parity] with `org.apache.camel.test.CamelTestSupport` and
`org.apache.camel.test.junit4.CamelTestSupport`. These classes support the full
suite of Spring Test annotations such as `@Autowired`, `@DirtiesContext`, and
`@ContextConfiguration`.
+* use the `org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner` runner
with the `@RunWith` annotation to enable
http://camel.apache.org/camel-test.html#CamelTest-FeaturesProvidedbyCamelTestSupport[feature
parity] with `org.apache.camel.test.CamelTestSupport` and
`org.apache.camel.test.junit4.CamelTestSupport`. These classes support the full
suite of Spring Test annotations such as `@Autowired`, `@DirtiesContext`, and
`@ContextConfiguration`.
a|
* JUnit 3.x (deprecated) - camel-test-spring
* JUnit 4.x - camel-test-spring
-* TestNG - camel-test-ng
|=======================================================================
[#camel-spring-test-support]
@@ -82,14 +70,12 @@ a|
The following Spring test support classes:
* `org.apache.camel.test.CamelSpringTestSupport`
-* `org.apache.camel.test.junit4.CamelSpringTestSupport`, and
-* `org.apache.camel.testng.CamelSpringTestSupport`
+* `org.apache.camel.test.junit4.CamelSpringTestSupport`
extend their non-Spring aware counterparts:
* `org.apache.camel.test.CamelTestSupport`
-* `org.apache.camel.test.junit4.CamelTestSupport`, and
-* `org.apache.camel.testng.CamelTestSupport`
+* `org.apache.camel.test.junit4.CamelTestSupport`
and deliver integration with Spring into your test classes.
@@ -295,7 +281,7 @@ public class MyCamelTest {
[#camel-enhanced-spring-test]
== Camel Enhanced Spring Test
-Using the `org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner` runner
with the `@RunWith` annotation or extending
`org.apache.camel.testng.AbstractCamelTestNGSpringContextTests` provides the
full feature set of Spring Test with support for the feature set provided in
the `CamelTestSupport` classes.
+Using the `org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner` runner
with the `@RunWith` annotation provides the full feature set of Spring Test
with support for the feature set provided in the `CamelTestSupport` classes.
A number of Camel specific annotations have been developed in order to provide
for declarative manipulation of the Camel context(s) involved in the test.
These annotations free your test classes from having to inherit from the
`CamelSpringTestSupport` classes and also reduce the amount of code required to
customize the tests.
[width="100%",cols="1,1,4,1,1",options="header",]
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/using-camel-core-testsjar.adoc
b/docs/user-manual/modules/ROOT/pages/faq/using-camel-core-testsjar.adoc
index 0bc320d..9181911 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/using-camel-core-testsjar.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/using-camel-core-testsjar.adoc
@@ -6,5 +6,5 @@ JAR is only used internally by Camel itself when it tests the
same unit
tests using different DSL such as Spring XML, Blueprint XML, Scala DSL,
etc.
-End users who need a test kit should use `camel-test` or `camel-testng`
+End users who need a test kit should use `camel-test`
JARs instead. See more here xref:testing.adoc[Testing].
diff --git a/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
b/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
index 3d44a0c..ed94e1a 100644
--- a/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
+++ b/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
@@ -4,7 +4,7 @@
Testing is a crucial part of any development or
integration work. The Spring Framework offers a number of features that
makes it easy to test while using Spring for Inversion of Control which
-works with JUnit 3.x, JUnit 4.x, and http://testng.org[TestNG].
+works with JUnit 3.x or JUnit 4.x.
We can use Spring for IoC and the Camel
xref:components::mock-component.adoc[Mock] and
xref:components::test.adoc[Test] endpoints to create sophisticated
integration/unit
@@ -17,51 +17,43 @@ supported approaches for testing with Spring in Camel.
|CamelSpringTestSupport |* JUnit 3.x (deprecated)
* JUnit 4.x
-* TestNG - *Camel 2.8* |Provided by
org.apache.camel.test.CamelSpringTestSupport,
-org.apache.camel.test.junit4.CamelSpringTestSupport, and
-org.apache.camel.testng.CamelSpringTestSupport. These base classes
+|Provided by org.apache.camel.test.CamelSpringTestSupport and
+org.apache.camel.test.junit4.CamelSpringTestSupport. These base classes
provide feature parity with the simple
CamelTestSupport classes from Camel Test but do
not support Spring annotations on the test class such as
*@Autowired*, *@DirtiesContext*, and *@ContextConfiguration*. |* JUnit 3.x
(deprecated) - camel-test-spring
* JUnit 4.x - camel-test-spring
-* TestNG - camel-test-ng
|Plain Spring Test |* JUnit 3.x
* JUnit 4.x
-* TestNG |Extend the abstract base classes
+|Extend the abstract base classes
(org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests,
org.springframework.test.context.junit38.AbstractJUnit4SpringContextTests,
etc.) provided in Spring Test or use the Spring Test JUnit4 runner.
These approaches support both the Camel annotations and Spring
annotations, but do not have feature parity
-with org.apache.camel.test.CamelTestSupport,
-org.apache.camel.test.junit4.CamelTestSupport, and
-org.apache.camel.testng.CamelSpringTestSupport. |* JUnit 3.x (deprecated) -
None
+with org.apache.camel.test.CamelTestSupport and
+org.apache.camel.test.junit4.CamelTestSupport. |* JUnit 3.x (deprecated) - None
* JUnit 4.x - None
-* TestNG - None
|Camel Enhanced Spring Test |* JUnit 4.x - *Camel 2.10*
-* TestNG - *Camel 2.10* |Use the
org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner runner
-with the *@RunWith* annotation or extend
-org.apache.camel.testng.AbstractCamelTestNGSpringContextTests to enable
+|Use the org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner runner
+with the *@RunWith* annotation to enable
feature parity with
org.apache.camel.test.CamelTestSupport and
org.apache.camel.test.junit4.CamelTestSupport and also support the full
suite of Spring Test annotations such
as *@Autowired*, *@DirtiesContext*, and *@ContextConfiguration*. |* JUnit 3.x
(deprecated) - camel-test-spring
* JUnit 4.x - camel-test-spring
-* TestNG - camel-test-ng
|=======================================================================
[[SpringTesting-CamelSpringTestSupport]]
== CamelSpringTestSupport
-org.apache.camel.test.CamelSpringTestSupport,
-org.apache.camel.test.junit4.CamelSpringTestSupport, and
-org.apache.camel.testng.CamelSpringTestSupport extend their non-Spring
-aware counterparts (org.apache.camel.test.CamelTestSupport,
-org.apache.camel.test.junit4.CamelTestSupport, and
-org.apache.camel.testng.CamelTestSupport) and deliver integration with
+org.apache.camel.test.CamelSpringTestSupport and
+org.apache.camel.test.junit4.CamelSpringTestSupport extend their non-Spring
+aware counterparts (org.apache.camel.test.CamelTestSupport and
+org.apache.camel.test.junit4.CamelTestSupport) and deliver integration with
Spring into your test classes. Instead of instantiating the
CamelContext and routes programmatically, these classes rely on a Spring
context to wire the needed components together. If your test extends
@@ -213,8 +205,7 @@ public class MyCamelTest {
== Camel Enhanced Spring Test
Using org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner runner
-with the *@RunWith* annotation or extending
-org.apache.camel.testng.AbstractCamelTestNGSpringContextTests provides
+with the *@RunWith* annotation provides
the full feature set of Spring Test with support for the feature set
provided in the CamelTestSupport classes. A number of Camel specific
annotations have been developed in order to provide for declarative
@@ -225,7 +216,7 @@ required to customize the tests.
[width="100%",cols="20%,20%,20%,20%,20%",options="header",]
|=======================================================================
-|Annotation Class |Applies To |Description |Default Behavioir If Not Present
|Default Behavior If Present
+|Annotation Class |Applies To |Description |Default Behavior If Not Present
|Default Behavior If Present
|org.apache.camel.test.spring.DisableJmx |Class |Indicates if JMX should be
globally disabled in the CamelContexts that
are bootstrapped during the test through the use of Spring Test loaded
diff --git a/docs/user-manual/modules/ROOT/pages/testing.adoc
b/docs/user-manual/modules/ROOT/pages/testing.adoc
index 0522487..40bc8ae 100644
--- a/docs/user-manual/modules/ROOT/pages/testing.adoc
+++ b/docs/user-manual/modules/ROOT/pages/testing.adoc
@@ -22,7 +22,7 @@ for things to go wrong! {icon-frown}. Testing is the crucial
weapon to ensure
that things work as you would expect {icon-smile}.
Camel is a Java library so you can easily wire up tests in whatever unit
-testing framework you use (JUnit 3.x (deprecated), 4.x, or TestNG).
+testing framework you use (JUnit 3.x (deprecated) or 4.x).
However the Camel project has tried to make the testing of Camel as easy
and powerful as possible so we have introduced the following features.
@@ -67,17 +67,6 @@ Spring Testing.
|*Camel 2.10:* Provides the ability to do unit testing on blueprint
configurations
-|Guice |camel-guice |Uses Guice to
-dependency inject your test classes
-
-|Camel TestNG |camel-testng |Supports plain TestNG based tests with or
-without CDI, Spring or Guice
-for Dependency Injection which does not
-require an in-depth knowledge of CDI, Spring + Spring Test or Guice.
-Also from *Camel 2.10* onwards, this component supports Spring Test based tests
-that use the declarative style of test configuration and injection common
-in Spring Test and described in more detail under
-Spring Testing.
|=======================================================================
In all approaches the test classes look pretty much the same in that
