From 48e4dbd8a3f9baaff356c239254a308ae5b125b9 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sat, 14 Jan 2023 21:55:59 +0100 Subject: [PATCH] Streamline type aliases, centralize suppressions in unit tests --- ....D2D1.Tests.AssemblyLevelAttributes.csproj | 1 - .../ComputeSharp.D2D1.Tests.csproj | 1 - .../D2D1ResourceTextureManagerTests.cs | 7 ++--- .../D2D1TransformMapperTests.cs | 9 +++--- .../Effects/BokehBlurEffect.cs | 20 ++++++------- .../Extensions/HRESULTExtensions.cs | 5 +--- .../Helpers/D2D1Helper.cs | 30 +++++++++---------- .../Helpers/D2D1TestRunner.cs | 5 +--- .../ComputeSharp.Tests.DeviceLost.csproj | 1 - .../DeviceDisposalTests.cs | 2 -- .../GetDefaultDeviceTests.cs | 7 ++--- .../Helpers/GraphicsDeviceHelper.cs | 2 -- ...arp.Tests.DisableDynamicCompilation.csproj | 1 - ...ComputeSharp.Tests.GlobalStatements.csproj | 1 - .../ComputeSharp.Tests.Internals.csproj | 1 - .../ComputeSharp.Tests.csproj | 1 - .../InteropServicesTests.cs | 8 ++--- tests/Directory.Build.props | 8 +++++ 18 files changed, 45 insertions(+), 65 deletions(-) diff --git a/tests/ComputeSharp.D2D1.Tests.AssemblyLevelAttributes/ComputeSharp.D2D1.Tests.AssemblyLevelAttributes.csproj b/tests/ComputeSharp.D2D1.Tests.AssemblyLevelAttributes/ComputeSharp.D2D1.Tests.AssemblyLevelAttributes.csproj index fd2c5f0b4..28800d8d6 100644 --- a/tests/ComputeSharp.D2D1.Tests.AssemblyLevelAttributes/ComputeSharp.D2D1.Tests.AssemblyLevelAttributes.csproj +++ b/tests/ComputeSharp.D2D1.Tests.AssemblyLevelAttributes/ComputeSharp.D2D1.Tests.AssemblyLevelAttributes.csproj @@ -3,7 +3,6 @@ net472;netcoreapp3.1;net6.0;net7.0 false - $(NoWarn);CA1416 diff --git a/tests/ComputeSharp.D2D1.Tests/ComputeSharp.D2D1.Tests.csproj b/tests/ComputeSharp.D2D1.Tests/ComputeSharp.D2D1.Tests.csproj index 4450891e8..6b9c54021 100644 --- a/tests/ComputeSharp.D2D1.Tests/ComputeSharp.D2D1.Tests.csproj +++ b/tests/ComputeSharp.D2D1.Tests/ComputeSharp.D2D1.Tests.csproj @@ -3,7 +3,6 @@ net472;netcoreapp3.1;net6.0;net7.0 false - $(NoWarn);CS0419;CA1416 diff --git a/tests/ComputeSharp.D2D1.Tests/D2D1ResourceTextureManagerTests.cs b/tests/ComputeSharp.D2D1.Tests/D2D1ResourceTextureManagerTests.cs index 47f3c49bd..ecd7dce1c 100644 --- a/tests/ComputeSharp.D2D1.Tests/D2D1ResourceTextureManagerTests.cs +++ b/tests/ComputeSharp.D2D1.Tests/D2D1ResourceTextureManagerTests.cs @@ -12,14 +12,13 @@ using SixLabors.ImageSharp.PixelFormats; using Win32; using Win32.Graphics.Direct2D; +using HRESULT = Win32.HResult; +using D2D1_MAPPED_RECT = Win32.Graphics.Direct2D.MappedRect; -#pragma warning disable CS0649, IDE0044, IDE0065 +#pragma warning disable CS0649, IDE0044 namespace ComputeSharp.D2D1.Tests; -using HRESULT = HResult; -using D2D1_MAPPED_RECT = MappedRect; - [TestClass] [TestCategory("D2D1ResourceTextureManager")] public partial class D2D1ResourceTextureManagerTests diff --git a/tests/ComputeSharp.D2D1.Tests/D2D1TransformMapperTests.cs b/tests/ComputeSharp.D2D1.Tests/D2D1TransformMapperTests.cs index b7be77222..edf500284 100644 --- a/tests/ComputeSharp.D2D1.Tests/D2D1TransformMapperTests.cs +++ b/tests/ComputeSharp.D2D1.Tests/D2D1TransformMapperTests.cs @@ -9,15 +9,14 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Win32; using Win32.Graphics.Direct2D; +using HRESULT = Win32.HResult; +using D2D1_MAPPED_RECT = Win32.Graphics.Direct2D.MappedRect; +using Rectangle = System.Drawing.Rectangle; -#pragma warning disable CS0649, IDE0044, IDE0065 +#pragma warning disable CS0649, IDE0044 namespace ComputeSharp.D2D1.Tests; -using HRESULT = HResult; -using D2D1_MAPPED_RECT = MappedRect; -using Rectangle = System.Drawing.Rectangle; - [TestClass] [TestCategory("D2D1TransformMapper")] public partial class D2D1TransformMapperTests diff --git a/tests/ComputeSharp.D2D1.Tests/Effects/BokehBlurEffect.cs b/tests/ComputeSharp.D2D1.Tests/Effects/BokehBlurEffect.cs index 9fcd84529..ef09dc4d9 100644 --- a/tests/ComputeSharp.D2D1.Tests/Effects/BokehBlurEffect.cs +++ b/tests/ComputeSharp.D2D1.Tests/Effects/BokehBlurEffect.cs @@ -11,20 +11,18 @@ using SixLabors.ImageSharp; using Win32; using Win32.Graphics.Direct2D; - -#pragma warning disable IDE0065 +using D2D1_BORDER_EDGE_MODE = Win32.Graphics.Direct2D.BorderEdgeMode; +using D2D1_BORDER_PROP = Win32.Graphics.Direct2D.BorderProp; +using D2D1_BUFFER_PRECISION = Win32.Graphics.Direct2D.BufferPrecision; +using D2D1_COMPOSITE_MODE = Win32.Graphics.Direct2D.Common.CompositeMode; +using D2D1_COMPOSITE_PROP = Win32.Graphics.Direct2D.CompositeProp; +using D2D1_INTERPOLATION_MODE = Win32.Graphics.Direct2D.InterpolationMode; +using D2D1_PROPERTY = Win32.Graphics.Direct2D.Property; +using D2D1_MAPPED_RECT = Win32.Graphics.Direct2D.MappedRect; +using D2D1_RENDERING_CONTROLS = Win32.Graphics.Direct2D.RenderingControls; namespace ComputeSharp.D2D1.Tests.Effects; -using D2D1_BORDER_EDGE_MODE = BorderEdgeMode; -using D2D1_BORDER_PROP = BorderProp; -using D2D1_BUFFER_PRECISION = BufferPrecision; -using D2D1_COMPOSITE_MODE = Win32.Graphics.Direct2D.Common.CompositeMode; -using D2D1_COMPOSITE_PROP = CompositeProp; -using D2D1_INTERPOLATION_MODE = InterpolationMode; -using D2D1_PROPERTY = Property; -using D2D1_MAPPED_RECT = MappedRect; -using D2D1_RENDERING_CONTROLS = RenderingControls; using D2D1 = Win32.Graphics.Direct2D.Apis; /// diff --git a/tests/ComputeSharp.D2D1.Tests/Extensions/HRESULTExtensions.cs b/tests/ComputeSharp.D2D1.Tests/Extensions/HRESULTExtensions.cs index 273b8957e..9039342d7 100644 --- a/tests/ComputeSharp.D2D1.Tests/Extensions/HRESULTExtensions.cs +++ b/tests/ComputeSharp.D2D1.Tests/Extensions/HRESULTExtensions.cs @@ -4,13 +4,10 @@ using System.Diagnostics.CodeAnalysis; #endif using System.Runtime.CompilerServices; - -#pragma warning disable IDE0065 +using HRESULT = Win32.HResult; namespace ComputeSharp.D2D1.Tests.Extensions; -using HRESULT = Win32.HResult; - /// /// Helper methods to efficiently throw exceptions. /// diff --git a/tests/ComputeSharp.D2D1.Tests/Helpers/D2D1Helper.cs b/tests/ComputeSharp.D2D1.Tests/Helpers/D2D1Helper.cs index 26bd84ac5..af2943fa2 100644 --- a/tests/ComputeSharp.D2D1.Tests/Helpers/D2D1Helper.cs +++ b/tests/ComputeSharp.D2D1.Tests/Helpers/D2D1Helper.cs @@ -5,31 +5,29 @@ using Win32.Graphics.Direct2D; using Win32.Graphics.Direct3D11; using Win32.Graphics.Dxgi; - -#pragma warning disable IDE0065 - -namespace ComputeSharp.D2D1.Tests.Helpers; - using D2D1_ALPHA_MODE = Win32.Graphics.Direct2D.Common.AlphaMode; -using D2D1_BITMAP_OPTIONS = BitmapOptions; -using D2D1_DEVICE_CONTEXT_OPTIONS = DeviceContextOptions; -using D2D1_FACTORY_OPTIONS = FactoryOptions; -using D2D1_FACTORY_TYPE = FactoryType; -using D2D1_INTERPOLATION_MODE = InterpolationMode; +using D2D1_BITMAP_OPTIONS = Win32.Graphics.Direct2D.BitmapOptions; +using D2D1_DEVICE_CONTEXT_OPTIONS = Win32.Graphics.Direct2D.DeviceContextOptions; +using D2D1_FACTORY_OPTIONS = Win32.Graphics.Direct2D.FactoryOptions; +using D2D1_FACTORY_TYPE = Win32.Graphics.Direct2D.FactoryType; +using D2D1_INTERPOLATION_MODE = Win32.Graphics.Direct2D.InterpolationMode; using D2D1_COMPOSITE_MODE = Win32.Graphics.Direct2D.Common.CompositeMode; -using D2D1_MAP_OPTIONS = MapOptions; +using D2D1_MAP_OPTIONS = Win32.Graphics.Direct2D.MapOptions; using D2D_RECT_U = Win32.Numerics.Rect; using D2D1_MAPPED_RECT = Win32.Graphics.Direct2D.MappedRect; -using D2D1_BITMAP_PROPERTIES = BitmapProperties; -using D2D1_BITMAP_PROPERTIES1 = BitmapProperties1; +using D2D1_BITMAP_PROPERTIES = Win32.Graphics.Direct2D.BitmapProperties; +using D2D1_BITMAP_PROPERTIES1 = Win32.Graphics.Direct2D.BitmapProperties1; using D3D_FEATURE_LEVEL = Win32.Graphics.Direct3D.FeatureLevel; using D3D_DRIVER_TYPE = Win32.Graphics.Direct3D.DriverType; -using D3D11_CREATE_DEVICE_FLAG = CreateDeviceFlags; +using D3D11_CREATE_DEVICE_FLAG = Win32.Graphics.Direct3D11.CreateDeviceFlags; using DXGI_FORMAT = Win32.Graphics.Dxgi.Common.Format; -using Win32 = Win32.Apis; -using D2D1 = Win32.Graphics.Direct2D.Apis; using D3D11 = Win32.Graphics.Direct3D11.Apis; +namespace ComputeSharp.D2D1.Tests.Helpers; + +using D2D1 = Win32.Graphics.Direct2D.Apis; +using Win32 = Win32.Apis; + /// /// A that uses the D2D1 APIs to configure and run effects. /// diff --git a/tests/ComputeSharp.D2D1.Tests/Helpers/D2D1TestRunner.cs b/tests/ComputeSharp.D2D1.Tests/Helpers/D2D1TestRunner.cs index 2e7de96ec..919a763f6 100644 --- a/tests/ComputeSharp.D2D1.Tests/Helpers/D2D1TestRunner.cs +++ b/tests/ComputeSharp.D2D1.Tests/Helpers/D2D1TestRunner.cs @@ -6,13 +6,10 @@ using ComputeSharp.Tests.Helpers; using Win32; using Win32.Graphics.Direct2D; - -#pragma warning disable IDE0065 +using D2D1_MAPPED_RECT = Win32.Graphics.Direct2D.MappedRect; namespace ComputeSharp.D2D1.Tests.Helpers; -using D2D1_MAPPED_RECT = MappedRect; - /// /// A test helper for D2D1 pixel shaders. /// diff --git a/tests/ComputeSharp.Tests.DeviceLost/ComputeSharp.Tests.DeviceLost.csproj b/tests/ComputeSharp.Tests.DeviceLost/ComputeSharp.Tests.DeviceLost.csproj index fed652d43..6edaa6690 100644 --- a/tests/ComputeSharp.Tests.DeviceLost/ComputeSharp.Tests.DeviceLost.csproj +++ b/tests/ComputeSharp.Tests.DeviceLost/ComputeSharp.Tests.DeviceLost.csproj @@ -4,7 +4,6 @@ net472;netcoreapp3.1;net6.0;net7.0 false AnyCPU;x64;ARM64 - $(NoWarn);CA1416 diff --git a/tests/ComputeSharp.Tests.DeviceLost/DeviceDisposalTests.cs b/tests/ComputeSharp.Tests.DeviceLost/DeviceDisposalTests.cs index 477405a06..dcfb7041d 100644 --- a/tests/ComputeSharp.Tests.DeviceLost/DeviceDisposalTests.cs +++ b/tests/ComputeSharp.Tests.DeviceLost/DeviceDisposalTests.cs @@ -7,8 +7,6 @@ using Win32; using Win32.Graphics.Direct3D12; -#pragma warning disable IDE0065 - namespace ComputeSharp.Tests.DeviceLost; using Win32 = Win32.Apis; diff --git a/tests/ComputeSharp.Tests.DeviceLost/GetDefaultDeviceTests.cs b/tests/ComputeSharp.Tests.DeviceLost/GetDefaultDeviceTests.cs index c0a9bd1df..8fd0647dd 100644 --- a/tests/ComputeSharp.Tests.DeviceLost/GetDefaultDeviceTests.cs +++ b/tests/ComputeSharp.Tests.DeviceLost/GetDefaultDeviceTests.cs @@ -4,14 +4,11 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Win32; using Win32.Graphics.Direct3D12; - -#pragma warning disable IDE0065 - -namespace ComputeSharp.Tests.DeviceLost; - using DXGI = Win32.Graphics.Dxgi.Apis; using HRESULT = Win32.HResult; +namespace ComputeSharp.Tests.DeviceLost; + [TestClass] [TestCategory("GetDefaultDevice")] public class GetDefaultDeviceTests diff --git a/tests/ComputeSharp.Tests.DeviceLost/Helpers/GraphicsDeviceHelper.cs b/tests/ComputeSharp.Tests.DeviceLost/Helpers/GraphicsDeviceHelper.cs index b99e8dc2b..c27a3ccb0 100644 --- a/tests/ComputeSharp.Tests.DeviceLost/Helpers/GraphicsDeviceHelper.cs +++ b/tests/ComputeSharp.Tests.DeviceLost/Helpers/GraphicsDeviceHelper.cs @@ -5,8 +5,6 @@ using Win32; using Win32.Graphics.Direct3D12; -#pragma warning disable IDE0065 - namespace ComputeSharp.Tests.DeviceLost.Helpers; using Win32 = Win32.Apis; diff --git a/tests/ComputeSharp.Tests.DisableDynamicCompilation/ComputeSharp.Tests.DisableDynamicCompilation.csproj b/tests/ComputeSharp.Tests.DisableDynamicCompilation/ComputeSharp.Tests.DisableDynamicCompilation.csproj index beceb4894..a6298c326 100644 --- a/tests/ComputeSharp.Tests.DisableDynamicCompilation/ComputeSharp.Tests.DisableDynamicCompilation.csproj +++ b/tests/ComputeSharp.Tests.DisableDynamicCompilation/ComputeSharp.Tests.DisableDynamicCompilation.csproj @@ -4,7 +4,6 @@ net472;netcoreapp3.1;net6.0;net7.0 false AnyCPU;x64;ARM64 - $(NoWarn);CA1416 diff --git a/tests/ComputeSharp.Tests.GlobalStatements/ComputeSharp.Tests.GlobalStatements.csproj b/tests/ComputeSharp.Tests.GlobalStatements/ComputeSharp.Tests.GlobalStatements.csproj index 9aeadcfa4..4bc77446b 100644 --- a/tests/ComputeSharp.Tests.GlobalStatements/ComputeSharp.Tests.GlobalStatements.csproj +++ b/tests/ComputeSharp.Tests.GlobalStatements/ComputeSharp.Tests.GlobalStatements.csproj @@ -5,7 +5,6 @@ net472;net6.0;net7.0 AnyCPU;x64;ARM64 enable - $(NoWarn);CA1416 diff --git a/tests/ComputeSharp.Tests.Internals/ComputeSharp.Tests.Internals.csproj b/tests/ComputeSharp.Tests.Internals/ComputeSharp.Tests.Internals.csproj index e600fa9c6..9a94155a2 100644 --- a/tests/ComputeSharp.Tests.Internals/ComputeSharp.Tests.Internals.csproj +++ b/tests/ComputeSharp.Tests.Internals/ComputeSharp.Tests.Internals.csproj @@ -4,7 +4,6 @@ net472;netcoreapp3.1;net6.0;net7.0 false AnyCPU;x64;ARM64 - $(NoWarn);CA1416 diff --git a/tests/ComputeSharp.Tests/ComputeSharp.Tests.csproj b/tests/ComputeSharp.Tests/ComputeSharp.Tests.csproj index c7a556ff1..5810d1f68 100644 --- a/tests/ComputeSharp.Tests/ComputeSharp.Tests.csproj +++ b/tests/ComputeSharp.Tests/ComputeSharp.Tests.csproj @@ -4,7 +4,6 @@ net472;netcoreapp3.1;net6.0;net7.0 false AnyCPU;x64;ARM64 - $(NoWarn);CA1416 diff --git a/tests/ComputeSharp.Tests/InteropServicesTests.cs b/tests/ComputeSharp.Tests/InteropServicesTests.cs index 5dbdf7d75..8057cb534 100644 --- a/tests/ComputeSharp.Tests/InteropServicesTests.cs +++ b/tests/ComputeSharp.Tests/InteropServicesTests.cs @@ -6,14 +6,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using Win32; using Win32.Graphics.Direct3D12; - -#pragma warning disable IDE0065 - -namespace ComputeSharp.Tests; - using D3D12_RESOURCE_DIMENSION = Win32.Graphics.Direct3D12.ResourceDimension; using HRESULT = Win32.HResult; using LUID = Win32.Luid; + +namespace ComputeSharp.Tests; + using Win32 = Win32.Apis; [TestClass] diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index e190c8b27..6238d8f99 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -2,6 +2,14 @@ + + $(NoWarn);CS1591 + + + $(NoWarn);CA1416 + + + $(NoWarn);IDE0065 \ No newline at end of file