Tests: Improve coverage in members_transitive*.swift.

- Reorganize test cases
- Add tests cases for multi-file and contextual base lookup
- Verify behavior without `MemberImportVisibility` feature

NFC.

Author: tshortli

test/NameLookup/Inputs/members_A.swift

@@ -23,3 +23,7 @@ extension Y {
 
   public static func <<<(a: Self, b: Self) -> Self { a }
 }
+
+public enum EnumInA {
+  case caseInA
+}

test/NameLookup/Inputs/members_B.swift

@@ -13,3 +13,6 @@ extension Y {
   public static func >>>(a: Self, b: Self) -> Self { b }
 }
 
+public enum EnumInB {
+  case caseInB
+}

test/NameLookup/Inputs/members_C.swift

@@ -13,3 +13,7 @@ extension Y {
 
   public static func <>(a: Self, b: Self) -> Self { a }
 }
+
+public enum EnumInC {
+  case caseInC
+}

test/NameLookup/Inputs/members_transitive_other.swift

@@ -0,0 +1,7 @@
+import members_A
+import members_B
+import members_C
+
+func takesEnumInA(_ a: EnumInA) {}
+func takesEnumInB(_ b: EnumInB) {}
+func takesEnumInC(_ c: EnumInC) {}

test/NameLookup/members_transitive.swift

@@ -2,26 +2,39 @@
 // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/members_A.swift
 // RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/members_B.swift
 // RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/members_C.swift
-// RUN: %target-swift-frontend -typecheck %s -I %t -verify -enable-experimental-feature MemberImportVisibility
+// RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/members_transitive_other.swift -I %t -verify -swift-version 5
+// RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/members_transitive_other.swift -I %t -verify -swift-version 6
+// RUN: %target-swift-frontend -typecheck -primary-file %s %S/Inputs/members_transitive_other.swift -I %t -verify -swift-version 5 -enable-experimental-feature MemberImportVisibility -verify-additional-prefix member-visibility-
 
 import members_C
-// expected-note 2{{add import of module 'members_B'}}{{1-1=import members_B\n}}
-func test(x: X, y: Y<Z>) {
-  // Declared in members_A
+// expected-member-visibility-note 7{{add import of module 'members_B'}}{{1-1=import members_B\n}}
+
+
+func testExtensionMembers(x: X, y: Y<Z>) {
   x.XinA()
   y.YinA()
+
+  x.XinB() // expected-member-visibility-error{{instance method 'XinB()' is not available due to missing import of defining module 'members_B'}}
+  y.YinB() // expected-member-visibility-error{{instance method 'YinB()' is not available due to missing import of defining module 'members_B'}}
+
+  x.XinC()
+  y.YinC()
+}
+
+func testOperatorMembers(x: X, y: Y<Z>) {
   _ = x <<< x
   _ = y <<< y
 
-  // Declared in members_B
-  x.XinB() // expected-error{{instance method 'XinB()' is not available due to missing import of defining module 'members_B'}}
-  y.YinB() // expected-error{{instance method 'YinB()' is not available due to missing import of defining module 'members_B'}}
   _ = x >>> x // expected-error{{cannot find operator '>>>' in scope}}
   _ = y >>> y // expected-error{{cannot find operator '>>>' in scope}}
 
-  // Declared in members_C
-  x.XinC()
-  y.YinC()
   _ = x <> x
   _ = y <> y
 }
+
+func testMembersWithContextualBase() {
+  takesEnumInA(.caseInA)
+  takesEnumInB(.caseInB) // expected-member-visibility-error{{enum case 'caseInB' is not available due to missing import of defining module 'members_B'}}
+  takesEnumInC(.caseInC)
+}
+

test/NameLookup/members_transitive_objc.swift

@@ -3,23 +3,26 @@
 // RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/Categories -o %t %S/Inputs/Categories/Categories_B.swift
 // RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/Categories -o %t %S/Inputs/Categories/Categories_C.swift
 // RUN: %target-swift-frontend -emit-module -I %t -I %S/Inputs/Categories -o %t %S/Inputs/Categories/Categories_E.swift
-// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/Categories -verify -enable-experimental-feature MemberImportVisibility
+// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/Categories -import-objc-header %S/Inputs/Categories/Bridging.h -verify -swift-version 5
+// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/Categories -import-objc-header %S/Inputs/Categories/Bridging.h -verify -swift-version 6
+// RUN: %target-swift-frontend -typecheck %s -I %t -I %S/Inputs/Categories -import-objc-header %S/Inputs/Categories/Bridging.h -verify -swift-version 5 -enable-experimental-feature MemberImportVisibility -verify-additional-prefix member-visibility-
 
 // REQUIRES: objc_interop
 
 import Categories_B
 import Categories_E
 
-// expected-note@-1 2 {{add import of module 'Categories_C'}}{{1-1=import Categories_C\n}}
-// expected-note@-2 {{add import of module 'Categories_D'}}{{1-1=import Categories_D\n}}
+// expected-member-visibility-note@-1 2 {{add import of module 'Categories_C'}}{{1-1=import Categories_C\n}}
+// expected-member-visibility-note@-2 {{add import of module 'Categories_D'}}{{1-1=import Categories_D\n}}
 func test(x: X) {
   x.fromA()
   x.fromOverlayForA()
   x.fromB()
   x.fromOverlayForB()
-  x.fromC() // expected-error {{class method 'fromC()' is not available due to missing import of defining module 'Categories_C'}}
-  x.fromOverlayForC() // expected-error {{instance method 'fromOverlayForC()' is not available due to missing import of defining module 'Categories_C'}}
-  x.fromSubmoduleOfD() // expected-error {{class method 'fromSubmoduleOfD()' is not available due to missing import of defining module 'Categories_D'}}
+  x.fromC() // expected-member-visibility-error {{class method 'fromC()' is not available due to missing import of defining module 'Categories_C'}}
+  x.fromOverlayForC() // expected-member-visibility-error {{instance method 'fromOverlayForC()' is not available due to missing import of defining module 'Categories_C'}}
+  x.fromSubmoduleOfD() // expected-member-visibility-error {{class method 'fromSubmoduleOfD()' is not available due to missing import of defining module 'Categories_D'}}
+  x.fromBridgingHeader()
 }
 
 func testAnyObject(a: AnyObject) {