Merge "Improve Mockito 2.7.13 compatibility classes"

am: 4f00a506f3

Change-Id: I0d414acc762464786288d511e7c81919ecff7db1

2 files changed, 28 insertions, 0 deletions

diff --git a/src/main/java/org/mockito/compat/ArgumentMatcher.java b/src/main/java/org/mockito/compat/ArgumentMatcher.java
index b288c8a..915f603 100644
--- a/src/main/java/org/mockito/compat/ArgumentMatcher.java
+++ b/src/main/java/org/mockito/compat/ArgumentMatcher.java
@@ -15,6 +15,9 @@
  */
 package org.mockito.compat;
 
+import org.hamcrest.Description;
+import org.mockito.internal.util.Decamelizer;
+
 /**
  * Base class for code that has to compile against Mockito 1.x and Mockito 2.x.
  */
@@ -26,4 +29,15 @@ public abstract class ArgumentMatcher<T> extends org.mockito.ArgumentMatcher<T>
     }
 
     public abstract boolean matchesObject(Object o);
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText(toString());
+    }
+
+    @Override
+    public String toString() {
+        String className = getClass().getSimpleName();
+        return Decamelizer.decamelizeMatcher(className);
+    }
 }
diff --git a/src/main/java/org/mockito/compat/CapturingMatcher.java b/src/main/java/org/mockito/compat/CapturingMatcher.java
index aa586ea..4cf2468 100644
--- a/src/main/java/org/mockito/compat/CapturingMatcher.java
+++ b/src/main/java/org/mockito/compat/CapturingMatcher.java
@@ -15,6 +15,9 @@
  */
 package org.mockito.compat;
 
+import org.hamcrest.Description;
+import org.mockito.internal.util.Decamelizer;
+
 /**
  * Base class for code that has to compile against Mockito 1.x and Mockito 2.x.
  */
@@ -27,4 +30,15 @@ public abstract class CapturingMatcher<T>
     }
 
     public abstract boolean matchesObject(Object o);
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText(toString());
+    }
+
+    @Override
+    public String toString() {
+        String className = getClass().getSimpleName();
+        return Decamelizer.decamelizeMatcher(className);
+    }
 }