Adjusting some tests

Author: LucianoPAlmeida

test/ClangImporter/objc_failable_inits.swift

@@ -18,13 +18,13 @@ func testString() throws {
   // Implicitly unwrapped optional
   let stringIUO = NSString(path: "blah")
   if stringIUO == nil { }
-  _ = stringIUO as NSString?
+  _ = stringIUO as NSString? // expected-warning {{casting expression to 'NSString?' doesn't change the type}} {{17-30=}}
   let _: NSString = NSString(path: "blah")
 }
 
 func testHive() {
   let hiveIUO = Hive()
   if hiveIUO == nil { }
-  _ = hiveIUO as Hive?
+  _ = hiveIUO as Hive? // expected-warning {{casting expression to 'Hive?' doesn't change the type}} {{15-24=}}
   let _: Hive = Hive()
 }

test/Generics/generic_types.swift

@@ -191,11 +191,11 @@ var xarray : XArray = [1, 2, 3]
 // Type parameters can be referenced only via unqualified name lookup
 struct XParam<T> {
   func foo(_ x: T) {
-    _ = x as T
+    _ = x as T // expected-warning {{casting expression to 'T' doesn't change the type}} {{11-16}}
   }
 
   static func bar(_ x: T) {
-    _ = x as T
+    _ = x as T // expected-warning {{casting expression to 'T' doesn't change the type}} {{11-16}}
   }
 }
 

test/decl/protocol/req/optional.swift

@@ -144,7 +144,7 @@ func optionalPropertyGeneric<T : P1>(_ t: T) {
 
   // ... and that we can use it
   let i = propertyRef!
-  _ = i as Int
+  _ = i as Int // expected-warning {{casting expression to 'Int' doesn't change the type}} {{9-16=}}
 }
 
 // Optional subscript references in generics.
@@ -157,7 +157,7 @@ func optionalSubscriptGeneric<T : P1>(_ t: T) {
 
   // ... and that we can use it
   let i = subscriptRef!
-  _ = i as ObjCClass?
+  _ = i as ObjCClass? // expected-warning {{casting expression to 'ObjCClass?' doesn't change the type}} {{9-23=}}
 }
 
 // Optional method references in existentials.
@@ -182,7 +182,7 @@ func optionalPropertyExistential(_ t: P1) {
 
   // ... and that we can use it
   let i = propertyRef!
-  _ = i as Int
+  _ = i as Int // expected-warning {{casting expression to 'Int' doesn't change the type}} {{9-16=}}
 }
 
 // Optional subscript references in existentials.
@@ -195,7 +195,7 @@ func optionalSubscriptExistential(_ t: P1) {
 
   // ... and that we can use it
   let i = subscriptRef!
-  _ = i as ObjCClass?
+  _ = i as ObjCClass? // expected-warning {{casting expression to 'ObjCClass?' doesn't change the type}} {{9-23=}}
 }
 
 // -----------------------------------------------------------------------

test/stdlib/StringDiagnostics.swift

@@ -27,7 +27,7 @@ func testNonAmbiguousStringComparisons() {
   let s2 = "b"
   var x = false // expected-warning {{variable 'x' was written to, but never read}}
   x = s1 > s2
-  x = s1 as String > s2
+  x = s1 as String > s2 // expected-warning {{casting expression to 'String' doesn't change the type}} {{10-20=}}
 }
 
 func testAmbiguousStringComparisons(s: String) {