Change and extend tests

Author: Daraan

src/test_typing_extensions.py

@@ -5316,37 +5316,24 @@ class ProtoZ(Protocol[P]):
                 self.assertEqual(G7args, (int,))
                 self.assertEqual(G7.__parameters__, ())
 
-                # P = [int, int, ...]
-                G8 = klass[T, Concatenate[int, ...]]
-                G8args = G8.__args__[0] if sys.version_info >= (3, 10) else G8.__args__
-                self.assertEqual(G8args, (T, Concatenate[int, ...]))
-
-                # P = [int, int, P_2]
-                G9 = klass[int, Concatenate[T, P_2]]
-                G9args = G9.__args__[0] if sys.version_info >= (3, 10) else G9.__args__
-                self.assertEqual(G9args, (int, Concatenate[T, P_2]))
-
-                with self.subTest("Recursive ParamSpec Test A"):
-                    if sys.version_info[:2] == (3, 10):
-                        self.skipTest("Parameter detection fails in 3.10")
-                    with self.assertRaisesRegex(TypeError, f"Too few {things}"):
-                        G9[int]  # for python 3.10 this has no parameters
-                    self.assertEqual(G8.__parameters__, (T,))
-                    self.assertEqual(G9.__parameters__, (T, P_2))
-
-                with self.subTest("Recursive ParamSpec Test B"):
-                    if sys.version_info[:2] == (3, 10):
-                        self.skipTest("Parameter detection fails in 3.10")
-                    if (3, 11, 0) <= sys.version_info[:3] < (3, 11, 3):
-                        self.skipTest("Wrong recursive substitution")
-                    H1 = G8[int]
-                    H2 = G8[T][int]
-                    self.assertEqual(H2.__parameters__, ())
-                    self.assertEqual(H1.__parameters__, ())
-                    with self.assertRaisesRegex(TypeError, "not a generic class"):
-                        H1[str]  # for python 3.11.0-3 this still has a parameter
-                    with self.assertRaisesRegex(TypeError, "not a generic class"):
-                        H2[str]  # for python 3.11.0-3 this still has a parameter
+                G8 = klass[Concatenate[T, ...]]
+                self.assertEqual(G8.__args__, (Concatenate[T, ...], ))
+                self.assertEqual(G8.__parameters__, (T,))
+
+                G9 = klass[Concatenate[T, P_2]]
+                self.assertEqual(G9.__args__, (Concatenate[T, P_2],))
+                self.assertEqual(G9.__parameters__, (T, P_2))
+                with self.assertRaisesRegex(TypeError, f"Too few {things}"):
+                    G9[int]
+
+                H1 = G8[int]
+                H2 = G8[T][int]
+                self.assertEqual(H2.__parameters__, ())
+                self.assertEqual(H1.__parameters__, ())
+                with self.assertRaisesRegex(TypeError, "not a generic class"):
+                    H1[str]
+                with self.assertRaisesRegex(TypeError, "not a generic class"):
+                    H2[str]
 
     def test_pickle(self):
         global P, P_co, P_contra, P_default
@@ -5529,6 +5516,32 @@ def test_eq(self):
         self.assertEqual(hash(C4), hash(C5))
         self.assertNotEqual(C4, C6)
 
+    def test_substitution(self):
+        T = TypeVar('T')
+        P = ParamSpec('P')
+        Ts = TypeVarTuple("Ts")
+
+        C1 = Concatenate[str, T, ...]
+        self.assertEqual(C1[int], Concatenate[str, int, ...])
+
+        C2 = Concatenate[str, P]
+        self.assertEqual(C2[...], Concatenate[str, ...])
+        self.assertEqual(C2[int], (str, int))
+        U1 = Unpack[Tuple[int, str]]
+        U2 = Unpack[Ts]
+        self.assertEqual(C2[U1], (str, int, str))
+        self.assertEqual(C2[U2], (str, Unpack[Ts]))
+
+        if (3, 12, 0) <= sys.version_info < (3, 12, 4):
+            with self.assertRaises(AssertionError):
+                C2[Unpack[U2]]
+        else:
+            with self.assertRaisesRegex(TypeError, "must be used with a tuple type"):
+                C2[Unpack[U2]]
+
+        C3 = Concatenate[str, T, P]
+        self.assertEqual(C3[int, [bool]], (str, int, bool))
+
 
 class TypeGuardTests(BaseTestCase):
     def test_basics(self):