generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-26 11:46:34 +01:00
Code Issues Projects Releases Wiki Activity

MSGPACK-7 fixed test cases; iteration order of HashMap is not defined by JDK 5/6 specification

Browse Source
This commit is contained in:
FURUHASHI Sadayuki 2011-04-12 18:39:54 +09:00
parent 65ddd1a455
commit c6d9bbd7b0
6 changed files with 42 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
java/src/test/java/org/msgpack/template/TestReflectionTemplateBuilderJavaBeansPackUnpack.java
View File

@ -826,7 +826,7 @@ public class TestReflectionTemplateBuilderJavaBeansPackUnpack extends TestCase {
SampleOptionalListTypes dst = SampleOptionalListTypes dst =
MessagePack.unpack(raw, SampleOptionalListTypes.class); MessagePack.unpack(raw, SampleOptionalListTypes.class);
assertEquals(src.f0.size(), dst.f0.size()); assertEquals(0, dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size()); assertEquals(src.f1.size(), dst.f1.size());
for (int i = 0; i < src.f1.size(); ++i) { for (int i = 0; i < src.f1.size(); ++i) {
assertEquals(src.f1.get(i), dst.f1.get(i)); assertEquals(src.f1.get(i), dst.f1.get(i));
@ -1013,22 +1013,18 @@ public class TestReflectionTemplateBuilderJavaBeansPackUnpack extends TestCase {
SampleMapTypes dst = SampleMapTypes dst =
MessagePack.unpack(raw, SampleMapTypes.class); MessagePack.unpack(raw, SampleMapTypes.class);
assertEquals(src.f0.size(), dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size());
Iterator<Integer> srcf1 = src.f1.keySet().iterator(); Iterator<Integer> srcf1 = src.f1.keySet().iterator();
Iterator<Integer> dstf1 = dst.f1.keySet().iterator();
while (srcf1.hasNext()) { while (srcf1.hasNext()) {
Integer s1 = srcf1.next(); Integer s1 = srcf1.next();
Integer d1 = dstf1.next(); assertEquals(src.f1.get(s1), dst.f1.get(s1));
assertEquals(s1, d1);
assertEquals(src.f1.get(s1), dst.f1.get(d1));
} }
assertEquals(src.f2.size(), dst.f2.size()); assertEquals(src.f2.size(), dst.f2.size());
Iterator<String> srcf2 = src.f2.keySet().iterator(); Iterator<String> srcf2 = src.f2.keySet().iterator();
Iterator<String> dstf2 = dst.f2.keySet().iterator();
while (srcf2.hasNext()) { while (srcf2.hasNext()) {
String s2 = srcf2.next(); String s2 = srcf2.next();
String d2 = dstf2.next(); assertEquals(src.f2.get(s2), dst.f2.get(s2));
assertEquals(s2, d2);
assertEquals(src.f2.get(s2), dst.f2.get(d2));
} }
} }
@ -1097,21 +1093,16 @@ public class TestReflectionTemplateBuilderJavaBeansPackUnpack extends TestCase {
assertEquals(src.f0.size(), dst.f0.size()); assertEquals(src.f0.size(), dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size()); assertEquals(src.f1.size(), dst.f1.size());
Iterator<Integer> srcf1 = src.f1.keySet().iterator(); Iterator<Integer> srcf1 = src.f1.keySet().iterator();
Iterator<Integer> dstf1 = dst.f1.keySet().iterator();
while (srcf1.hasNext()) { while (srcf1.hasNext()) {
Integer s1 = srcf1.next(); Integer s1 = srcf1.next();
Integer d1 = dstf1.next(); assertEquals(src.f1.get(s1), dst.f1.get(s1));
assertEquals(s1, d1);
assertEquals(src.f1.get(s1), dst.f1.get(d1));
} }
assertEquals(src.f2.size(), dst.f2.size()); assertEquals(src.f2.size(), dst.f2.size());
Iterator<String> srcf2 = src.f2.keySet().iterator(); Iterator<String> srcf2 = src.f2.keySet().iterator();
Iterator<String> dstf2 = dst.f2.keySet().iterator(); Iterator<String> dstf2 = dst.f2.keySet().iterator();
while (srcf2.hasNext()) { while (srcf2.hasNext()) {
String s2 = srcf2.next(); String s2 = srcf2.next();
String d2 = dstf2.next(); assertEquals(src.f2.get(s2), dst.f2.get(s2));
assertEquals(s2, d2);
assertEquals(src.f2.get(s2), dst.f2.get(d2));
} }
} }

24
java/src/test/java/org/msgpack/template/TestReflectionTemplateBuilderPackConvert.java
View File

@ -612,22 +612,18 @@ public class TestReflectionTemplateBuilderPackConvert extends TestCase {
SampleMapTypes dst = SampleMapTypes dst =
MessagePack.unpack(raw).convert(SampleMapTypes.class); MessagePack.unpack(raw).convert(SampleMapTypes.class);
assertEquals(src.f0.size(), dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size());
Iterator<Integer> srcf1 = src.f1.keySet().iterator(); Iterator<Integer> srcf1 = src.f1.keySet().iterator();
Iterator<Integer> dstf1 = dst.f1.keySet().iterator();
while (srcf1.hasNext()) { while (srcf1.hasNext()) {
Integer s1 = srcf1.next(); Integer s1 = srcf1.next();
Integer d1 = dstf1.next(); assertEquals(src.f1.get(s1), dst.f1.get(s1));
assertEquals(s1, d1);
assertEquals(src.f1.get(s1), dst.f1.get(d1));
} }
assertEquals(src.f2.size(), dst.f2.size()); assertEquals(src.f2.size(), dst.f2.size());
Iterator<String> srcf2 = src.f2.keySet().iterator(); Iterator<String> srcf2 = src.f2.keySet().iterator();
Iterator<String> dstf2 = dst.f2.keySet().iterator();
while (srcf2.hasNext()) { while (srcf2.hasNext()) {
String s2 = srcf2.next(); String s2 = srcf2.next();
String d2 = dstf2.next(); assertEquals(src.f2.get(s2), dst.f2.get(s2));
assertEquals(s2, d2);
assertEquals(src.f2.get(s2), dst.f2.get(d2));
} }
} }
@ -668,24 +664,18 @@ public class TestReflectionTemplateBuilderPackConvert extends TestCase {
SampleOptionalMapTypes dst = SampleOptionalMapTypes dst =
MessagePack.unpack(raw).convert(SampleOptionalMapTypes.class); MessagePack.unpack(raw).convert(SampleOptionalMapTypes.class);
assertEquals(src.f0.size(), dst.f0.size()); assertEquals(0, dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size()); assertEquals(src.f1.size(), dst.f1.size());
Iterator<Integer> srcf1 = src.f1.keySet().iterator(); Iterator<Integer> srcf1 = src.f1.keySet().iterator();
Iterator<Integer> dstf1 = dst.f1.keySet().iterator();
while (srcf1.hasNext()) { while (srcf1.hasNext()) {
Integer s1 = srcf1.next(); Integer s1 = srcf1.next();
Integer d1 = dstf1.next(); assertEquals(src.f1.get(s1), dst.f1.get(s1));
assertEquals(s1, d1);
assertEquals(src.f1.get(s1), dst.f1.get(d1));
} }
assertEquals(src.f2.size(), dst.f2.size()); assertEquals(src.f2.size(), dst.f2.size());
Iterator<String> srcf2 = src.f2.keySet().iterator(); Iterator<String> srcf2 = src.f2.keySet().iterator();
Iterator<String> dstf2 = dst.f2.keySet().iterator();
while (srcf2.hasNext()) { while (srcf2.hasNext()) {
String s2 = srcf2.next(); String s2 = srcf2.next();
String d2 = dstf2.next(); assertEquals(src.f2.get(s2), dst.f2.get(s2));
assertEquals(s2, d2);
assertEquals(src.f2.get(s2), dst.f2.get(d2));
} }
} }

