Revert "Fix warnings"

brianpopow · brianpopow · commit d617c40158a9 · 2021-10-08T15:16:32.000+02:00
This reverts commit 2b7fec7.
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawBeziers.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawBeziers.cs
@@ -12,7 +12,7 @@
 using SixLabors.ImageSharp.Processing;
 using SDPointF = System.Drawing.PointF;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
+namespace SixLabors.ImageSharp.Drawing.Benchmarks
 {
     public class DrawBeziers
     {
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawPolygon.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawPolygon.cs
@@ -14,9 +14,10 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SkiaSharp;
+using SDPoint = System.Drawing.Point;
 using SDPointF = System.Drawing.PointF;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
+namespace SixLabors.ImageSharp.Drawing.Benchmarks
 {
     public abstract class DrawPolygon
     {
@@ -25,7 +26,7 @@ public abstract class DrawPolygon
         private Image<Rgba32> image;
 
         private SDPointF[][] sdPoints;
-        private Bitmap sdBitmap;
+        private System.Drawing.Bitmap sdBitmap;
         private Graphics sdGraphics;
 
         private SKPath skPath;
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawText.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawText.cs
@@ -13,7 +13,7 @@
 using SDFont = System.Drawing.Font;
 using SDRectangleF = System.Drawing.RectangleF;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
+namespace SixLabors.ImageSharp.Drawing.Benchmarks
 {
     [MemoryDiagnoser]
     public class DrawText
@@ -42,7 +42,7 @@ public class DrawText
         public void Setup()
         {
             this.image = new Image<Rgba32>(Width, Height);
-            this.sdBitmap = new SDBitmap(Width, Height);
+            this.sdBitmap = new Bitmap(Width, Height);
             this.sdGraphics = Graphics.FromImage(this.sdBitmap);
             this.sdGraphics.InterpolationMode = InterpolationMode.Default;
             this.sdGraphics.SmoothingMode = SmoothingMode.AntiAlias;
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawTextOutline.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/DrawTextOutline.cs
@@ -11,7 +11,7 @@
 
 using SDRectangleF = System.Drawing.RectangleF;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
+namespace SixLabors.ImageSharp.Drawing.Benchmarks
 {
     [MemoryDiagnoser]
     public class DrawTextOutline
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillPathGradientBrush.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillPathGradientBrush.cs
@@ -1,12 +1,12 @@
-// Copyright (c) Six Labors.
+﻿// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using BenchmarkDotNet.Attributes;
 using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
+namespace SixLabors.ImageSharp.Drawing.Benchmarks
 {
     public class FillPathGradientBrush
     {
@@ -23,11 +23,8 @@ public void FillGradientBrush_ImageSharp()
         {
             var star = new Star(50, 50, 5, 20, 45);
             PointF[] points = star.Points.ToArray();
-            Color[] colors =
-            {
-                Color.Red, Color.Yellow, Color.Green, Color.Blue, Color.Purple,
-                Color.Red, Color.Yellow, Color.Green, Color.Blue, Color.Purple
-            };
+            Color[] colors = { Color.Red, Color.Yellow, Color.Green, Color.Blue, Color.Purple,
+                Color.Red, Color.Yellow, Color.Green, Color.Blue, Color.Purple };
 
             var brush = new PathGradientBrush(points, colors, Color.White);
 
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillPolygon.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillPolygon.cs
@@ -18,7 +18,7 @@
 using SDBitmap = System.Drawing.Bitmap;
 using SDPointF = System.Drawing.PointF;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
+namespace SixLabors.ImageSharp.Drawing.Benchmarks
 {
     public abstract class FillPolygon
     {
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillRectangle.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillRectangle.cs
@@ -12,7 +12,7 @@
 using SDRectangle = System.Drawing.Rectangle;
 using SDSize = System.Drawing.Size;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
+namespace SixLabors.ImageSharp.Drawing.Benchmarks
 {
     public class FillRectangle
     {
diff --git a/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillWithPattern.cs b/tests/ImageSharp.Drawing.Benchmarks/Drawing/FillWithPattern.cs
@@ -11,7 +11,7 @@
 using CoreBrushes = SixLabors.ImageSharp.Drawing.Processing.Brushes;
 using SDRectangle = System.Drawing.Rectangle;
 
-namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing
+namespace SixLabors.ImageSharp.Drawing.Benchmarks
 {
     public class FillWithPattern
     {
diff --git a/tests/ImageSharp.Drawing.Tests/Drawing/DrawingProfilingBenchmarks.cs b/tests/ImageSharp.Drawing.Tests/Drawing/DrawingProfilingBenchmarks.cs
@@ -46,9 +46,9 @@ static PointF[][] GetPoints(FeatureCollection features)
         [InlineData(IntersectionRule.Nonzero)]
         public void FillPolygon(IntersectionRule intersectionRule)
         {
-            const int times = 100;
+            const int Times = 100;
 
-            for (int i = 0; i < times; i++)
+            for (int i = 0; i < Times; i++)
             {
                 this.image.Mutate(c =>
                 {
@@ -69,13 +69,13 @@ public void FillPolygon(IntersectionRule intersectionRule)
         [InlineData(10)]
         public void DrawText(int textIterations)
         {
-            const int times = 20;
-            const string textPhrase = "asdfghjkl123456789{}[]+$%?";
-            string textToRender = string.Join("/n", Enumerable.Repeat(textPhrase, textIterations));
+            const int Times = 20;
+            const string TextPhrase = "asdfghjkl123456789{}[]+$%?";
+            string textToRender = string.Join("/n", Enumerable.Repeat(TextPhrase, textIterations));
 
             Font font = SystemFonts.CreateFont("Arial", 12);
 
-            for (int i = 0; i < times; i++)
+            for (int i = 0; i < Times; i++)
             {
                 this.image.Mutate(x => x
                     .SetGraphicsOptions(o => o.Antialias = true)
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/BezierLineSegmentTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/BezierLineSegmentTests.cs
@@ -6,7 +6,7 @@
 using System.Numerics;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
+namespace SixLabors.ImageSharp.Drawing.Tests
 {
     public class BezierLineSegmentTests
     {
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/EllipseTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/EllipseTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
+namespace SixLabors.ImageSharp.Drawing.Tests
 {
     public class EllipseTests
     {
@@ -13,7 +13,7 @@ public class EllipseTests
         [InlineData(0, true)]
         [InlineData(0.00001, false)]
         [InlineData(1, false)]
-        public void WidthMustBeGreaterThan0(float width, bool throws)
+        public void WidthMustBeGreateThan0(float width, bool throws)
         {
             if (throws)
             {
@@ -33,7 +33,7 @@ public void WidthMustBeGreaterThan0(float width, bool throws)
         [InlineData(0, true)]
         [InlineData(0.00001, false)]
         [InlineData(1, false)]
-        public void HeightMustBeGreaterThan0(float height, bool throws)
+        public void HeightMustBeGreateThan0(float height, bool throws)
         {
             if (throws)
             {
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/EllipticalArcLineSegmentTest.cs b/tests/ImageSharp.Drawing.Tests/Shapes/EllipticalArcLineSegmentTest.cs
@@ -5,12 +5,12 @@
 using System.Numerics;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
+namespace SixLabors.ImageSharp.Drawing.Tests
 {
     public class EllipticalArcLineSegmentTest
     {
         [Fact]
-        public void ContainsStartAndEnd()
+        public void ContainsStartandEnd()
         {
             var segment = new EllipticalArcLineSegment(10, 10, 10, 20, 0, 0, 90, Matrix3x2.Identity);
             IReadOnlyList<PointF> points = segment.Flatten().ToArray();
@@ -21,7 +21,7 @@ public void ContainsStartAndEnd()
         }
 
         [Fact]
-        public void CheckZeroRadii()
+        public void checkZeroRadii()
         {
             IReadOnlyCollection<PointF> xRadiusZero = new EllipticalArcLineSegment(20, 10, 0, 20, 0, 0, 360, Matrix3x2.Identity).Flatten().ToArray();
             IReadOnlyCollection<PointF> yRadiusZero = new EllipticalArcLineSegment(20, 10, 30, 0, 0, 0, 360, Matrix3x2.Identity).Flatten().ToArray();
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/InternalPathTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/InternalPathTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
+namespace SixLabors.ImageSharp.Drawing.Tests
 {
     /// <summary>
     /// The internal path tests.
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/LinearLineSegmentTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/LinearLineSegmentTests.cs
@@ -6,7 +6,7 @@
 using System.Numerics;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
+namespace SixLabors.ImageSharp.Drawing.Tests
 {
     public class LinearLineSegmentTests
     {
@@ -21,12 +21,15 @@ public void SingleSegmentConstructor()
         }
 
         [Fact]
-        public void MustHaveAtLeast2Points()
+        public void MustHaveAtleast2Points()
         {
             ArgumentOutOfRangeException error = Assert.Throws<ArgumentOutOfRangeException>(() => new LinearLineSegment(new[] { new PointF(0, 0) }));
         }
 
         [Fact]
-        public void NullPointsArrayThrowsCountException() => Assert.ThrowsAny<ArgumentNullException>(() => new LinearLineSegment(null));
+        public void NullPointsArrayThrowsCountException()
+        {
+            Assert.ThrowsAny<ArgumentNullException>(() => new LinearLineSegment(null));
+        }
     }
 }
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/PathBuilderTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/PathBuilderTests.cs
@@ -6,7 +6,7 @@
 using System.Numerics;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
+namespace SixLabors.ImageSharp.Drawing.Tests
 {
     public class PathBuilderTests
     {
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/PathExtentionTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/PathExtentionTests.cs
@@ -6,11 +6,11 @@
 using Moq;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
+namespace SixLabors.ImageSharp.Drawing.Tests
 {
     public class PathExtentionTests
     {
-        private readonly RectangleF bounds;
+        private RectangleF bounds;
         private readonly Mock<IPath> mockPath;
 
         public PathExtentionTests()
@@ -23,39 +23,39 @@ public PathExtentionTests()
         [Fact]
         public void RotateInRadians()
         {
-            const float angle = (float)Math.PI;
+            const float Angle = (float)Math.PI;
 
             this.mockPath.Setup(x => x.Transform(It.IsAny<Matrix3x2>()))
                 .Callback<Matrix3x2>(m =>
                 {
                     // validate matrix in here
-                    var targetMatrix = Matrix3x2.CreateRotation(angle, RectangleF.Center(this.bounds));
+                    var targetMatrix = Matrix3x2.CreateRotation(Angle, RectangleF.Center(this.bounds));
 
                     Assert.Equal(targetMatrix, m);
                 }).Returns(this.mockPath.Object);
 
-            this.mockPath.Object.Rotate(angle);
+            this.mockPath.Object.Rotate(Angle);
 
             this.mockPath.Verify(x => x.Transform(It.IsAny<Matrix3x2>()), Times.Once);
         }
 
         [Fact]
         public void RotateInDegrees()
         {
-            const float angle = 90;
+            const float Angle = 90;
 
             this.mockPath.Setup(x => x.Transform(It.IsAny<Matrix3x2>()))
                 .Callback<Matrix3x2>(m =>
                 {
                     // validate matrix in here
-                    const float radians = (float)(Math.PI * angle / 180.0);
+                    const float Radians = (float)(Math.PI * Angle / 180.0);
 
-                    var targetMatrix = Matrix3x2.CreateRotation(radians, RectangleF.Center(this.bounds));
+                    var targetMatrix = Matrix3x2.CreateRotation(Radians, RectangleF.Center(this.bounds));
 
                     Assert.Equal(targetMatrix, m);
                 }).Returns(this.mockPath.Object);
 
-            this.mockPath.Object.RotateDegree(angle);
+            this.mockPath.Object.RotateDegree(Angle);
 
             this.mockPath.Verify(x => x.Transform(It.IsAny<Matrix3x2>()), Times.Once);
         }
@@ -82,19 +82,19 @@ public void TranslateVector()
         [Fact]
         public void TranslateXY()
         {
-            const float x = 76;
-            const float y = 7;
+            const float X = 76;
+            const float Y = 7;
 
             this.mockPath.Setup(p => p.Transform(It.IsAny<Matrix3x2>()))
                 .Callback<Matrix3x2>(m =>
                 {
                     // validate matrix in here
-                    var targetMatrix = Matrix3x2.CreateTranslation(new Vector2(x, y));
+                    var targetMatrix = Matrix3x2.CreateTranslation(new Vector2(X, Y));
 
                     Assert.Equal(targetMatrix, m);
                 }).Returns(this.mockPath.Object);
 
-            this.mockPath.Object.Translate(x, y);
+            this.mockPath.Object.Translate(X, Y);
 
             this.mockPath.Verify(p => p.Transform(It.IsAny<Matrix3x2>()), Times.Once);
         }
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/PathTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/PathTests.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
+namespace SixLabors.ImageSharp.Drawing.Tests
 {
     /// <summary>
     /// The internal path tests.
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/PolygonTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/PolygonTests.cs
@@ -5,12 +5,12 @@
 using System.Linq;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
+namespace SixLabors.ImageSharp.Drawing.Tests
 {
     public class PolygonTests
     {
         public static TheoryData<TestPoint[], TestPoint, bool> PointInPolygonTheoryData =
-            new ()
+            new TheoryData<TestPoint[], TestPoint, bool>
             {
                 {
                     new TestPoint[] { new PointF(10, 10), new PointF(10, 100), new PointF(100, 100), new PointF(100, 10) },
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/RectangleTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/RectangleTests.cs
@@ -7,7 +7,7 @@
 using System.Numerics;
 using Xunit;
 
-namespace SixLabors.ImageSharp.Drawing.Tests.Shapes
+namespace SixLabors.ImageSharp.Drawing.Tests
 {
     public class RectangleTests
     {
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/RegularPolygonTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/RegularPolygonTests.cs
diff --git a/tests/ImageSharp.Drawing.Tests/Shapes/StarTests.cs b/tests/ImageSharp.Drawing.Tests/Shapes/StarTests.cs

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`using SixLabors.ImageSharp.Processing;`
`13`	`13`	`using SDPointF = System.Drawing.PointF;`
`14`	`14`
`15`		`-namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing`
	`15`	`+namespace SixLabors.ImageSharp.Drawing.Benchmarks`
`16`	`16`	`{`
`17`	`17`	`public class DrawBeziers`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`using SDRectangleF = System.Drawing.RectangleF;`
`13`	`13`
`14`		`-namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing`
	`14`	`+namespace SixLabors.ImageSharp.Drawing.Benchmarks`
`15`	`15`	`{`
`16`	`16`	`[MemoryDiagnoser]`
`17`	`17`	`public class DrawTextOutline`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`using SDBitmap = System.Drawing.Bitmap;`
`19`	`19`	`using SDPointF = System.Drawing.PointF;`
`20`	`20`
`21`		`-namespace SixLabors.ImageSharp.Drawing.Benchmarks.Drawing`
	`21`	`+namespace SixLabors.ImageSharp.Drawing.Benchmarks`
`22`	`22`	`{`
`23`	`23`	`public abstract class FillPolygon`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ static PointF[][] GetPoints(FeatureCollection features)`
`46`	`46`	`[InlineData(IntersectionRule.Nonzero)]`
`47`	`47`	`public void FillPolygon(IntersectionRule intersectionRule)`
`48`	`48`	`{`
`49`		`- const int times = 100;`
	`49`	`+ const int Times = 100;`
`50`	`50`
`51`		`- for (int i = 0; i < times; i++)`
	`51`	`+ for (int i = 0; i < Times; i++)`
`52`	`52`	`{`
`53`	`53`	`this.image.Mutate(c =>`
`54`	`54`	`{`
`@@ -69,13 +69,13 @@ public void FillPolygon(IntersectionRule intersectionRule)`
`69`	`69`	`[InlineData(10)]`
`70`	`70`	`public void DrawText(int textIterations)`
`71`	`71`	`{`
`72`		`- const int times = 20;`
`73`		`- const string textPhrase = "asdfghjkl123456789{}[]+$%?";`
`74`		`- string textToRender = string.Join("/n", Enumerable.Repeat(textPhrase, textIterations));`
	`72`	`+ const int Times = 20;`
	`73`	`+ const string TextPhrase = "asdfghjkl123456789{}[]+$%?";`
	`74`	`+ string textToRender = string.Join("/n", Enumerable.Repeat(TextPhrase, textIterations));`
`75`	`75`
`76`	`76`	`Font font = SystemFonts.CreateFont("Arial", 12);`
`77`	`77`
`78`		`- for (int i = 0; i < times; i++)`
	`78`	`+ for (int i = 0; i < Times; i++)`
`79`	`79`	`{`
`80`	`80`	`this.image.Mutate(x => x`
`81`	`81`	`.SetGraphicsOptions(o => o.Antialias = true)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using System.Numerics;`
`7`	`7`	`using Xunit;`
`8`	`8`
`9`		`-namespace SixLabors.ImageSharp.Drawing.Tests.Shapes`
	`9`	`+namespace SixLabors.ImageSharp.Drawing.Tests`
`10`	`10`	`{`
`11`	`11`	`public class BezierLineSegmentTests`
`12`	`12`	`{`