From b2a82e4aa8c10f64cc889fe445e57d2f0859b66d Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 23 Jan 2017 15:39:44 +0000 Subject: Allow Mockito to compile against external/hamcrest v2.0 Bug: 30946317 Test: make checkbuild Change-Id: Ic42adf9c3849f31a389ae8c03f6526643d27723a --- src/org/mockito/internal/matchers/LocalizedMatcher.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/org/mockito') diff --git a/src/org/mockito/internal/matchers/LocalizedMatcher.java b/src/org/mockito/internal/matchers/LocalizedMatcher.java index b19cdf5..7ba456b 100644 --- a/src/org/mockito/internal/matchers/LocalizedMatcher.java +++ b/src/org/mockito/internal/matchers/LocalizedMatcher.java @@ -4,6 +4,7 @@ */ package org.mockito.internal.matchers; +import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.SelfDescribing; @@ -13,7 +14,8 @@ import org.mockito.invocation.Location; import java.io.Serializable; @SuppressWarnings("unchecked") -public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation, CapturesArguments, MatcherDecorator, Serializable { +public class LocalizedMatcher extends BaseMatcher + implements Matcher, ContainsExtraTypeInformation, CapturesArguments, MatcherDecorator, Serializable { private static final long serialVersionUID = 6748641229659825725L; private final Matcher actualMatcher; @@ -24,10 +26,6 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation, this.location = new LocationImpl(); } - public void _dont_implement_Matcher___instead_extend_BaseMatcher_() { - // yeah right - } - public boolean matches(Object item) { return actualMatcher.matches(item); } -- cgit v1.2.3