Merge pull request #122 from olibye/junit5

Document Invocation.ExceptationMode and tidy imports
jmock-developers · Feb 2, 2019 · 1b3d8b9 · 1b3d8b9
2 parents ddce923 + 8fec75b
commit 1b3d8b9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/jmock-imposters/src/main/java/org/jmock/imposters/ByteBuddyClassImposteriser.java b/jmock-imposters/src/main/java/org/jmock/imposters/ByteBuddyClassImposteriser.java
@@ -14,7 +14,6 @@
 import org.jmock.api.Invocation;
 import org.jmock.api.Invokable;
 import org.jmock.internal.SearchingClassLoader;
-import org.jmock.internal.matcher.MethodMatcher;
 import org.objenesis.Objenesis;
 import org.objenesis.ObjenesisStd;
 

diff --git a/jmock/src/main/java/org/jmock/api/Invocation.java b/jmock/src/main/java/org/jmock/api/Invocation.java
@@ -41,8 +41,15 @@ public class Invocation implements SelfDescribing {
     };
 
 
+    /**
+     * Support distinguish between building expectations and asserting against expectations.
+     * ByteBuddy (for example) checks runtime return types.
+     * It's simplest and safest to return null when building expectations
+     */
     public enum ExpectationMode {
-        BUILDING, ASSERTING, LEGACY
+        BUILDING, // We're building the expectations so invocations can return null
+        ASSERTING, // Return the default or specified reply
+        LEGACY // Legacy mode old imposters
     }
 
     public Invocation(ExpectationMode mode, Object invoked, Method method, Object... parameterValues) {

diff --git a/testjar/pom.xml b/testjar/pom.xml
@@ -22,7 +22,6 @@
                 <!-- Copy jar for unsigned tests -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.9</version>
                 <executions>
                     <execution>
                         <id>copy</id>