From 0ae3bbb0fcbbb3c0aeefdb0951e86a9d52e2dddb Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 11 Dec 2008 22:18:50 +0000 Subject: [PATCH] moving unit tests from .testsuite -> .aop --- .../AspectJExpressionPointcutTests.java | 0 .../aop/aspectj/CallCountingInterceptor.java | 26 +++++++++++++++++++ .../AspectJPointcutAdvisorTests.java | 0 3 files changed, 26 insertions(+) rename {org.springframework.testsuite => org.springframework.aop}/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java (100%) create mode 100644 org.springframework.aop/src/test/java/org/springframework/aop/aspectj/CallCountingInterceptor.java rename {org.springframework.testsuite => org.springframework.aop}/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java (100%) diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java rename to org.springframework.aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java diff --git a/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/CallCountingInterceptor.java b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/CallCountingInterceptor.java new file mode 100644 index 00000000000..aa5eb61eddc --- /dev/null +++ b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/CallCountingInterceptor.java @@ -0,0 +1,26 @@ + +package org.springframework.aop.aspectj; + +import org.aopalliance.intercept.MethodInterceptor; +import org.aopalliance.intercept.MethodInvocation; + +/** + * @author robh + */ +class CallCountingInterceptor implements MethodInterceptor { + + private int count; + + public Object invoke(MethodInvocation methodInvocation) throws Throwable { + count++; + return methodInvocation.proceed(); + } + + public int getCount() { + return count; + } + + public void reset() { + this.count = 0; + } +} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java b/org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java rename to org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java