Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified staticmethod mocking to remove compile-time dependency on JUnit (see ROO-314 and related issues)

Browse Source
This commit is contained in:
Ramnivas Laddad
2009-11-03 00:51:22 +00:00
parent 04a7656292
commit 868cf09b2d
4 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControl.aj → org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj
View File

@@ -1,26 +1,24 @@
package org.springframework.mock.staticmock;
import javax.persistence.Entity;
import org.junit.Test;
/**
* JUnit-specific aspect to use in test build to enable mocking static methods
* Annotation-based aspect to use in test build to enable mocking static methods
* on Entity classes, as used by Roo for finders.
* <br>
* Mocking will occur in JUnit tests where the Test class is annotated with the
* @MockStaticEntityMethods annotation, in the call stack of each
* JUnit @Test method.
* Mocking will occur in the call stack of any method in a class (typically a test class)
* that is annotated with the @MockStaticEntityMethods annotation.
* <br>
* Also provides static methods to simplify the programming model for
* entering playback mode and setting expected return values.
* <br>
* Usage:<ol>
* <li>Annotate a JUnit test class with @MockStaticEntityMethods.
* <li>In each @Test method, JUnitMockControl will begin in recording mode.
* <li>Annotate a test class with @MockStaticEntityMethods.
* <li>In each test method, AnnotationDrivenStaticEntityMockingControl will begin in recording mode.
* Invoke static methods on Entity classes, with each recording-mode invocation
* being followed by an invocation to the static expectReturn() or expectThrow()
* method on JUnitMockControl.
* <li>Invoke the static JUnitMockControl.playback() method.
* method on AnnotationDrivenStaticEntityMockingControl.
* <li>Invoke the static AnnotationDrivenStaticEntityMockingControl() method.
* <li>Call the code you wish to test that uses the static methods. Verification will
* occur automatically.
* </ol>
@@ -31,26 +29,26 @@ import org.junit.Test;
* @author Ramnivas Laddad
*
*/
public aspect JUnitStaticEntityMockingControl extends AbstractMethodMockingControl {
public aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {
/**
* Stop recording mock calls and enter playback state
*/
public static void playback() {
JUnitStaticEntityMockingControl.aspectOf().playbackInternal();
AnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();
}
public static void expectReturn(Object retVal) {
JUnitStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);
AnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);
}
public static void expectThrow(Throwable throwable) {
JUnitStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);
AnnotationDrivenStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);
}
// Only matches directly annotated @Test methods, to allow methods in
// @MockStatics classes to invoke each other without resetting the mocking environment
protected pointcut mockStaticsTestMethod() : execution(@Test public * (@MockStaticEntityMethods *).*(..));
protected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));
protected pointcut methodToMock() : execution(public static * (@Entity *).*(..));