[GR-23282] Make test_collections pass.

PullRequest: graalpython/1672

Author: tomasstupka

graalpython/com.oracle.graal.python.test/src/tests/test_dict.py

@@ -140,6 +140,13 @@ def test_init():
 
     assert_raises(TypeError, dict.fromkeys, 10)
 
+    d = {'a':1, 'b':2}
+    d.__init__()
+    assert d == {'a':1, 'b':2}
+    d.__init__({'c':3})
+    assert d == {'a':1, 'b':2, 'c':3}
+    d.__init__({'d':4})
+    assert d == {'a':1, 'b':2, 'c':3, 'd':4}
 
 def test_init1():
     try:

graalpython/com.oracle.graal.python.test/src/tests/test_set.py

@@ -40,6 +40,7 @@
 # ankitv 10/10/13
 # Iterating by Sequence Index
 
+from collections.abc import MutableSet
 
 def assert_raises(err, fn, *args, **kwargs):
     raised = False
@@ -315,6 +316,12 @@ def test_same_id():
     empty_ids = set([id(frozenset()) for i in range(100)])
     assert len(empty_ids) == 1
 
+def test_init():
+    s = {1, 2, 3}
+    s.__init__({4})
+    assert s == {4}
+    s.__init__()
+    assert s == set()
 
 def test_rich_compare():
     class TestRichSetCompare:

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_collections.txt

@@ -24,6 +24,7 @@
 *graalpython.lib-python.3.test.test_collections.TestCollectionABCs.test_issue26915
 *graalpython.lib-python.3.test.test_collections.TestCollectionABCs.test_issue8750
 *graalpython.lib-python.3.test.test_collections.TestCollectionABCs.test_issue_5647
+*graalpython.lib-python.3.test.test_collections.TestCounter.test_basics
 *graalpython.lib-python.3.test.test_collections.TestCounter.test_conversions
 *graalpython.lib-python.3.test.test_collections.TestCounter.test_copy_subclass
 *graalpython.lib-python.3.test.test_collections.TestCounter.test_copying
@@ -54,6 +55,7 @@
 *graalpython.lib-python.3.test.test_collections.TestNamedTuple.test_readonly
 *graalpython.lib-python.3.test.test_collections.TestNamedTuple.test_repr
 *graalpython.lib-python.3.test.test_collections.TestNamedTuple.test_tupleness
+*graalpython.lib-python.3.test.test_collections.TestOneTrickPonyABCs.test_AsyncGenerator
 *graalpython.lib-python.3.test.test_collections.TestOneTrickPonyABCs.test_AsyncIterable
 *graalpython.lib-python.3.test.test_collections.TestOneTrickPonyABCs.test_AsyncIterator
 *graalpython.lib-python.3.test.test_collections.TestOneTrickPonyABCs.test_Callable

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DictBuiltins.java

@@ -136,8 +136,11 @@ private HashingStorage.InitNode getInitNode() {
         @Specialization(guards = {"args.length == 1", "firstArgIterable(args, lib)", "!firstArgString(args)"})
         Object doVarargs(VirtualFrame frame, PDict self, Object[] args, PKeyword[] kwargs,
                         @Cached SetDictStorageNode setStorage,
-                        @SuppressWarnings("unused") @CachedLibrary(limit = "1") PythonObjectLibrary lib) {
-            setStorage.execute(self, getInitNode().execute(frame, args[0], kwargs));
+                        @SuppressWarnings("unused") @CachedLibrary(limit = "1") PythonObjectLibrary lib,
+                        @CachedLibrary(limit = "1") HashingStorageLibrary storageLib) {
+            HashingStorage storage = self.getDictStorage();
+            storage = storageLib.addAllToOther(getInitNode().execute(frame, args[0], kwargs), storage);
+            setStorage.execute(self, storage);
             return PNone.NONE;
         }
 
@@ -155,10 +158,19 @@ static Object doString(Object self, Object[] args, PKeyword[] kwargs,
             throw raise.raise(ValueError, ErrorMessages.DICT_UPDATE_SEQ_ELEM_HAS_LENGTH_2_REQUIRED, 0, 1);
         }
 
-        @Specialization(guards = "args.length == 0")
+        @Specialization(guards = {"args.length == 0", "kwargs.length > 0"})
         Object doKeywords(VirtualFrame frame, PDict self, @SuppressWarnings("unused") Object[] args, PKeyword[] kwargs,
-                        @Cached SetDictStorageNode setStorage) {
-            setStorage.execute(self, getInitNode().execute(frame, NO_VALUE, kwargs));
+                        @Cached SetDictStorageNode setStorage,
+                        @CachedLibrary(limit = "1") HashingStorageLibrary storageLib) {
+            HashingStorage storage = self.getDictStorage();
+            storage = storageLib.addAllToOther(getInitNode().execute(frame, NO_VALUE, kwargs), storage);
+            setStorage.execute(self, storage);
+            return PNone.NONE;
+        }
+
+        @SuppressWarnings("unused")
+        @Specialization(guards = {"args.length == 0", "kwargs.length == 0"})
+        Object doEmpty(PDict self, Object[] args, PKeyword[] kwargs) {
             return PNone.NONE;
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/SetBuiltins.java

@@ -86,9 +86,11 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @ImportStatic(PGuards.class)
     public abstract static class InitNode extends PythonBuiltinNode {
 
-        @Specialization(guards = "isNoValue(iterable)")
-        @SuppressWarnings("unused")
-        static PNone doNoValue(VirtualFrame frame, PSet self, PNone iterable) {
+        @Specialization(guards = "isNoValue(iterable)", limit = "1")
+        static PNone doNoValue(PSet self, @SuppressWarnings("unused") PNone iterable,
+                        @CachedLibrary("self.getDictStorage()") HashingStorageLibrary lib) {
+            HashingStorage newStorage = lib.clear(self.getDictStorage());
+            self.setDictStorage(newStorage);
             return PNone.NONE;
         }
 

graalpython/lib-python/3/test/test_collections.py

@@ -1125,6 +1125,7 @@ def throw(self, *args): pass
 
         self.assertRaises(RuntimeError, IgnoreGeneratorExit().close)
 
+    @support.impl_detail("async support", graalvm=False)
     def test_AsyncGenerator(self):
         class NonAGen1:
             def __aiter__(self): return self