Added new tests for parameterized ctors

Author: fahadnayyar

test/Interop/Cxx/class/Inputs/constructors.h

@@ -307,15 +307,15 @@ __attribute__((swift_attr("release:Release10"))) DeletedCtor {
 
 struct __attribute__((swift_attr("import_reference")))
 __attribute__((swift_attr("retain:Retain11")))
-__attribute__((swift_attr("release:Release11"))) CtorWithDefaultArg {
+__attribute__((swift_attr("release:Release11"))) CtorWithDefaultArg { // expected-note {{'init(_:)' declared here}}
 public:
   int val = 1;
   CtorWithDefaultArg(int x = 2) : val(x) {}
 };
 
 struct __attribute__((swift_attr("import_reference")))
 __attribute__((swift_attr("retain:Retain12"))) __attribute__((
-    swift_attr("release:Release12"))) CtorWithDefaultAndNonDefaultArg {
+    swift_attr("release:Release12"))) CtorWithDefaultAndNonDefaultArg { // expected-note {{'init(_:_:)' declared here}}
 public:
   int val;
   CtorWithDefaultAndNonDefaultArg(int x, int y = 42) : val(x + y) {}
@@ -337,6 +337,17 @@ __attribute__((swift_attr("release:Release14"))) ParameterizedCtor {
   int val = 1;
   ParameterizedCtor(int x) : val(x) {}
 };
+
+struct __attribute__((swift_attr("import_reference")))
+__attribute__((swift_attr("retain:Retain16")))
+__attribute__((swift_attr("release:Release16"))) ParameterizedCtor2 {
+public:
+  int val1 = 1;
+  int val2 = 1;
+  ParameterizedCtor2() {};
+  ParameterizedCtor2(int x) : val1(x) {}
+  ParameterizedCtor2(int x, int y) : val1(x), val2(y) {}
+};
 } // namespace SwiftInitSynthesisForCXXRefTypes
 
 void Retain1(SwiftInitSynthesisForCXXRefTypes::CompilerGeneratedDefaultCtor
@@ -397,5 +408,9 @@ void Retain15(
     SwiftInitSynthesisForCXXRefTypes::UserProvidedStaticFactory *_Nonnull v) {};
 void Release15(
     SwiftInitSynthesisForCXXRefTypes::UserProvidedStaticFactory *_Nonnull v) {};
+void Retain16(
+    SwiftInitSynthesisForCXXRefTypes::ParameterizedCtor2 *_Nonnull v) {};
+void Release16(
+    SwiftInitSynthesisForCXXRefTypes::ParameterizedCtor2 *_Nonnull v) {};
 
 #endif // TEST_INTEROP_CXX_CLASS_INPUTS_CONSTRUCTORS_H

test/Interop/Cxx/class/constructors-diagnostics.swift

@@ -16,12 +16,6 @@ let _ = SwiftInitSynthesisForCXXRefTypes.PrivateCtor()  // expected-error {{'Swi
 let _ = SwiftInitSynthesisForCXXRefTypes.ProtectedCtor()  // expected-error {{'SwiftInitSynthesisForCXXRefTypes.ProtectedCtor' cannot be constructed because it has no accessible initializers}}
 let _ = SwiftInitSynthesisForCXXRefTypes.DeletedCtor()  // expected-error {{'SwiftInitSynthesisForCXXRefTypes.DeletedCtor' cannot be constructed because it has no accessible initializers}}
 
-let _ = SwiftInitSynthesisForCXXRefTypes.CtorWithDefaultArg()  // expected-error {{'SwiftInitSynthesisForCXXRefTypes.CtorWithDefaultArg' cannot be constructed because it has no accessible initializers}}
-let _ = SwiftInitSynthesisForCXXRefTypes.CtorWithDefaultAndNonDefaultArg()  // expected-error {{'SwiftInitSynthesisForCXXRefTypes.CtorWithDefaultAndNonDefaultArg' cannot be constructed because it has no accessible initializers}}
-
-let _ = SwiftInitSynthesisForCXXRefTypes.DefaulltAndNonDefaultCtors()
-// TODO: change the error message when we start supporting parameterised ctors
-let _ = SwiftInitSynthesisForCXXRefTypes.DefaulltAndNonDefaultCtors(2)  // expected-error {{argument passed to call that takes no arguments}}
-
-// TODO: fix the error message in this case
-let _ = SwiftInitSynthesisForCXXRefTypes.ParameterizedCtor()  // expected-error {{missing argument for parameter #1 in call}}
+// Todo: add support for default args in ctors and fix this error
+let _ = SwiftInitSynthesisForCXXRefTypes.CtorWithDefaultArg()  // expected-error {{missing argument for parameter #1 in call}}
+let _ = SwiftInitSynthesisForCXXRefTypes.CtorWithDefaultAndNonDefaultArg()  // expected-error {{missing arguments for parameters #1, #2 in call}}

test/Interop/Cxx/class/constructors-executable.swift

@@ -118,6 +118,37 @@ CxxConstructorTestSuite.test("SynthesizeAndImportStaticFactoryAsInitializer") {
   expectEqual(x7.val, 2)
   x7.val = 3
   expectEqual(x7.val, 3)
+
+  let x8 = SwiftInitSynthesisForCXXRefTypes.ParameterizedCtor2()
+  expectEqual(x8.val1, 1)
+  expectEqual(x8.val2, 1)
+  x8.val1 = 2
+  expectEqual(x8.val1, 2)
+  expectEqual(x8.val2, 1)
+
+  let y8 = SwiftInitSynthesisForCXXRefTypes.ParameterizedCtor2(2)
+  expectEqual(y8.val1, 2)
+  expectEqual(y8.val2, 1)
+  y8.val1 = 3
+  expectEqual(y8.val1, 3)
+  expectEqual(y8.val2, 1)
+
+  let z8 = SwiftInitSynthesisForCXXRefTypes.ParameterizedCtor2(2, 3)
+  expectEqual(z8.val1, 2)
+  expectEqual(z8.val2, 3)
+  z8.val1 = 4
+  z8.val2 = 5
+  expectEqual(z8.val1, 4)
+  expectEqual(z8.val2, 5)
+
+  let x9 = SwiftInitSynthesisForCXXRefTypes.DefaulltAndNonDefaultCtors()
+  expectEqual(x9.val, 1)
+  x9.val = 2
+  expectEqual(x9.val, 2)
+  let y9 = SwiftInitSynthesisForCXXRefTypes.DefaulltAndNonDefaultCtors(3)
+  expectEqual(y9.val, 3)
+  y9.val = 4
+  expectEqual(y9.val, 4)
 }
 
 runAllTests()