Code review

Author: cdce8p

mypyc/doc/frozenset_operations.rst

@@ -1,4 +1,4 @@
-.. _set-ops:
+.. _frozenset-ops:
 
 Native frozenset operations
 ======================

mypyc/test-data/run-sets.test

@@ -118,6 +118,8 @@ assert s == {1, 2, 3, 4, 5}
 
 [case testFrozenSets]
 from typing import FrozenSet, List, Any, cast
+from testutil import assertRaises
+
 def instantiateLiteral() -> FrozenSet[int]:
     return frozenset((1, 2, 3, 5, 8))
 
@@ -144,42 +146,42 @@ def castFrozenSet() -> FrozenSet[int]:
     x: Any = frozenset((1, 2, 3, 5, 8))
     return cast(FrozenSet, x)
 
-[file driver.py]
-from native import instantiateLiteral
-from testutil import assertRaises
-
-val = instantiateLiteral()
-assert 1 in val
-assert 2 in val
-assert 3 in val
-assert 5 in val
-assert 8 in val
-assert len(val) == 5
-assert val == {1, 2, 3, 5, 8}
-s = 0
-for i in val:
-    s += i
-assert s == 19
-
-from native import emptyFrozenSet1, emptyFrozenSet2
-empty_set1 = emptyFrozenSet1()
-assert empty_set1 == frozenset()
-
-empty_set2 = emptyFrozenSet2()
-assert empty_set2 == frozenset()
-
-from native import fromIterator
-sets = fromIterator()
-for s in sets:
-    assert s == {1, 3, 5}
-
-from native import fromIterator2
-s = fromIterator2()
-assert s == {11, 21, 31}
+def castFrozenSetError() -> FrozenSet[int]:
+    x: Any = {1, 2, 3, 5, 8}
+    return cast(FrozenSet, x)
 
-from native import castFrozenSet
-val2 = castFrozenSet()
-assert val2 == {1, 2, 3, 5, 8}
+def test_frozen_sets() -> None:
+    val = instantiateLiteral()
+    assert 1 in val
+    assert 2 in val
+    assert 3 in val
+    assert 5 in val
+    assert 8 in val
+    assert len(val) == 5
+    assert val == {1, 2, 3, 5, 8}
+    s = 0
+    for i in val:
+        s += i
+    assert s == 19
+
+    empty_set1 = emptyFrozenSet1()
+    assert empty_set1 == frozenset()
+
+    empty_set2 = emptyFrozenSet2()
+    assert empty_set2 == frozenset()
+
+    sets = fromIterator()
+    for s2 in sets:
+        assert s2 == {1, 3, 5}
+
+    s3 = fromIterator2()
+    assert s3 == {11, 21, 31}
+
+    val2 = castFrozenSet()
+    assert val2 == {1, 2, 3, 5, 8}
+
+    with assertRaises(TypeError, "frozenset object expected; got set"):
+        castFrozenSetError()
 
 [case testPrecomputedFrozenSets]
 from typing import Any