EasyMock - API Change History

2.5 to 2.5.1
2.4 to 2.5
2.3 to 2.4

2.5 to 2.5.1

2.4 to 2.5

Modified Interfaces:

org.easymock.IExpectationSetters

New Methods:

public abstract org.easymock.IExpectationSetters andDelegateTo(java.lang.Object)

public abstract void andStubDelegateTo(java.lang.Object)

org.easymock.IMocksControl

New Methods:

public abstract void checkIsUsedInOneThread(boolean)

org.easymock.internal.IMocksBehavior

Removed Methods:

public abstract void checkCurrentThreadSameAsLastThread()

New Methods:

public abstract void checkThreadSafety()

public abstract void shouldBeUsedInOneThread(boolean)

org.easymock.internal.IMocksControlState

New Methods:

public abstract void andDelegateTo(java.lang.Object)

public abstract void andStubDelegateTo(java.lang.Object)

public abstract void checkIsUsedInOneThread(boolean)

Modified Classes:

org.easymock.Capture

Removed Fields:

private boolean captured

private java.lang.Object value

New Fields:

private org.easymock.CaptureType type

private final java.util.List values

New Constructors:

public Capture(org.easymock.CaptureType)

New Methods:

public java.util.List getValues()

org.easymock.EasyMock

Constructor Changes:

old:public EasyMock() new:protected EasyMock()

New Fields:

public static final java.lang.String ENABLE_THREAD_SAFETY_CHECK_BY_DEFAULT

public static final java.lang.String NOT_THREAD_SAFE_BY_DEFAULT

New Methods:

public static void checkIsUsedInOneThread(java.lang.Object, boolean)

public static java.lang.String getEasyMockProperty(java.lang.String)

public static java.lang.String setEasyMockProperty(java.lang.String, java.lang.String)

org.easymock.MockControl

Declaration Changes:

old:public class org.easymock.MockControl extends java.lang.Object[deprecated] new:public class org.easymock.MockControl extends java.lang.Object implements java.io.Serializable[deprecated]

New Fields:

private static final long serialVersionUID

org.easymock.internal.ArrayMatcher

Removed Methods:

public java.lang.String argumentToString(java.lang.Object)

org.easymock.internal.Invocation

New Fields:

private final java.util.Collection currentCaptures

New Methods:

public void addCapture(org.easymock.internal.matchers.Captures, java.lang.Object)

public void clearCaptures()

private static java.lang.Object[] createObjectArray(java.lang.Object)

public void validateCaptures()

org.easymock.internal.LastControl

Removed Fields:

private static final java.lang.ThreadLocal threadToCurrentArguments

Removed Methods:

public static java.lang.Object[] getCurrentArguments()

public static void popCurrentArguments()

public static void pushCurrentArguments(java.lang.Object[])

Method Changes:

old:public static synchronized org.easymock.internal.MocksControl lastControl() new:public static org.easymock.internal.MocksControl lastControl()

old:public static synchronized java.util.List pullMatchers() new:public static java.util.List pullMatchers()

old:public static synchronized void reportAnd(int) new:public static void reportAnd(int)

old:public static synchronized void reportLastControl(org.easymock.internal.MocksControl) new:public static void reportLastControl(org.easymock.internal.MocksControl)

old:public static synchronized void reportMatcher(org.easymock.IArgumentMatcher) new:public static void reportMatcher(org.easymock.IArgumentMatcher)

old:public static synchronized void reportNot() new:public static void reportNot()

New Fields:

private static final java.lang.ThreadLocal threadToCurrentInvocation

New Methods:

public static org.easymock.internal.Invocation getCurrentInvocation()

public static void popCurrentInvocation()

public static void pushCurrentInvocation(org.easymock.internal.Invocation)

org.easymock.internal.LegacyMatcherProvider

Declaration Changes:

old:public class org.easymock.internal.LegacyMatcherProvider extends java.lang.Object new:public class org.easymock.internal.LegacyMatcherProvider extends java.lang.Object implements java.io.Serializable

Field Declaration Changes:

old:private java.util.Map matchers new:private transient java.util.Map matchers

New Fields:

private static final long serialVersionUID

New Methods:

private void readObject(java.io.ObjectInputStream) throws java.io.IOException, java.lang.ClassNotFoundException

private void writeObject(java.io.ObjectOutputStream) throws java.io.IOException

org.easymock.internal.MocksBehavior

Removed Methods:

public void checkCurrentThreadSameAsLastThread()

Field Declaration Changes:

old:private java.util.List stubResults new:private final java.util.List stubResults

New Fields:

private boolean shouldBeUsedInOneThread

New Methods:

public void checkThreadSafety()

