|
From: Brian F. <bit...@us...> - 2009-02-11 19:08:27
|
Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24990/input/javasrc/biz/xsoftware/mock Modified Files: MockObject.java Log Message: Interfaces are inherently public and abstract, so removing redundant declaration Index: MockObject.java =================================================================== RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock/MockObject.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** MockObject.java 11 Feb 2009 18:38:45 -0000 1.16 --- MockObject.java 11 Feb 2009 19:08:22 -0000 1.17 *************** *** 29,33 **** * Field used to expect that no methods have been called. */ ! public static String NONE = "No method should have been called"; /** --- 29,33 ---- * Field used to expect that no methods have been called. */ ! static String NONE = "No method should have been called"; /** *************** *** 35,39 **** * is called. */ ! public static String ANY = "'Any method'"; /** --- 35,39 ---- * is called. */ ! static String ANY = "'Any method'"; /** *************** *** 46,50 **** * @return An array of params that were passed to the methods called */ ! public CalledMethod expect(String method); /** --- 46,50 ---- * @return An array of params that were passed to the methods called */ ! CalledMethod expect(String method); /** *************** *** 86,90 **** * called */ ! public CalledMethod[] expect(String... methods); /** --- 86,90 ---- * called */ ! CalledMethod[] expect(String... methods); /** *************** *** 101,107 **** * called */ ! public CalledMethod[] expect(String method, int times); ! public CalledMethod expectUnordered(String method); /** --- 101,107 ---- * called */ ! CalledMethod[] expect(String method, int times); ! CalledMethod expectUnordered(String method); /** *************** *** 112,116 **** * @return The methods that were called with their parameters */ ! public CalledMethod[] expectUnordered(String... methods); /** --- 112,116 ---- * @return The methods that were called with their parameters */ ! CalledMethod[] expectUnordered(String... methods); /** *************** *** 123,127 **** * @return The information about the method called */ ! public CalledMethod[] expectOnceThenIgnore(String... methods); /** --- 123,127 ---- * @return The information about the method called */ ! CalledMethod[] expectOnceThenIgnore(String... methods); /** *************** *** 129,133 **** */ @Deprecated ! public CalledMethod expectCall(String method); /** --- 129,133 ---- */ @Deprecated ! CalledMethod expectCall(String method); /** *************** *** 138,142 **** * {@link #expect(String)} */ ! public CalledMethod expectCall(String method, String... ignoredMethods); /** --- 138,142 ---- * {@link #expect(String)} */ ! CalledMethod expectCall(String method, String... ignoredMethods); /** *************** *** 144,148 **** */ @Deprecated ! public CalledMethod[] expectOrderedCalls(String... methods); /** --- 144,148 ---- */ @Deprecated ! CalledMethod[] expectOrderedCalls(String... methods); /** *************** *** 152,163 **** */ @Deprecated ! public CalledMethod[] expectOrderedCalls(String[] methods, ! String[] ignoredMethods); /** ! * @deprecated No longer supported ! */ @Deprecated ! public CalledMethod[] expectUnorderedCalls(String... methods); /** --- 152,162 ---- */ @Deprecated ! CalledMethod[] expectOrderedCalls(String[] methods, String[] ignoredMethods); /** ! * @deprecated No longer supported ! */ @Deprecated ! CalledMethod[] expectUnorderedCalls(String... methods); /** *************** *** 171,191 **** */ @Deprecated ! public CalledMethod[] expectUnorderedCalls(String[] methods, ! String[] ignoredMethods); /** ! * Set the DefaultReturnValue for a 'method'. This value is returned if none ! * of the following happen ! * <ol> ! * <li>addReturnValue is not called giving a return value</li> ! * <li>addThrowException is not called returning an exception</li> ! * <li>addBehavior is not called running a snippet of code that returns a ! * value</li> ! * </ol> ! * ! * @param method The method name to set the default return value for ! * @param returnValue ! */ ! public void setDefaultReturnValue(String method, Object returnValue); /** --- 170,191 ---- */ @Deprecated ! CalledMethod[] expectUnorderedCalls(String[] methods, ! String[] ignoredMethods); /** ! * Set the DefaultReturnValue for a 'method'. This value is returned if none ! * of the following happen ! * <ol> ! * <li>addReturnValue is not called giving a return value</li> ! * <li>addThrowException is not called returning an exception</li> ! * <li>addBehavior is not called running a snippet of code that returns a ! * value</li> ! * </ol> ! * ! * @param method ! * The method name to set the default return value for ! * @param returnValue ! */ ! void setDefaultReturnValue(String method, Object returnValue); /** *************** *** 202,206 **** * @param returnValue */ ! public void setDefaultReturnValue(MethodSignature methodSignature, Object returnValue); /** --- 202,206 ---- * @param returnValue */ ! void setDefaultReturnValue(MethodSignature methodSignature, Object returnValue); /** *************** *** 221,225 **** * @param returnValue The value to return when the method is called */ ! public void setDefaultReturnValue(Method method, Object returnValue); /** --- 221,225 ---- * @param returnValue The value to return when the method is called */ ! void setDefaultReturnValue(Method method, Object returnValue); /** *************** *** 239,243 **** * @param b The snippet of code to be run. */ ! public void setDefaultBehavior(String method, Behavior b); /** --- 239,243 ---- * @param b The snippet of code to be run. */ ! void setDefaultBehavior(String method, Behavior b); /** *************** *** 265,290 **** */ @Deprecated ! public void setDefaultBehavior(String method, Behavior b, ! Class<?>... argTypes); /** ! * Set the DefaultBehavior for a 'method'. This Behavior object is used to ! * run a snippet of code if none of the following happen ! * <ol> ! * <li>addReturnValue is not called giving a return value</li> ! * <li>addThrowException is not called returning an exception</li> ! * <li>addBehavior is not called running a snippet of code that returns a ! * value</li> ! * </ol> ! * ! * A Behavior or CloningBehavior can be passed in. See the Behavior or ! * CloningBehavior class for more info on what to put in the Behavior ! * implementation. ! * ! * @param methodSignature Used to define which method the behavior should be ! * assigned to ! * @param b The snippet of code to be run. ! */ ! public void setDefaultBehavior(MethodSignature methodSignature, Behavior b); /** --- 265,290 ---- */ @Deprecated ! void setDefaultBehavior(String method, Behavior b, Class<?>... argTypes); /** ! * Set the DefaultBehavior for a 'method'. This Behavior object is used to ! * run a snippet of code if none of the following happen ! * <ol> ! * <li>addReturnValue is not called giving a return value</li> ! * <li>addThrowException is not called returning an exception</li> ! * <li>addBehavior is not called running a snippet of code that returns a ! * value</li> ! * </ol> ! * ! * A Behavior or CloningBehavior can be passed in. See the Behavior or ! * CloningBehavior class for more info on what to put in the Behavior ! * implementation. ! * ! * @param methodSignature ! * Used to define which method the behavior should be assigned to ! * @param b ! * The snippet of code to be run. ! */ ! void setDefaultBehavior(MethodSignature methodSignature, Behavior b); /** *************** *** 311,315 **** * @param e The exception to throw on method. */ ! public void addThrowException(String method, Throwable e); /** --- 311,315 ---- * @param e The exception to throw on method. */ ! void addThrowException(String method, Throwable e); /** *************** *** 330,334 **** * @param e */ ! public void addThrowException(MethodSignature method, Throwable e); /** --- 330,334 ---- * @param e */ ! void addThrowException(MethodSignature method, Throwable e); /** *************** *** 343,347 **** * @param o The object or objects to return that is added to the queue */ ! public <T extends Object> void addReturnValue(String method, T... o); /** --- 343,347 ---- * @param o The object or objects to return that is added to the queue */ ! <T extends Object> void addReturnValue(String method, T... o); /** *************** *** 353,357 **** * </br> Use Integer to return int, Long for long, etc. */ ! public <T extends Object> void addReturnValue(MethodSignature methodSignature, T... o); /** --- 353,357 ---- * </br> Use Integer to return int, Long for long, etc. */ ! <T extends Object> void addReturnValue(MethodSignature methodSignature, T... o); /** *************** *** 363,367 **** * </br> Use Integer to return int, Long for long, etc. */ ! public <T extends Object> void addReturnValue(Method method, T... o); /** --- 363,367 ---- * </br> Use Integer to return int, Long for long, etc. */ ! <T extends Object> void addReturnValue(Method method, T... o); /** *************** *** 370,374 **** */ @Deprecated ! public void addReturnValue(String method,boolean isArray, Object ... o); /** --- 370,374 ---- */ @Deprecated ! void addReturnValue(String method,boolean isArray, Object ... o); /** *************** *** 379,383 **** * @param behavior */ ! public void setBehavior(Behavior behavior); /** --- 379,383 ---- * @param behavior */ ! void setBehavior(Behavior behavior); /** *************** *** 390,394 **** * @param behavior The snippet of code to be run. */ ! public void addBehavior(String method, Behavior behavior); /** --- 390,394 ---- * @param behavior The snippet of code to be run. */ ! void addBehavior(String method, Behavior behavior); /** *************** *** 407,411 **** */ @Deprecated ! public void addBehavior(String method, Behavior behavior, Class<?>... argTypes); --- 407,411 ---- */ @Deprecated ! void addBehavior(String method, Behavior behavior, Class<?>... argTypes); *************** *** 421,425 **** * @param behavior The snippet of code to be run. */ ! public void addBehavior(MethodSignature methodSignature, Behavior behavior); /** --- 421,425 ---- * @param behavior The snippet of code to be run. */ ! void addBehavior(MethodSignature methodSignature, Behavior behavior); /** *************** *** 430,434 **** * @param method The name of the method(s) to ignore */ ! public void addIgnore(String... method); /** --- 430,434 ---- * @param method The name of the method(s) to ignore */ ! void addIgnore(String... method); /** *************** *** 440,444 **** * ignored methods */ ! public void addIgnore(MethodSignature... methodSignature); /** --- 440,444 ---- * ignored methods */ ! void addIgnore(MethodSignature... methodSignature); /** *************** *** 448,452 **** * ignored methods */ ! public void removeIgnore(String... methods); /** --- 448,452 ---- * ignored methods */ ! void removeIgnore(String... methods); /** *************** *** 456,460 **** * ignore list */ ! public void removeIgnore(MethodSignature... methodSignature); /** --- 456,460 ---- * ignore list */ ! void removeIgnore(MethodSignature... methodSignature); /** *************** *** 466,470 **** * before failing */ ! public void setExpectTimeout(int timeout); /** --- 466,470 ---- * before failing */ ! void setExpectTimeout(int timeout); /** *************** *** 474,478 **** * @return The current expect timeout duration, in milliseconds */ ! public int getExpectTimeout(); /** --- 474,478 ---- * @return The current expect timeout duration, in milliseconds */ ! int getExpectTimeout(); /** *************** *** 483,492 **** * @param isCaseSensitive */ ! public void setCaseSensitive(boolean isCaseSensitive); /** * Returns the current setting for case sensitivity */ ! public boolean isCaseSensitive(); /** --- 483,492 ---- * @param isCaseSensitive */ ! void setCaseSensitive(boolean isCaseSensitive); /** * Returns the current setting for case sensitivity */ ! boolean isCaseSensitive(); /** *************** *** 496,499 **** * behaviors */ ! public void reset(); } --- 496,499 ---- * behaviors */ ! void reset(); } |
