← Back to branch summary

~ubuntu-branches/ubuntu/saucy/mockito/saucy

« back to all changes in this revision

Viewing changes to debian/patches/01-fix_FTBFS_with_hamcrest_interfaces.patch

  • Committer: Package Import Robot
  • Author(s): David Paleino
  • Date: 2012-03-19 23:53:45 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120319235345-ommdb05d5kmn4q9g
Tags: 1.9.0+ds1-1
http://bugs.debian.org/661877
* New upstream version
* Updated debian/watch
* Fix FTBFS with hamcrest new interfaces (Closes: #661877)
* Updated debian/copyright
* Bump Standards-Version to 3.9.3, no changes needed

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01-fix_FTBFS_with_hamcrest_interfaces.patch
 
1
From: David Paleino <dapal@debian.org>
 
2
Subject: (new?) hamcrest needs a describeMismatch method implemented
 
3
Origin: vendor
 
4
Forwarded: no
 
5
 
 
6
---
 
7
 org/mockito/internal/matchers/LocalizedMatcher.java |    4 ++++
 
8
 1 file changed, 4 insertions(+)
 
9
 
 
10
--- mockito.orig/org/mockito/internal/matchers/LocalizedMatcher.java
 
11
+++ mockito/org/mockito/internal/matchers/LocalizedMatcher.java
 
12
@@ -33,6 +33,10 @@ public class LocalizedMatcher implements
 
13
         actualMatcher.describeTo(description);
 
14
     }
 
15
 
 
16
+    public void describeMismatch(Object item, Description description) {
 
17
+        actualMatcher.describeMismatch(item, description);
 
18
+    }
 
19
+
 
20
     public Location getLocation() {
 
21
         return location;
 
22
     }