public void shouldBeUsedInOneThread(boolean)

org.easymock.internal.MocksControl

New Methods:

public org.easymock.IExpectationSetters andDelegateTo(java.lang.Object)

public void andStubDelegateTo(java.lang.Object)

public void checkIsUsedInOneThread(boolean)

org.easymock.internal.Range

Removed Methods:

public java.lang.String expectedAndActual(int)

Field Declaration Changes:

old:private int maximum new:private final int maximum

old:private int minimum new:private final int minimum

New Methods:

public java.lang.String expectedCount()

org.easymock.internal.RecordState

Field Declaration Changes:

old:private org.easymock.internal.IMocksBehavior behavior new:private final org.easymock.internal.IMocksBehavior behavior

New Methods:

public void andDelegateTo(java.lang.Object)

public void andStubDelegateTo(java.lang.Object)

public void checkIsUsedInOneThread(boolean)

private void requireValidDelegation(java.lang.Object)

org.easymock.internal.ReplayState

Field Declaration Changes:

old:private org.easymock.internal.IMocksBehavior behavior new:private final org.easymock.internal.IMocksBehavior behavior

New Fields:

private final java.util.concurrent.locks.ReentrantLock lock

New Methods:

public void andDelegateTo(java.lang.Object)

public void andStubDelegateTo(java.lang.Object)

public void checkIsUsedInOneThread(boolean)

org.easymock.internal.Result

Removed Constructors:

private Result(org.easymock.IAnswer)

Field Declaration Changes:

old:private org.easymock.IAnswer value new:private final org.easymock.IAnswer value

New Fields:

private final boolean shouldFillInStackTrace

New Constructors:

private Result(org.easymock.IAnswer, boolean)

New Methods:

public static org.easymock.internal.Result createDelegatingResult(java.lang.Object)

public boolean shouldFillInStackTrace()

org.easymock.internal.Results

Field Declaration Changes:

old:private java.util.LinkedList ranges new:private final java.util.LinkedList ranges

old:private java.util.List results new:private final java.util.List results

org.easymock.internal.UnorderedBehavior

Removed Methods:

public java.lang.String toString()

public java.lang.String toString(org.easymock.internal.Invocation)

New Methods:

public java.util.List getMessages(org.easymock.internal.Invocation)

org.easymock.internal.matchers.ArrayEquals

Removed Methods:

private void appendArray(java.lang.Object[], java.lang.StringBuffer)

public static java.lang.Object[] createObjectArray(java.lang.Object)

org.easymock.internal.matchers.Captures

Field Declaration Changes:

old:private org.easymock.Capture capture new:private final org.easymock.Capture capture

New Fields:

private java.lang.Object potentialValue

New Methods:

public void setPotentialValue(java.lang.Object)

public void validateCapture()

org.easymock.internal.matchers.Equals

Removed Methods:

private void appendQuoting(java.lang.StringBuffer)

org.easymock.internal.matchers.Same

Removed Methods:

private void appendQuoting(java.lang.StringBuffer)

New Classes:

org.easymock.Capture$1
org.easymock.CaptureType
org.easymock.internal.ArgumentToString
org.easymock.internal.EasyMockProperties
org.easymock.internal.ErrorMessage
org.easymock.internal.Result$1DelegatingAnswer

2.3 to 2.4

EasyMock

Removed Classes:

org.easymock.internal.Result$1
org.easymock.internal.Result$2

Modified Interfaces:

org.easymock.IMocksControl

Declaration Changes:

old:public interface org.easymock.IMocksControl extends org.easymock.IExpectationSetters new:public interface org.easymock.IMocksControl

New Methods:

public abstract void makeThreadSafe(boolean)

public abstract void resetToDefault()

public abstract void resetToNice()

public abstract void resetToStrict()

org.easymock.internal.IMocksBehavior

New Methods:

public abstract void checkCurrentThreadSameAsLastThread()

public abstract boolean isThreadSafe()

public abstract void makeThreadSafe(boolean)

org.easymock.internal.IMocksControlState

New Methods:

public abstract void makeThreadSafe(boolean)

Modified Classes:

org.easymock.AbstractMatcher

Declaration Changes:

old:public abstract class org.easymock.AbstractMatcher extends java.lang.Object implements org.easymock.ArgumentsMatcher[deprecated] new:public abstract class org.easymock.AbstractMatcher extends java.lang.Object implements org.easymock.ArgumentsMatcher, java.io.Serializable[deprecated]

New Fields:

private static final long serialVersionUID

org.easymock.EasyMock

New Methods:

public static java.lang.Object capture(org.easymock.Capture)

public static void makeThreadSafe(java.lang.Object, boolean)

