From 0b3e8437c482a31b0fa9acd5d344351115486bf1 Mon Sep 17 00:00:00 2001
From: Charles Stoner <chucks@microsoft.com>
Date: Tue, 25 Apr 2017 12:11:58 -0700
Subject: [PATCH] PR feedback

---
 .../Attributes/AttributeTests_Experimental.cs |  1 -
 .../AttributeTests_ObsoleteAttribute.vb       | 20 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Experimental.cs b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Experimental.cs
index eeed8b26b0b..79149523739 100644
--- a/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Experimental.cs
+++ b/src/Compilers/CSharp/Test/Emit/Attributes/AttributeTests_Experimental.cs
@@ -562,7 +562,6 @@ static void Main()
                 Diagnostic(ErrorCode.ERR_DeprecatedSymbolStr, "EP").WithArguments("EP", "DP").WithLocation(20, 19));
         }
 
-        // Suppress diagnostics in unused import statements.
         [Fact]
         public void TestImportStatements()
         {
diff --git a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_ObsoleteAttribute.vb b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_ObsoleteAttribute.vb
index c435c781972..d28aecede41 100644
--- a/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_ObsoleteAttribute.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/Attributes/AttributeTests_ObsoleteAttribute.vb
@@ -760,8 +760,12 @@ End Class
 ]]>
     </file>
 </compilation>
-            CreateCompilationWithMscorlib(source).VerifyDiagnostics(
-                Diagnostic(ERRID.WRN_UseOfObsoleteSymbolNoMessage1, "A").WithArguments("A").WithLocation(11, 24))
+            Dim comp = CreateCompilationWithMscorlib(source)
+            comp.AssertTheseDiagnostics(<errors><![CDATA[
+BC40008: 'A' is obsolete.
+            Return New A()
+                       ~
+]]></errors>)
         End Sub
 
         <Fact>
@@ -826,9 +830,15 @@ End Class
 ]]>
     </file>
 </compilation>
-            CreateCompilationWithMscorlib(source).VerifyDiagnostics(
-                Diagnostic(ERRID.ERR_ObsoleteInvalidOnEventMember, "<Deprecated(Nothing, DeprecationType.Deprecate, 0)>RemoveHandler(value As EventHandler)").WithArguments("Windows.Foundation.Metadata.DeprecatedAttribute").WithLocation(31, 9),
-                Diagnostic(ERRID.WRN_UseOfObsoleteSymbolNoMessage1, "A").WithArguments("A").WithLocation(14, 19))
+            Dim comp = CreateCompilationWithMscorlib(source)
+            comp.AssertTheseDiagnostics(<errors><![CDATA[
+BC40008: 'A' is obsolete.
+            M(New A())
+                  ~
+BC31142: 'Windows.Foundation.Metadata.DeprecatedAttribute' cannot be applied to the 'AddHandler', 'RemoveHandler', or 'RaiseEvent' definitions. If required, apply the attribute directly to the event.
+        <Deprecated(Nothing, DeprecationType.Deprecate, 0)>RemoveHandler(value As EventHandler)
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+]]></errors>)
         End Sub
 
         <Fact>
-- 
GitLab