more dict tests

Author: tomasstupka

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/datatype/DictTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -54,36 +54,78 @@ public void del() {
         assertPrints("{3: 4}\n", source);
     }
 
+    @Test
+    public void dict() {
+        String source = "print(type({}))\n" +
+                        "print(type(iter({1: 'a', 2: 'b'})))\n" +
+                        "print({})\n" +
+                        "print({1: 'a'})\n" +
+                        "print({1: 'a', 2: 'b'})\n";
+
+        assertPrints("<class 'dict'>\n" +
+                        "<class 'dict_keyiterator'>\n" +
+                        "{}\n" +
+                        "{1: 'a'}\n" +
+                        "{1: 'a', 2: 'b'}\n", source);
+
+        source = "d = {1: 1}\n" +
+                        "d.__setitem__(2, d)\n" +
+                        "print(d)\n";
+        assertPrints("{1: 1, 2: {...}}\n", source);
+    }
+
     @Test
     public void dictViewKeys() {
         String source = "print(type({}.keys()))\n" +
                         "print(type(iter({1: 'a', 2: 'b'}.keys())))\n" +
+                        "print({}.keys())\n" +
+                        "print({1: 'a'}.keys())\n" +
                         "print({1: 'a', 2: 'b'}.keys())\n";
 
         assertPrints("<class 'dict_keys'>\n" +
-                        "<class 'dict_keysiterator'>\n" +
+                        "<class 'dict_keyiterator'>\n" +
+                        "dict_keys([])\n" +
+                        "dict_keys([1])\n" +
                         "dict_keys([1, 2])\n", source);
     }
 
     @Test
     public void dictViewValues() {
         String source = "print(type({}.values()))\n" +
                         "print(type(iter({1: 'a', 2: 'b'}.values())))\n" +
+                        "print({}.values())\n" +
+                        "print({1: 'a'}.values())\n" +
                         "print({1: 'a', 2: 'b'}.values())\n";
 
         assertPrints("<class 'dict_values'>\n" +
-                        "<class 'dict_valuesiterator'>\n" +
+                        "<class 'dict_valueiterator'>\n" +
+                        "dict_values([])\n" +
+                        "dict_values(['a'])\n" +
                         "dict_values(['a', 'b'])\n", source);
+
+        source = "d = {1: 1}\n" +
+                        "d.__setitem__(2, d)\n" +
+                        "print(d.values())\n";
+        assertPrints("dict_values([1, {1: 1, 2: {...}}])\n", source);
     }
 
     @Test
     public void dictViewItems() {
         String source = "print(type({}.items()))\n" +
                         "print(type(iter({1: 'a', 2: 'b'}.items())))\n" +
+                        "print({}.items())\n" +
+                        "print({1: 'a'}.items())\n" +
                         "print({1: 'a', 2: 'b'}.items())\n";
 
         assertPrints("<class 'dict_items'>\n" +
-                        "<class 'dict_itemsiterator'>\n" +
+                        "<class 'dict_itemiterator'>\n" +
+                        "dict_items([])\n" +
+                        "dict_items([(1, 'a')])\n" +
                         "dict_items([(1, 'a'), (2, 'b')])\n", source);
+
+        source = "d = {1: 1}\n" +
+                        "d.__setitem__(2, d)\n" +
+                        "print(d.items())\n";
+        assertPrints("dict_items([(1, 1), (2, {1: 1, 2: {...}})])\n", source);
     }
 }

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

@@ -103,6 +103,24 @@ def test_fromkeys():
     assert set(d.keys()) == {'a', 'b', 'c'}
     assert set(d.values()) == {o}
 
+    class preset(dict):
+        def __init__(self):
+            self['a'] = 1
+    assert preset.fromkeys(['b']) == {'a':1, 'b':None}        
+        
+    class morethanoneinitargraiseserror(dict):        
+        def __init__(self, anotherArg):
+            self.__init__()        
+    assert_raises(TypeError, morethanoneinitargraiseserror.fromkeys, [1])
+    
+    class nosetitem:
+        pass
+
+    class nosetitem2(dict):
+        def __new__(cls):
+            return nosetitem()
+    assert_raises(TypeError, nosetitem2.fromkeys, [1])
+
 
 def test_init():
     d = dict(a=1, b=2, c=3)