Author: dennisl
Date: Sun Oct 10 16:12:25 2010
New Revision: 1006317
URL: http://svn.apache.org/viewvc?rev=1006317&view=rev
Log:
o Use consistent naming of JUnit.
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm?rev=1006317&r1=1006316&r2=1006317&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
Sun Oct 10 16:12:25 2010
@@ -1,16 +1,16 @@
------
- Using Junit
+ Using JUnit
------
Kristian Rosenvold <[email protected]>
------
- 2010-04-12
+ 2010-10-10
------
-Using Junit
+Using JUnit
-* Configuring Junit
+* Configuring JUnit
- To get started with junit, you need to add the required version of junit to
your project:
+ To get started with JUnit, you need to add the required version of JUnit to
your project:
+---+
[...]
@@ -27,17 +27,17 @@ Using Junit
This is the only step that is required to get started - you can now create
tests in your test source directory
(eg, <<<src/test/java>>>).
-* Generations of junit support
+* Generations of JUnit support
- Surefire supports three different generations of junit: Junit3.8.x, Junit
4.x (serial provider) and Junit 4.7 (junit-core provider
- with parallel support). The provider is selected based on the junit version
in your project and the configuration parameters (for parallel).
+ Surefire supports three different generations of JUnit: JUnit 3.8.x, JUnit
4.x (serial provider) and JUnit 4.7 (junit-core provider
+ with parallel support). The provider is selected based on the JUnit version
in your project and the configuration parameters (for parallel).
* How is the provider chosen ?
+---+
-if the junit version in the project >= 4.7 and the parallel attribute has ANY
value
+if the JUnit version in the project >= 4.7 and the parallel attribute has ANY
value
use junit47 provider
-if junit >= 4.0 is present
+if JUnit >= 4.0 is present
use junit4 provider
else
use junit3.8.1
@@ -45,15 +45,15 @@ else
Please note that the "else" part of this algorithm is also a FAQ response:
- You depend on the appropriate version of junit being present in the
project dependencies, or surefire may choose the wrong
- provider. If, for instance, one of your dependencies pulls in junit 3.8.1
you risk that surefire chooses the
+ You depend on the appropriate version of JUnit being present in the
project dependencies, or surefire may choose the wrong
+ provider. If, for instance, one of your dependencies pulls in JUnit 3.8.1
you risk that surefire chooses the
3.8.1 provider, which will not support annotations or any of the 4.x
features.
Use mvn dependency:tree, pom dependency ordering and/or and exclusion of
transitive dependencies to fix this problem.
* Running tests in parallel
- From junit 4.7 and onwards you can run your tests in parallel. To do this,
you must set the
+ From JUnit 4.7 and onwards you can run your tests in parallel. To do this,
you must set the
<<<parallel>>> parameter, and may change the <<<threadCount>>> or
<<<useUnlimitedThreads>>> attribute.
For example:
@@ -72,14 +72,14 @@ else
+---+
- If your tests specify any value for the "parallel" attribute and your
project uses junit4.7+, your request will be routed to
- the concurrent junit provider, which uses the JUnit JUnitCore testrunner.
+ If your tests specify any value for the "parallel" attribute and your
project uses JUnit 4.7+, your request will be routed to
+ the concurrent JUnit provider, which uses the JUnit JUnitCore testrunner.
This is particularly useful for slow tests that can have high concurrency.
- The JUnitCore test-runner has stricter test-compliance checking than earlier
versions of junit; with this provider
- your test must be legitimate junit tests to be run, whereas the old 4.x
provider would also run tests that were not
- according to junit spec.
+ The JUnitCore test-runner has stricter test-compliance checking than earlier
versions of JUnit; with this provider
+ your test must be legitimate JUnit tests to be run, whereas the old 4.x
provider would also run tests that were not
+ according to JUnit spec.
- For more information on JUnit, see the {{{http://www.junit.org}Junit web
site}}.
+ For more information on JUnit, see the {{{http://www.junit.org}JUnit web
site}}.
