Merge pull request junit-team#436 from matthewfarwell/testrule-javadoc

Fixes junit-team#427 inconsistent javadoc for test rules
jglick · Aug 2, 2012 · eaa8d51 · eaa8d51
2 parents 185a219 + 30ecbbc
commit eaa8d51
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/junit/rules/RuleChain.java b/src/main/java/org/junit/rules/RuleChain.java
@@ -15,7 +15,7 @@
  * <pre>
  * public static class UseRuleChain {
  * 	&#064;Rule
- * 	public TestRule chain= RuleChain
+ * 	public RuleChain chain= RuleChain
  * 	                       .outerRule(new LoggingRule("outer rule")
  * 	                       .around(new LoggingRule("middle rule")
  * 	                       .around(new LoggingRule("inner rule");

diff --git a/src/main/java/org/junit/rules/TestWatcher.java b/src/main/java/org/junit/rules/TestWatcher.java
@@ -18,7 +18,7 @@
  * 	private static String watchedLog;
  * 
  * 	&#064;Rule
- * 	public TestRule watchman= new TestWatcher() {
+ * 	public TestWatcher watchman= new TestWatcher() {
  * 		&#064;Override
  * 		protected void failed(Throwable e, Description description) {
  * 			watchedLog+= description + &quot;\n&quot;;

diff --git a/src/main/java/org/junit/rules/Timeout.java b/src/main/java/org/junit/rules/Timeout.java
@@ -12,7 +12,7 @@
  * 	public static String log;
  * 
  * 	&#064;Rule
- * 	public TestRule globalTimeout= new Timeout(20);
+ * 	public Timeout globalTimeout= new Timeout(20);
  * 
  * 	&#064;Test
  * 	public void testInfiniteLoop1() {

diff --git a/src/main/java/org/junit/rules/Verifier.java b/src/main/java/org/junit/rules/Verifier.java
@@ -13,7 +13,7 @@
  *        private ErrorLog errorLog = new ErrorLog();
  *     
  *        &#064;Rule
- *        public TestRule verifier = new Verifier() {
+ *        public Verifier verifier = new Verifier() {
  *           &#064;Override public void verify() {
  *              assertTrue(errorLog.isEmpty());
  *           }