public static void resetToDefault(java.lang.Object[])

public static void resetToNice(java.lang.Object[])

public static void resetToStrict(java.lang.Object[])

org.easymock.internal.AlwaysMatcher

New Fields:

private static final long serialVersionUID

org.easymock.internal.ArrayMatcher

New Fields:

private static final long serialVersionUID

org.easymock.internal.AssertionErrorWrapper

New Fields:

private static final long serialVersionUID

org.easymock.internal.EqualsMatcher

New Fields:

private static final long serialVersionUID

org.easymock.internal.ExpectedInvocation

Declaration Changes:

old:public class org.easymock.internal.ExpectedInvocation extends java.lang.Object new:public class org.easymock.internal.ExpectedInvocation extends java.lang.Object implements java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.ExpectedInvocationAndResult

Declaration Changes:

old:public class org.easymock.internal.ExpectedInvocationAndResult extends java.lang.Object new:public class org.easymock.internal.ExpectedInvocationAndResult extends java.lang.Object implements java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.ExpectedInvocationAndResults

Declaration Changes:

old:public class org.easymock.internal.ExpectedInvocationAndResults extends java.lang.Object new:public class org.easymock.internal.ExpectedInvocationAndResults extends java.lang.Object implements java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.Invocation

Declaration Changes:

old:public class org.easymock.internal.Invocation extends java.lang.Object new:public class org.easymock.internal.Invocation extends java.lang.Object implements java.io.Serializable

Field Declaration Changes:

old:private final java.lang.reflect.Method method new:private transient java.lang.reflect.Method method

New Fields:

private static final long serialVersionUID

New Methods:

private void readObject(java.io.ObjectInputStream) throws java.io.IOException, java.lang.ClassNotFoundException

private void writeObject(java.io.ObjectOutputStream) throws java.io.IOException

org.easymock.internal.MockInvocationHandler

Declaration Changes:

old:public final class org.easymock.internal.MockInvocationHandler extends java.lang.Object implements java.lang.reflect.InvocationHandler new:public final class org.easymock.internal.MockInvocationHandler extends java.lang.Object implements java.lang.reflect.InvocationHandler, java.io.Serializable

Field Declaration Changes:

old:final org.easymock.internal.MocksControl control new:private final org.easymock.internal.MocksControl control

New Fields:

private static final long serialVersionUID

org.easymock.internal.MocksBehavior

Declaration Changes:

old:public class org.easymock.internal.MocksBehavior extends java.lang.Object implements org.easymock.internal.IMocksBehavior new:public class org.easymock.internal.MocksBehavior extends java.lang.Object implements org.easymock.internal.IMocksBehavior, java.io.Serializable

New Fields:

private boolean isThreadSafe

private volatile transient java.lang.Thread lastThread

private static final long serialVersionUID

New Methods:

public void checkCurrentThreadSameAsLastThread()

public boolean isThreadSafe()

public void makeThreadSafe(boolean)

org.easymock.internal.MocksControl

Declaration Changes:

old:public class org.easymock.internal.MocksControl extends java.lang.Object implements org.easymock.IMocksControl new:public class org.easymock.internal.MocksControl extends java.lang.Object implements org.easymock.IMocksControl, org.easymock.IExpectationSetters, java.io.Serializable

Field Declaration Changes:

old:private final org.easymock.internal.MocksControl$MockType type new:private org.easymock.internal.MocksControl$MockType type

New Fields:

private static final long serialVersionUID

New Methods:

public void makeThreadSafe(boolean)

public void resetToDefault()

public void resetToNice()

public void resetToStrict()

org.easymock.internal.ObjectMethodsFilter

Declaration Changes:

old:public class org.easymock.internal.ObjectMethodsFilter extends java.lang.Object implements java.lang.reflect.InvocationHandler new:public class org.easymock.internal.ObjectMethodsFilter extends java.lang.Object implements java.lang.reflect.InvocationHandler, java.io.Serializable

Field Declaration Changes:

old:private final java.lang.reflect.Method equalsMethod new:private transient java.lang.reflect.Method equalsMethod

old:private final java.lang.reflect.Method hashCodeMethod new:private transient java.lang.reflect.Method hashCodeMethod

old:private final java.lang.reflect.Method toStringMethod new:private transient java.lang.reflect.Method toStringMethod

New Fields:

private static final long serialVersionUID

New Methods:

private void readObject(java.io.ObjectInputStream) throws java.io.IOException, java.lang.ClassNotFoundException

private void writeObject(java.io.ObjectOutputStream) throws java.io.IOException

org.easymock.internal.Range

Declaration Changes:

