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

MethodBasedEvaluationContext reliably exposes varargs

Browse Source 
Issue: SPR-14554
(cherry picked from commit 4543a28)
This commit is contained in:
Juergen Hoeller
2016-08-09 21:24:38 +02:00
parent 9475c06eb5
commit 48980a247a
3 changed files with 120 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
spring-context/src/test/java/org/springframework/context/expression/MethodBasedEvaluationContextTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 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.
@@ -30,16 +30,18 @@ import static org.junit.Assert.*;
* Unit tests for {@link MethodBasedEvaluationContext}.
*
* @author Stephane Nicoll
* @author Juergen Hoeller
* @author Sergey Podgurskiy
*/
public class MethodBasedEvaluationContextTests {
private final ParameterNameDiscoverer paramDiscover = new DefaultParameterNameDiscoverer();
@Test
public void simpleArguments() {
Method method = ReflectionUtils.findMethod(SampleMethods.class, "hello",
String.class, Boolean.class);
MethodBasedEvaluationContext context = createEvaluationContext(method, new Object[] {"test", true});
Method method = ReflectionUtils.findMethod(SampleMethods.class, "hello", String.class, Boolean.class);
MethodBasedEvaluationContext context = createEvaluationContext(method, "test", true);
assertEquals("test", context.lookupVariable("a0"));
assertEquals("test", context.lookupVariable("p0"));
@@ -50,19 +52,80 @@ public class MethodBasedEvaluationContextTests {
assertEquals(true, context.lookupVariable("flag"));
assertNull(context.lookupVariable("a2"));
assertNull(context.lookupVariable("p2"));
}
@Test
public void nullArgument() {
Method method = ReflectionUtils.findMethod(SampleMethods.class, "hello",
String.class, Boolean.class);
MethodBasedEvaluationContext context = createEvaluationContext(method, new Object[] {null, null});
Method method = ReflectionUtils.findMethod(SampleMethods.class, "hello", String.class, Boolean.class);
MethodBasedEvaluationContext context = createEvaluationContext(method, null, null);
assertNull(context.lookupVariable("a0"));
assertNull(context.lookupVariable("p0"));
assertNull(context.lookupVariable("foo"));
assertNull(context.lookupVariable("a1"));
assertNull(context.lookupVariable("p1"));
assertNull(context.lookupVariable("flag"));
}
private MethodBasedEvaluationContext createEvaluationContext(Method method, Object[] args) {
@Test
public void varArgEmpty() {
Method method = ReflectionUtils.findMethod(SampleMethods.class, "hello", Boolean.class, String[].class);
MethodBasedEvaluationContext context = createEvaluationContext(method, new Object[] {null});
assertNull(context.lookupVariable("a0"));
assertNull(context.lookupVariable("p0"));
assertNull(context.lookupVariable("flag"));
assertNull(context.lookupVariable("a1"));
assertNull(context.lookupVariable("p1"));
assertNull(context.lookupVariable("vararg"));
}
@Test
public void varArgNull() {
Method method = ReflectionUtils.findMethod(SampleMethods.class, "hello", Boolean.class, String[].class);
MethodBasedEvaluationContext context = createEvaluationContext(method, null, null);
assertNull(context.lookupVariable("a0"));
assertNull(context.lookupVariable("p0"));
assertNull(context.lookupVariable("flag"));
assertNull(context.lookupVariable("a1"));
assertNull(context.lookupVariable("p1"));
assertNull(context.lookupVariable("vararg"));
}
@Test
public void varArgSingle() {
Method method = ReflectionUtils.findMethod(SampleMethods.class, "hello", Boolean.class, String[].class);
MethodBasedEvaluationContext context = createEvaluationContext(method, null, "hello");
assertNull(context.lookupVariable("a0"));
assertNull(context.lookupVariable("p0"));
assertNull(context.lookupVariable("flag"));
assertEquals("hello", context.lookupVariable("a1"));
assertEquals("hello", context.lookupVariable("p1"));
assertEquals("hello", context.lookupVariable("vararg"));
}
@Test
public void varArgMultiple() {
Method method = ReflectionUtils.findMethod(SampleMethods.class, "hello", Boolean.class, String[].class);
MethodBasedEvaluationContext context = createEvaluationContext(method, null, "hello", "hi");
assertNull(context.lookupVariable("a0"));
assertNull(context.lookupVariable("p0"));
assertNull(context.lookupVariable("flag"));
assertArrayEquals(new Object[] {"hello", "hi"}, (Object[]) context.lookupVariable("a1"));
assertArrayEquals(new Object[] {"hello", "hi"}, (Object[]) context.lookupVariable("p1"));
assertArrayEquals(new Object[] {"hello", "hi"}, (Object[]) context.lookupVariable("vararg"));
}
private MethodBasedEvaluationContext createEvaluationContext(Method method, Object... args) {
return new MethodBasedEvaluationContext(this, method, args, this.paramDiscover);
}
@@ -73,6 +136,8 @@ public class MethodBasedEvaluationContextTests {
private void hello(String foo, Boolean flag) {
}
private void hello(Boolean flag, String... vararg){
}
}
}
}