|
|
200f6e |
changeset: 1493:0ecfebcf845d
|
|
|
200f6e |
user: maslovalex
|
|
|
200f6e |
date: Thu May 22 09:24:53 2014 +0300
|
|
|
200f6e |
summary: Using LinkedHashMap in some tests to be sure about keys order in dumped yaml.
|
|
|
200f6e |
|
|
|
200f6e |
diff -r 1413062d7874 -r 0ecfebcf845d src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java
|
|
|
200f6e |
--- a/src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java Wed May 21 16:06:58 2014 +0300
|
|
|
200f6e |
+++ b/src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java Thu May 22 09:24:53 2014 +0300
|
|
|
200f6e |
@@ -16,6 +16,7 @@
|
|
|
200f6e |
package org.yaml.snakeyaml.constructor;
|
|
|
200f6e |
|
|
|
200f6e |
import java.util.HashMap;
|
|
|
200f6e |
+import java.util.LinkedHashMap;
|
|
|
200f6e |
import java.util.List;
|
|
|
200f6e |
import java.util.Map;
|
|
|
200f6e |
|
|
|
200f6e |
@@ -69,14 +70,16 @@
|
|
|
200f6e |
|
|
|
200f6e |
@SuppressWarnings("unchecked")
|
|
|
200f6e |
public void testRootMap() {
|
|
|
200f6e |
- Map<Object, Object> car1 = new HashMap<Object, Object>();
|
|
|
200f6e |
- car1.put("plate", "12-XP-F4");
|
|
|
200f6e |
+ Map<Object, Object> car1 = new LinkedHashMap<Object, Object>();
|
|
|
200f6e |
Wheel wheel = new Wheel();
|
|
|
200f6e |
wheel.setId(2);
|
|
|
200f6e |
- car1.put("wheel", wheel);
|
|
|
200f6e |
Map<String, Integer> map = new HashMap<String, Integer>();
|
|
|
200f6e |
map.put("id", 3);
|
|
|
200f6e |
+
|
|
|
200f6e |
+ car1.put("wheel", wheel);
|
|
|
200f6e |
car1.put("map", map);
|
|
|
200f6e |
+ car1.put("plate", "12-XP-F4");
|
|
|
200f6e |
+
|
|
|
200f6e |
String carYaml1 = new Yaml().dump(car1);
|
|
|
200f6e |
assertEquals(Util.getLocalResource("constructor/carwheel-root-map.yaml"), carYaml1);
|
|
|
200f6e |
Map<Object, Object> car2 = (Map<Object, Object>) new Yaml().load(carYaml1);
|
|
|
200f6e |
diff -r 1413062d7874 -r 0ecfebcf845d src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java
|
|
|
200f6e |
--- a/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java Wed May 21 16:06:58 2014 +0300
|
|
|
200f6e |
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java Thu May 22 09:24:53 2014 +0300
|
|
|
200f6e |
@@ -16,6 +16,7 @@
|
|
|
200f6e |
package org.yaml.snakeyaml.issues.issue61;
|
|
|
200f6e |
|
|
|
200f6e |
import java.util.HashMap;
|
|
|
200f6e |
+import java.util.LinkedHashMap;
|
|
|
200f6e |
import java.util.Map;
|
|
|
200f6e |
|
|
|
200f6e |
import junit.framework.TestCase;
|
|
|
200f6e |
@@ -68,7 +69,7 @@
|
|
|
200f6e |
}
|
|
|
200f6e |
|
|
|
200f6e |
public static class MapProvider<K, V> {
|
|
|
200f6e |
- private Map<K, V> map = new HashMap<K, V>();
|
|
|
200f6e |
+ private Map<K, V> map = new LinkedHashMap<K, V>();
|
|
|
200f6e |
|
|
|
200f6e |
public Map<K, V> getMap() {
|
|
|
200f6e |
return map;
|
|
|
200f6e |
|