[Import as member] Refactor testing.

Separate out error tests, so that we can more extensively test
protocol and non-prototype errors. NFC

Author: milseman

test/IDE/Inputs/custom-modules/ImportAsMemberError.h

@@ -0,0 +1,33 @@
+#ifndef IMPORT_AS_MEMBER_ERR_H
+#define IMPORT_AS_MEMBER_ERR_H
+
+struct __attribute__((swift_name("ErrorStruct"))) IAMStruct {
+  double x, y, z;
+};
+
+@import Foundation;
+
+@protocol ImportedProtocolBase;
+@protocol ImportedProtocolBase <NSObject>
+@end
+typedef NSObject<ImportedProtocolBase> *ImportedProtocolBase_t;
+
+@protocol ErrorProto;
+@protocol ErrorProto <ImportedProtocolBase>
+@end
+
+typedef NSObject<ErrorProto> *ErrorProto_t;
+
+// Instance and static member onto protocol
+void mutateSomeStaticState()
+    __attribute__((swift_name("ErrorProto.mutateSomeStaticState()"))); // ok
+void mutateSomeInstanceState(ErrorProto_t self) __attribute__((
+    swift_name("ErrorProto.mutateSomeInstanceState(self:)"))); // error
+
+// Non-prototype declaration
+extern void IAMErrorStructHasPrototype(void)
+    __attribute__((swift_name("ErrorStruct.hasPrototype()"))); // ok
+extern void IAMErrorStructNonPrototype()
+    __attribute__((swift_name("ErrorStruct.nonPrototype()"))); // error
+
+#endif // IMPORT_AS_MEMBER_ERR_H

test/IDE/Inputs/custom-modules/ImportAsMemberProtoErr.h

@@ -31,11 +31,12 @@ module ImportAsMember {
     requires objc
     header "ImportAsMemberProto.h"
   }
+}
 
-  module ProtoErr {
-    requires objc
-    header "ImportAsMemberProto.h"
-  }
+module IAMError {
+  export *
+  requires objc
+  header "ImportAsMemberError.h"
 }
 
 module InferImportAsMember {

test/IDE/Inputs/custom-modules/module.map

@@ -67,9 +67,11 @@
 
 // REQUIRES: objc_interop
 
-import ImportAsMember
+import Foundation
+import ImportAsMember.A
 import ImportAsMember.B
-import ImportAsMember.ProtoErr
+import ImportAsMember.Proto
+import IAMError
 
 let iamStructFail = IAMStruct1CreateSimple()
   // expected-error@-1{{use of unresolved identifier 'IAMStruct1CreateSimple'}}
@@ -96,19 +98,25 @@ iamStruct = Struct1.zero
 // Global properties
 currentStruct1.x += 1.5
 
+ErrorStruct.hasPrototype();
+ErrorStruct.nonPrototype();
+  // expected-error@-1{{type 'ErrorStruct' has no member 'nonPrototype'}}
+
 // Protocols
-// class Foo : NSObject, IAMProto {}
+@objc class Foo : NSObject, IAMProto {}
 
 struct Bar : IAMProto {}
   // expected-error@-1{{non-class type 'Bar' cannot conform to class protocol 'IAMProto'}}
   // expected-error@-2{{non-class type 'Bar' cannot conform to class protocol 'ImportedProtocolBase'}}
   // expected-error@-3{{non-class type 'Bar' cannot conform to class protocol 'NSObjectProtocol'}}
 
+@objc class FooErr : NSObject, ErrorProto {}
 
-// let foo = Foo()
-// foo.mutateSomeState()
-// Foo.mutateSomeStaticState()
-  // expected-not-error@-1{{type 'Foo' has no member 'mutateSomeStaticState'}}
+let foo = Foo()
+foo.mutateSomeState()
 
-// TODO: error: "swift_name cannot be used to define static member on protocol"
+let fooErr = FooErr()
+fooErr.mutateSomeInstanceState()
+FooErr.mutateSomeStaticState()
+  // expected-error@-1{{type 'FooErr' has no member 'mutateSomeStaticState'}}