Browse Source

[SL.Core] remove IsEmpty based ToString() branches

pull/1087/head
Scott Williams 9 years ago
parent
commit
7e377e605d
  1. 5
      src/SixLabors.Core/Primitives/Point.cs
  2. 5
      src/SixLabors.Core/Primitives/PointF.cs
  3. 5
      src/SixLabors.Core/Primitives/Rectangle.cs
  4. 5
      src/SixLabors.Core/Primitives/RectangleF.cs
  5. 5
      src/SixLabors.Core/Primitives/Size.cs
  6. 5
      src/SixLabors.Core/Primitives/SizeF.cs
  7. 7
      tests/SixLabors.Core.Tests/Primitives/PointFTests.cs
  8. 7
      tests/SixLabors.Core.Tests/Primitives/PointTests.cs
  9. 7
      tests/SixLabors.Core.Tests/Primitives/RectangleTests.cs
  10. 7
      tests/SixLabors.Core.Tests/Primitives/SizeFTests.cs
  11. 7
      tests/SixLabors.Core.Tests/Primitives/SizeTests.cs

5
src/SixLabors.Core/Primitives/Point.cs

@ -274,11 +274,6 @@ namespace SixLabors.Primitives
/// <inheritdoc/>
public override string ToString()
{
if (this.IsEmpty)
{
return "Point [ Empty ]";
}
return $"Point [ X={this.X}, Y={this.Y} ]";
}

5
src/SixLabors.Core/Primitives/PointF.cs

@ -283,11 +283,6 @@ namespace SixLabors.Primitives
/// <inheritdoc/>
public override string ToString()
{
if (this.IsEmpty)
{
return "PointF [ Empty ]";
}
return $"PointF [ X={this.X}, Y={this.Y} ]";
}

5
src/SixLabors.Core/Primitives/Rectangle.cs

@ -437,11 +437,6 @@ namespace SixLabors.Primitives
/// <inheritdoc/>
public override string ToString()
{
if (this.IsEmpty)
{
return "Rectangle [ Empty ]";
}
return $"Rectangle [ X={this.X}, Y={this.Y}, Width={this.Width}, Height={this.Height} ]";
}

5
src/SixLabors.Core/Primitives/RectangleF.cs

@ -370,11 +370,6 @@ namespace SixLabors.Primitives
/// <inheritdoc/>
public override string ToString()
{
if (this.IsEmpty)
{
return "RectangleF [ Empty ]";
}
return $"RectangleF [ X={this.X}, Y={this.Y}, Width={this.Width}, Height={this.Height} ]";
}

5
src/SixLabors.Core/Primitives/Size.cs

@ -264,11 +264,6 @@ namespace SixLabors.Primitives
/// <inheritdoc/>
public override string ToString()
{
if (this.IsEmpty)
{
return "Size [ Empty ]";
}
return $"Size [ Width={this.Width}, Height={this.Height} ]";
}

5
src/SixLabors.Core/Primitives/SizeF.cs

@ -194,11 +194,6 @@ namespace SixLabors.Primitives
/// <inheritdoc/>
public override string ToString()
{
if (this.IsEmpty)
{
return "SizeF [ Empty ]";
}
return $"SizeF [ Width={this.Width}, Height={this.Height} ]";
}

7
tests/SixLabors.Core.Tests/Primitives/PointFTests.cs

@ -181,12 +181,5 @@ namespace SixLabors.Primitives.Tests
var p = new PointF(5.1F, -5.123F);
Assert.Equal(string.Format(CultureInfo.CurrentCulture, "PointF [ X={0}, Y={1} ]", p.X, p.Y), p.ToString());
}
[Fact]
public void ToStringEmptyTest()
{
var p = new PointF(0, 0);
Assert.Equal("PointF [ Empty ]", p.ToString());
}
}
}

7
tests/SixLabors.Core.Tests/Primitives/PointTests.cs

@ -241,12 +241,5 @@ namespace SixLabors.Primitives.Tests
var p = new Point(5, -5);
Assert.Equal(string.Format(CultureInfo.CurrentCulture, "Point [ X={0}, Y={1} ]", p.X, p.Y), p.ToString());
}
[Fact]
public void ToStringEmptyTest()
{
var p = new Point(0, 0);
Assert.Equal("Point [ Empty ]", p.ToString());
}
}
}

7
tests/SixLabors.Core.Tests/Primitives/RectangleTests.cs

@ -297,12 +297,5 @@ namespace SixLabors.Primitives.Tests
var r = new Rectangle(5, -5, 0, 1);
Assert.Equal(string.Format(CultureInfo.CurrentCulture, "Rectangle [ X={0}, Y={1}, Width={2}, Height={3} ]", r.X, r.Y, r.Width, r.Height), r.ToString());
}
[Fact]
public void ToStringTestEmpty()
{
var r = new Rectangle(0, 0, 0, 0);
Assert.Equal("Rectangle [ Empty ]", r.ToString());
}
}
}

7
tests/SixLabors.Core.Tests/Primitives/SizeFTests.cs

@ -153,13 +153,6 @@ namespace SixLabors.Primitives.Tests
Assert.Equal(string.Format(CultureInfo.CurrentCulture, "SizeF [ Width={0}, Height={1} ]", sz.Width, sz.Height), sz.ToString());
}
[Fact]
public void ToStringTestEmpty()
{
var sz = new SizeF(0, 0);
Assert.Equal("SizeF [ Empty ]", sz.ToString());
}
[Theory]
[InlineData(1000.234f, 0.0f)]
[InlineData(1000.234f, 1.0f)]

7
tests/SixLabors.Core.Tests/Primitives/SizeTests.cs

@ -186,13 +186,6 @@ namespace SixLabors.Primitives.Tests
Assert.Equal(string.Format(CultureInfo.CurrentCulture, "Size [ Width={0}, Height={1} ]", sz.Width, sz.Height), sz.ToString());
}
[Fact]
public void ToStringTestEmpty()
{
var sz = new Size(0, 0);
Assert.Equal("Size [ Empty ]", sz.ToString());
}
[Theory]
[InlineData(1000, 0)]
[InlineData(1000, 1)]

Loading…
Cancel
Save