24
java/src/test/java/org/msgpack/template/TestReflectionTemplateBuilderPackUnpack.java
View File

@ -617,22 +617,18 @@ public class TestReflectionTemplateBuilderPackUnpack extends TestCase {
SampleMapTypes dst = SampleMapTypes dst =
MessagePack.unpack(raw, SampleMapTypes.class); MessagePack.unpack(raw, SampleMapTypes.class);
assertEquals(0, dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size());
Iterator<Integer> srcf1 = src.f1.keySet().iterator(); Iterator<Integer> srcf1 = src.f1.keySet().iterator();
Iterator<Integer> dstf1 = dst.f1.keySet().iterator();
while (srcf1.hasNext()) { while (srcf1.hasNext()) {
Integer s1 = srcf1.next(); Integer s1 = srcf1.next();
Integer d1 = dstf1.next(); assertEquals(src.f1.get(s1), dst.f1.get(s1));
assertEquals(s1, d1);
assertEquals(src.f1.get(s1), dst.f1.get(d1));
} }
assertEquals(src.f2.size(), dst.f2.size()); assertEquals(src.f2.size(), dst.f2.size());
Iterator<String> srcf2 = src.f2.keySet().iterator(); Iterator<String> srcf2 = src.f2.keySet().iterator();
Iterator<String> dstf2 = dst.f2.keySet().iterator();
while (srcf2.hasNext()) { while (srcf2.hasNext()) {
String s2 = srcf2.next(); String s2 = srcf2.next();
String d2 = dstf2.next(); assertEquals(src.f2.get(s2), dst.f2.get(s2));
assertEquals(s2, d2);
assertEquals(src.f2.get(s2), dst.f2.get(d2));
} }
} }
@ -673,24 +669,18 @@ public class TestReflectionTemplateBuilderPackUnpack extends TestCase {
SampleOptionalMapTypes dst = SampleOptionalMapTypes dst =
MessagePack.unpack(raw, SampleOptionalMapTypes.class); MessagePack.unpack(raw, SampleOptionalMapTypes.class);
assertEquals(src.f0.size(), dst.f0.size()); assertEquals(0, dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size()); assertEquals(src.f1.size(), dst.f1.size());
Iterator<Integer> srcf1 = src.f1.keySet().iterator(); Iterator<Integer> srcf1 = src.f1.keySet().iterator();
Iterator<Integer> dstf1 = dst.f1.keySet().iterator();
while (srcf1.hasNext()) { while (srcf1.hasNext()) {
Integer s1 = srcf1.next(); Integer s1 = srcf1.next();
Integer d1 = dstf1.next(); assertEquals(src.f1.get(s1), dst.f1.get(s1));
assertEquals(s1, d1);
assertEquals(src.f1.get(s1), dst.f1.get(d1));
} }
assertEquals(src.f2.size(), dst.f2.size()); assertEquals(src.f2.size(), dst.f2.size());
Iterator<String> srcf2 = src.f2.keySet().iterator(); Iterator<String> srcf2 = src.f2.keySet().iterator();
Iterator<String> dstf2 = dst.f2.keySet().iterator();
while (srcf2.hasNext()) { while (srcf2.hasNext()) {
String s2 = srcf2.next(); String s2 = srcf2.next();
String d2 = dstf2.next(); assertEquals(src.f2.get(s2), dst.f2.get(s2));
assertEquals(s2, d2);
assertEquals(src.f2.get(s2), dst.f2.get(d2));
} }
} }

