Merge pull request #526 from marcphilipp/release-notes-file-extension

Change to Markdown extension for ease of viewing
junit-team · Oct 22, 2012 · 2f879b9 · 2f879b9
2 parents e7090d1 + c09de4d
commit 2f879b9
Show file tree

Hide file tree

Showing 23 changed files with 1,064 additions and 1,053 deletions.
diff --git a/build.xml b/build.xml
@@ -133,7 +133,7 @@
     <property name="basename" value="doc/ReleaseNotes${version-base}" />
     <exec executable="perl" failonerror="true">
       <arg file="build/Markdown.pl"/>
-      <arg file="${basename}.txt"/>
+      <arg file="${basename}.md"/>
       <redirector output="${basename}.html" />
     </exec>
   </target>

diff --git a/doc/ReleaseNotes4.10.md b/doc/ReleaseNotes4.10.md
@@ -0,0 +1,84 @@
+## Summary of Changes in version 4.10 ##
+
+Thanks to a full cast of contributors of bug fixes and new features.
+
+A full summary of commits between 4.9 and 4.10 is on [github](https://github.com/KentBeck/junit/compare/r4.9...4.10)
+
+### junit-dep has correct contents ###
+
+junit-dep-4.9.jar incorrectly contained hamcrest classes, which could lead to version conflicts in projects that depend on hamcrest directly.  This is fixed in 4.10 [@dsaff, closing gh-309]
+
+### RuleChain ###
+
+The RuleChain rule allows ordering of TestRules:
+
+    public static class UseRuleChain {
+    	@Rule
+    	public TestRule chain= RuleChain
+    	                       .outerRule(new LoggingRule("outer rule")
+    	                       .around(new LoggingRule("middle rule")
+    	                       .around(new LoggingRule("inner rule");
+
+    	@Test
+    	public void example() {
+    		assertTrue(true);
+    	}
+    }
+
+writes the log
+
+    starting outer rule
+    starting middle rule
+    starting inner rule
+    finished inner rule
+    finished middle rule
+    finished outer rule
+
+### TemporaryFolder ###
+
+- `TemporaryFolder#newFolder(String... folderNames)` creates recursively deep temporary folders 
+  [@rodolfoliviero, closing gh-283]
+- `TemporaryFolder#newFile()` creates a randomly named new file, and `#newFolder()` creates a randomly named new folder
+  [@Daniel Rothmaler, closing gh-299]
+
+### Theories ###
+
+The `Theories` runner does not anticipate theory parameters that have generic
+types, as reported by github#64.  Fixing this won't happen until `Theories` is
+moved to junit-contrib. In anticipation of this, 4.9.1 adds some of the
+necessary machinery to the runner classes, and deprecates a method that only
+the `Theories` runner uses, `FrameworkMethod`#producesType(). 
+The Common Public License that JUnit is released under is now included
+in the source repository.
+
+Thanks to `@pholser` for identifying a potential resolution for github#64
+and initiating work on it.
+
+### Bug fixes ###
+
+- Built-in Rules implementations
+  - TemporaryFolder should not create files in the current working directory if applying the rule fails 
+    [@orfjackal, fixing gh-278]
+  - TestWatcher and TestWatchman should not call failed for AssumptionViolatedExceptions
+    [@stefanbirkner, fixing gh-296]
+- Javadoc bugs
+  - Assert documentation [@stefanbirkner, fixing gh-134]
+  - ClassRule [@stefanbirkner, fixing gh-254]
+  - Parameterized  [@stefanbirkner, fixing gh-89]
+  - Parameterized, again [@orfjackal, fixing gh-285]
+- Miscellaneous
+  - Useless code in RunAfters [@stefanbirkner, fixing gh-289]
+  - Parameterized test classes should be able to have `@Category` annotations
+    [@dsaff, fixing gh-291]
+  - Error count should be initialized in junit.tests.framework.TestListenerTest [@stefanbirkner, fixing gh-225]
+  - AssertionFailedError constructor shouldn't call super with null message [@stefanbirkner, fixing gh-318]
+  - Clearer error message for non-static inner test classes  [@stefanbirkner, fixing gh-42]
+
+### Minor changes ###
+
+- Description, Result and Failure are Serializable [@ephox-rob, closing gh-101]
+- FailOnTimeout is reusable, allowing for retrying Rules [@stefanbirkner, closing gh-265]
+- New `ErrorCollector.checkThat` overload, that allows you to specify a reason [@drothmaler, closing gh-300]
+
+
+
diff --git a/doc/ReleaseNotes4.10.txt b/doc/ReleaseNotes4.10.txt
@@ -1,84 +1 @@
-## Summary of Changes in version 4.10 ##
-
-Thanks to a full cast of contributors of bug fixes and new features.
-
-A full summary of commits between 4.9 and 4.10 is on [github](https://github.com/KentBeck/junit/compare/r4.9...4.10)
-
-### junit-dep has correct contents ###
-
-junit-dep-4.9.jar incorrectly contained hamcrest classes, which could lead to version conflicts in projects that depend on hamcrest directly.  This is fixed in 4.10 [@dsaff, closing gh-309]
-
-### RuleChain ###
-
-The RuleChain rule allows ordering of TestRules:
-
-    public static class UseRuleChain {
-    	@Rule
-    	public TestRule chain= RuleChain
-    	                       .outerRule(new LoggingRule("outer rule")
-    	                       .around(new LoggingRule("middle rule")
-    	                       .around(new LoggingRule("inner rule");
-
-    	@Test
-    	public void example() {
-    		assertTrue(true);
-    	}
-    }
-
-writes the log
-
-    starting outer rule
-    starting middle rule
-    starting inner rule
-    finished inner rule
-    finished middle rule
-    finished outer rule
-
-### TemporaryFolder ###
-
-- `TemporaryFolder#newFolder(String... folderNames)` creates recursively deep temporary folders 
-  [@rodolfoliviero, closing gh-283]
-- `TemporaryFolder#newFile()` creates a randomly named new file, and `#newFolder()` creates a randomly named new folder
-  [@Daniel Rothmaler, closing gh-299]
-
-### Theories ###
-
-The `Theories` runner does not anticipate theory parameters that have generic
-types, as reported by github#64.  Fixing this won't happen until `Theories` is
-moved to junit-contrib. In anticipation of this, 4.9.1 adds some of the
-necessary machinery to the runner classes, and deprecates a method that only
-the `Theories` runner uses, `FrameworkMethod`#producesType(). 
-The Common Public License that JUnit is released under is now included
-in the source repository.
-
-Thanks to `@pholser` for identifying a potential resolution for github#64
-and initiating work on it.
-
-### Bug fixes ###
-
-- Built-in Rules implementations
-  - TemporaryFolder should not create files in the current working directory if applying the rule fails 
-    [@orfjackal, fixing gh-278]
-  - TestWatcher and TestWatchman should not call failed for AssumptionViolatedExceptions
-    [@stefanbirkner, fixing gh-296]
-- Javadoc bugs
-  - Assert documentation [@stefanbirkner, fixing gh-134]
-  - ClassRule [@stefanbirkner, fixing gh-254]
-  - Parameterized  [@stefanbirkner, fixing gh-89]
-  - Parameterized, again [@orfjackal, fixing gh-285]
-- Miscellaneous
-  - Useless code in RunAfters [@stefanbirkner, fixing gh-289]
-  - Parameterized test classes should be able to have `@Category` annotations
-    [@dsaff, fixing gh-291]
-  - Error count should be initialized in junit.tests.framework.TestListenerTest [@stefanbirkner, fixing gh-225]
-  - AssertionFailedError constructor shouldn't call super with null message [@stefanbirkner, fixing gh-318]
-  - Clearer error message for non-static inner test classes  [@stefanbirkner, fixing gh-42]
-
-### Minor changes ###
-
-- Description, Result and Failure are Serializable [@ephox-rob, closing gh-101]
-- FailOnTimeout is reusable, allowing for retrying Rules [@stefanbirkner, closing gh-265]
-- New `ErrorCollector.checkThat` overload, that allows you to specify a reason [@drothmaler, closing gh-300]
-
-
-
+Please see ReleaseNotes4.10.md
diff --git a/doc/ReleaseNotes4.11.md b/doc/ReleaseNotes4.11.md
@@ -0,0 +1,109 @@
+## Summary of changes in version 4.11 [unreleased!]
+
+### Matchers: Upgrade to Hamcrest 1.3
+
+JUnit now uses the latest version of Hamcrest. Thus, you can use all the available matchers and benefit from an improved `assertThat` which will now print the mismatch description from the matcher when an assertion fails.
+
+#### Example
+
+    assertThat(Long.valueOf(1), instanceOf(Integer.class));
+
+Old error message:
+
+    Expected: an instance of java.lang.Integer
+         got: <1L>
+
+New error message:
+
+    Expected: an instance of java.lang.Integer
+         but: <1L> is a java.lang.Long
+
+Hamcrest's new `FeatureMatcher` makes writing custom matchers that make use of custom mismatch descriptions quite easy:
+
+	@Test
+	public void featureMatcher() throws Exception {
+		assertThat("Hello World!", length(is(0)));
+	}
+
+	private Matcher<String> length(Matcher<? super Integer> matcher) {
+		return new FeatureMatcher<String, Integer>(matcher, "a String of length that", "length") {
+			@Override
+			protected Integer featureValueOf(String actual) {
+				return actual.length();
+			}
+		};
+	}
+
+Running this test will return the following failure message:
+
+    Expected: a String of length that is <0>
+         but: length was <12>
+
+
+Most of the matchers in `JUnitMatchers` have been deprecated. Please use `org.hamcrest.CoreMatchers` directly.
+
+### Parameterized Tests
+
+In order to easily identify the individual test cases in a Parameterized test, you may provide a name using the `@Parameters` annotation. This name is allowed to contain placeholders that are replaced at runtime:
+
+* `{index}`: the current parameter index
+* `{0}`, `{1}`, …: the first, second, and so on, parameter value
+
+#### Example
+
+    @RunWith(Parameterized.class)
+    public class FibonacciTest {
+
+    	@Parameters(name = "{index}: fib({0})={1}")
+    	public static Iterable<Object[]> data() {
+    		return Arrays.asList(new Object[][] { { 0, 0 }, { 1, 1 }, { 2, 1 },
+    				{ 3, 2 }, { 4, 3 }, { 5, 5 }, { 6, 8 } });
+    	}
+
+    	private int input;
+    	private int expected;
+
+    	public FibonacciTest(int input, int expected) {
+    		this.input = input;
+    		this.expected = expected;
+    	}
+
+    	@Test
+    	public void test() {
+    		assertEquals(expected, Fibonacci.compute(input));
+    	}
+    }
+
+In the example given above, the `Parameterized` runner creates names like `[1: fib(3)=2]`. If you don't specify a name, the current parameter index will be used by default.
+
+### Test execution order
+
+By design, JUnit does not specify the execution order of test method invocations. Until now, the methods were simply invoked in the order returned by the reflection API. However, using the JVM order is unwise since the Java platform does not specify any particular order, and in fact JDK 7 returns a more or less random order. Of course, well-written test code would not assume any order, but some does, and a predictable failure is better than a random failure on certain platforms.
+
+From now on, JUnit will by default use a deterministic, but not predictable, order (`MethodSorters.DEFAULT`). To change the test execution order simply annotate your test class using `@FixMethodOrder` and specify one of the available `MethodSorters`:
+
+* `@FixMethodOrder(MethodSorters.JVM)`: Leaves the test methods in the order returned by the JVM. This order may vary from run to run.
+
+* `@FixMethodOrder(MethodSorters.NAME_ASCENDING)`: Sorts the test methods by method name, in lexicographic order.
+
+### Maven artifacts
+
+Up until now there were two Maven artifacts for JUnit: `junit:junit-dep` and `junit:junit`. From a Maven point-of-view only the former made sense because it did not contain the Hamcrest classes but declared a dependency to the Hamcrest Maven artifact. The latter included the Hamcrest classes which was very un-Maven-like.
+
+From this release on, you should use `junit:junit` which will be what `junit:junit-dep` used to. If you still reference `junit:junit-dep`, Maven will automatically relocate you to the new `junit:junit` and issue a warning for you to fix.
+
+### Rules
+
+A number of improvements have been made to Rules:
+
+* Both `@Rule` and `@ClassRule` can now be used on methods that return a `TestRule`.
+* `ExpectedException` now always prints the stacktrace of the actual exception in case of failure.
+* A parent folder can be specified for `TemporaryFolder`. In addition, the `newFile`/`newFolder` methods will now fail when the file or folder could not be created.
+* `TestWatcher` has a new template method called `skipped` that is invoked when a test is skipped due to a failed assumption.
+
+### Improvements to Assert and Assume
+
+* `assertNotEquals` has been added to `Assert`.
+* `assertEquals` has been overloaded in order to check whether two floats are equal given a certain float delta.
+* Most methods in `Assume` now allow to pass a custom message.
+