Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Commits on Mar 21, 2012
@marcphilipp marcphilipp Upgrade to Hamcrest 1.3.0 RC2
- Matchers in JUnitMatchers that are now provided by hamcrest-core are deprecated
- Using CoreMatchers where possible

*Important:*
In some but not all cases, this change will cause compiler errors for people
using JUnitMatchers.hasItem(s), both(), and either().
d9cccce
@marcphilipp marcphilipp Remove test for functionality provided by Hamcrest 3cab133
@marcphilipp marcphilipp Remove deleted BothTest from AllTests 8d63a24
Commits on Mar 30, 2012
@marcphilipp marcphilipp Simplify matcher expression in ParameterSignatureTest f4df6d5
Commits on Apr 03, 2012
@marcphilipp marcphilipp Remove everyItem matcher now provided by Hamcrest 4f1dbfc
@marcphilipp marcphilipp Deprecate TypeSafeMatcher which is now provided by Hamcrest 8b9dfef
@marcphilipp marcphilipp assertThat uses org.hamcrest.MatcherAssert
As pointed out by Steve Freeman of Hamcrest, the Matcher interface now
has an additional method describeMismatch. To be safe to catch such 
improvements in the future, MatcherAssert is used instead of
duplicating its implementation.
a0eea13
Commits on Apr 09, 2012
@marcphilipp marcphilipp Update references to Hamcrest JAR a26d3de
@marcphilipp marcphilipp Fix javac build
There seems to be a problem compiling calls of the new

	assertThat(T actual, Matcher<? super T> matcher)

using javac and matchers like `hasItem` and `both` that also use 
`Matcher<? super T>` as parameter.
c2bdb1a
Commits on Apr 12, 2012
@marcphilipp marcphilipp Merge remote-tracking branch 'KentBeck/master' into hamcrest-1.3
Conflicts:
	src/main/java/org/junit/rules/ExpectedException.java
	src/test/java/org/junit/tests/experimental/rules/ExpectedExceptionRuleTest.java
e01ccf1
@marcphilipp marcphilipp Replace JUnitMatchers with CoreMatchers fa80b68
Commits on May 01, 2012
@marcphilipp marcphilipp Merge remote-tracking branch 'KentBeck/master' into hamcrest-1.3 8d783ef
Commits on May 25, 2012
@matthewfarwell matthewfarwell Fixes #427 inconsistent javadoc for test rules
The examples for some test rules used

public TestRule chain= RuleChain...

whereas others did not refer to TestRule, they used the class name.
Changed all of those who refered to TestRule to use the class name.
30ecbbc
Commits on Jun 03, 2012
@shirishp shirishp Do we really need to have "GENERATOR" meta for "Microsoft FrontPage 4…
….0"?
8874fb8
@davidhart82 davidhart82 DataPoints need to be Public 0deeda9
Commits on Jun 04, 2012
Petter Måhlén cucumber-jvm issue #322, added a new Description factory method and t…
…emporarily changed from Serializable back to Object for the unique id; this needs a change to Gherkin
14f9868
Commits on Jun 15, 2012
Petter Måhlén Merge remote-tracking branch 'kentbeck/master' accece2
Petter Måhlén changed back to using Serializable as the necessary Gherkin change ha…
…s been made
2e69992
Commits on Jun 24, 2012
@davidhart82 davidhart82 Throw MulitpleFailureException c07b3e7
@davidhart82 davidhart82 Throw MulitpleFailureException 8c1c0e7
@davidhart82 davidhart82 More tests; fix case if failed and finished throw exceptions 2162def
Commits on Jul 15, 2012
@marcphilipp marcphilipp Merge remote-tracking branch 'KentBeck/master' into hamcrest-1.3
Conflicts:
	src/main/java/org/junit/Assert.java
	src/main/java/org/junit/matchers/JUnitMatchers.java
	src/main/java/org/junit/rules/ExpectedException.java
	src/test/java/org/junit/tests/experimental/rules/ExpectedExceptionTest.java
ee03724
@marcphilipp marcphilipp Update Hamcrest from 1.3.RC2 to 1.3 40375ef
@marcphilipp marcphilipp Remove unused import 620ccfd
@marcphilipp marcphilipp Replace JUnitMatchers with CoreMatchers a68b42c
@marcphilipp marcphilipp Fix warnings in MethodSorterTest
There were several compiler warnings due to seemingly unused members of
private classes that were only used via reflection.
014f241
@kcooney kcooney Merge pull request #462 from marcphilipp/fix-method-sorter-warnings
Fix compiler warnings in MethodSorterTest
cac8c34
Commits on Jul 19, 2012
@marcphilipp marcphilipp Custom matcher for ExpectedException (refactoring)
ExpectedExceptionMatcher now collects all the matchers and internally
provides custom matchers for checking the message and the cause of an
exception.
23793cd
@marcphilipp marcphilipp Add Hamcrest source JAR for easy reference 6e6a6e4
@marcphilipp marcphilipp Introduce withStacktrace() matcher
StacktracePrintingMatcher delegates to a Matcher<Throwable> and in
addition appends the stacktrace of the actual item in case of a
mismatch.

It is used inside ExpectedExceptionMatcher and can also be used
separately when matching Throwables by calling `assertThat(actual,
withStacktrace(throwableMatcher)`.

