enhance tests

Author: JelleZijlstra

Lib/test/test_type_annotations.py

@@ -476,7 +476,6 @@ def check_scopes(self, code, true_annos, false_annos):
 
     def test_with(self):
         code = """
-            import contextlib
             class Swallower:
                 def __enter__(self):
                     pass
@@ -501,6 +500,21 @@ def test_simple_if(self):
         """
         self.check_scopes(code, {"in_if": "if"}, {"in_if": "else"})
 
+    def test_if_elif(self):
+        code = """
+            if not len:
+                in_if: "if"
+            elif {cond}:
+                in_elif: "elif"
+            else:
+                in_else: "else"
+        """
+        self.check_scopes(
+            code,
+            {"in_elif": "elif"},
+            {"in_else": "else"}
+        )
+
     def test_try(self):
         code = """
             try:
@@ -562,6 +576,33 @@ def test_for(self):
             {"in_else": "else"}
         )
 
+    def test_match(self):
+        code = """
+            match {cond}:
+                case True:
+                    x: "true"
+                case False:
+                    x: "false"
+        """
+        self.check_scopes(
+            code,
+            {"x": "true"},
+            {"x": "false"}
+        )
+
+    def test_nesting_override(self):
+        code = """
+            if {cond}:
+                x: "foo"
+                if {cond}:
+                    x: "bar"
+        """
+        self.check_scopes(
+            code,
+            {"x": "bar"},
+            {}
+        )
+
     def test_nesting_outer(self):
         code = """
             if {cond}: