fixed files form Mockito #16

Spirals-Team · Mar 7, 2017 · dd9f371 · dd9f371
1 parent f840778
commit dd9f371
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/projects/Mockito/16/org/mockito/Mockito.java b/projects/Mockito/16/org/mockito/Mockito.java
@@ -824,7 +824,7 @@ public static <T> T mock(Class<T> classToMock, Answer defaultAnswer) {
      * @return mock object
      */
     public static <T> T mock(Class<T> classToMock, MockSettings mockSettings) {
-        return MOCKITO_CORE.mock(classToMock, mockSettings);
+        return MOCKITO_CORE.mock(classToMock, mockSettings, true);
     }
 
     /**
@@ -896,7 +896,7 @@ public static <T> T mock(Class<T> classToMock, MockSettings mockSettings) {
     public static <T> T spy(T object) {
         return MOCKITO_CORE.mock((Class<T>) object.getClass(), withSettings()
                 .spiedInstance(object)
-                .defaultAnswer(CALLS_REAL_METHODS)); 
+                .defaultAnswer(CALLS_REAL_METHODS), true); 
     }
 
     /**

diff --git a/projects/Mockito/16/org/mockito/internal/MockitoCore.java b/projects/Mockito/16/org/mockito/internal/MockitoCore.java
@@ -29,10 +29,11 @@ public class MockitoCore {
     private final MockUtil mockUtil = new MockUtil();
     private final MockingProgress mockingProgress = new ThreadSafeMockingProgress();
 
-    public <T> T mock(Class<T> classToMock, MockSettings mockSettings, boolean shouldResetOngoingStubbing) { return mock(classToMock, mockSettings); }
-    public <T> T mock(Class<T> classToMock, MockSettings mockSettings) {
+    public <T> T mock(Class<T> classToMock, MockSettings mockSettings, boolean shouldResetOngoingStubbing) {
         mockingProgress.validateState();
+        if (shouldResetOngoingStubbing) {
             mockingProgress.resetOngoingStubbing();
+        }
         return mockUtil.createMock(classToMock, (MockSettingsImpl) mockSettings);
     }