22
java/src/test/java/org/msgpack/template/TestTemplateBuilderJavaBeansPackUnpack.java
View File

@ -1038,22 +1038,18 @@ public class TestTemplateBuilderJavaBeansPackUnpack extends TestCase {
SampleMapTypes dst = SampleMapTypes dst =
MessagePack.unpack(raw, SampleMapTypes.class); MessagePack.unpack(raw, SampleMapTypes.class);
assertEquals(0, dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size());
Iterator<Integer> srcf1 = src.f1.keySet().iterator(); Iterator<Integer> srcf1 = src.f1.keySet().iterator();
Iterator<Integer> dstf1 = dst.f1.keySet().iterator();
while (srcf1.hasNext()) { while (srcf1.hasNext()) {
Integer s1 = srcf1.next(); Integer s1 = srcf1.next();
Integer d1 = dstf1.next(); assertEquals(src.f1.get(s1), dst.f1.get(s1));
assertEquals(s1, d1);
assertEquals(src.f1.get(s1), dst.f1.get(d1));
} }
assertEquals(src.f2.size(), dst.f2.size()); assertEquals(src.f2.size(), dst.f2.size());
Iterator<String> srcf2 = src.f2.keySet().iterator(); Iterator<String> srcf2 = src.f2.keySet().iterator();
Iterator<String> dstf2 = dst.f2.keySet().iterator();
while (srcf2.hasNext()) { while (srcf2.hasNext()) {
String s2 = srcf2.next(); String s2 = srcf2.next();
String d2 = dstf2.next(); assertEquals(src.f2.get(s2), dst.f2.get(s2));
assertEquals(s2, d2);
assertEquals(src.f2.get(s2), dst.f2.get(d2));
} }
} }
@ -1119,24 +1115,20 @@ public class TestTemplateBuilderJavaBeansPackUnpack extends TestCase {
SampleOptionalMapTypes dst = SampleOptionalMapTypes dst =
MessagePack.unpack(raw, SampleOptionalMapTypes.class); MessagePack.unpack(raw, SampleOptionalMapTypes.class);
assertEquals(src.f0.size(), dst.f0.size()); assertEquals(0, dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size()); assertEquals(src.f1.size(), dst.f1.size());
Iterator<Integer> srcf1 = src.f1.keySet().iterator(); Iterator<Integer> srcf1 = src.f1.keySet().iterator();
Iterator<Integer> dstf1 = dst.f1.keySet().iterator(); Iterator<Integer> dstf1 = dst.f1.keySet().iterator();
while (srcf1.hasNext()) { while (srcf1.hasNext()) {
Integer s1 = srcf1.next(); Integer s1 = srcf1.next();
Integer d1 = dstf1.next(); assertEquals(src.f1.get(s1), dst.f1.get(s1));
assertEquals(s1, d1);
assertEquals(src.f1.get(s1), dst.f1.get(d1));
} }
assertEquals(src.f2.size(), dst.f2.size()); assertEquals(src.f2.size(), dst.f2.size());
Iterator<String> srcf2 = src.f2.keySet().iterator(); Iterator<String> srcf2 = src.f2.keySet().iterator();
Iterator<String> dstf2 = dst.f2.keySet().iterator(); Iterator<String> dstf2 = dst.f2.keySet().iterator();
while (srcf2.hasNext()) { while (srcf2.hasNext()) {
String s2 = srcf2.next(); String s2 = srcf2.next();
String d2 = dstf2.next(); assertEquals(src.f2.get(s2), dst.f2.get(s2));
assertEquals(s2, d2);
assertEquals(src.f2.get(s2), dst.f2.get(d2));
} }
} }

