DI: More tests

Author: slavapestov

test/Interpreter/failable_initializers.swift

@@ -263,13 +263,28 @@ func mustFail<T>(f: () -> T?) {
   }
 }
 
+FailableInitTestSuite.test("FailableInitSuccess_Root") {
+  _ = Bear(n: 0, before: false)
+  _ = Bear(n: 0, before: false, after: false)
+}
+
 FailableInitTestSuite.test("FailableInitFailure_Root") {
   mustFail { Bear(n: 0, before: true) }
   mustFail { Bear(n: 0, after: true) }
   mustFail { Bear(n: 0, before: true, after: false) }
   mustFail { Bear(n: 0, before: false, after: true) }
 }
 
+FailableInitTestSuite.test("FailableInitSuccess_Derived") {
+  _ = PolarBear(n: 0, before: false)
+  _ = PolarBear(n: 0, during: false)
+  _ = PolarBear(n: 0, before: false, during: false)
+  _ = PolarBear(n: 0, after: false)
+  _ = PolarBear(n: 0, during: false, after: false)
+  _ = PolarBear(n: 0, before: false, after: false)
+  _ = PolarBear(n: 0, before: false, during: false, after: false)
+}
+
 FailableInitTestSuite.test("FailableInitFailure_Derived") {
   mustFail { PolarBear(n: 0, before: true) }
   mustFail { PolarBear(n: 0, during: true) }
@@ -285,10 +300,27 @@ FailableInitTestSuite.test("FailableInitFailure_Derived") {
   mustFail { PolarBear(n: 0, before: false, during: false, after: true) }
 }
 
+FailableInitTestSuite.test("DesignatedInitSuccess_DerivedGeneric") {
+  _ = GuineaPig<LifetimeTracked>(t: LifetimeTracked(0), during: false)
+}
+
 FailableInitTestSuite.test("DesignatedInitFailure_DerivedGeneric") {
   mustFail { GuineaPig<LifetimeTracked>(t: LifetimeTracked(0), during: true) }
 }
 
+FailableInitTestSuite.test("ConvenienceInitSuccess_Root") {
+  _ = Bear(before: false)
+  _ = Bear(during: false)
+  _ = Bear(before: false, during: false)
+  _ = Bear(after: false)
+  _ = Bear(before: false, after: false)
+  _ = Bear(during: false, after: false)
+  _ = Bear(before: false, during: false, after: false)
+
+  _ = Bear(IUO: false)
+  _ = Bear(force: false)
+}
+
 FailableInitTestSuite.test("ConvenienceInitFailure_Root") {
   mustFail { Bear(before: true) }
   mustFail { Bear(during: true) }
@@ -307,6 +339,16 @@ FailableInitTestSuite.test("ConvenienceInitFailure_Root") {
   _ = Bear(force: false)
 }
 
+FailableInitTestSuite.test("ConvenienceInitSuccess_Derived") {
+  _ = PolarBear(before: false)
+  _ = PolarBear(during: false)
+  _ = PolarBear(before: false, during: false)
+  _ = PolarBear(after: false)
+  _ = PolarBear(before: false, after: false)
+  _ = PolarBear(during: false, after: false)
+  _ = PolarBear(before: false, during: false, after: false)
+}
+
 FailableInitTestSuite.test("ConvenienceInitFailure_Derived") {
   mustFail { PolarBear(before: true) }
   mustFail { PolarBear(during: true) }

test/Interpreter/objc_throwing_initializers.swift

@@ -196,6 +196,14 @@ func mustThrow<T>(_ f: () throws -> T) {
   } catch {}
 }
 
+ThrowingInitTestSuite.test("DesignatedInitSuccess_Root") {
+  _ = try! Bear(n: 0, before: false)
+  _ = try! Bear(n: 0, after: false)
+  _ = try! Bear(n: 0, before: false, after: false)
+  _ = try! Bear(n: 0, before: false, after: false)
+  expectEqual(NSLifetimeTracked.count(), 0)
+}
+
 ThrowingInitTestSuite.test("DesignatedInitFailure_Root") {
   mustThrow { try Bear(n: 0, before: true) }
   mustThrow { try Bear(n: 0, after: true) }
@@ -204,6 +212,17 @@ ThrowingInitTestSuite.test("DesignatedInitFailure_Root") {
   expectEqual(NSLifetimeTracked.count(), 0)
 }
 
+ThrowingInitTestSuite.test("DesignatedInitSuccess_Derived") {
+  _ = try! PolarBear(n: 0, before: false)
+  _ = try! PolarBear(n: 0, during: false)
+  _ = try! PolarBear(n: 0, before: false, during: false)
+  _ = try! PolarBear(n: 0, after: false)
+  _ = try! PolarBear(n: 0, during: false, after: false)
+  _ = try! PolarBear(n: 0, before: false, after: false)
+  _ = try! PolarBear(n: 0, before: false, during: false, after: false)
+  expectEqual(NSLifetimeTracked.count(), 0)
+}
+
 ThrowingInitTestSuite.test("DesignatedInitFailure_Derived") {
   mustThrow { try PolarBear(n: 0, before: true) }
   mustThrow { try PolarBear(n: 0, during: true) }
@@ -220,11 +239,30 @@ ThrowingInitTestSuite.test("DesignatedInitFailure_Derived") {
   expectEqual(NSLifetimeTracked.count(), 0)
 }
 
+ThrowingInitTestSuite.test("DesignatedInitSuccess_DerivedGeneric") {
+  _ = try! GuineaPig(t: LifetimeTracked(0), during: false)
+  expectEqual(NSLifetimeTracked.count(), 0)
+}
+
 ThrowingInitTestSuite.test("DesignatedInitFailure_DerivedGeneric") {
   mustThrow { try GuineaPig(t: LifetimeTracked(0), during: true) }
   expectEqual(NSLifetimeTracked.count(), 0)
 }
 
+ThrowingInitTestSuite.test("ConvenienceInitSuccess_Root") {
+  _ = try! Bear(before: false)
+  _ = try! Bear(before2: false)
+  _ = try! Bear(before: false, before2: false)
+  _ = try! Bear(during: false)
+  _ = try! Bear(before: false, during: false)
+  _ = try! Bear(after: false)
+  _ = try! Bear(before: false, after: false)
+  _ = try! Bear(during: false, after: false)
+  _ = try! Bear(before: false, during: false, after: false)
+  _ = try! Bear(before: false, before2: false, during: false, after: false)
+  expectEqual(NSLifetimeTracked.count(), 0)
+}
+
 ThrowingInitTestSuite.test("ConvenienceInitFailure_Root") {
   mustThrow { try Bear(before: true) }
   mustThrow { try Bear(before2: true) }
@@ -248,6 +286,20 @@ ThrowingInitTestSuite.test("ConvenienceInitFailure_Root") {
   expectEqual(NSLifetimeTracked.count(), 0)
 }
 
+ThrowingInitTestSuite.test("ConvenienceInitSuccess_Derived") {
+  _ = try! PolarBear(before: false)
+  _ = try! PolarBear(before2: false)
+  _ = try! PolarBear(before: false, before2: false)
+  _ = try! PolarBear(during: false)
+  _ = try! PolarBear(before: false, during: false)
+  _ = try! PolarBear(after: false)
+  _ = try! PolarBear(before: false, after: false)
+  _ = try! PolarBear(during: false, after: false)
+  _ = try! PolarBear(before: false, during: false, after: false)
+  _ = try! PolarBear(before: false, before2: false, during: false, after: false)
+  expectEqual(NSLifetimeTracked.count(), 0)
+}
+
 ThrowingInitTestSuite.test("ConvenienceInitFailure_Derived") {
   mustThrow { try PolarBear(before: true) }
   mustThrow { try PolarBear(before2: true) }

test/Interpreter/protocol_extensions.swift

@@ -350,98 +350,4 @@ ProtocolExtensionTestSuite.test("WitnessSelf") {
   }
 }
 
-protocol TrivialInit {
-  init()
-  init(throws: Bool) throws
-}
-
-enum SillyError : Error {
-  case error
-}
-
-struct TrivialInitStruct : TrivialInit {
-  let l = LifetimeTracked(0)
-
-  init() {}
-
-  init(throws: Bool) throws {
-    if `throws` {
-      throw SillyError.error
-    }
-  }
-}
-
-extension TrivialInit {
-  init(throwsFirst: Bool, throwsSecond: Bool, initThenInit: ()) throws {
-    try self.init(throws: throwsFirst)
-    try self.init(throws: throwsSecond)
-  }
-
-  init(throwsFirst: Bool, throwsSecond: Bool, initThenAssign: ()) throws {
-    try self.init(throws: throwsFirst)
-    self = try Self(throws: throwsSecond)
-  }
-
-  init(throwsFirst: Bool, throwsSecond: Bool, assignThenInit: ()) throws {
-    self = try Self(throws: throwsFirst)
-    try self.init(throws: throwsSecond)
-  }
-
-  init(throwsFirst: Bool, throwsSecond: Bool, assignThenAssign: ()) throws {
-    self = try Self(throws: throwsFirst)
-    try self.init(throws: throwsSecond)
-  }
-}
-
-ProtocolExtensionTestSuite.test("ExtensionInitializer") {
-  do {
-    _ = try TrivialInitStruct(throwsFirst: false, throwsSecond: false, initThenInit: ())
-    _ = try TrivialInitStruct(throwsFirst: false, throwsSecond: false, initThenAssign: ())
-    _ = try TrivialInitStruct(throwsFirst: false, throwsSecond: false, assignThenInit: ())
-    _ = try TrivialInitStruct(throwsFirst: false, throwsSecond: false, assignThenAssign: ())
-  } catch {
-    preconditionFailure()
-  }
-
-  do {
-    _ = try TrivialInitStruct(throwsFirst: true, throwsSecond: false, initThenInit: ())
-    preconditionFailure()
-  } catch { }
-
-  do {
-    _ = try TrivialInitStruct(throwsFirst: false, throwsSecond: true, initThenInit: ())
-    preconditionFailure()
-  } catch { }
-
-  do {
-    _ = try TrivialInitStruct(throwsFirst: true, throwsSecond: false, initThenAssign: ())
-    preconditionFailure()
-  } catch { }
-
-  do {
-    _ = try TrivialInitStruct(throwsFirst: false, throwsSecond: true, initThenAssign: ())
-    preconditionFailure()
-  } catch { }
-
-  do {
-    _ = try TrivialInitStruct(throwsFirst: true, throwsSecond: false, assignThenInit: ())
-    preconditionFailure()
-  } catch { }
-
-  do {
-    _ = try TrivialInitStruct(throwsFirst: false, throwsSecond: true, assignThenInit: ())
-    preconditionFailure()
-  } catch { }
-
-  do {
-    _ = try TrivialInitStruct(throwsFirst: true, throwsSecond: false, assignThenAssign: ())
-    preconditionFailure()
-  } catch { }
-
-  do {
-    _ = try TrivialInitStruct(throwsFirst: false, throwsSecond: true, assignThenAssign: ())
-    preconditionFailure()
-  } catch { }
-}
-
 runAllTests()