Merge pull request #2337 from austinzheng/az1

Fixing index(where:) API test

Author: gribozavr

stdlib/private/StdlibCollectionUnittest/CheckCollectionType.swift.gyb

@@ -833,9 +833,9 @@ extension TestSuite {
 
     self.test("\(testNamePrefix).index(where:)/semantics") {
       for test in findTests {
-        let c = makeWrappedCollectionWithEquatableElement(test.sequence)
         let closureLifetimeTracker = LifetimeTracked(0)
         expectEqual(1, LifetimeTracked.instances)
+        let c = makeWrappedCollectionWithEquatableElement(test.sequence)
         let result = c.index {
           (candidate) in
           _blackHole(closureLifetimeTracker)

validation-test/stdlib/Collection/LazyMapCollection.swift.gyb

@@ -44,16 +44,15 @@ CollectionTests.add${traversal}${kind}Tests(
   extractValue: { (element: LifetimeTracked) in
     OpaqueValue(element.value, identity: element.identity)
   },
-  // FIXME: use LifetimeTracked once bug is validated/fixed
-  make${kind}OfEquatable: { (elements: [MinimalEquatableValue]) -> LazyMap${traversal}${kind}<Minimal${traversal}${kind}<MinimalEquatableValue>, MinimalEquatableValue> in // -> LazyMap${traversal}${kind}<Minimal${traversal}${kind}<LifetimeTracked>, LifetimeTracked> in
+  make${kind}OfEquatable: { (elements: [LifetimeTracked]) -> LazyMap${traversal}${kind}<Minimal${traversal}${kind}<LifetimeTracked>, LifetimeTracked> in
     Minimal${traversal}${kind}(elements: elements).lazy.map { $0 }
   },
-  wrapValueIntoEquatable: identityEq, //{ (element: MinimalEquatableValue) in
-//    LifetimeTracked(element.value, identity: element.identity)
-//  },
-  extractValueFromEquatable: identityEq //{ (element: LifetimeTracked) in
-//    MinimalEquatableValue(element.value, identity: element.identity)
-//  }
+  wrapValueIntoEquatable: { (element: MinimalEquatableValue) in
+    LifetimeTracked(element.value, identity: element.identity)
+  },
+  extractValueFromEquatable: { (element: LifetimeTracked) in
+    MinimalEquatableValue(element.value, identity: element.identity)
+  }
 )
 % end