24
java/src/test/java/org/msgpack/template/TestTemplateBuilderPackConvert.java
View File

@ -598,22 +598,18 @@ public class TestTemplateBuilderPackConvert extends TestCase {
SampleMapTypes dst = SampleMapTypes dst =
MessagePack.unpack(raw).convert(SampleMapTypes.class); MessagePack.unpack(raw).convert(SampleMapTypes.class);
assertEquals(0, dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size());
Iterator<Integer> srcf1 = src.f1.keySet().iterator(); Iterator<Integer> srcf1 = src.f1.keySet().iterator();
Iterator<Integer> dstf1 = dst.f1.keySet().iterator();
while (srcf1.hasNext()) { while (srcf1.hasNext()) {
Integer s1 = srcf1.next(); Integer s1 = srcf1.next();
Integer d1 = dstf1.next(); assertEquals(src.f1.get(s1), dst.f1.get(s1));
assertEquals(s1, d1);
assertEquals(src.f1.get(s1), dst.f1.get(d1));
} }
assertEquals(src.f2.size(), dst.f2.size()); assertEquals(src.f2.size(), dst.f2.size());
Iterator<String> srcf2 = src.f2.keySet().iterator(); Iterator<String> srcf2 = src.f2.keySet().iterator();
Iterator<String> dstf2 = dst.f2.keySet().iterator();
while (srcf2.hasNext()) { while (srcf2.hasNext()) {
String s2 = srcf2.next(); String s2 = srcf2.next();
String d2 = dstf2.next(); assertEquals(src.f2.get(s2), dst.f2.get(s2));
assertEquals(s2, d2);
assertEquals(src.f2.get(s2), dst.f2.get(d2));
} }
} }
@ -654,24 +650,18 @@ public class TestTemplateBuilderPackConvert extends TestCase {
SampleOptionalMapTypes dst = SampleOptionalMapTypes dst =
MessagePack.unpack(raw).convert(SampleOptionalMapTypes.class); MessagePack.unpack(raw).convert(SampleOptionalMapTypes.class);
assertEquals(src.f0.size(), dst.f0.size()); assertEquals(0, dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size()); assertEquals(src.f1.size(), dst.f1.size());
Iterator<Integer> srcf1 = src.f1.keySet().iterator(); Iterator<Integer> srcf1 = src.f1.keySet().iterator();
Iterator<Integer> dstf1 = dst.f1.keySet().iterator();
while (srcf1.hasNext()) { while (srcf1.hasNext()) {
Integer s1 = srcf1.next(); Integer s1 = srcf1.next();
Integer d1 = dstf1.next(); assertEquals(src.f1.get(s1), dst.f1.get(s1));
assertEquals(s1, d1);
assertEquals(src.f1.get(s1), dst.f1.get(d1));
} }
assertEquals(src.f2.size(), dst.f2.size()); assertEquals(src.f2.size(), dst.f2.size());
Iterator<String> srcf2 = src.f2.keySet().iterator(); Iterator<String> srcf2 = src.f2.keySet().iterator();
Iterator<String> dstf2 = dst.f2.keySet().iterator();
while (srcf2.hasNext()) { while (srcf2.hasNext()) {
String s2 = srcf2.next(); String s2 = srcf2.next();
String d2 = dstf2.next(); assertEquals(src.f2.get(s2), dst.f2.get(s2));
assertEquals(s2, d2);
assertEquals(src.f2.get(s2), dst.f2.get(d2));
} }
} }

