[nfc][cxx-interop] Add some tests for calling C++ methods.

Finally 😅

Author: zoecarver

test/Interop/Cxx/class/method/Inputs/methods.h

@@ -0,0 +1,30 @@
+#ifndef TEST_INTEROP_CXX_CLASS_METHOD_METHODS_H
+#define TEST_INTEROP_CXX_CLASS_METHOD_METHODS_H
+
+struct NonTrivialInWrapper {
+  int value;
+
+  ~NonTrivialInWrapper() { }
+};
+
+struct HasMethods {
+  void nonConstMethod() { }
+  void constMethod() const { }
+
+  int nonConstPassThrough(int a) { return a; }
+  int constPassThrough(int a) const { return a; }
+
+  int nonConstSum(int a, int b) { return a + b; }
+  int constSum(int a, int b) const { return a + b; }
+
+  int nonConstSum(NonTrivialInWrapper a, NonTrivialInWrapper b) { return a.value + b.value; }
+  int constSum(NonTrivialInWrapper a, NonTrivialInWrapper b) const { return a.value + b.value; }
+
+  NonTrivialInWrapper nonConstSumAsWrapper(NonTrivialInWrapper a, NonTrivialInWrapper b) { return {a.value + b.value}; }
+  NonTrivialInWrapper constSumAsWrapper(NonTrivialInWrapper a, NonTrivialInWrapper b) const { return {a.value + b.value}; }
+
+  NonTrivialInWrapper nonConstPassThroughAsWrapper(int a) { return {a}; }
+  NonTrivialInWrapper constPassThroughAsWrapper(int a) const { return {a}; }
+};
+
+#endif // TEST_INTEROP_CXX_CLASS_METHOD_METHODS_H

test/Interop/Cxx/class/method/Inputs/module.modulemap

@@ -0,0 +1,4 @@
+module Methods {
+  header "methods.h"
+  requires cplusplus
+}

test/Interop/Cxx/class/method/methods-module-interface.swift

@@ -0,0 +1,19 @@
+// RUN: %target-swift-ide-test -print-module -module-to-print=Methods -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
+
+// CHECK: mutating func nonConstMethod()
+// CHECK: func constMethod()
+
+// CHECK: mutating func nonConstPassThrough(_ a: Int32) -> Int32
+// CHECK: func constPassThrough(_ a: Int32) -> Int32
+
+// CHECK: mutating func nonConstSum(_ a: Int32, _ b: Int32) -> Int32
+// CHECK: func constSum(_ a: Int32, _ b: Int32) -> Int32
+
+// CHECK: mutating func nonConstSum(_ a: NonTrivialInWrapper, _ b: NonTrivialInWrapper) -> Int32
+// CHECK: func constSum(_ a: NonTrivialInWrapper, _ b: NonTrivialInWrapper) -> Int32
+
+// CHECK: mutating func nonConstSumAsWrapper(_ a: NonTrivialInWrapper, _ b: NonTrivialInWrapper) -> NonTrivialInWrapper
+// CHECK: func constSumAsWrapper(_ a: NonTrivialInWrapper, _ b: NonTrivialInWrapper) -> NonTrivialInWrapper
+
+// CHECK: mutating func nonConstPassThroughAsWrapper(_ a: Int32) -> NonTrivialInWrapper
+// CHECK: func constPassThroughAsWrapper(_ a: Int32) -> NonTrivialInWrapper

test/Interop/Cxx/class/method/methods.swift

@@ -0,0 +1,56 @@
+// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-cxx-interop)
+//
+// REQUIRES: executable_test
+//
+// Crash when running on windows: rdar://88391102
+// XFAIL: OS=windows-msvc
+
+import StdlibUnittest
+import Methods
+
+var CxxMethodTestSuite = TestSuite("CxxMethods")
+
+CxxMethodTestSuite.test("() -> Void") {
+  var instance = HasMethods()
+
+  instance.nonConstMethod()
+  instance.constMethod()
+}
+
+CxxMethodTestSuite.test("(Int) -> Int") {
+  var instance = HasMethods()
+
+  expectEqual(42, instance.nonConstPassThrough(42))
+  expectEqual(42, instance.constPassThrough(42))
+}
+
+CxxMethodTestSuite.test("(Int, Int) -> Int") {
+  var instance = HasMethods()
+
+  expectEqual(42, instance.nonConstSum(40, 2))
+  expectEqual(42, instance.constSum(40, 2))
+}
+
+// This causes a crash: rdar://88354445
+// CxxMethodTestSuite.test("(NonTrivialInWrapper, NonTrivialInWrapper) -> Int") {
+//   var instance = HasMethods()
+//
+//   expectEqual(42, instance.nonConstSum(NonTrivialInWrapper(value: 40), NonTrivialInWrapper(value: 2)))
+//   expectEqual(42, instance.constSum(NonTrivialInWrapper(value: 40), NonTrivialInWrapper(value: 2)))
+// }
+//
+// CxxMethodTestSuite.test("(NonTrivialInWrapper, NonTrivialInWrapper) -> NonTrivialInWrapper") {
+//   var instance = HasMethods()
+//
+//   expectEqual(42, instance.nonConstSumAsWrapper(NonTrivialInWrapper(value: 40), NonTrivialInWrapper(value: 2)).value)
+//   expectEqual(42, instance.constSumAsWrapper(NonTrivialInWrapper(value: 40), NonTrivialInWrapper(value: 2)).value)
+// }
+
+CxxMethodTestSuite.test("(Int) -> NonTrivialInWrapper") {
+  var instance = HasMethods()
+
+  expectEqual(42, instance.nonConstPassThroughAsWrapper(42).value)
+  expectEqual(42, instance.constPassThroughAsWrapper(42).value)
+}
+
+runAllTests()