From dc2a4d0cd8198b916fbe26d2da4c26789fdf5be2 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 17 Dec 2008 06:48:52 +0000
Subject: [PATCH] moving .scripting.* unit tests from .testsuite -> .context

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@448 50f2f4bb-b051-0410-bef5-90022cba6387
---
 org.springframework.context/.classpath        |   1 +
 org.springframework.context/.classpath.swp    | Bin 0 -> 16384 bytes
 org.springframework.context/.ivy.xml.swp      | Bin 0 -> 16384 bytes
 org.springframework.context/ivy.xml           |   1 +
 .../aop/framework/CountingBeforeAdvice.java   |  34 +++++++++
 .../aop/framework/MethodCounter.java          |  68 ++++++++++++++++++
 .../springframework/scripting/Calculator.java |   0
 .../scripting/CallCounter.java                |   0
 .../scripting/ConfigurableMessenger.java      |   0
 .../scripting/ContextScriptBean.java          |   0
 .../springframework/scripting/Messenger.java  |   0
 .../scripting/MessengerScrambler.java         |   0
 .../springframework/scripting/ScriptBean.java |   0
 .../scripting/TestBeanAwareMessenger.java     |   0
 .../springframework/scripting/bsh/Broken.bsh  |   0
 .../scripting/bsh/BshScriptFactoryTests.java  |   0
 .../scripting/bsh/Calculator.bsh              |   0
 .../scripting/bsh/Messenger.bsh               |   0
 .../scripting/bsh/MessengerImpl.bsh           |   0
 .../scripting/bsh/MessengerInstance.bsh       |   0
 .../scripting/bsh/bsh-with-xsd.xml            |   0
 .../scripting/bsh/bshBrokenContext.xml        |   0
 .../scripting/bsh/bshContext.xml              |   0
 .../scripting/bsh/bshRefreshableContext.xml   |   0
 .../scripting/config/ITestBean.java           |   0
 .../scripting/config/OtherTestBean.java       |   0
 .../config/ScriptingDefaultsTests.java        |   0
 .../scripting/config/TestBean.groovy          |   0
 .../config/scriptingDefaultsTests.xml         |   0
 .../scripting/groovy/Broken.groovyb           |   0
 .../scripting/groovy/Calculator.groovy        |   0
 .../scripting/groovy/CallCounter.groovy       |   0
 .../groovy/DelegatingCalculator.groovy        |   0
 .../groovy/GroovyClassLoadingTests.java       |   0
 .../groovy/GroovyScriptFactoryTests.java      |  53 ++++++++++----
 .../scripting/groovy/Messenger.groovy         |   0
 .../scripting/groovy/MessengerInstance.groovy |   0
 .../scripting/groovy/ScriptBean.groovy        |   0
 .../scripting/groovy/TestFactoryBean.groovy   |   0
 .../scripting/groovy/calculators-with-xsd.xml |   0
 .../scripting/groovy/calculators.xml          |   0
 .../groovy/groovy-multiple-properties.xml     |   0
 .../scripting/groovy/groovy-with-xsd.xml      |   0
 .../scripting/groovy/groovyBrokenContext.xml  |   0
 .../scripting/groovy/groovyContext.xml        |   0
 .../groovy/groovyRefreshableContext.xml       |   0
 .../scripting/groovy/lwspBadGroovyContext.xml |   0
 .../groovy/twoClassesCorrectOneFirst.xml      |   0
 .../groovy/twoClassesWrongOneFirst.xml        |   0
 .../jruby/AdvisedJRubyScriptFactoryTests.java |   0
 .../springframework/scripting/jruby/Broken.rb |   0
 .../scripting/jruby/Calculator.rb             |   0
 .../jruby/JRubyScriptFactoryTests.java        |   0
 .../scripting/jruby/Messenger.rb              |   0
 .../scripting/jruby/PrimitiveAdder.java       |   0
 .../scripting/jruby/Printable.java            |   0
 .../scripting/jruby/Printer.java              |   0
 .../scripting/jruby/Printer.rb                |   0
 .../scripting/jruby/WrapperAdder.java         |   0
 .../advisedByBeanNameAutoProxyCreator.xml     |   0
 .../jruby/advisedByProxyFactoryBean.xml       |   0
 .../scripting/jruby/jruby-aop.xml             |   0
 .../scripting/jruby/jruby-with-xsd.xml        |   0
 .../scripting/jruby/jrubyBrokenContext.xml    |   0
 .../scripting/jruby/jrubyContext.xml          |   0
 .../jruby/jrubyContextForPrimitives.xml       |   0
 .../jruby/jrubyContextForWrappers.xml         |   0
 .../jruby/jrubyRefreshableContext.xml         |   0
 .../RefreshableScriptTargetSourceTests.java   |   0
 .../support/ResourceScriptSourceTests.java    |   0
 .../ScriptFactoryPostProcessorTests.java      |   0
 .../support/StaticScriptSourceTests.java      |   0
 .../scripting/support/StubMessenger.java      |   0
 .../scripting/support/groovyReferences.xml    |   0
 org.springframework.testsuite/.classpath.swp  | Bin 0 -> 16384 bytes
 org.springframework.testsuite/.ivy.xml.swp    | Bin 0 -> 16384 bytes
 76 files changed, 145 insertions(+), 12 deletions(-)
 create mode 100644 org.springframework.context/.classpath.swp
 create mode 100644 org.springframework.context/.ivy.xml.swp
 create mode 100644 org.springframework.context/src/test/java/org/springframework/aop/framework/CountingBeforeAdvice.java
 create mode 100644 org.springframework.context/src/test/java/org/springframework/aop/framework/MethodCounter.java
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/Calculator.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/CallCounter.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/ConfigurableMessenger.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/ContextScriptBean.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/Messenger.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/MessengerScrambler.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/ScriptBean.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/bsh/Broken.bsh (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/bsh/Calculator.bsh (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/bsh/Messenger.bsh (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/bsh/MessengerInstance.bsh (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/bsh/bshContext.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/config/ITestBean.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/config/OtherTestBean.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/config/TestBean.groovy (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/config/scriptingDefaultsTests.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/Broken.groovyb (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/Calculator.groovy (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/CallCounter.groovy (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/DelegatingCalculator.groovy (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java (96%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/Messenger.groovy (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/MessengerInstance.groovy (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/TestFactoryBean.groovy (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/calculators.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/groovyContext.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/Broken.rb (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/Calculator.rb (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/Messenger.rb (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/Printable.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/Printer.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/Printer.rb (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/advisedByBeanNameAutoProxyCreator.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/advisedByProxyFactoryBean.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/support/StaticScriptSourceTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/support/StubMessenger.java (100%)
 rename {org.springframework.testsuite => org.springframework.context}/src/test/java/org/springframework/scripting/support/groovyReferences.xml (100%)
 create mode 100644 org.springframework.testsuite/.classpath.swp
 create mode 100644 org.springframework.testsuite/.ivy.xml.swp

diff --git a/org.springframework.context/.classpath b/org.springframework.context/.classpath
index 360c7a532c0..23afd252b2b 100644
--- a/org.springframework.context/.classpath
+++ b/org.springframework.context/.classpath
@@ -29,6 +29,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.2.RELEASE/com.springsource.org.aspectj.weaver-1.6.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-3.0.0.jar" sourcepath="/IVY_CACHE/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-sources-3.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.antlr/com.springsource.antlr/2.7.6/com.springsource.antlr-2.7.6.jar" sourcepath="/IVY_CACHE/org.antlr/com.springsource.antlr/2.7.6/com.springsource.antlr-sources-2.7.6.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.expression"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/org.springframework.context/.classpath.swp b/org.springframework.context/.classpath.swp
new file mode 100644
index 0000000000000000000000000000000000000000..874d80f7df2c2b7a47d9dd47a0ff1f18d37472d0
GIT binary patch
literal 16384
zcmeHO&5ztP6nD#KfdVQ*<v0Y1+c-P3yWL9cY_(bq>Q>N|N?Qb%*2#EgGMmJao$Ln(
z{tZ+FH||KBIKUN&1AhSG$ccL|T!3dMnPfK~Gn1XIgw~O)*&YAv_xyV=w%@bIT6wtp
zaccv25j<}q#J|10`|B@%UD|kxkZn=o30YD9>=Wk;>SLGL#H~Yq8Fy%Y%J{x10`B-D
z!6I%`GhjR%GS^|r*X<!E9zB#e#z#2DPQSx8^Fw+Rn%H)U5CI9tbz*g$W<WC#g~RsE
zt7x^`S$WTRxAoSw2bvSjfM!55pc&8%Xa+O`ngPv#X5fM`5C)ggzcA*@P_9F{l$7V-
z^D2~glK<gDKbir}fM!55pc&8%Xa+O`ngPv#W<WEb8PE*;PZ=Nsg#H2DeHr+}`M=Bo
z{Qd?)zd`vLiUs8wl%HQmD1dSu%1@9Ou%PU{hS1|z5n6u*p&zdx^yFoPK7R?JA6`W0
zZ7A=*fY8SCkVAlE!r#!pl;KG^7xuZbIlZw!{g5BG_8ouFGY$whTJjo0&)9wV*`uB9
zo!fnLLJr6gKJr}51KYHjmt2F0uT0>R)g9cyD>FcC1%ig$Ft^a+s)U^Qg4m(M{3=O#
zNUcgaU{0-8Jhqq#^E4H?HcOQs3l%v%8qpI_E*ue3AMUeMSSt?!dsSO32L!bMsH|2`
zPp-{U<!AJydNiVE;)yD?WL2%V03c_bdK%6uCmXILzVXXKCsx&PWz}k(^#RaUfH|yw
zRypZ#GkFVISGqdm#C9oW_S&R4=%i9jd@dsc%FWISOjoP8GY`0(f}7Yvy@!#HVX~zh
zE}V&ySF?zLn{2U~<wmM(kb6}ZBvD>+W7dS);UTp!5ndTHryy_(&hwZr%r5TY)dd=~
zRfAgJdbawcKA7qC4CtGiwsWFue)&tG2d;AZVoY7P=qQ#LgEDe*x7JE)fq}TT$tx&b
z$z}sOCXv7+&e*|mQAio6gV)Pvh(dqx-T`!`L!Y-6shu)y8o2R<M^*(vaaF}aDH&9N
zITp$(w%ibN%E^Y?aG~^Rh~rL%pb^FP$aP8<O$8e!wOzSz6xGgSz+2_wB3JIJox*uZ
zPASPWDDwcAw=Kt~#I~srJaVb%8AIX<Y9!%+;C31gR9t`Nv~&x9=AP9oaXwuW7L;}z
zM?i3+I~}t0PHMYOASj*;LhO>rx5sc-9N)Ruf3&lA_x|?o-Tu9r&J=$v3WF%@86g4R
z3eAv;u&wqWRHTvsr@l8iO)R&}PGx{LtG_tXk$QN<@#oj$RJ&AE7F}+k&07#Uwhm-a
z!u*~A@2Js&*n|y$$)54x{)g?G#;q+R<NrN~)xUxw<9~VP|0l%wPvMX6A-?|x;`>b~
zPawv>12O(C#P}14@jrm_2ekPvZF^y3dOdK>fM!55pcz;q1DobFQCgX*j92({F;CX{
zbcsKgjTb!%V5=Y()S898ESb9?T<!XZAG*A_)s4UI;thPGq7pX1P+7YHmV2z`{b$?U
zR8AS&HK}d2#UtX_WA=V=5GQIOwNaKP&0}D^GJ93G;m^aDATT2!6}%t;bP!?cF@B6a
z$oks?Tg2X%KY}bOR}EDuy9FA|kyES|rjlN{pKRi4=)!uXbgG8RjtkN$%}Yc8>9f-O
z<FpbVQUW_-NH*VqoY}qpNB!+j`b7qF-6bs`sLr*hRPoI5m*b0&M;@dr8_gIjAg=3>
z(h~?Zs2o5YD^!d<gXL11Rl)S>jtic08Zf8i)GHLclJXg|3<-!mhSWlmDlOOT1O}47
zqY=bN>O`V6Lk;d!+CpVsW~ZS}Hm<NhselG5WhBbHQG?SAX}n3~J0&wyR<#ECx02Jx
zDWI(YN_?Fcon1~k+)Q4RnItA3{Gj|eV`~2x(SfO?vtDaQ1qAnyz?m#0{;_oNDK|Ma
HfSmsThX%k4

literal 0
HcmV?d00001

diff --git a/org.springframework.context/.ivy.xml.swp b/org.springframework.context/.ivy.xml.swp
new file mode 100644
index 0000000000000000000000000000000000000000..1bb97904129e9a1b3ae22e4a0dcfca24434c73ea
GIT binary patch
literal 16384
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
CWM!fN

literal 0
HcmV?d00001

diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml
index 5e1c267b909..ceb7aeb38c6 100644
--- a/org.springframework.context/ivy.xml
+++ b/org.springframework.context/ivy.xml
@@ -39,6 +39,7 @@
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, jpa->compile"/>
 		<dependency org="javax.xml.ws" name="com.springsource.javax.xml.ws" rev="2.1.1" conf="provided, ws->compile"/>
 		<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="optional, bytecode-proxy->compile"/>
+		<dependency org="org.antlr" name="com.springsource.antlr" rev="2.7.6" conf="test->compile"/>
 		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.5.4" conf="optional, aspectj->compile"/>
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/CountingBeforeAdvice.java b/org.springframework.context/src/test/java/org/springframework/aop/framework/CountingBeforeAdvice.java
new file mode 100644
index 00000000000..3f391b2c68c
--- /dev/null
+++ b/org.springframework.context/src/test/java/org/springframework/aop/framework/CountingBeforeAdvice.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2002-2005 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.aop.framework;
+
+import java.lang.reflect.Method;
+
+import org.springframework.aop.MethodBeforeAdvice;
+
+/**
+ * Simple before advice example that we can use for counting checks.
+ *
+ * @author Rod Johnson
+ */
+public class CountingBeforeAdvice extends MethodCounter implements MethodBeforeAdvice {
+
+	public void before(Method m, Object[] args, Object target) throws Throwable {
+		count(m);
+	}
+
+}
\ No newline at end of file
diff --git a/org.springframework.context/src/test/java/org/springframework/aop/framework/MethodCounter.java b/org.springframework.context/src/test/java/org/springframework/aop/framework/MethodCounter.java
new file mode 100644
index 00000000000..d3030ffe8e0
--- /dev/null
+++ b/org.springframework.context/src/test/java/org/springframework/aop/framework/MethodCounter.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.aop.framework;
+
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+
+/**
+ * Useful abstract superclass for counting advices etc.
+ * 
+ * @author Rod Johnson
+ */
+public class MethodCounter implements Serializable {
+
+	/** Method name --> count, does not understand overloading */
+	private HashMap map = new HashMap();
+
+	private int allCount;
+
+	protected void count(Method m) {
+		count(m.getName());
+	}
+
+	protected void count(String methodName) {
+		Integer i = (Integer) map.get(methodName);
+		i = (i != null) ? new Integer(i.intValue() + 1) : new Integer(1);
+		map.put(methodName, i);
+		++allCount;
+	}
+
+	public int getCalls(String methodName) {
+		Integer i = (Integer) map.get(methodName);
+		return (i != null ? i.intValue() : 0);
+	}
+
+	public int getCalls() {
+		return allCount;
+	}
+
+	/**
+	 * A bit simplistic: just wants the same class.
+	 * Doesn't worry about counts.
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	public boolean equals(Object other) {
+		return (other != null && other.getClass() == this.getClass());
+	}
+
+	public int hashCode() {
+		return getClass().hashCode();
+	}
+
+}
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/Calculator.java b/org.springframework.context/src/test/java/org/springframework/scripting/Calculator.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/Calculator.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/Calculator.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/CallCounter.java b/org.springframework.context/src/test/java/org/springframework/scripting/CallCounter.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/CallCounter.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/CallCounter.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/ConfigurableMessenger.java b/org.springframework.context/src/test/java/org/springframework/scripting/ConfigurableMessenger.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/ConfigurableMessenger.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/ConfigurableMessenger.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/ContextScriptBean.java b/org.springframework.context/src/test/java/org/springframework/scripting/ContextScriptBean.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/ContextScriptBean.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/ContextScriptBean.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/Messenger.java b/org.springframework.context/src/test/java/org/springframework/scripting/Messenger.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/Messenger.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/Messenger.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/MessengerScrambler.java b/org.springframework.context/src/test/java/org/springframework/scripting/MessengerScrambler.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/MessengerScrambler.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/MessengerScrambler.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/ScriptBean.java b/org.springframework.context/src/test/java/org/springframework/scripting/ScriptBean.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/ScriptBean.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/ScriptBean.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java b/org.springframework.context/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/Broken.bsh b/org.springframework.context/src/test/java/org/springframework/scripting/bsh/Broken.bsh
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/Broken.bsh
rename to org.springframework.context/src/test/java/org/springframework/scripting/bsh/Broken.bsh
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/org.springframework.context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/Calculator.bsh b/org.springframework.context/src/test/java/org/springframework/scripting/bsh/Calculator.bsh
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/Calculator.bsh
rename to org.springframework.context/src/test/java/org/springframework/scripting/bsh/Calculator.bsh
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/Messenger.bsh b/org.springframework.context/src/test/java/org/springframework/scripting/bsh/Messenger.bsh
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/Messenger.bsh
rename to org.springframework.context/src/test/java/org/springframework/scripting/bsh/Messenger.bsh
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh b/org.springframework.context/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh
rename to org.springframework.context/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/MessengerInstance.bsh b/org.springframework.context/src/test/java/org/springframework/scripting/bsh/MessengerInstance.bsh
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/MessengerInstance.bsh
rename to org.springframework.context/src/test/java/org/springframework/scripting/bsh/MessengerInstance.bsh
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml b/org.springframework.context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml b/org.springframework.context/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/bsh/bshBrokenContext.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/bshContext.xml b/org.springframework.context/src/test/java/org/springframework/scripting/bsh/bshContext.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/bshContext.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/bsh/bshContext.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml b/org.springframework.context/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/bsh/bshRefreshableContext.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/config/ITestBean.java b/org.springframework.context/src/test/java/org/springframework/scripting/config/ITestBean.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/config/ITestBean.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/config/ITestBean.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/config/OtherTestBean.java b/org.springframework.context/src/test/java/org/springframework/scripting/config/OtherTestBean.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/config/OtherTestBean.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/config/OtherTestBean.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java b/org.springframework.context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/config/TestBean.groovy b/org.springframework.context/src/test/java/org/springframework/scripting/config/TestBean.groovy
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/config/TestBean.groovy
rename to org.springframework.context/src/test/java/org/springframework/scripting/config/TestBean.groovy
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/config/scriptingDefaultsTests.xml b/org.springframework.context/src/test/java/org/springframework/scripting/config/scriptingDefaultsTests.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/config/scriptingDefaultsTests.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/config/scriptingDefaultsTests.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/Broken.groovyb b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/Broken.groovyb
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/Broken.groovyb
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/Broken.groovyb
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/Calculator.groovy b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/Calculator.groovy
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/Calculator.groovy
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/Calculator.groovy
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/CallCounter.groovy b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/CallCounter.groovy
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/CallCounter.groovy
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/CallCounter.groovy
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/DelegatingCalculator.groovy b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/DelegatingCalculator.groovy
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/DelegatingCalculator.groovy
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/DelegatingCalculator.groovy
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
similarity index 96%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
index a8641a688ba..50bee5d33f4 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
@@ -16,6 +16,8 @@
 
 package org.springframework.scripting.groovy;
 
+import static org.junit.Assert.*;
+
 import java.io.FileNotFoundException;
 import java.util.Arrays;
 import java.util.Map;
@@ -24,6 +26,7 @@ import groovy.lang.DelegatingMetaClass;
 import groovy.lang.GroovyObject;
 import junit.framework.TestCase;
 import org.easymock.MockControl;
+import org.junit.Test;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.target.dynamic.Refreshable;
@@ -42,7 +45,6 @@ import org.springframework.scripting.Messenger;
 import org.springframework.scripting.ScriptCompilationException;
 import org.springframework.scripting.ScriptSource;
 import org.springframework.scripting.support.ScriptFactoryPostProcessor;
-import org.springframework.test.AssertThrows;
 
 /**
  * @author Rob Harrop
@@ -50,9 +52,11 @@ import org.springframework.test.AssertThrows;
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Mark Fisher
+ * @author Chris Beams
  */
-public class GroovyScriptFactoryTests extends TestCase {
+public class GroovyScriptFactoryTests {
 
+    @Test
 	public void testStaticScript() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
 
@@ -81,6 +85,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		assertTrue(ctx.getBeansOfType(Messenger.class).values().contains(messenger));
 	}
 
+    @Test
 	public void testStaticPrototypeScript() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
 		ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerPrototype");
@@ -99,6 +104,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		assertEquals("Byebye World!", messenger2.getMessage());
 	}
 
+    @Test
 	public void testStaticScriptWithInstance() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
 		assertTrue(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstance"));
@@ -112,6 +118,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		assertTrue(ctx.getBeansOfType(Messenger.class).values().contains(messenger));
 	}
 
+    @Test
 	public void testStaticScriptWithInlineDefinedInstance() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
 		assertTrue(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("messengerInstanceInline"));
@@ -125,6 +132,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		assertTrue(ctx.getBeansOfType(Messenger.class).values().contains(messenger));
 	}
 
+    @Test
 	public void testNonStaticScript() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyRefreshableContext.xml", getClass());
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
@@ -142,6 +150,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		assertEquals("Incorrect refresh count", 2, refreshable.getRefreshCount());
 	}
 
+    @Test
 	public void testNonStaticPrototypeScript() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyRefreshableContext.xml", getClass());
 		ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerPrototype");
@@ -165,6 +174,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		assertEquals("Incorrect refresh count", 2, refreshable.getRefreshCount());
 	}
 
+    @Test
 	public void testScriptCompilationException() throws Exception {
 		try {
 			new ClassPathXmlApplicationContext("org/springframework/scripting/groovy/groovyBrokenContext.xml");
@@ -175,6 +185,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		}
 	}
 
+    @Test
 	public void testScriptedClassThatDoesNotHaveANoArgCtor() throws Exception {
 		MockControl mock = MockControl.createControl(ScriptSource.class);
 		ScriptSource script = (ScriptSource) mock.getMock();
@@ -195,6 +206,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		mock.verify();
 	}
 
+    @Test
 	public void testScriptedClassThatHasNoPublicNoArgCtor() throws Exception {
 		MockControl mock = MockControl.createControl(ScriptSource.class);
 		ScriptSource script = (ScriptSource) mock.getMock();
@@ -215,6 +227,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		mock.verify();
 	}
 
+    @Test
 	public void testWithTwoClassesDefinedInTheOneGroovyFile_CorrectClassFirst() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("twoClassesCorrectOneFirst.xml", getClass());
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
@@ -225,6 +238,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		GroovyObject goo = (GroovyObject) messenger;
 	}
 
+    @Test
 	public void testWithTwoClassesDefinedInTheOneGroovyFile_WrongClassFirst() throws Exception {
 		try {
 			ApplicationContext ctx = new ClassPathXmlApplicationContext("twoClassesWrongOneFirst.xml", getClass());
@@ -236,6 +250,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		}
 	}
 
+    @Test
 	public void testCtorWithNullScriptSourceLocator() throws Exception {
 		try {
 			new GroovyScriptFactory(null);
@@ -245,6 +260,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		}
 	}
 
+    @Test
 	public void testCtorWithEmptyScriptSourceLocator() throws Exception {
 		try {
 			new GroovyScriptFactory("");
@@ -254,6 +270,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		}
 	}
 
+    @Test
 	public void testCtorWithWhitespacedScriptSourceLocator() throws Exception {
 		try {
 			new GroovyScriptFactory("\n   ");
@@ -263,6 +280,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		}
 	}
 
+    @Test
 	public void testWithInlineScriptWithLeadingWhitespace() throws Exception {
 		try {
 			new ClassPathXmlApplicationContext("lwspBadGroovyContext.xml", getClass());
@@ -273,6 +291,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		}
 	}
 
+    @Test
 	public void testGetScriptedObjectDoesNotChokeOnNullInterfacesBeingPassedIn() throws Exception {
 		MockControl mock = MockControl.createControl(ScriptSource.class);
 		ScriptSource scriptSource = (ScriptSource) mock.getMock();
@@ -288,6 +307,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		mock.verify();
 	}
 
+    @Test
 	public void testGetScriptedObjectDoesChokeOnNullScriptSourceBeingPassedIn() throws Exception {
 		GroovyScriptFactory factory = new GroovyScriptFactory("a script source locator (doesn't matter here)");
 		try {
@@ -298,6 +318,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		}
 	}
 
+    @Test
 	public void testResourceScriptFromTag() throws Exception {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
@@ -313,6 +334,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		assertEquals(-200, countingAspect.getCalls());
 	}
 
+    @Test
 	public void testPrototypeScriptFromTag() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
 		ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerPrototype");
@@ -328,6 +350,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		assertEquals("Byebye World!", messenger2.getMessage());
 	}
 
+    @Test
 	public void testInlineScriptFromTag() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
 		Calculator calculator = (Calculator) ctx.getBean("calculator");
@@ -335,6 +358,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		assertFalse(calculator instanceof Refreshable);
 	}
 
+    @Test
 	public void testRefreshableFromTag() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
 		assertTrue(Arrays.asList(ctx.getBeanNamesForType(Messenger.class)).contains("refreshableMessenger"));
@@ -351,6 +375,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		assertTrue(ctx.getBeansOfType(Messenger.class).values().contains(messenger));
 	}
 
+    @Test
 	public void testAnonymousScriptDetected() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
 		Map beans = ctx.getBeansOfType(Messenger.class);
@@ -361,6 +386,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 	 * Tests the SPR-2098 bug whereby no more than 1 property element could be
 	 * passed to a scripted bean :(
 	 */
+    @Test
 	public void testCanPassInMoreThanOneProperty() {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-multiple-properties.xml", getClass());
 		TestBean tb = (TestBean) ctx.getBean("testBean");
@@ -385,28 +411,30 @@ public class GroovyScriptFactoryTests extends TestCase {
 		}
 	}
 
+    @Test
 	public void testMetaClassWithBeans() {
 		testMetaClass("org/springframework/scripting/groovy/calculators.xml");
 	}
 	
+    @Test
 	public void testMetaClassWithXsd() {
 		testMetaClass("org/springframework/scripting/groovy/calculators-with-xsd.xml");
 	}
 	
 	private void testMetaClass(final String xmlFile) {
 		// expect the exception we threw in the custom metaclass to show it got invoked
-		AssertThrows at = new AssertThrows(IllegalStateException.class) {
-			public void test() throws Exception {
-				ApplicationContext ctx =
-						new ClassPathXmlApplicationContext(xmlFile);
-				Calculator calc = (Calculator) ctx.getBean("delegatingCalculator");
-				calc.add(1, 2);
-			}
-		};
-		at.runTest();
-		assertEquals("Gotcha", at.getActualException().getMessage());
+	    try {
+			ApplicationContext ctx =
+					new ClassPathXmlApplicationContext(xmlFile);
+			Calculator calc = (Calculator) ctx.getBean("delegatingCalculator");
+			calc.add(1, 2);
+			fail("expected IllegalStateException");
+		} catch (IllegalStateException ex) {
+		    assertEquals("Gotcha", ex.getMessage());
+		}
 	}
 
+	@Test
 	public void testFactoryBean() {
 		ApplicationContext context = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
 		Object factory = context.getBean("&factory");
@@ -416,6 +444,7 @@ public class GroovyScriptFactoryTests extends TestCase {
 		assertEquals("test", result);
 	}
 
+	@Test
 	public void testRefreshableFactoryBean() {
 		ApplicationContext context = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
 		Object factory = context.getBean("&refreshableFactory");
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/Messenger.groovy b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/Messenger.groovy
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/MessengerInstance.groovy b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/MessengerInstance.groovy
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/MessengerInstance.groovy
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/MessengerInstance.groovy
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/TestFactoryBean.groovy b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/TestFactoryBean.groovy
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/TestFactoryBean.groovy
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/TestFactoryBean.groovy
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/calculators-with-xsd.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/calculators.xml b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/calculators.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/calculators.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/calculators.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovy-with-xsd.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovyBrokenContext.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/groovyContext.xml b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovyContext.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/groovyContext.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovyContext.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/groovyRefreshableContext.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/lwspBadGroovyContext.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/twoClassesCorrectOneFirst.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml b/org.springframework.context/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/groovy/twoClassesWrongOneFirst.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/Broken.rb b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/Broken.rb
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/Broken.rb
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/Broken.rb
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/Calculator.rb b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/Calculator.rb
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/Calculator.rb
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/Calculator.rb
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/Messenger.rb b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/Messenger.rb
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/Messenger.rb
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/Messenger.rb
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/PrimitiveAdder.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/Printable.java b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/Printable.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/Printable.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/Printable.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/Printer.java b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/Printer.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/Printer.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/Printer.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/Printer.rb b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/Printer.rb
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/Printer.rb
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/Printer.rb
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/advisedByBeanNameAutoProxyCreator.xml b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/advisedByBeanNameAutoProxyCreator.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/advisedByBeanNameAutoProxyCreator.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/advisedByBeanNameAutoProxyCreator.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/advisedByProxyFactoryBean.xml b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/advisedByProxyFactoryBean.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/advisedByProxyFactoryBean.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/advisedByProxyFactoryBean.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/jruby-aop.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyBrokenContext.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyContext.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyContextForPrimitives.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyContextForWrappers.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml b/org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/jruby/jrubyRefreshableContext.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java b/org.springframework.context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java b/org.springframework.context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java b/org.springframework.context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/support/StaticScriptSourceTests.java b/org.springframework.context/src/test/java/org/springframework/scripting/support/StaticScriptSourceTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/support/StaticScriptSourceTests.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/support/StaticScriptSourceTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/support/StubMessenger.java b/org.springframework.context/src/test/java/org/springframework/scripting/support/StubMessenger.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/support/StubMessenger.java
rename to org.springframework.context/src/test/java/org/springframework/scripting/support/StubMessenger.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/scripting/support/groovyReferences.xml b/org.springframework.context/src/test/java/org/springframework/scripting/support/groovyReferences.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/scripting/support/groovyReferences.xml
rename to org.springframework.context/src/test/java/org/springframework/scripting/support/groovyReferences.xml
diff --git a/org.springframework.testsuite/.classpath.swp b/org.springframework.testsuite/.classpath.swp
new file mode 100644
index 0000000000000000000000000000000000000000..4d9c78ecde0ad942bdd7cd7e5536dc85769e1b6d
GIT binary patch
literal 16384
zcmeI3%WvF79LJ};3xr2GZ~_){-f?!*JOtTPQIx8wM3JhrsHbSwJG<+R?J*uZj~)<r
zu3X^6e*l6jj~llNZm2gnapJ}aLCbgiShw}s*=%BZ$XNO*9?x&)H}mm$c7DH^bmwnw
zz28`-ZG!6+LhgLJzV-PZzn)wEix8{JnJZOB^|j0F+uWm$u$WV&`EgRA`Jo7QP3Z@=
zH;^I<EN=QD2>ZgZMf$ke517mMm7WL&G|?SDqal}}jO>t`)N+`VJ`0CchIO7MaMlS#
zVZXUDM;6+x`FD)B8?Rlsan_0G{%Zo7fF_^`XabsmCZGvu0%wju=s!d5qt{PB-hiA-
z<vy;LasOtTzK8TnxNoNEf03TU{d;NpAEaNz{gpKRB>p}N*-q2=qc2TB6VL=S0Zl*?
z&;&FAO+XXS1T+CnKofXO1Xz!dTd@7RvXA|L6$7{n$NvuG3rH7o0rEYZe;@KX<U2V2
zJCMKO@P7%p4Egf~LOz4M3%UC|A)i3rg8Xovke{C;<QoJ7<{<Z;CgiK92>A&Cf*%od
z_yqw6W&1ZsE!X+g@eu*;g~4HC*Y<iHV~+(!L!BGw7+W`Q?QE=XT-h{7Y>yq#kt<D0
zxap~b<b(pvvs$!8=PMMNu>uOfKvFm{W1hC1q;mOyJ#&rB(A}OW?G3WpbiSgyJ<*I6
zrs?hp?PT4}?akEPKC^h~`%N-iG`6u)h9%Yl_C#xnuAiFCjKM>;XTrdpvfd%5T{XnH
zgIA7EV2Xa9$Vk@L+}JTY%6k#zt_TjPi|^c$w9Bkrb<(KV^K#XN$-}?2Kr=2-$)>by
zt?kNi=IuKsPBkS8pL_Dq^@qYcq#s2r2yYh~txjyEc`dp`+f^F)il9-6s~)=<j@<qX
zIP9)V_jy<PLmu#AH&x3YQlXL9H<vJ?Fs7HM)Nf|`F{EQQQoRc1Gi%6kI&W}sRJ2*p
zP*Y25@o2?({%b8(zPdu?g`d@e#?<EX7pU4hE1Xf}*%Rgi)vP4zB3+#H^EXy##tKJL
zIJupyzq!3hV*!A>w#S);A2}IB4woIH&m75(bloEZD_i$WJX(q2OeGKY93C3A8BmjO
zod)V@c^EKHGAp!&SCau8Ypthd5xDhKjJ0x275BPUJvCb*;C0pPh5R6-GV;|3uhmFB
zmE*v-SJMk+!k^gY#2vHnO{MObnp(N#*uLa+)C;M@BF`G)tT?@TeRF5ygKOLCTh}(P
zS5y|yaUu%+DC`&^3kEzi)sgXL><Mz2S%O~t+zfa+yPjsH%40mLzQi+B?QogxP2Y}3
z%4Mc<S9gu9UOI4{#vTtO=Bti@1-sGUo+Wx9*)eWxUv91#m)3~#|5xFsI}qjnt3CT~
z;p1P0fB!1{`ZoOeuaS3{>g*~#eQ5%kfF_^`XabsmCZGvu0#guJHOE^qr5hE=vOQa&
zr;GP&-99NGQL&xlark2KKbZF6RB#p7@QZ=1_$l^m7HDg7rrKaZ=Byzm=7mmBtT}ny
zrpt7xBokqFWF8q>n!Wxkq?Fq^CSc{NrQt;co?PKg*jOp*z@zg9WqS-I>Qihv6iXJl
z7IkK7Ob#yF2bmq53aO8LR@v56hx*E!lOfzV<r;S_Q<*P`ucz;&tSAPx3PV@zQa%9d
iaWygnoj3OX0qxjbpxI-K#~?f|Qy<!~iJ6);5$1m$*0K2j

literal 0
HcmV?d00001

diff --git a/org.springframework.testsuite/.ivy.xml.swp b/org.springframework.testsuite/.ivy.xml.swp
new file mode 100644
index 0000000000000000000000000000000000000000..73e724d7bc5d8f70c7028997f9d277027ae90f80
GIT binary patch
literal 16384
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
R7xp81{H?xx#auS#{{RsBPFVl|

literal 0
HcmV?d00001