[mockito] 3 new revisions pushed by szcze...@gmail.com on 2012-01-29 15:47 GMT
moc...@googlecode.com
Revision: 9d43c48d8e72
Author: szczepiq
Date: Sun Jan 29 06:37:54 2012
Log: Introduced new interface to hide the details of MockSettingsImpl
in th...
http://code.google.com/p/mockito/source/detail?r=9d43c48d8e72
Revision: 146d43d22b9f
Author: szczepiq
Date: Sun Jan 29 07:30:47 2012
Log: Moved the MockitoInvocationHandler to public space. Added a new
annota...
http://code.google.com/p/mockito/source/detail?r=146d43d22b9f
Revision: 2d74de36c814
Author: szczepiq
Date: Sun Jan 29 07:39:59 2012
Log: Moved MockMaker to the public packages. Added tiny bit of docs.
http://code.google.com/p/mockito/source/detail?r=2d74de36c814
==============================================================================
Revision: 9d43c48d8e72
Author: szczepiq
Date: Sun Jan 29 06:37:54 2012
Log: Introduced new interface to hide the details of MockSettingsImpl
in the plugins API. It's still an incubating api, might change.
http://code.google.com/p/mockito/source/detail?r=9d43c48d8e72
Added:
/src/org/mockito/plugins/MockSettingsInfo.java
Modified:
/src/org/mockito/MockSettings.java
/src/org/mockito/internal/IMockMaker.java
/src/org/mockito/internal/creation/CglibMockMaker.java
/src/org/mockito/internal/creation/MethodInterceptorFilter.java
/src/org/mockito/internal/util/MockUtil.java
=======================================
--- /dev/null
+++ /src/org/mockito/plugins/MockSettingsInfo.java Sun Jan 29 06:37:54 2012
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+
+package org.mockito.plugins;
+
+/**
+ * This API is incubating. It may change.
+ * <p>
+ * Informs about the mock settings
+ */
+public interface MockSettingsInfo {
+
+ /**
+ * if the mock is serializable
+ */
+ boolean isSerializable();
+}
=======================================
--- /src/org/mockito/MockSettings.java Wed Nov 23 11:23:42 2011
+++ /src/org/mockito/MockSettings.java Sun Jan 29 06:37:54 2012
@@ -5,6 +5,7 @@
package org.mockito;
import org.mockito.listeners.InvocationListener;
+import org.mockito.plugins.MockSettingsInfo;
import org.mockito.stubbing.Answer;
import java.io.Serializable;
@@ -34,7 +35,7 @@
* Firstly, to make it easy to add another mock setting when the demand
comes.
* Secondly, to enable combining together different mock settings without
introducing zillions of overloaded mock() methods.
*/
-public interface MockSettings extends Serializable {
+public interface MockSettings extends Serializable, MockSettingsInfo {
/**
* Specifies extra interfaces the mock should implement. Might be
useful for legacy code or some corner cases.
=======================================
--- /src/org/mockito/internal/IMockMaker.java Mon Jan 16 12:28:17 2012
+++ /src/org/mockito/internal/IMockMaker.java Sun Jan 29 06:37:54 2012
@@ -4,7 +4,7 @@
*/
package org.mockito.internal;
-import org.mockito.internal.creation.MockSettingsImpl;
+import org.mockito.plugins.MockSettingsInfo;
public interface IMockMaker {
@@ -14,7 +14,7 @@
* returned instance will be delegated to {@code handler}.
*/
<T> T createMock(Class<T> typeToMock, Class<?>[] extraInterfaces,
- MockitoInvocationHandler handler, MockSettingsImpl settings);
+ MockitoInvocationHandler handler, MockSettingsInfo settings);
/**
* Returns the handler for the {@code mock}, or null if {@code mock}
was not
@@ -26,5 +26,5 @@
* Replaces the existing handler on {@code mock} with {@code
newHandler}.
*/
public void resetMock(Object mock, MockitoInvocationHandler newHandler,
- MockSettingsImpl settings);
-}
+ MockSettingsInfo settings);
+}
=======================================
--- /src/org/mockito/internal/creation/CglibMockMaker.java Mon Jan 16
12:28:17 2012
+++ /src/org/mockito/internal/creation/CglibMockMaker.java Sun Jan 29
06:37:54 2012
@@ -9,6 +9,7 @@
import org.mockito.internal.IMockMaker;
import org.mockito.internal.MockitoInvocationHandler;
import org.mockito.internal.creation.jmock.ClassImposterizer;
+import org.mockito.plugins.MockSettingsInfo;
/**
* A MockMaker that uses cglib to generate mocks on a JVM.
@@ -16,13 +17,12 @@
public final class CglibMockMaker implements IMockMaker {
public <T> T createMock(Class<T> typeToMock, Class<?>[]
extraInterfaces,
- MockitoInvocationHandler handler, MockSettingsImpl settings) {
- settings.initiateMockName(typeToMock);
+ MockitoInvocationHandler handler, MockSettingsInfo settings) {
return ClassImposterizer.INSTANCE.imposterise(
new MethodInterceptorFilter(handler, settings),
typeToMock, extraInterfaces);
}
- public void resetMock(Object mock, MockitoInvocationHandler
newHandler, MockSettingsImpl settings) {
+ public void resetMock(Object mock, MockitoInvocationHandler
newHandler, MockSettingsInfo settings) {
((Factory) mock).setCallback(0, new
MethodInterceptorFilter(newHandler, settings));
}
=======================================
--- /src/org/mockito/internal/creation/MethodInterceptorFilter.java Sun
Jul 3 12:16:08 2011
+++ /src/org/mockito/internal/creation/MethodInterceptorFilter.java Sun Jan
29 06:37:54 2012
@@ -16,6 +16,7 @@
import
org.mockito.internal.invocation.realmethod.FilteredCGLIBProxyRealMethod;
import org.mockito.internal.progress.SequenceNumber;
import org.mockito.internal.util.ObjectMethodsGuru;
+import org.mockito.plugins.MockSettingsInfo;
public class MethodInterceptorFilter implements MethodInterceptor,
Serializable {
@@ -23,9 +24,9 @@
private final MockitoInvocationHandler handler;
CGLIBHacker cglibHacker = new CGLIBHacker();
ObjectMethodsGuru objectMethodsGuru = new ObjectMethodsGuru();
- private final MockSettingsImpl mockSettings;
-
- public MethodInterceptorFilter(MockitoInvocationHandler handler,
MockSettingsImpl mockSettings) {
+ private final MockSettingsInfo mockSettings;
+
+ public MethodInterceptorFilter(MockitoInvocationHandler handler,
MockSettingsInfo mockSettings) {
this.handler = handler;
this.mockSettings = mockSettings;
}
=======================================
--- /src/org/mockito/internal/util/MockUtil.java Mon Jan 16 12:28:17 2012
+++ /src/org/mockito/internal/util/MockUtil.java Sun Jan 29 06:37:54 2012
@@ -33,6 +33,8 @@
creationValidator.validateExtraInterfaces(classToMock,
settings.getExtraInterfaces());
creationValidator.validateMockedType(classToMock,
settings.getSpiedInstance());
+ settings.initiateMockName(classToMock);
+
InvocationNotifierHandler<T> mockHandler = new
InvocationNotifierHandler<T>(
new MockHandler<T>(settings), settings);
Class<?>[] extraInterfaces = prepareAncillaryTypes(settings);
==============================================================================
Revision: 146d43d22b9f
Author: szczepiq
Date: Sun Jan 29 07:30:47 2012
Log: Moved the MockitoInvocationHandler to public space. Added a new
annotation to mark the 'incubating' apis. Refactored ReturnsSmartNulls a
bit so that it uses the interface rather than the implementation.
http://code.google.com/p/mockito/source/detail?r=146d43d22b9f
Added:
/src/org/mockito/internal/Incubating.java
/src/org/mockito/plugins/MockitoInvocationHandler.java
Deleted:
/src/org/mockito/internal/MockitoInvocationHandler.java
Modified:
/src/org/mockito/internal/IMockMaker.java
/src/org/mockito/internal/InvocationNotifierHandler.java
/src/org/mockito/internal/MockHandler.java
/src/org/mockito/internal/creation/CglibMockMaker.java
/src/org/mockito/internal/creation/MethodInterceptorFilter.java
/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java
/src/org/mockito/plugins/MockSettingsInfo.java
/test/org/mockito/internal/creation/MethodInterceptorFilterTest.java
=======================================
--- /dev/null
+++ /src/org/mockito/internal/Incubating.java Sun Jan 29 07:30:47 2012
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+
+package org.mockito.internal;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Indicates the type or method is work in progress and might chagnge.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Incubating {
+}
=======================================
--- /dev/null
+++ /src/org/mockito/plugins/MockitoInvocationHandler.java Sun Jan 29
07:30:47 2012
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.plugins;
+
+import java.io.Serializable;
+
+import org.mockito.internal.Incubating;
+import org.mockito.internal.invocation.Invocation;
+
+/**
+ * Handles the invocation on a mock
+ *
+ * TODO - should it extend serializable?
+ */
+@Incubating
+public interface MockitoInvocationHandler extends Serializable {
+
+ @Incubating
+ Object handle(Invocation invocation) throws Throwable;
+
+}
=======================================
--- /src/org/mockito/internal/MockitoInvocationHandler.java Tue Oct 25
01:08:20 2011
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2007 Mockito contributors
- * This program is made available under the terms of the MIT License.
- */
-package org.mockito.internal;
-
-import java.io.Serializable;
-
-import org.mockito.internal.invocation.Invocation;
-
-public interface MockitoInvocationHandler extends Serializable {
-
- Object handle(Invocation invocation) throws Throwable;
-
-}
=======================================
--- /src/org/mockito/internal/IMockMaker.java Sun Jan 29 06:37:54 2012
+++ /src/org/mockito/internal/IMockMaker.java Sun Jan 29 07:30:47 2012
@@ -5,6 +5,7 @@
package org.mockito.internal;
import org.mockito.plugins.MockSettingsInfo;
+import org.mockito.plugins.MockitoInvocationHandler;
public interface IMockMaker {
@@ -20,11 +21,11 @@
* Returns the handler for the {@code mock}, or null if {@code mock}
was not
* a mock object created by {@link #createMock}.
*/
- public MockitoInvocationHandler getHandler(Object mock);
+ MockitoInvocationHandler getHandler(Object mock);
/**
* Replaces the existing handler on {@code mock} with {@code
newHandler}.
*/
- public void resetMock(Object mock, MockitoInvocationHandler newHandler,
+ void resetMock(Object mock, MockitoInvocationHandler newHandler,
MockSettingsInfo settings);
}
=======================================
--- /src/org/mockito/internal/InvocationNotifierHandler.java Tue Oct 25
01:08:20 2011
+++ /src/org/mockito/internal/InvocationNotifierHandler.java Sun Jan 29
07:30:47 2012
@@ -10,6 +10,7 @@
import org.mockito.internal.listeners.NotifiedMethodInvocationReport;
import org.mockito.internal.stubbing.InvocationContainer;
import org.mockito.listeners.InvocationListener;
+import org.mockito.plugins.MockitoInvocationHandler;
import org.mockito.stubbing.Answer;
import org.mockito.stubbing.VoidMethodStubbable;
=======================================
--- /src/org/mockito/internal/MockHandler.java Tue Oct 25 01:08:20 2011
+++ /src/org/mockito/internal/MockHandler.java Sun Jan 29 07:30:47 2012
@@ -13,6 +13,7 @@
import org.mockito.internal.stubbing.*;
import org.mockito.internal.verification.MockAwareVerificationMode;
import org.mockito.internal.verification.VerificationDataImpl;
+import org.mockito.plugins.MockitoInvocationHandler;
import org.mockito.stubbing.Answer;
import org.mockito.stubbing.VoidMethodStubbable;
import org.mockito.verification.VerificationMode;
=======================================
--- /src/org/mockito/internal/creation/CglibMockMaker.java Sun Jan 29
06:37:54 2012
+++ /src/org/mockito/internal/creation/CglibMockMaker.java Sun Jan 29
07:30:47 2012
@@ -7,7 +7,7 @@
import org.mockito.cglib.proxy.Callback;
import org.mockito.cglib.proxy.Factory;
import org.mockito.internal.IMockMaker;
-import org.mockito.internal.MockitoInvocationHandler;
+import org.mockito.plugins.MockitoInvocationHandler;
import org.mockito.internal.creation.jmock.ClassImposterizer;
import org.mockito.plugins.MockSettingsInfo;
=======================================
--- /src/org/mockito/internal/creation/MethodInterceptorFilter.java Sun Jan
29 06:37:54 2012
+++ /src/org/mockito/internal/creation/MethodInterceptorFilter.java Sun Jan
29 07:30:47 2012
@@ -10,7 +10,7 @@
import org.mockito.cglib.proxy.MethodInterceptor;
import org.mockito.cglib.proxy.MethodProxy;
-import org.mockito.internal.MockitoInvocationHandler;
+import org.mockito.plugins.MockitoInvocationHandler;
import org.mockito.internal.creation.cglib.CGLIBHacker;
import org.mockito.internal.invocation.*;
import
org.mockito.internal.invocation.realmethod.FilteredCGLIBProxyRealMethod;
=======================================
---
/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java
Mon Jan 16 13:06:55 2012
+++
/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java
Sun Jan 29 07:30:47 2012
@@ -5,23 +5,18 @@
package org.mockito.internal.stubbing.defaultanswers;
import java.io.Serializable;
-import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.Arrays;
import org.mockito.Mockito;
-import org.mockito.cglib.proxy.MethodInterceptor;
-import org.mockito.cglib.proxy.MethodProxy;
import org.mockito.exceptions.Reporter;
import org.mockito.internal.IMockMaker;
-import org.mockito.internal.MockHandler;
import org.mockito.internal.configuration.ClassPathLoader;
import org.mockito.internal.creation.MockSettingsImpl;
-import org.mockito.internal.creation.jmock.ClassImposterizer;
import org.mockito.internal.debugging.Location;
import org.mockito.internal.invocation.Invocation;
import org.mockito.internal.util.ObjectMethodsGuru;
import org.mockito.invocation.InvocationOnMock;
+import org.mockito.plugins.MockitoInvocationHandler;
import org.mockito.stubbing.Answer;
/**
@@ -47,12 +42,11 @@
private static final long serialVersionUID = 7618312406617949441L;
private static IMockMaker mockMaker = ClassPathLoader.getMockMaker();
- private final class ThrowingInterceptor extends MockHandler<Object> {
+ private final class ThrowingInterceptor implements
MockitoInvocationHandler {
private final InvocationOnMock invocation;
private final Location location = new Location();
private ThrowingInterceptor(InvocationOnMock invocation) {
- super(new MockSettingsImpl());
this.invocation = invocation;
}
@@ -77,7 +71,7 @@
Class<?> type = invocation.getMethod().getReturnType();
if (!type.isPrimitive() && !Modifier.isFinal(type.getModifiers()))
{
ThrowingInterceptor handler = new
ThrowingInterceptor(invocation);
- return mockMaker.createMock(type, new Class[0], handler,
handler.getMockSettings());
+ return mockMaker.createMock(type, new Class[0], handler, new
MockSettingsImpl());
}
return null;
}
=======================================
--- /src/org/mockito/plugins/MockSettingsInfo.java Sun Jan 29 06:37:54 2012
+++ /src/org/mockito/plugins/MockSettingsInfo.java Sun Jan 29 07:30:47 2012
@@ -5,11 +5,12 @@
package org.mockito.plugins;
+import org.mockito.internal.Incubating;
+
/**
- * This API is incubating. It may change.
- * <p>
* Informs about the mock settings
*/
+@Incubating
public interface MockSettingsInfo {
/**
=======================================
--- /test/org/mockito/internal/creation/MethodInterceptorFilterTest.java
Tue Oct 25 01:08:20 2011
+++ /test/org/mockito/internal/creation/MethodInterceptorFilterTest.java
Sun Jan 29 07:30:47 2012
@@ -16,7 +16,7 @@
import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.cglib.proxy.MethodProxy;
-import org.mockito.internal.MockitoInvocationHandler;
+import org.mockito.plugins.MockitoInvocationHandler;
import org.mockito.internal.creation.cglib.CGLIBHacker;
import org.mockito.internal.invocation.Invocation;
import org.mockito.internal.invocation.InvocationBuilder;
==============================================================================
Revision: 2d74de36c814
Author: szczepiq
Date: Sun Jan 29 07:39:59 2012
Log: Moved MockMaker to the public packages. Added tiny bit of docs.
http://code.google.com/p/mockito/source/detail?r=2d74de36c814
Added:
/src/org/mockito/plugins/MockMaker.java
Deleted:
/src/org/mockito/internal/IMockMaker.java
Modified:
/src/org/mockito/internal/configuration/ClassPathLoader.java
/src/org/mockito/internal/creation/CglibMockMaker.java
/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java
/src/org/mockito/internal/util/MockUtil.java
=======================================
--- /dev/null
+++ /src/org/mockito/plugins/MockMaker.java Sun Jan 29 07:39:59 2012
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2012 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.plugins;
+
+import org.mockito.internal.Incubating;
+
+/**
+ * The facility to create mocks. By default, a cglib/asm based
implementation is used.
+ * It is possible to configure your own mock maker so that dynamic proxies
are created without cglib/asm.
+ * For example, the android users can use a MockMaker that can work with
Dalvik virtual machine
+ * and hence bring Mockito to android apps developers.
+ *
+ * TODO: way more documentation and examples.
+ */
+@Incubating
+public interface MockMaker {
+
+ /**
+ * Returns a new instance of {@code typeToMock} that implements the
+ * interfaces of {@code extraInterfaces}. Invocations to the methods
of the
+ * returned instance will be delegated to {@code handler}.
+ */
+ <T> T createMock(Class<T> typeToMock, Class<?>[] extraInterfaces,
+ MockitoInvocationHandler handler, MockSettingsInfo settings);
+
+ /**
+ * Returns the handler for the {@code mock}, or null if {@code mock}
was not
+ * a mock object created by {@link #createMock}.
+ */
+ MockitoInvocationHandler getHandler(Object mock);
+
+ /**
+ * Replaces the existing handler on {@code mock} with {@code
newHandler}.
+ */
+ void resetMock(Object mock, MockitoInvocationHandler newHandler,
+ MockSettingsInfo settings);
+}
=======================================
--- /src/org/mockito/internal/IMockMaker.java Sun Jan 29 07:30:47 2012
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2012 Mockito contributors
- * This program is made available under the terms of the MIT License.
- */
-package org.mockito.internal;
-
-import org.mockito.plugins.MockSettingsInfo;
-import org.mockito.plugins.MockitoInvocationHandler;
-
-public interface IMockMaker {
-
- /**
- * Returns a new instance of {@code typeToMock} that implements the
- * interfaces of {@code extraInterfaces}. Invocations to the methods
of the
- * returned instance will be delegated to {@code handler}.
- */
- <T> T createMock(Class<T> typeToMock, Class<?>[] extraInterfaces,
- MockitoInvocationHandler handler, MockSettingsInfo settings);
-
- /**
- * Returns the handler for the {@code mock}, or null if {@code mock}
was not
- * a mock object created by {@link #createMock}.
- */
- MockitoInvocationHandler getHandler(Object mock);
-
- /**
- * Replaces the existing handler on {@code mock} with {@code
newHandler}.
- */
- void resetMock(Object mock, MockitoInvocationHandler newHandler,
- MockSettingsInfo settings);
-}
=======================================
--- /src/org/mockito/internal/configuration/ClassPathLoader.java Mon Jan 16
12:28:17 2012
+++ /src/org/mockito/internal/configuration/ClassPathLoader.java Sun Jan 29
07:39:59 2012
@@ -7,7 +7,7 @@
import java.util.ServiceLoader;
import org.mockito.configuration.IMockitoConfiguration;
import org.mockito.exceptions.misusing.MockitoConfigurationException;
-import org.mockito.internal.IMockMaker;
+import org.mockito.plugins.MockMaker;
import org.mockito.internal.creation.CglibMockMaker;
public class ClassPathLoader {
@@ -42,8 +42,8 @@
* the classpath to find a mock maker plugin if one is available,
allowing
* mockito to run on alternative platforms like Android.
*/
- public static IMockMaker getMockMaker() {
- for (IMockMaker mockMaker : ServiceLoader.load(IMockMaker.class)) {
+ public static MockMaker getMockMaker() {
+ for (MockMaker mockMaker : ServiceLoader.load(MockMaker.class)) {
return mockMaker; // return the first one service loader finds
(if any)
}
return new CglibMockMaker(); // default implementation
=======================================
--- /src/org/mockito/internal/creation/CglibMockMaker.java Sun Jan 29
07:30:47 2012
+++ /src/org/mockito/internal/creation/CglibMockMaker.java Sun Jan 29
07:39:59 2012
@@ -6,7 +6,7 @@
import org.mockito.cglib.proxy.Callback;
import org.mockito.cglib.proxy.Factory;
-import org.mockito.internal.IMockMaker;
+import org.mockito.plugins.MockMaker;
import org.mockito.plugins.MockitoInvocationHandler;
import org.mockito.internal.creation.jmock.ClassImposterizer;
import org.mockito.plugins.MockSettingsInfo;
@@ -14,7 +14,7 @@
/**
* A MockMaker that uses cglib to generate mocks on a JVM.
*/
-public final class CglibMockMaker implements IMockMaker {
+public final class CglibMockMaker implements MockMaker {
public <T> T createMock(Class<T> typeToMock, Class<?>[]
extraInterfaces,
MockitoInvocationHandler handler, MockSettingsInfo settings) {
=======================================
---
/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java
Sun Jan 29 07:30:47 2012
+++
/src/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java
Sun Jan 29 07:39:59 2012
@@ -9,7 +9,7 @@
import org.mockito.Mockito;
import org.mockito.exceptions.Reporter;
-import org.mockito.internal.IMockMaker;
+import org.mockito.plugins.MockMaker;
import org.mockito.internal.configuration.ClassPathLoader;
import org.mockito.internal.creation.MockSettingsImpl;
import org.mockito.internal.debugging.Location;
@@ -40,7 +40,7 @@
public class ReturnsSmartNulls implements Answer<Object>, Serializable {
private static final long serialVersionUID = 7618312406617949441L;
- private static IMockMaker mockMaker = ClassPathLoader.getMockMaker();
+ private static MockMaker mockMaker = ClassPathLoader.getMockMaker();
private final class ThrowingInterceptor implements
MockitoInvocationHandler {
private final InvocationOnMock invocation;
=======================================
--- /src/org/mockito/internal/util/MockUtil.java Sun Jan 29 06:37:54 2012
+++ /src/org/mockito/internal/util/MockUtil.java Sun Jan 29 07:39:59 2012
@@ -6,7 +6,7 @@
import java.io.Serializable;
import org.mockito.exceptions.misusing.NotAMockException;
-import org.mockito.internal.IMockMaker;
+import org.mockito.plugins.MockMaker;
import org.mockito.internal.InvocationNotifierHandler;
import org.mockito.internal.MockHandler;
import org.mockito.internal.MockHandlerInterface;
@@ -17,7 +17,7 @@
@SuppressWarnings("unchecked")
public class MockUtil {
- private static final IMockMaker mockMaker =
ClassPathLoader.getMockMaker();
+ private static final MockMaker mockMaker =
ClassPathLoader.getMockMaker();
private final MockCreationValidator creationValidator;
public MockUtil(MockCreationValidator creationValidator) {