Merge pull request #19734 from lorentey/fix-optimized-crash-test

swift-ci · web-flow · commit 4f113f6610a9 · 2018-10-05T07:03:08.000-07:00
diff --git a/validation-test/stdlib/Dictionary.swift b/validation-test/stdlib/Dictionary.swift
@@ -4801,10 +4801,11 @@ DictionaryTestSuite.test("Values.MutationDoesNotInvalidateIndices") {
 
   // You should also be able to advance Cocoa indices.
   let j = d.index(after: i)
+  expectLT(i, j)
 
   // Unfortunately, Cocoa and Native indices aren't comparable, so the
   // Collection conformance is not quite perfect.
-  expectCrash(withMessage: "Comparing indexes from different dictionaries") {
+  expectCrash() {
     print(i == i2)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -4801,10 +4801,11 @@ DictionaryTestSuite.test("Values.MutationDoesNotInvalidateIndices") {`
`4801`	`4801`
`4802`	`4802`	`// You should also be able to advance Cocoa indices.`
`4803`	`4803`	`let j = d.index(after: i)`
	`4804`	`+ expectLT(i, j)`
`4804`	`4805`
`4805`	`4806`	`// Unfortunately, Cocoa and Native indices aren't comparable, so the`
`4806`	`4807`	`// Collection conformance is not quite perfect.`
`4807`		`- expectCrash(withMessage: "Comparing indexes from different dictionaries") {`
	`4808`	`+ expectCrash() {`
`4808`	`4809`	`print(i == i2)`
`4809`	`4810`	`}`
`4810`	`4811`	`}`