Add method name check for Expectations

Author: Saljack

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

@@ -113,7 +113,7 @@ private boolean isMatchingGenericMethod(@Nullable Object mock, @Nonnull String i
             if (mockedClass != instance.getClass()) {
                GenericTypeReflection typeReflection = new GenericTypeReflection(mockedClass, null);
                GenericSignature parsedSignature = typeReflection.parseSignature(genericSignature);
-               return parsedSignature.satisfiesSignature(invokedMethod);
+               return parsedSignature.satisfiesSignature(invokedMethod) && isMatchingMethodName(invokedMethod);
             }
          }
       }
@@ -122,6 +122,9 @@ 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) {
@@ -137,6 +140,12 @@ private boolean isMatchingMethod(@Nonnull String invokedMethod) {
       return isReturnTypeOfRecordedMethodAssignableToReturnTypeOfInvokedMethod(invokedMethod, returnTypeStartPos);
    }
 
+   private boolean isMatchingMethodName(@Nonnull String invokedMethod) {
+      int methodNameEndPos = invokedMethod.indexOf('(');
+      String methodName = invokedMethod.substring(0, methodNameEndPos);
+      return getMethodNameAndDescription().startsWith(methodName);
+   }
+
    // Returns -1 if the method names or parameters are different.
    private int getReturnTypePosition(@Nonnull String invokedMethod) {
       String recordedMethod = getMethodNameAndDescription();

main/test/mockit/CapturingImplementationsTest.java

@@ -263,4 +263,26 @@ public void captureLibraryClassImplementingInterfaceFromAnotherLibrary(@Capturin
 
       new Verifications() {{ mock.contextInitialized(null); }};
    }
+
+   static class BaseGenericReturnTypes {
+      Class<?> methodOne() {return null;}
+      Class<?> methodTwo() {return null;}
+   }
+   static class SubGenericReturnTypes extends BaseGenericReturnTypes {}
+
+   @Test
+   public void captureMethodWithGenericReturnTypes(@Capturing final BaseGenericReturnTypes mock) {
+      new Expectations () {{
+         mock.methodOne();
+         result = BaseGenericReturnTypes.class;
+         times = 1;
+
+         mock.methodTwo();
+         result = SubGenericReturnTypes.class;
+         times = 1;
+      }};
+      SubGenericReturnTypes subBaseGenericReturnTypes = new SubGenericReturnTypes();
+      assertEquals(BaseGenericReturnTypes.class, subBaseGenericReturnTypes.methodOne());
+      assertEquals(SubGenericReturnTypes.class, subBaseGenericReturnTypes.methodTwo());
+   }
 }