assertThat no longer sets the cause of the AssertionError. CauseMatcher
has been removed.
f1be7f2
@davidhart82 davidhart82 Move brace (code review) 7496008
@dsaff dsaff Merge pull request #448 from davidhart82/publicdatapoints
DataPoints need to be Public
436e0ea
@marcphilipp marcphilipp Fix javac compile error 1489b8e
@marcphilipp marcphilipp Use allOf() instead of both() to avoid type parameter 2d886e2
@marcphilipp marcphilipp Lazy init for composite matcher 6bea82d
@marcphilipp marcphilipp Rename `and` methods to `andAlso` 872faea
Commits on Jul 20, 2012
@marcphilipp marcphilipp Rename withStacktrace() to isException()/isThrowable()
Following suggestion by @sf105
a37fd9a
@marcphilipp marcphilipp Both hasCause() and hasMessage() describe mismatches 5e9467c
@marcphilipp marcphilipp Extract matchers to separate classes (refactoring) a7c4d03
@marcphilipp marcphilipp ExpectedException uses builder instead of custom matcher ec1a5c3
@marcphilipp marcphilipp Linear control flow in ExpectedExceptionStatement (refactoring) e77e1c4
@marcphilipp marcphilipp Fix typo in test name fe10c8a
@dsaff dsaff Merge pull request #447 from shirish4you/patch-2
Removed "GENERATOR" meta for "Microsoft FrontPage 4.0" from index.html
daeda1a
Commits on Aug 02, 2012
Petter Måhlén reformatted a comment as per code review cfeb604
Petter Måhlén Merge remote-tracking branch 'remotes/kentbeck/master' into cucumber-…
…jvm-322
1c545fd
@dsaff dsaff Merge pull request #452 from davidhart82/issue433
TestWatcher exceptions hide test exceptions
fbdf793
@dsaff dsaff Merge pull request #404 from marcphilipp/hamcrest-1.3
Upgrade to Hamcrest 1.3
185a219
@dsaff dsaff Merge pull request #436 from matthewfarwell/testrule-javadoc
Fixes #427 inconsistent javadoc for test rules
eaa8d51
@marcphilipp marcphilipp Fix javac build
Replace both() with allOf()
ab9caa3
Commits on Aug 03, 2012
@dsaff dsaff Merge pull request #470 from marcphilipp/fix-javac-build
Fix javac build
26caa86
Petter Måhlén re-added createTestDescription(Class, String), and fixed javadoc comm…
…ent that had ended up in the wrong place
303d2e6
Commits on Aug 10, 2012
Petter Måhlén improved the javadoc description of the added factory method 09f3e35
Commits on Aug 12, 2012
Arjan Wulder Issue 478: Throw an IllegalStateException when the folder already exists
Changed the code so it behaves like it is described in the
documentation.
6012fa3
Arjan Wulder Changes suggested by kcooney
kcooney suggested some changes for #479
6b822aa
Arjan Wulder Fixed indenting on several lines
After solving #479 also fixed the indenting
59e5333
Commits on Aug 13, 2012
Arjan Wulder Replaced IllegalArgumentException for IOException
It's more consistent to throw an IOException instead of an
IllegalArgumentException
2568203
Petter Måhlén shortened some lines that were too long b564894
@dsaff dsaff Merge pull request #479 from awulder/issue-478
Issue 478: Throw an IllegalArgumentException when the folder already exists
6dbbd79
Commits on Aug 14, 2012
@dsaff dsaff Merge pull request #451 from pettermahlen/cucumber-jvm-322
Making it possible to instantiate Descriptions for individual tests without an actual Java class
6a8215a
Commits on Aug 17, 2012
@jherault jherault Pull request #182 && #483: Adding Parameter annotation for field para…
…meters
cbf46b8
@jherault jherault Couple of nitpicks ;-) 1fa373f
Arjan Wulder Fix for issue #55
Added Type check for MultiPointsMethod
48aabe1
Commits on Aug 18, 2012
Arjan Wulder Fix for issue #487
The wrong Harmcrest jar was used in the build.xml for generating the
javadoc.
b698037
Commits on Aug 20, 2012
@jherault jherault Spelling 8672a83
@jherault jherault refactoring for better readability 0215c66
@jherault jherault 'each' instead of 'f' for the variable name 56b5463
Arjan Wulder Changed variable name and removed the space before the equal sign 61326c9
@dsaff dsaff Merge pull request #488 from awulder/issue-487
Fix for issue #487
87fe505
@dsaff dsaff Merge pull request #485 from awulder/issue-55
Fix for issue #55
f9ec047
Commits on Aug 21, 2012
@jherault jherault fixing weird indent def7dc5
@dsaff dsaff Merge pull request #484 from jherault/feature
[Enhancement] for parameterized JUnit test, Parameter annotation - V3
2e53904
Commits on Aug 26, 2012
@mmichaelis Merge remote branch 'remotes/upstream/master'
Conflicts:
	src/test/java/org/junit/tests/experimental/rules/TestRuleTest.java
6caeeb1
Commits on Aug 27, 2012
@mmichaelis Adjust dependencies as retrieved from KentBeck / junit : master 00d830f