root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

SPR11348 test should use LinkedHashSet since it relies on insertion order of elements

This commit is contained in:
Juergen Hoeller 2014-03-07 15:07:15 +01:00 committed by unknown
parent 241682c117
commit 40b81fcc3e
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
View File

@ -24,8 +24,8 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
@ -227,9 +227,7 @@ public class SpelReproTests extends AbstractExpressionTests {
public void SPR5804() throws Exception { public void SPR5804() throws Exception {
Map<String, String> m = new HashMap<String, String>(); Map<String, String> m = new HashMap<String, String>();
m.put("foo", "bar"); m.put("foo", "bar");
StandardEvaluationContext eContext = new StandardEvaluationContext(m); // root is StandardEvaluationContext eContext = new StandardEvaluationContext(m); // root is a map instance
// a map
// instance
eContext.addPropertyAccessor(new MapAccessor()); eContext.addPropertyAccessor(new MapAccessor());
Expression expr = new SpelExpressionParser().parseRaw("['foo']"); Expression expr = new SpelExpressionParser().parseRaw("['foo']");
assertEquals("bar", expr.getValue(eContext)); assertEquals("bar", expr.getValue(eContext));
@ -419,8 +417,7 @@ public class SpelReproTests extends AbstractExpressionTests {
expr = new SpelExpressionParser().parseRaw("instance[bar]"); expr = new SpelExpressionParser().parseRaw("instance[bar]");
name = expr.getValue(eContext, String.class); name = expr.getValue(eContext, String.class);
assertEquals("hello", name); assertEquals("hello", name);
name = expr.getValue(eContext, String.class); // will be using the cached accessor name = expr.getValue(eContext, String.class); // will be using the cached accessor this time
// this time
assertEquals("hello", name); assertEquals("hello", name);
} }
@ -434,8 +431,7 @@ public class SpelReproTests extends AbstractExpressionTests {
expr = new SpelExpressionParser().parseRaw("instance[#bar]"); expr = new SpelExpressionParser().parseRaw("instance[#bar]");
name = expr.getValue(eContext, String.class); name = expr.getValue(eContext, String.class);
assertEquals("hello", name); assertEquals("hello", name);
name = expr.getValue(eContext, String.class); // will be using the cached accessor name = expr.getValue(eContext, String.class); // will be using the cached accessor this time
// this time
assertEquals("hello", name); assertEquals("hello", name);
} }
@ -1279,8 +1275,8 @@ public class SpelReproTests extends AbstractExpressionTests {
@Override @Override
protected Method[] getMethods(Class<?> type) { protected Method[] getMethods(Class<?> type) {
try { try {
return new Method[] { Integer.class.getDeclaredMethod("parseInt", new Class[] { String.class, return new Method[] {
Integer.TYPE }) }; Integer.class.getDeclaredMethod("parseInt", new Class[] { String.class, Integer.TYPE }) };
} }
catch (NoSuchMethodException ex) { catch (NoSuchMethodException ex) {
return new Method[0]; return new Method[0];
@ -1811,7 +1807,7 @@ public class SpelReproTests extends AbstractExpressionTests {
@Test @Test
public void SPR11348() { public void SPR11348() {
Collection<String> coll = new HashSet<String>(); Collection<String> coll = new LinkedHashSet<String>();
coll.add("one"); coll.add("one");
coll.add("two"); coll.add("two");
coll = Collections.unmodifiableCollection(coll); coll = Collections.unmodifiableCollection(coll);
@ -1841,6 +1837,7 @@ public class SpelReproTests extends AbstractExpressionTests {
assertEquals(1, expr.getValue(context)); assertEquals(1, expr.getValue(context));
} }
static class Spr11445Class implements BeanResolver { static class Spr11445Class implements BeanResolver {
private final AtomicInteger counter = new AtomicInteger(); private final AtomicInteger counter = new AtomicInteger();
@ -1859,6 +1856,7 @@ public class SpelReproTests extends AbstractExpressionTests {
} }
} }
@Test @Test
public void SPR11494() { public void SPR11494() {
Expression exp = new SpelExpressionParser().parseExpression("T(java.util.Arrays).asList('a','b')"); Expression exp = new SpelExpressionParser().parseExpression("T(java.util.Arrays).asList('a','b')");