MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

removed HashMap inherent ambiguity

Browse Source
This commit is contained in:
Alexey Kudravtsev
2014-09-16 15:27:13 +04:00
parent e50721e044
commit 759f26454a
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/testSrc/com/intellij/util/xmlb/XmlSerializerTest.java
+16 -16
View File
@@ -19,7 +19,6 @@ package com.intellij.util.xmlb;
import com.intellij.openapi.util.JDOMUtil;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.xmlb.annotations.*;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
@@ -254,7 +253,7 @@ public class XmlSerializerTest extends TestCase {
}
public static class BeanWithMap {
public Map<String, String> VALUES = new HashMap<String, String>();
public Map<String, String> VALUES = new LinkedHashMap<String, String>();
{
VALUES.put("a", "1");
@@ -302,7 +301,7 @@ public class XmlSerializerTest extends TestCase {
keyAttributeName = "name",
valueAttributeName = "value"
)
public Map<String, String> VALUES = new HashMap<String, String>();
public Map<String, String> VALUES = new LinkedHashMap<String, String>();
{
VALUES.put("a", "1");
@@ -336,7 +335,7 @@ public class XmlSerializerTest extends TestCase {
public static class BeanWithMapWithBeanValue {
public Map<String, BeanWithProperty> VALUES = new HashMap<String, BeanWithProperty>();
public Map<String, BeanWithProperty> VALUES = new LinkedHashMap<String, BeanWithProperty>();
}
public void testMapWithBeanValue() {
@@ -519,7 +518,7 @@ public class XmlSerializerTest extends TestCase {
Element element = serialize(bean, null);
Element node = (Element)element.getChildren().get(0);
Element node = element.getChildren().get(0);
element.removeContent(node);
element.addContent(node);
@@ -1007,15 +1006,15 @@ public class XmlSerializerTest extends TestCase {
}
public static class BeanWithSetKeysInMap {
public Map<Collection<String>, String> myMap = new HashMap<Collection<String>, String>();
public Map<Collection<String>, String> myMap = new LinkedHashMap<Collection<String>, String>();
}
public void testSetKeysInMap() {
final BeanWithSetKeysInMap bean = new BeanWithSetKeysInMap();
bean.myMap.put(new HashSet<String>(Arrays.asList("1", "2", "3")), "numbers");
bean.myMap.put(new HashSet<String>(Arrays.asList("a", "b", "c")), "letters");
bean.myMap.put(new LinkedHashSet<String>(Arrays.asList("a", "b", "c")), "letters");
bean.myMap.put(new LinkedHashSet<String>(Arrays.asList("1", "2", "3")), "numbers");
BeanWithSetKeysInMap bb = (BeanWithSetKeysInMap)doSerializerTest(
BeanWithSetKeysInMap bb = doSerializerTest(
"<BeanWithSetKeysInMap>\n" +
" <option name=\"myMap\">\n" +
" <map>\n" +
@@ -1087,7 +1086,7 @@ public class XmlSerializerTest extends TestCase {
public static class BeanWithMapWithoutSurround {
@Tag("map")
@MapAnnotation(surroundWithTag = false, entryTagName = "pair", surroundKeyWithTag = false, surroundValueWithTag = false)
public Map<BeanWithPublicFields, BeanWithTextAnnotation> MAP = new HashMap<BeanWithPublicFields, BeanWithTextAnnotation>();
public Map<BeanWithPublicFields, BeanWithTextAnnotation> MAP = new LinkedHashMap<BeanWithPublicFields, BeanWithTextAnnotation>();
}
public void testMapWithNotSurroundingKeyAndValue() {
@@ -1137,7 +1136,7 @@ public class XmlSerializerTest extends TestCase {
public static class BeanWithMapAtTopLevel {
@Property(surroundWithTag = false)
@MapAnnotation(surroundWithTag = false, surroundKeyWithTag = false, surroundValueWithTag = false)
public Map<String, String> map = new HashMap<String, String>();
public Map<String, String> map = new LinkedHashMap<String, String>();
public String option;
}
@@ -1212,13 +1211,14 @@ public class XmlSerializerTest extends TestCase {
return assertSerializer(bean, expected, "Serialization failure", filter);
}
private static Object doSerializerTest(@Language("XML") String expectedText, Object bean) {
private static <T> T doSerializerTest(@Language("XML") String expectedText, T bean) {
try {
Element element = assertSerializer(bean, expectedText, null);
//test deserializer
Object o = XmlSerializer.deserialize(element, bean.getClass());
Class<T> aClass = (Class<T>)bean.getClass();
T o = XmlSerializer.deserialize(element, aClass);
assertSerializer(o, expectedText, "Deserialization failure", null);
return o;
}
@@ -1247,14 +1247,14 @@ public class XmlSerializerTest extends TestCase {
public static class BeanWithMapWithSetValue {
@MapAnnotation(entryTagName = "entry-tag", keyAttributeName = "key-attr", surroundWithTag = false)
public Map<String, Set<String>> myValues = new HashMap<String, Set<String>>();
public Map<String, Set<String>> myValues = new LinkedHashMap<String, Set<String>>();
}
public void testBeanWithMapWithSetValue() {
BeanWithMapWithSetValue bean = new BeanWithMapWithSetValue();
bean.myValues.put("a", ContainerUtil.newHashSet("first1", "second1"));
bean.myValues.put("b", ContainerUtil.newHashSet("first2", "second2"));
bean.myValues.put("a", new LinkedHashSet<String>(Arrays.asList("first1", "second1")));
bean.myValues.put("b", new LinkedHashSet<String>(Arrays.asList("first2", "second2")));
doSerializerTest(
"<BeanWithMapWithSetValue>\n" +