summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHugo Hudson <hugohudson@google.com>2012-02-02 01:39:33 +0000
committerHugo Hudson <hugohudson@google.com>2012-02-02 01:39:33 +0000
commit2a267dd8513e727846c03395429f69e4ab17f1c6 (patch)
tree4a51b87f2323d0fe84e495eb666eb65cd566236a /src
parent25ab6b601720d62298a39f1b8bbd1dc99c252725 (diff)
downloadlittlemock-2a267dd8513e727846c03395429f69e4ab17f1c6.tar.gz
Update to r14 of LittleMock.
Change-Id: I94075779786b8a398a8664aa0be8b740ce811780
Diffstat (limited to 'src')
-rw-r--r--src/com/google/testing/littlemock/LittleMock.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/google/testing/littlemock/LittleMock.java b/src/com/google/testing/littlemock/LittleMock.java
index 0d93c4f..9946798 100644
--- a/src/com/google/testing/littlemock/LittleMock.java
+++ b/src/com/google/testing/littlemock/LittleMock.java
@@ -898,7 +898,7 @@ public class LittleMock {
}
/** Represents something capable of testing if it matches an argument or not. */
- /*package*/ interface ArgumentMatcher {
+ public interface ArgumentMatcher {
public boolean matches(Object value);
}
@@ -980,6 +980,12 @@ public class LittleMock {
return value;
}
+ /** A custom argument matcher, should be used only for object arguments not primitives. */
+ public static <T> T matches(ArgumentMatcher argument) {
+ sMatchArguments.add(argument);
+ return null;
+ }
+
/** Utility method to throw an AssertionError if an assertion fails. */
private static void expect(boolean result, String message) {
if (!result) {