update test.

Author: nkcsgexi

test/ClangImporter/enum-dataflow.swift

@@ -7,15 +7,15 @@ import user_objc
 
 let aliasOriginal = NSAliasesEnum.byName
 
-switch aliasOriginal { // expected-error {{switch must be exhaustive, consider adding missing cases:}}
-// expected-note@-1 {{missing case: '.differentValue'}}
+switch aliasOriginal { // expected-error {{switch must be exhaustive}}
+// expected-note@-1 {{add missing case: '.differentValue'}}
 case .original:
   break
 }
 
-switch aliasOriginal { // expected-error {{switch must be exhaustive, consider adding missing cases:}}
-// expected-note@-1 {{missing case: '.original'}}
-// expected-note@-2 {{missing case: '.differentValue'}}
+switch aliasOriginal { // expected-error {{switch must be exhaustive}}
+// expected-note@-1 {{add missing case: '.original'}}
+// expected-note@-2 {{add missing case: '.differentValue'}}
 case .bySameValue:
   break
 }

test/ClangImporter/enum-error.swift

@@ -83,8 +83,8 @@ func testError() {
   switch (terr) { case .TENone, .TEOne, .TETwo: break } // ok
 
   switch (terr) { case .TENone, .TEOne: break }
-  // EXHAUSTIVE: [[@LINE-1]]:{{.+}}: error: switch must be exhaustive, consider adding missing cases
-  // EXHAUSTIVE: [[@LINE-2]]:{{.+}}: note: missing case: '.TETwo'
+  // EXHAUSTIVE: [[@LINE-1]]:{{.+}}: error: switch must be exhaustive
+  // EXHAUSTIVE: [[@LINE-2]]:{{.+}}: note: add missing case: '.TETwo'
   let _ = TestError.Code(rawValue: 2)!
 
   do {

test/ClangImporter/enum-new.swift

@@ -13,12 +13,11 @@ func test() {
   case .Yellow, .Magenta, .Black, .Cyan: break
   } // no-error
 
-  switch getColorOptions() { // expected-error {{switch must be exhaustive, consider adding a default clause}}
+  switch getColorOptions() { // expected-error {{switch must be exhaustive}} expected-note{{do you want to add a default clause?}}
   case ColorOptions.Pastel: break
   case ColorOptions.Swift: break
   }
 
-  switch 5 as Int16 { // expected-error {{switch must be exhaustive, consider adding a default clause}}
-  case Zero: break // no-error
+  switch 5 as Int16 { // expected-error {{'switch' statement body must have at least one 'case' or 'default' block; do you want to add a default case?}}
   }
 }

test/ClangImporter/swift2_warnings.swift

@@ -99,9 +99,9 @@ class X : NSDocument {
 func makeProgress<T: NSProgressReporting>(thing: T) {} // expected-error {{'NSProgressReporting' has been renamed to 'ProgressReporting'}} {{22-41=ProgressReporting}} 
 
 func useLowercasedEnumCase(x: NSRuncingMode) {
-  switch x { // expected-error {{switch must be exhaustive, consider adding missing cases:}}
-    // expected-note@-1 {{missing case: '.mince'}}
-    // expected-note@-2 {{missing case: '.quince'}}
+  switch x { // expected-error {{switch must be exhaustive}}
+    // expected-note@-1 {{add missing case: '.mince'}}
+    // expected-note@-2 {{add missing case: '.quince'}}
     case .Mince: return // expected-error {{'Mince' has been renamed to 'mince'}} {{11-16=mince}}
     case .Quince: return // expected-error {{'Quince' has been renamed to 'quince'}} {{11-17=quince}}
   }

test/stmt/statements.swift

@@ -267,7 +267,7 @@ func breakContinue(_ x : Int) -> Int {
 Outer:
   for _ in 0...1000 {
 
-  Switch: // expected-error {{switch must be exhaustive, consider adding a default clause:}}
+  Switch: // expected-error {{switch must be exhaustive}} expected-note{{do you want to add a default clause?}}
   switch x {
     case 42: break Outer
     case 97: continue Outer
@@ -299,7 +299,7 @@ Loop:  // expected-note {{previously declared here}}
   let x : Int? = 42
 
   // <rdar://problem/16879701> Should be able to pattern match 'nil' against optionals
-  switch x { // expected-error {{switch must be exhaustive, consider adding missing cases:}}
+  switch x { // expected-error {{switch must be exhaustive}}
   // expected-note@-1 {{missing case: '.some(_)'}}
   case .some(42): break
   case nil: break
@@ -452,7 +452,7 @@ enum Type {
   case Bar
 }
 func r25178926(_ a : Type) {
-  switch a { // expected-error {{switch must be exhaustive, consider adding missing cases:}}
+  switch a { // expected-error {{switch must be exhaustive}}
   // expected-note@-1 {{missing case: '.Bar'}}
   case .Foo, .Bar where 1 != 100:
     // expected-warning @-1 {{'where' only applies to the second pattern match in this case}}
@@ -461,20 +461,20 @@ func r25178926(_ a : Type) {
     break
   }
 
-  switch a { // expected-error {{switch must be exhaustive, consider adding missing cases:}}
+  switch a { // expected-error {{switch must be exhaustive}}
   // expected-note@-1 {{missing case: '.Bar'}}
   case .Foo: break
   case .Bar where 1 != 100: break
   }
 
-  switch a { // expected-error {{switch must be exhaustive, consider adding missing cases:}}
+  switch a { // expected-error {{switch must be exhaustive}}
   // expected-note@-1 {{missing case: '.Bar'}}
   case .Foo,  // no warn
        .Bar where 1 != 100:
     break
   }
 
-  switch a { // expected-error {{switch must be exhaustive, consider adding missing cases:}}
+  switch a { // expected-error {{switch must be exhaustive}}
   // expected-note@-1 {{missing case: '.Foo'}}
   // expected-note@-2 {{missing case: '.Bar'}}
   case .Foo where 1 != 100, .Bar where 1 != 100: