fixed SequentialMapValueImpl.equals

frsyuki · frsyuki · commit 108fb1d80e72 · 2011-08-12T19:57:49.000+09:00
diff --git a/src/main/java/org/msgpack/type/SequentialMapValueImpl.java b/src/main/java/org/msgpack/type/SequentialMapValueImpl.java
@@ -53,6 +53,18 @@ public Value[] getKeyValueArray() {
         }
     }
 
+    public Value get(Value key) {
+        if(key == null) {
+            return null;
+        }
+        for(int i=array.length-2; i >= 0; i-=2) {
+            if(array[i].equals(key)) {
+                return array[i+1];
+            }
+        }
+        return null;
+    }
+
     private static class EntrySet extends AbstractSet<Map.Entry<Value,Value>> {
         private Value[] array;
 
@@ -187,10 +199,6 @@ public boolean equals(Object o) {
             return false;
         }
 
-        if(v.getClass() == SequentialMapValueImpl.class) {
-            return equals((SequentialMapValueImpl) v);
-        }
-
         Map<Value,Value> om = v.asMapValue();
         if (om.size() != array.length/2) {
             return false;
@@ -213,17 +221,17 @@ public boolean equals(Object o) {
         return true;
     }
 
-    private boolean equals(SequentialMapValueImpl o) {
-        if(array.length != o.array.length) {
-            return false;
-        }
-        for(int i=0; i < array.length; i+=2) {
-            if(!equalsValue(o.array, array[i], array[i+1], i)) {
-                return false;
-            }
-        }
-        return true;
-    }
+    //private boolean equals(SequentialMapValueImpl o) {
+    //    if(array.length != o.array.length) {
+    //        return false;
+    //    }
+    //    for(int i=0; i < array.length; i+=2) {
+    //        if(!equalsValue(o.array, array[i], array[i+1], i)) {
+    //            return false;
+    //        }
+    //    }
+    //    return true;
+    //}
 
     private boolean equalsValue(Value[] oarray, Value key, Value val, int hint) {
         for(int j=hint; j < array.length; j+=2) {
diff --git a/src/test/java/org/msgpack/type/TestEquals.java b/src/test/java/org/msgpack/type/TestEquals.java
@@ -70,6 +70,55 @@ public void testDouble(double v) throws Exception {
         testEquals(v1, v2);
     }
 
+    @Test
+    public void testMapOrder() throws Exception {
+        Value v1 = ValueFactory.mapValue(new Value[] {
+            ValueFactory.rawValue("k0"), ValueFactory.nilValue(),
+            ValueFactory.rawValue("k1"), ValueFactory.rawValue("v1"),
+            ValueFactory.rawValue("k2"), ValueFactory.rawValue("v2"),
+            ValueFactory.rawValue("k3"), ValueFactory.rawValue("v3"),
+            ValueFactory.rawValue("k4"), ValueFactory.rawValue("v4"),
+            ValueFactory.rawValue("k5"), ValueFactory.rawValue("v5"),
+            ValueFactory.rawValue("k6"), ValueFactory.rawValue("v6"),
+            ValueFactory.rawValue("k7"), ValueFactory.rawValue("v7"),
+            ValueFactory.rawValue("k8"), ValueFactory.rawValue("v8"),
+            ValueFactory.rawValue("k9"), ValueFactory.rawValue("v9"),
+            ValueFactory.rawValue("k10"), ValueFactory.rawValue("v10"),
+            ValueFactory.rawValue("k11"), ValueFactory.rawValue("v11"),
+            ValueFactory.rawValue("k12"), ValueFactory.rawValue("v12"),
+            ValueFactory.rawValue("k13"), ValueFactory.rawValue("v13"),
+            ValueFactory.rawValue("k14"), ValueFactory.rawValue("v14"),
+            ValueFactory.rawValue("k15"), ValueFactory.rawValue("v15"),
+            ValueFactory.rawValue("k16"), ValueFactory.rawValue("v16"),
+            ValueFactory.rawValue("k17"), ValueFactory.rawValue("v17"),
+            ValueFactory.rawValue("k18"), ValueFactory.rawValue("v18"),
+            ValueFactory.rawValue("k19"), ValueFactory.rawValue("v19"),
+        });
+        Value v2 = ValueFactory.mapValue(new Value[] {
+            ValueFactory.rawValue("k3"), ValueFactory.rawValue("v3"),
+            ValueFactory.rawValue("k11"), ValueFactory.rawValue("v11"),
+            ValueFactory.rawValue("k4"), ValueFactory.rawValue("v4"),
+            ValueFactory.rawValue("k10"), ValueFactory.rawValue("v10"),
+            ValueFactory.rawValue("k5"), ValueFactory.rawValue("v5"),
+            ValueFactory.rawValue("k6"), ValueFactory.rawValue("v6"),
+            ValueFactory.rawValue("k15"), ValueFactory.rawValue("v15"),
+            ValueFactory.rawValue("k7"), ValueFactory.rawValue("v7"),
+            ValueFactory.rawValue("k14"), ValueFactory.rawValue("v14"),
+            ValueFactory.rawValue("k8"), ValueFactory.rawValue("v8"),
+            ValueFactory.rawValue("k13"), ValueFactory.rawValue("v13"),
+            ValueFactory.rawValue("k9"), ValueFactory.rawValue("v9"),
+            ValueFactory.rawValue("k12"), ValueFactory.rawValue("v12"),
+            ValueFactory.rawValue("k0"), ValueFactory.nilValue(),
+            ValueFactory.rawValue("k1"), ValueFactory.rawValue("v1"),
+            ValueFactory.rawValue("k2"), ValueFactory.rawValue("v2"),
+            ValueFactory.rawValue("k18"), ValueFactory.rawValue("v18"),
+            ValueFactory.rawValue("k19"), ValueFactory.rawValue("v19"),
+            ValueFactory.rawValue("k16"), ValueFactory.rawValue("v16"),
+            ValueFactory.rawValue("k17"), ValueFactory.rawValue("v17"),
+        });
+        testEquals(v1, v2);
+    }
+
     @Override
     public void testByte(byte v) throws Exception {
         testLong((long)v);
