Update dictionary tests

Author: natecook1000

validation-test/stdlib/Dictionary.swift

@@ -1180,10 +1180,12 @@ DictionaryTestSuite.test("COW.Fast.ValuesAccessDoesNotReallocate") {
   assert(d1.values[i] == 1010)
   assert(d1[i] == (10, 1010))
 
+#if swift(>=4.0)
   d2.values[i] += 1
   assert(d2.values[i] == 1011)
   assert(d2[10]! == 1011)
   assert(identity1 != d2._rawIdentifier())
+#endif
 
   assert(d1[10]! == 1010)
   assert(identity1 == d1._rawIdentifier())
@@ -1242,8 +1244,10 @@ DictionaryTestSuite.test("COW.Fast.KeysAccessDoesNotReallocate") {
     // keys.index(of:) - O(1) bucket + linear search
     MinimalHashableValue.timesEqualEqualWasCalled = 0
     let l = d2.keys.index(of: lastKey)!
+#if swift(>=4.0)
     expectLE(MinimalHashableValue.timesEqualEqualWasCalled, 4)
-    
+#endif
+
     expectEqual(j, k)
     expectEqual(k, l)
   }

validation-test/stdlib/HashedCollectionFilter3.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-stdlib-swift
+// RUN: %target-run-stdlib-swift -swift-version 3
 // REQUIRES: executable_test
 
 import StdlibUnittest
@@ -21,14 +21,16 @@ FilterTestSuite.test("Dictionary.keys -> LazyMapCollection") {
   let d = [10: 1010, 20: 1020, 30: 1030, 40: 1040]
   // .keys should produce a LazyMapCollection in Swift 3
   let f: Any = d.keys
-  expectEqual(4, f.count)
+  let g = f as! LazyMapCollection<[Int: Int], Int>
+  expectEqual(4, g.count)
 }
 
 FilterTestSuite.test("Dictionary.values -> LazyMapCollection") {
   let d = [10: 1010, 20: 1020, 30: 1030, 40: 1040]
   // .values should produce a LazyMapCollection in Swift 3
   let f: Any = d.values
-  expectEqual(4, f.count)
+  let g = f as! LazyMapCollection<[Int: Int], Int>
+  expectEqual(4, g.count)
 }
 
 runAllTests()

validation-test/stdlib/HashedCollectionFilter4.swift

@@ -10,14 +10,14 @@ FilterTestSuite.test("Dictionary.filter(_:) -> [Key: Value]")
 {
   let d = [10: 1010, 20: 1020, 30: 1030, 40: 1040]
   // filter(_:) should produce a dictionary in Swift 4
-  let f: Any = d.filter { (k, v) in k > 20 }
+  let f: Any = d.filter { $0.key > 20 }
   expectTrue(f is [Int: Int])
 }
 
 FilterTestSuite.test("Dictionary.filter(_:) -> [(Key, Value)] available") {
   let d = [10: 1010, 20: 1020, 30: 1030, 40: 1040]
   // The Array-returning version from Sequence should still be accessible
-  let f: [(Int, Int)] = d.filter { (k, v) in k > 20 }
+  let f: [(Int, Int)] = d.filter { $0.key > 20 }
   expectEqual(2, f.count)
 }
 
@@ -37,14 +37,18 @@ FilterTestSuite.test("Set.filter(_:) -> [Element] available") {
   expectEqual(2, f.count)
 }
 
-FilterTestSuite.test("Dictionary.keys -> Keys") {
+FilterTestSuite.test("Dictionary.keys -> Keys")
+  .xfail(.always("Not actually running under Swift 4")).code
+{
   let d = [10: 1010, 20: 1020, 30: 1030, 40: 1040]
   // .keys should produce a Dictionary.Keys in Swift 4
   let f: Any = d.keys
   expectTrue(f is Dictionary<Int, Int>.Keys)
 }
 
-FilterTestSuite.test("Dictionary.values -> Values") {
+FilterTestSuite.test("Dictionary.values -> Values")
+  .xfail(.always("Not actually running under Swift 4")).code
+{
   let d = [10: 1010, 20: 1020, 30: 1030, 40: 1040]
   // .values should produce a Dictionary.Values in Swift 4
   let f: Any = d.values