diff options
author | Dan Shi <dshi@google.com> | 2019-07-30 20:07:42 +0000 |
---|---|---|
committer | Dan Shi <dshi@google.com> | 2019-07-30 20:36:03 +0000 |
commit | 5ea495ad0abda02b77b02cca21182b075a6bc8d6 (patch) | |
tree | 0f7c162e8073c7f326ee4ac29a496c4262d9c086 /src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java | |
parent | feedf5422d04e9d37a8f7c8e76d17f2cf7378924 (diff) | |
download | mockito-5ea495ad0abda02b77b02cca21182b075a6bc8d6.tar.gz |
Revert "Update to Mockito v2.25.7."
This reverts commit feedf5422d04e9d37a8f7c8e76d17f2cf7378924.
Reason for revert: b/138648173
Change-Id: I21b2147346f42bb35ef263f333ff08f1b1216ae3
Exempt-From-Owner-Approval: fix tot
Diffstat (limited to 'src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java')
-rw-r--r-- | src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java b/src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java index d92fc28..69a733c 100644 --- a/src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java +++ b/src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java @@ -10,8 +10,6 @@ import org.mockito.internal.invocation.DefaultInvocationFactory; import org.mockito.internal.util.Checks; import org.mockito.invocation.InvocationFactory; import org.mockito.listeners.MockitoListener; -import org.mockito.plugins.InlineMockMaker; -import org.mockito.plugins.MockMaker; import org.mockito.plugins.MockitoPlugins; import static org.mockito.internal.progress.ThreadSafeMockingProgress.mockingProgress; @@ -39,25 +37,4 @@ public class DefaultMockitoFramework implements MockitoFramework { public InvocationFactory getInvocationFactory() { return new DefaultInvocationFactory(); } - - private InlineMockMaker getInlineMockMaker() { - MockMaker mockMaker = Plugins.getMockMaker(); - return (mockMaker instanceof InlineMockMaker) ? (InlineMockMaker) mockMaker : null; - } - - @Override - public void clearInlineMocks() { - InlineMockMaker mockMaker = getInlineMockMaker(); - if (mockMaker != null) { - mockMaker.clearAllMocks(); - } - } - - @Override - public void clearInlineMock(Object mock) { - InlineMockMaker mockMaker = getInlineMockMaker(); - if (mockMaker != null) { - mockMaker.clearMock(mock); - } - } } |