Add method name check for generic methods Expectations

Author: Saljack

main/src/mockit/internal/expectations/invocation/ExpectedInvocation.java

@@ -122,9 +122,6 @@ private boolean isMatchingGenericMethod(@Nullable Object mock, @Nonnull String i
    }
 
    private boolean isMatchingMethod(@Nonnull String invokedMethod) {
-      if (!isMatchingMethodName(invokedMethod)) {
-        return false;
-      }
       int returnTypeStartPos = getReturnTypePosition(invokedMethod);
 
       if (returnTypeStartPos < 0) {
@@ -142,7 +139,7 @@ private boolean isMatchingMethod(@Nonnull String invokedMethod) {
 
    private boolean isMatchingMethodName(@Nonnull String invokedMethod) {
       int methodNameEndPos = invokedMethod.indexOf('(');
-      String methodName = invokedMethod.substring(0, methodNameEndPos);
+      String methodName = invokedMethod.substring(0, methodNameEndPos + 1);
       return getMethodNameAndDescription().startsWith(methodName);
    }
 

main/test/mockit/CapturingImplementationsTest.java

@@ -196,22 +196,26 @@ public void captureClassWhichImplementsCapturedBaseInterfaceAndExtendsUnrelatedB
    static class Base<T> {
       T doSomething() { return null; }
       void doSomething(T t) { System.out.println("test");}
+      T doSomethingReturn(T t) { return t;}
    }
 
    static final class Impl extends Base<Integer> {
       @Override Integer doSomething() { return 1; }
       @Override void doSomething(Integer i) {}
+      @Override Integer doSomethingReturn(Integer t) { return null;}
    }
 
    @Test
    public void captureImplementationsOfGenericType(@Capturing final Base<Integer> anyInstance) {
       new Expectations() {{
          anyInstance.doSomething(); result = 2;
+         anyInstance.doSomethingReturn(0);
          anyInstance.doSomething(0);
       }};
 
       Base<Integer> impl = new Impl();
       int i = impl.doSomething();
+      impl.doSomethingReturn(0);
       impl.doSomething(0);
 
       assertEquals(2, i);
@@ -285,4 +289,26 @@ public void captureMethodWithGenericReturnTypes(@Capturing final BaseGenericRetu
       assertEquals(BaseGenericReturnTypes.class, subBaseGenericReturnTypes.methodOne());
       assertEquals(SubGenericReturnTypes.class, subBaseGenericReturnTypes.methodTwo());
    }
+
+   static class BaseR {
+     void foo() {};
+     void bar() {};
+   }
+
+   static class SubR extends BaseR {}
+
+   @Test
+   public void captureR(@Capturing final BaseR mock) {
+      new Expectations () {{
+         mock.foo();
+         times = 1;
+
+         mock.bar();
+         times = 1;
+      }};
+     SubR subR = new SubR();
+     subR.foo();
+     subR.bar();
+   }
+
 }