Merge pull request #1971 from stephentoub/cc_exclude_tests

stephentoub · stephentoub · commit b4d3960b8b0f · 2015-06-09T18:26:30.000-04:00
Exclude XML test assemblies from code coverage
diff --git a/src/Common/src/System/Diagnostics/CodeAnalysis/ExcludeFromCodeCoverageAttribute.cs b/src/Common/src/System/Diagnostics/CodeAnalysis/ExcludeFromCodeCoverageAttribute.cs
@@ -3,9 +3,8 @@
 
 namespace System.Diagnostics.CodeAnalysis
 {
-    // Missing from .NET for Windows store, NET 4.5
     [AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = false)]
     internal sealed class ExcludeFromCodeCoverageAttribute : Attribute
     {
     }
-}
+}
diff --git a/src/Common/tests/SystemXml/ModuleCore/ModuleCore.csproj b/src/Common/tests/SystemXml/ModuleCore/ModuleCore.csproj
@@ -26,6 +26,7 @@
     <Compile Include="ctestmodule.cs" />
     <Compile Include="cvariation.cs" />
     <Compile Include="interop.cs" />
+    <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/src/Common/tests/SystemXml/ModuleCore/ccommon.cs b/src/Common/tests/SystemXml/ModuleCore/ccommon.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Diagnostics;		//Assert
 
+[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+
 namespace OLEDB.Test.ModuleCore
 {
     ////////////////////////////////////////////////////////////////
diff --git a/src/Common/tests/SystemXml/XmlCoreTest/MiscUtil.cs b/src/Common/tests/SystemXml/XmlCoreTest/MiscUtil.cs
@@ -3,6 +3,8 @@
 
 using System;
 
+[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+
 namespace XmlCoreTest.Common
 {
     public static class MiscUtil
diff --git a/src/Common/tests/SystemXml/XmlCoreTest/XmlCoreTest.csproj b/src/Common/tests/SystemXml/XmlCoreTest/XmlCoreTest.csproj
@@ -24,6 +24,7 @@
     <Compile Include="UnicodeCharHelper.cs" />
     <Compile Include="WriterFactory.cs" />
     <Compile Include="TestData.g.cs" />
+    <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/System.Collections.Immutable/src/System.Collections.Immutable.csproj
@@ -96,10 +96,12 @@
     <Compile Include="System\Collections\Immutable\KeysOrValuesCollectionAccessor.cs" />
     <Compile Include="System\Collections\Immutable\RefAsValueType.cs" />
     <Compile Include="System\Collections\Immutable\SecureObjectPool.cs" />
-    <Compile Include="System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
     <Compile Include="System\Linq\ImmutableArrayExtensions.cs" />
     <Compile Include="Validation\Requires.cs" />
     <Compile Include="Validation\ValidatedNotNullAttribute.cs" />
+    <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs">
+      <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="Interfaces.cd" />
diff --git a/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/CommonTests.cs b/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/CommonTests.cs
diff --git a/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj b/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj
@@ -53,6 +53,7 @@
     <Compile Include="XmlFactoryWriterTests.cs" />
     <Compile Include="XmlWriterTestCaseBase.cs" />
     <Compile Include="XmlWriterTestModule.cs" />
+    <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj b/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{507DB29F-74F5-4B34-A240-ABE7BD168DF6}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AssemblyName>System.Xml.RW.XmlReaderDisposeTests</AssemblyName>
-    <RootNamespace>XMLTests.ReaderWriter.DisposeTests</RootNamespace>
+    <AssemblyName>System.Xml.RW.XmlReader.Tests</AssemblyName>
+    <RootNamespace>XMLTests.ReaderWriter.Tests</RootNamespace>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/System.Xml.ReaderWriter/tests/XmlReaderLib/CommonTest.cs b/src/System.Xml.ReaderWriter/tests/XmlReaderLib/CommonTest.cs
@@ -10,6 +10,8 @@
 using XmlCoreTest.Common;
 using OLEDB.Test.ModuleCore;
 
+[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+
 namespace XmlReaderTest.Common
 {
     ////////////////////////////////////////////////////////////////
diff --git a/src/System.Xml.ReaderWriter/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj b/src/System.Xml.ReaderWriter/tests/XmlReaderLib/System.Xml.RW.XmlReaderLib.csproj
@@ -82,6 +82,7 @@
     <Compile Include="TCXmlSpace.cs" />
     <Compile Include="TestFiles.cs" />
     <Compile Include="XmlException.cs" />
+    <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/src/System.Xml.XDocument/tests/XDocument.Common/HelperExtensionMethods.cs b/src/System.Xml.XDocument/tests/XDocument.Common/HelperExtensionMethods.cs
@@ -11,6 +11,8 @@
 
 using Microsoft.Test.ModuleCore;
 
+[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+
 namespace CoreXml.Test.XLinq
 {
     public static class Helpers
diff --git a/src/System.Xml.XDocument/tests/XDocument.Common/XDocument.Common.csproj b/src/System.Xml.XDocument/tests/XDocument.Common/XDocument.Common.csproj
@@ -24,6 +24,7 @@
     <Compile Include="InputSpace.cs" />
     <Compile Include="ManagedNodeWriter.cs" />
     <Compile Include="XLinqTestCase.cs" />
+    <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(CommonTestPath)\SystemXml\XmlCoreTest\XmlCoreTest.csproj">
diff --git a/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj b/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj
@@ -28,6 +28,7 @@
     <Compile Include="testspec.cs" />
     <Compile Include="testvariation.cs" />
     <Compile Include="util.cs" />
+    <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\System.Xml.XDocument.csproj">
diff --git a/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/util.cs b/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/util.cs
@@ -4,6 +4,8 @@
 using System;
 using System.Collections.Generic;
 
+[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+
 namespace Microsoft.Test.ModuleCore
 {
     ////////////////////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,8 @@`
`3`	`3`
`4`	`4`	`namespace System.Diagnostics.CodeAnalysis`
`5`	`5`	`{`
`6`		`- // Missing from .NET for Windows store, NET 4.5`
`7`	`6`	`[AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = false)]`
`8`	`7`	`internal sealed class ExcludeFromCodeCoverageAttribute : Attribute`
`9`	`8`	`{`
`10`	`9`	`}`
`11`		`-}`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.Diagnostics; //Assert`
`6`	`6`
	`7`	`+[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]`
	`8`	`+`
`7`	`9`	`namespace OLEDB.Test.ModuleCore`
`8`	`10`	`{`
`9`	`11`	`////////////////////////////////////////////////////////////////`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`
`4`	`4`	`using System;`
`5`	`5`
	`6`	`+[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]`
	`7`	`+`
`6`	`8`	`namespace XmlCoreTest.Common`
`7`	`9`	`{`
`8`	`10`	`public static class MiscUtil`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`using XmlCoreTest.Common;`
`11`	`11`	`using OLEDB.Test.ModuleCore;`
`12`	`12`
	`13`	`+[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]`
	`14`	`+`
`13`	`15`	`namespace XmlReaderTest.Common`
`14`	`16`	`{`
`15`	`17`	`////////////////////////////////////////////////////////////////`