old:public class org.easymock.internal.Range extends java.lang.Object new:public class org.easymock.internal.Range extends java.lang.Object implements java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.RecordState

Declaration Changes:

old:public class org.easymock.internal.RecordState extends java.lang.Object implements org.easymock.internal.IMocksControlState new:public class org.easymock.internal.RecordState extends java.lang.Object implements org.easymock.internal.IMocksControlState, java.io.Serializable

New Fields:

private static final long serialVersionUID

New Methods:

public void makeThreadSafe(boolean)

org.easymock.internal.ReplayState

Declaration Changes:

old:public class org.easymock.internal.ReplayState extends java.lang.Object implements org.easymock.internal.IMocksControlState new:public class org.easymock.internal.ReplayState extends java.lang.Object implements org.easymock.internal.IMocksControlState, java.io.Serializable

New Fields:

private static final long serialVersionUID

New Methods:

private java.lang.Object invokeInner(org.easymock.internal.Invocation) throws java.lang.Throwable

public void makeThreadSafe(boolean)

org.easymock.internal.Result

Declaration Changes:

old:public class org.easymock.internal.Result extends java.lang.Object implements org.easymock.IAnswer new:public class org.easymock.internal.Result extends java.lang.Object implements org.easymock.IAnswer, java.io.Serializable

New Fields:

private static final long serialVersionUID

New Methods:

public java.lang.String toString()

org.easymock.internal.Results

Declaration Changes:

old:public class org.easymock.internal.Results extends java.lang.Object new:public class org.easymock.internal.Results extends java.lang.Object implements java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.RuntimeExceptionWrapper

New Fields:

private static final long serialVersionUID

org.easymock.internal.ThrowableWrapper

New Fields:

private static final long serialVersionUID

org.easymock.internal.UnorderedBehavior

Declaration Changes:

old:public class org.easymock.internal.UnorderedBehavior extends java.lang.Object new:public class org.easymock.internal.UnorderedBehavior extends java.lang.Object implements java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.And

Declaration Changes:

old:public class org.easymock.internal.matchers.And extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.And extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.Any

Declaration Changes:

old:public class org.easymock.internal.matchers.Any extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.Any extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.ArrayEquals

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.Compare

Declaration Changes:

old:public class org.easymock.internal.matchers.Compare extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.Compare extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.CompareEqual

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.CompareTo

Declaration Changes:

old:public abstract class org.easymock.internal.matchers.CompareTo extends java.lang.Object implements org.easymock.IArgumentMatcher new:public abstract class org.easymock.internal.matchers.CompareTo extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.Contains

Declaration Changes:

old:public class org.easymock.internal.matchers.Contains extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.Contains extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.EndsWith

Declaration Changes:

old:public class org.easymock.internal.matchers.EndsWith extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.EndsWith extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.Equals

Declaration Changes:

old:public class org.easymock.internal.matchers.Equals extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.Equals extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.EqualsWithDelta

Declaration Changes:

old:public class org.easymock.internal.matchers.EqualsWithDelta extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.EqualsWithDelta extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.Find

Declaration Changes:

old:public class org.easymock.internal.matchers.Find extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.Find extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.GreaterOrEqual

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.GreaterThan

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.InstanceOf

Declaration Changes:

old:public class org.easymock.internal.matchers.InstanceOf extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.InstanceOf extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.LessOrEqual

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.LessThan

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.Matches

Declaration Changes:

old:public class org.easymock.internal.matchers.Matches extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.Matches extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.Not

Declaration Changes:

old:public class org.easymock.internal.matchers.Not extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.Not extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.NotNull

Declaration Changes:

old:public class org.easymock.internal.matchers.NotNull extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.NotNull extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.Null

Declaration Changes:

old:public class org.easymock.internal.matchers.Null extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.Null extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.Or

Declaration Changes:

old:public class org.easymock.internal.matchers.Or extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.Or extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.Same

Declaration Changes:

old:public class org.easymock.internal.matchers.Same extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.Same extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

org.easymock.internal.matchers.StartsWith

Declaration Changes:

old:public class org.easymock.internal.matchers.StartsWith extends java.lang.Object implements org.easymock.IArgumentMatcher new:public class org.easymock.internal.matchers.StartsWith extends java.lang.Object implements org.easymock.IArgumentMatcher, java.io.Serializable

New Fields:

private static final long serialVersionUID

New Classes:

org.easymock.Capture
org.easymock.internal.MethodSerializationWrapper
org.easymock.internal.Result$1ReturningAnswer
org.easymock.internal.Result$1ThrowingAnswer
org.easymock.internal.matchers.Captures