Merge pull request #114 from oracle/Issue#113-dict.update(PyOrderedDict)-not-working

Issue#113 dict.update(py ordered dict) not working

Author: ddsharpe

core/src/main/java/oracle/weblogic/deploy/util/PyOrderedDict.java

@@ -51,6 +51,7 @@ public PyOrderedDict() {
      */
     public PyOrderedDict(PyOrderedDict other) {
         this();
+        super.update(other);
         update(other);
     }
 
@@ -279,6 +280,9 @@ public void __setitem__(PyObject key, PyObject value) {
         synchronized (this.linkedHashMap) {
             this.linkedHashMap.put(key, value);
         }
+        synchronized (super.table) {
+            super.table.put(key, value);
+        }
     }
 
     /**
@@ -287,6 +291,7 @@ public void __setitem__(PyObject key, PyObject value) {
     @Override
     public void clear() {
         this.linkedHashMap.clear();
+        super.table.clear();;
     }
 
     /**
@@ -476,6 +481,7 @@ private void doUpdate(PyDictionary od) {
         for (int i = 0; i < pylist.size(); i++) {
             PyTuple tuple = (PyTuple) pylist.get(i);
             this.__setitem__(Py.java2py(tuple.get(0)), Py.java2py(tuple.get(1)));
+            super.__setitem__(Py.java2py(tuple.get(0)), Py.java2py(tuple.get(1)));
         }
     }
 

core/src/test/python/collections_test.py

@@ -151,5 +151,51 @@ def testCopyDeepcopyKeyOrdering(self):
         new_list.extend([6, 7, 8, 9, 10])
         self.assertEqual(len(my_list), 5, 'expected deepcopy to make a copy of my_list but it did not')
 
+    def testDictDictUpdate(self):
+        dict1 = dict()
+        dict1['entry1'] = 'you'
+        dict2 = dict()
+        dict2['entry2'] = 'me'
+        print 'Before:         dict() dict1=', dict1
+        print '                dict() dict2=', dict2
+        dict1.update(dict2)
+        self.assertEqual('entry1' in dict1 and 'entry2' in dict1, True,
+                         "expected dict1 to contain 'entry1' and 'entry2' keys")
+
+    def testOrderedDictOrderedDictUpdate(self):
+        dict1 = OrderedDict()
+        dict1['entry1'] = 'you'
+        dict2 = OrderedDict()
+        dict2['entry2'] = 'me'
+        print 'Before: OrderedDict() dict1=', dict1
+        print '        OrderedDict() dict2=', dict2
+        dict1.update(dict2)
+        self.assertEqual('entry1' in dict1 and 'entry2' in dict1, True,
+                         "expected ordereddict1 to contain 'entry1' and 'entry2' keys")
+
+    def testOrderedDictDictUpdate(self):
+        dict1 = OrderedDict()
+        dict1['entry1'] = 'you'
+        dict2 = dict()
+        dict2['entry2'] = 'me'
+        print 'Before: OrderedDict() dict1=', dict1
+        print '               dict() dict2=', dict2
+        print
+        dict1.update(dict2)
+        self.assertEqual('entry1' in dict1 and 'entry2' in dict1, True,
+                         "expected ordereddict1 to contain 'entry1' and 'entry2' keys")
+
+    def testDictOrderedDictUpdate(self):
+        dict1 = dict()
+        dict1['entry1'] = 'you'
+        dict2 = OrderedDict()
+        dict2['entry2'] = 'me'
+        print 'Before:         dict() dict1=', dict1
+        print '         OrderedDict() dict2=', dict2
+        print
+        dict1.update(dict2)
+        self.assertEqual('entry1' in dict1 and 'entry2' in dict1, True,
+                         "expected ordereddict1 to contain 'entry1' and 'entry2' keys")
+
 if __name__ == '__main__':
     unittest.main()