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

Consistent Map/Set ordering

Browse Source 
Use LinkedHashMaps/Sets wherever exposed to users, and code tests defensively in terms of expected Map/Set ordering. Otherwise, there'll be runtime order differences between JDK 7 and JDK 8 due to internal HashMap/Set implementation differences.

Issue: SPR-9639
This commit is contained in:
Juergen Hoeller
2013-04-23 13:53:09 +02:00
parent b5d44e1d15
commit 9c09a0a037
18 changed files with 145 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
View File

@@ -16,26 +16,26 @@
package org.springframework.ui;
import static org.junit.Assert.*;
import java.io.Serializable;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import org.junit.Test;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;
import static org.junit.Assert.*;
/**
* @author Rick Evans
* @author Juergen Hoeller
@@ -226,12 +226,12 @@ public final class ModelMapTests {
public void testAopCglibProxy() throws Exception {
ModelMap map = new ModelMap();
ProxyFactory factory = new ProxyFactory();
Date date = new Date();
factory.setTarget(date);
SomeInnerClass val = new SomeInnerClass();
factory.setTarget(val);
factory.setProxyTargetClass(true);
map.addAttribute(factory.getProxy());
assertTrue(map.containsKey("date"));
assertEquals(date, map.get("date"));
assertTrue(map.containsKey("someInnerClass"));
assertEquals(val, map.get("someInnerClass"));
}
@Test
@@ -288,11 +288,20 @@ public final class ModelMapTests {
}
private static class SomeInnerClass {
public static class SomeInnerClass {
public boolean equals(Object obj) {
return (obj instanceof SomeInnerClass);
}
@Override
public int hashCode() {
return SomeInnerClass.class.hashCode();
}
}
private static class UKInnerClass {
public static class UKInnerClass {
}
}

5
spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
View File

@@ -56,6 +56,7 @@ import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.format.Formatter;
import org.springframework.format.number.NumberFormatter;
import org.springframework.format.support.FormattingConversionService;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
/**
@@ -614,8 +615,8 @@ public class DataBinderTests extends TestCase {
assertNull(rod.getSomeMap().get("key4"));
String[] disallowedFields = binder.getBindingResult().getSuppressedFields();
assertEquals(2, disallowedFields.length);
assertEquals("someMap[key3]", disallowedFields[0]);
assertEquals("someMap[key4]", disallowedFields[1]);
assertTrue(ObjectUtils.containsElement(disallowedFields, "someMap[key3]"));
assertTrue(ObjectUtils.containsElement(disallowedFields, "someMap[key4]"));
}
/**