Merge changes from topic 'upgrade-hamcrest-to-2.0' (a5651492) · Commits · CodeLinaro / public-release-test-restored / platform / external / junit · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

J

junit
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

a5651492

Commit a5651492 authored 8 years ago by Paul Duffin Committed by Gerrit Code Review 8 years ago

Downloads
- Plain Diff

Merge changes from topic 'upgrade-hamcrest-to-2.0'

* changes:
  Allow JUnit to compile against external/hamcrest v2.0
  Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1"

parents 7323bf63 ccc794a9

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

README.version 0 additions, 1 deletion

README.version
src/main/java/org/junit/Assume.java 7 additions, 8 deletions

src/main/java/org/junit/Assume.java
src/main/java/org/junit/internal/matchers/CombinableMatcher.java 0 additions, 34 deletions

...n/java/org/junit/internal/matchers/CombinableMatcher.java
src/main/java/org/junit/internal/matchers/Each.java 0 additions, 24 deletions

src/main/java/org/junit/internal/matchers/Each.java
src/main/java/org/junit/internal/matchers/IsCollectionContaining.java 0 additions, 67 deletions

...a/org/junit/internal/matchers/IsCollectionContaining.java
src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java 56 additions, 0 deletions

...rg/junit/internal/matchers/StacktracePrintingMatcher.java
src/main/java/org/junit/internal/matchers/StringContains.java 0 additions, 31 deletions

...main/java/org/junit/internal/matchers/StringContains.java
src/main/java/org/junit/internal/matchers/SubstringMatcher.java 0 additions, 28 deletions

...in/java/org/junit/internal/matchers/SubstringMatcher.java
src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java 50 additions, 0 deletions

...va/org/junit/internal/matchers/ThrowableCauseMatcher.java
src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java 37 additions, 0 deletions

.../org/junit/internal/matchers/ThrowableMessageMatcher.java
src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java 12 additions, 9 deletions

...ain/java/org/junit/internal/matchers/TypeSafeMatcher.java
src/main/java/org/junit/matchers/JUnitMatchers.java 98 additions, 68 deletions

src/main/java/org/junit/matchers/JUnitMatchers.java
src/main/java/org/junit/rules/ExpectedException.java 258 additions, 124 deletions

src/main/java/org/junit/rules/ExpectedException.java
src/main/java/org/junit/rules/ExpectedExceptionMatcherBuilder.java 46 additions, 0 deletions

...java/org/junit/rules/ExpectedExceptionMatcherBuilder.java

with 564 additions and 394 deletions

Loading

CodeLinaro @codelinaro
mentioned in commit 9600e973
· 7 months ago

mentioned in commit 9600e973

mentioned in commit 9600e97393ac4a8cc11b16e91396f81c6edb2c7c

Toggle commit list
CodeLinaro @codelinaro
mentioned in commit a4abf50c
· 7 months ago

mentioned in commit a4abf50c

mentioned in commit a4abf50c684223b81e8fdc1e26af5bd56ae83429

Toggle commit list
CodeLinaro @codelinaro
mentioned in commit ec7ba37c
· 7 months ago

mentioned in commit ec7ba37c

mentioned in commit ec7ba37c4102e583e5b50b737db8ceaa133ba25f

Toggle commit list

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment