Move tests from test_typing to test_dataclasses

Author: sobolevn

Lib/test/test_dataclasses.py

@@ -3128,6 +3128,99 @@ def test_text_annotations(self):
             {'foo': dataclass_textanno.Foo,
              'return': type(None)})
 
+    def test_dataclass_from_another_module(self):
+        # see bpo-45524
+        from test import dataclass_textanno
+        from dataclasses import dataclass
+
+        @dataclass
+        class Default(dataclass_textanno.Bar):
+            pass
+
+        @dataclass(init=False)
+        class WithInitFalse(dataclass_textanno.Bar):
+            pass
+
+        @dataclass(init=False)
+        class CustomInit(dataclass_textanno.Bar):
+            def __init__(self, foo: dataclass_textanno.Foo) -> None:
+                pass
+
+        @dataclass
+        class FutureInitChild(dataclass_textanno.WithFutureInit):
+            pass
+
+        classes = [
+            Default,
+            WithInitFalse,
+            CustomInit,
+            dataclass_textanno.WithFutureInit,
+            FutureInitChild,
+        ]
+        for klass in classes:
+            with self.subTest(klass=klass):
+                self.assertEqual(
+                    get_type_hints(klass),
+                    {'foo': dataclass_textanno.Foo},
+                )
+                self.assertEqual(get_type_hints(klass.__new__), {})
+                self.assertEqual(
+                    get_type_hints(klass.__init__),
+                    {'foo': dataclass_textanno.Foo, 'return': type(None)},
+                )
+
+    def test_dataclass_from_proxy_module(self):
+        # see bpo-45524
+        from test import dataclass_textanno, dataclass_textanno2
+        from dataclasses import dataclass
+
+        @dataclass
+        class Default(dataclass_textanno2.Child):
+            pass
+
+        @dataclass(init=False)
+        class WithInitFalse(dataclass_textanno2.Child):
+            pass
+
+        @dataclass(init=False)
+        class CustomInit(dataclass_textanno2.Child):
+            def __init__(
+                self,
+                foo: dataclass_textanno.Foo,
+                custom: dataclass_textanno2.Custom,
+            ) -> None:
+                pass
+
+        @dataclass
+        class FutureInitChild(dataclass_textanno2.WithFutureInit):
+            pass
+
+        classes = [
+            Default,
+            WithInitFalse,
+            CustomInit,
+            dataclass_textanno2.WithFutureInit,
+            FutureInitChild,
+        ]
+        for klass in classes:
+            with self.subTest(klass=klass):
+                self.assertEqual(
+                    get_type_hints(klass),
+                    {
+                        'foo': dataclass_textanno.Foo,
+                        'custom': dataclass_textanno2.Custom,
+                    },
+                )
+                self.assertEqual(get_type_hints(klass.__new__), {})
+                self.assertEqual(
+                    get_type_hints(klass.__init__),
+                    {
+                        'foo': dataclass_textanno.Foo,
+                        'custom': dataclass_textanno2.Custom,
+                        'return': type(None),
+                    },
+                )
+
 
 class TestMakeDataclass(unittest.TestCase):
     def test_simple(self):

Lib/test/test_typing.py

@@ -3300,99 +3300,6 @@ def test_top_level_class_var(self):
         ):
             get_type_hints(ann_module6)
 
-    def test_dataclass_from_another_module(self):
-        # see bpo-45524
-        from test import dataclass_textanno
-        from dataclasses import dataclass
-
-        @dataclass
-        class Default(dataclass_textanno.Bar):
-            pass
-
-        @dataclass(init=False)
-        class WithInitFalse(dataclass_textanno.Bar):
-            pass
-
-        @dataclass(init=False)
-        class CustomInit(dataclass_textanno.Bar):
-            def __init__(self, foo: dataclass_textanno.Foo) -> None:
-                pass
-
-        @dataclass
-        class FutureInitChild(dataclass_textanno.WithFutureInit):
-            pass
-
-        classes = [
-            Default,
-            WithInitFalse,
-            CustomInit,
-            dataclass_textanno.WithFutureInit,
-            FutureInitChild,
-        ]
-        for klass in classes:
-            with self.subTest(klass=klass):
-                self.assertEqual(
-                    get_type_hints(klass),
-                    {'foo': dataclass_textanno.Foo},
-                )
-                self.assertEqual(get_type_hints(klass.__new__), {})
-                self.assertEqual(
-                    get_type_hints(klass.__init__),
-                    {'foo': dataclass_textanno.Foo, 'return': type(None)},
-                )
-
-    def test_dataclass_from_proxy_module(self):
-        # see bpo-45524
-        from test import dataclass_textanno, dataclass_textanno2
-        from dataclasses import dataclass
-
-        @dataclass
-        class Default(dataclass_textanno2.Child):
-            pass
-
-        @dataclass(init=False)
-        class WithInitFalse(dataclass_textanno2.Child):
-            pass
-
-        @dataclass(init=False)
-        class CustomInit(dataclass_textanno2.Child):
-            def __init__(
-                self,
-                foo: dataclass_textanno.Foo,
-                custom: dataclass_textanno2.Custom,
-            ) -> None:
-                pass
-
-        @dataclass
-        class FutureInitChild(dataclass_textanno2.WithFutureInit):
-            pass
-
-        classes = [
-            Default,
-            WithInitFalse,
-            CustomInit,
-            dataclass_textanno2.WithFutureInit,
-            FutureInitChild,
-        ]
-        for klass in classes:
-            with self.subTest(klass=klass):
-                self.assertEqual(
-                    get_type_hints(klass),
-                    {
-                        'foo': dataclass_textanno.Foo,
-                        'custom': dataclass_textanno2.Custom,
-                    },
-                )
-                self.assertEqual(get_type_hints(klass.__new__), {})
-                self.assertEqual(
-                    get_type_hints(klass.__init__),
-                    {
-                        'foo': dataclass_textanno.Foo,
-                        'custom': dataclass_textanno2.Custom,
-                        'return': type(None),
-                    },
-                )
-
 
 class GetUtilitiesTestCase(TestCase):
     def test_get_origin(self):