From bc3d5fe548cb8d6a58ffcf7d17da71aeaad74e69 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Tue, 31 Jul 2007 18:40:45 +0000 Subject: [PATCH] reorg for el lang support --- .../expression/{support => el}/ELContextDelegationTests.java | 3 ++- .../expression/{support => el}/ELMethodExpressionTests.java | 4 +++- .../expression/{support => el}/ELMethodParsingTests.java | 2 +- .../{support => ognl}/OgnlExpressionParserTests.java | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) rename spring-binding/src/test/java/org/springframework/binding/expression/{support => el}/ELContextDelegationTests.java (96%) rename spring-binding/src/test/java/org/springframework/binding/expression/{support => el}/ELMethodExpressionTests.java (92%) rename spring-binding/src/test/java/org/springframework/binding/expression/{support => el}/ELMethodParsingTests.java (95%) rename spring-binding/src/test/java/org/springframework/binding/expression/{support => ognl}/OgnlExpressionParserTests.java (97%) diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/ELContextDelegationTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/el/ELContextDelegationTests.java similarity index 96% rename from spring-binding/src/test/java/org/springframework/binding/expression/support/ELContextDelegationTests.java rename to spring-binding/src/test/java/org/springframework/binding/expression/el/ELContextDelegationTests.java index 90d78d07..61b7f892 100644 --- a/spring-binding/src/test/java/org/springframework/binding/expression/support/ELContextDelegationTests.java +++ b/spring-binding/src/test/java/org/springframework/binding/expression/el/ELContextDelegationTests.java @@ -1,4 +1,4 @@ -package org.springframework.binding.expression.support; +package org.springframework.binding.expression.el; import java.util.Iterator; @@ -14,6 +14,7 @@ import org.springframework.binding.expression.ExpressionParser; import org.springframework.binding.expression.el.DelegatingELContext; import org.springframework.binding.expression.el.ELContextFactory; import org.springframework.binding.expression.el.JBossELExpressionParser; +import org.springframework.binding.expression.support.TestBean; /** * Tests to verify the delegation behavior of ELContextImpl. diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodExpressionTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/el/ELMethodExpressionTests.java similarity index 92% rename from spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodExpressionTests.java rename to spring-binding/src/test/java/org/springframework/binding/expression/el/ELMethodExpressionTests.java index a1e51b6d..9bea524b 100644 --- a/spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodExpressionTests.java +++ b/spring-binding/src/test/java/org/springframework/binding/expression/el/ELMethodExpressionTests.java @@ -1,9 +1,11 @@ -package org.springframework.binding.expression.support; +package org.springframework.binding.expression.el; import java.util.HashMap; import java.util.Map; import org.easymock.MockControl; import org.springframework.binding.expression.el.JBossELExpressionParser; +import org.springframework.binding.expression.support.TestBean; +import org.springframework.binding.expression.support.TestMethods; import junit.framework.TestCase; diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodParsingTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/el/ELMethodParsingTests.java similarity index 95% rename from spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodParsingTests.java rename to spring-binding/src/test/java/org/springframework/binding/expression/el/ELMethodParsingTests.java index 35d29c55..04b110b9 100644 --- a/spring-binding/src/test/java/org/springframework/binding/expression/support/ELMethodParsingTests.java +++ b/spring-binding/src/test/java/org/springframework/binding/expression/el/ELMethodParsingTests.java @@ -1,4 +1,4 @@ -package org.springframework.binding.expression.support; +package org.springframework.binding.expression.el; import junit.framework.TestCase; diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/OgnlExpressionParserTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/ognl/OgnlExpressionParserTests.java similarity index 97% rename from spring-binding/src/test/java/org/springframework/binding/expression/support/OgnlExpressionParserTests.java rename to spring-binding/src/test/java/org/springframework/binding/expression/ognl/OgnlExpressionParserTests.java index f0042061..24667a00 100644 --- a/spring-binding/src/test/java/org/springframework/binding/expression/support/OgnlExpressionParserTests.java +++ b/spring-binding/src/test/java/org/springframework/binding/expression/ognl/OgnlExpressionParserTests.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.binding.expression.support; +package org.springframework.binding.expression.ognl; import junit.framework.TestCase; import org.springframework.binding.expression.Expression; import org.springframework.binding.expression.ParserException; import org.springframework.binding.expression.ognl.OgnlExpressionParser; +import org.springframework.binding.expression.support.TestBean; /** * Unit tests for {@link org.springframework.binding.expression.ognl.OgnlExpressionParser}.