24
java/src/test/java/org/msgpack/template/TestTemplateBuilderPackUnpack.java
View File

@ -594,22 +594,18 @@ public class TestTemplateBuilderPackUnpack extends TestCase {
SampleMapTypes dst = SampleMapTypes dst =
MessagePack.unpack(raw, SampleMapTypes.class); MessagePack.unpack(raw, SampleMapTypes.class);
assertEquals(0, dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size());
Iterator<Integer> srcf1 = src.f1.keySet().iterator(); Iterator<Integer> srcf1 = src.f1.keySet().iterator();
Iterator<Integer> dstf1 = dst.f1.keySet().iterator();
while (srcf1.hasNext()) { while (srcf1.hasNext()) {
Integer s1 = srcf1.next(); Integer s1 = srcf1.next();
Integer d1 = dstf1.next(); assertEquals(src.f1.get(s1), dst.f1.get(s1));
assertEquals(s1, d1);
assertEquals(src.f1.get(s1), dst.f1.get(d1));
} }
assertEquals(src.f2.size(), dst.f2.size()); assertEquals(src.f2.size(), dst.f2.size());
Iterator<String> srcf2 = src.f2.keySet().iterator(); Iterator<String> srcf2 = src.f2.keySet().iterator();
Iterator<String> dstf2 = dst.f2.keySet().iterator();
while (srcf2.hasNext()) { while (srcf2.hasNext()) {
String s2 = srcf2.next(); String s2 = srcf2.next();
String d2 = dstf2.next(); assertEquals(src.f2.get(s2), dst.f2.get(s2));
assertEquals(s2, d2);
assertEquals(src.f2.get(s2), dst.f2.get(d2));
} }
} }
@ -650,24 +646,18 @@ public class TestTemplateBuilderPackUnpack extends TestCase {
SampleOptionalMapTypes dst = SampleOptionalMapTypes dst =
MessagePack.unpack(raw, SampleOptionalMapTypes.class); MessagePack.unpack(raw, SampleOptionalMapTypes.class);
assertEquals(src.f0.size(), dst.f0.size()); assertEquals(0, dst.f0.size());
assertEquals(src.f1.size(), dst.f1.size()); assertEquals(src.f1.size(), dst.f1.size());
Iterator<Integer> srcf1 = src.f1.keySet().iterator(); Iterator<Integer> srcf1 = src.f1.keySet().iterator();
Iterator<Integer> dstf1 = dst.f1.keySet().iterator();
while (srcf1.hasNext()) { while (srcf1.hasNext()) {
Integer s1 = srcf1.next(); Integer s1 = srcf1.next();
Integer d1 = dstf1.next(); assertEquals(src.f1.get(s1), dst.f1.get(s1));
assertEquals(s1, d1);
assertEquals(src.f1.get(s1), dst.f1.get(d1));
} }
assertEquals(src.f2.size(), dst.f2.size()); assertEquals(src.f2.size(), dst.f2.size());
Iterator<String> srcf2 = src.f2.keySet().iterator(); Iterator<String> srcf2 = src.f2.keySet().iterator();
Iterator<String> dstf2 = dst.f2.keySet().iterator();
while (srcf2.hasNext()) { while (srcf2.hasNext()) {
String s2 = srcf2.next(); String s2 = srcf2.next();
String d2 = dstf2.next(); assertEquals(src.f2.get(s2), dst.f2.get(s2));
assertEquals(s2, d2);
assertEquals(src.f2.get(s2), dst.f2.get(d2));
} }
} }