Skip to content
This repository has been archived by the owner on Jan 18, 2020. It is now read-only.

Commit

Permalink
update dependencies and fix xunit warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@tocsoft
tocsoft committed May 30, 2018
1 parent bfc79ae commit 0004da8
Show file tree
Hide file tree
Showing 15 changed files with 58 additions and 54 deletions.
2 changes: 1 addition & 1 deletion NuGet.config
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="myget.org imagesharp-CI" value="https://www.myget.org/F/imagesharp/api/v3/index.json" />
<add key="myget.org sixlabors-CI" value="https://www.myget.org/F/sixlabors/api/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
</packageSources>
Expand Down
6 changes: 5 additions & 1 deletion SixLabors.Shapes.sln
View file
Expand Up @@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
.editorconfig = .editorconfig
appveyor.yml = appveyor.yml
build.cmd = build.cmd
NuGet.config = NuGet.config
README.md = README.md
EndProjectSection
EndProject
Expand All @@ -29,7 +30,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SixLabors.Shapes.Tests", "t
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrawShapesWithImageSharp", "samples\DrawShapesWithImageSharp\DrawShapesWithImageSharp.csproj", "{999EDFB3-9FE4-4E09-B669-CB02E597EC20}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SixLabors.Shapes.Benchmarks", "tests\SixLabors.Shapes.Benchmarks\SixLabors.Shapes.Benchmarks.csproj", "{87E262FA-57FE-4AA7-853C-9DD91E769D4B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SixLabors.Shapes.Benchmarks", "tests\SixLabors.Shapes.Benchmarks\SixLabors.Shapes.Benchmarks.csproj", "{87E262FA-57FE-4AA7-853C-9DD91E769D4B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SixLabors.Shapes.Text", "src\SixLabors.Shapes.Text\SixLabors.Shapes.Text.csproj", "{32D7A12E-B392-42CE-8EFB-1B685680F5B8}"
EndProject
Expand Down Expand Up @@ -71,6 +72,9 @@ Global
{87E262FA-57FE-4AA7-853C-9DD91E769D4B} = {56801022-D71A-4FBE-BC5B-CBA08E2284EC}
{32D7A12E-B392-42CE-8EFB-1B685680F5B8} = {815C0625-CD3D-440F-9F80-2D83856AB7AE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A0074D4F-97D9-49A4-BE1F-35AFCEA40486}
EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
Expand Down
4 changes: 2 additions & 2 deletions samples/DrawShapesWithImageSharp/DrawShapesWithImageSharp.csproj
View file
Expand Up @@ -12,8 +12,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0003" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0-rc1" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-dev001425" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="System.Runtime.Numerics" Version="4.3.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Shapes.Text/SixLabors.Shapes.Text.csproj
View file
Expand Up @@ -41,7 +41,7 @@
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0005" />
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-dev000083" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SixLabors.Shapes/SixLabors.Shapes.csproj
View file
Expand Up @@ -48,7 +48,7 @@
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0005" />
<PackageReference Include="System.Buffers" Version="4.4.0" />
<PackageReference Include="System.Memory" Version="4.5.0-rc1" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
<PackageReference Include="System.Memory" Version="4.5.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion tests/SixLabors.Shapes.Benchmarks/SixLabors.Shapes.Benchmarks.csproj
View file
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.10.9" />
<PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions tests/SixLabors.Shapes.Tests/InternalPathTests.cs
View file
Expand Up @@ -215,7 +215,7 @@ public void Intersections_Diagonal()

PointF[] buffer = shape.FindIntersections(new PointF(0, 10), new PointF(10, 0)).ToArray();

Assert.Equal(1, buffer.Length);
Assert.Single(buffer);
Assert.Equal(new PointF(5, 5), buffer[0]);
}

Expand All @@ -226,7 +226,7 @@ public void Intersections_Diagonal_NoHit()

PointF[] buffer = shape.FindIntersections(new PointF(0, 10), new PointF(10, 0)).ToArray();

Assert.Equal(0, buffer.Length);
Assert.Empty(buffer);
}
[Fact]
public void Intersections_Diagonal_and_straight_Hit()
Expand All @@ -235,7 +235,7 @@ public void Intersections_Diagonal_and_straight_Hit()

PointF[] buffer = shape.FindIntersections(new PointF(3, 10), new PointF(3, 0)).ToArray();

Assert.Equal(1, buffer.Length);
Assert.Single(buffer);
Assert.Equal(new PointF(3, 3), buffer[0]);
}
[Fact]
Expand All @@ -245,7 +245,7 @@ public void Intersections_Diagonal_and_straight_NoHit()

PointF[] buffer = shape.FindIntersections(new PointF(3, 10), new PointF(3, 3.5f)).ToArray();

Assert.Equal(0, buffer.Length);
Assert.Empty(buffer);
}
}
}
2 changes: 1 addition & 1 deletion tests/SixLabors.Shapes.Tests/Issues/Issue_16.cs
View file
Expand Up @@ -22,7 +22,7 @@ public void IndexOutoufRangeException()
IEnumerable<PointF> inter = p.FindIntersections(Vector2.One, Vector2.Zero);

// if simplified to single point then we should never have an intersection
Assert.Equal(0, inter.Count());
Assert.Empty(inter);
}
}
}
40 changes: 20 additions & 20 deletions tests/SixLabors.Shapes.Tests/PathExtentionTests.cs
View file
Expand Up @@ -17,59 +17,59 @@ public class PathExtentionTests
public PathExtentionTests()
{
this.bounds = new RectangleF(10, 10, 20, 20);
mockPath = new Mock<IPath>();
mockPath.Setup(x => x.Bounds).Returns(() => bounds);
this.mockPath = new Mock<IPath>();
this.mockPath.Setup(x => x.Bounds).Returns(() => this.bounds);
}

[Fact]
public void RotateInRadians()
{
float angle = (float)Math.PI;

mockPath.Setup(x => x.Transform(It.IsAny<Matrix3x2>()))
this.mockPath.Setup(x => x.Transform(It.IsAny<Matrix3x2>()))
.Callback<Matrix3x2>(m =>
{
//validate matrix in here
Matrix3x2 targetMatrix = Matrix3x2.CreateRotation(angle, RectangleF.Center(bounds));
Matrix3x2 targetMatrix = Matrix3x2.CreateRotation(angle, RectangleF.Center(this.bounds));
Assert.Equal(targetMatrix, m);
}).Returns(mockPath.Object);
}).Returns(this.mockPath.Object);

mockPath.Object.Rotate(angle);
this.mockPath.Object.Rotate(angle);

mockPath.Verify(x => x.Transform(It.IsAny<Matrix3x2>()), Times.Once);
this.mockPath.Verify(x => x.Transform(It.IsAny<Matrix3x2>()), Times.Once);
}

[Fact]
public void RotateInDegrees()
{
float angle = 90;

mockPath.Setup(x => x.Transform(It.IsAny<Matrix3x2>()))
this.mockPath.Setup(x => x.Transform(It.IsAny<Matrix3x2>()))
.Callback<Matrix3x2>(m =>
{
//validate matrix in here
float radians = (float)(Math.PI * angle / 180.0);
Matrix3x2 targetMatrix = Matrix3x2.CreateRotation(radians, RectangleF.Center(bounds));
Matrix3x2 targetMatrix = Matrix3x2.CreateRotation(radians, RectangleF.Center(this.bounds));
Assert.Equal(targetMatrix, m);
}).Returns(mockPath.Object);
}).Returns(this.mockPath.Object);

mockPath.Object.RotateDegree(angle);
this.mockPath.Object.RotateDegree(angle);

mockPath.Verify(x => x.Transform(It.IsAny<Matrix3x2>()), Times.Once);
this.mockPath.Verify(x => x.Transform(It.IsAny<Matrix3x2>()), Times.Once);
}

[Fact]
public void TranslateVector()
{
Vector2 point = new Vector2(98, 120);

mockPath.Setup(x => x.Transform(It.IsAny<Matrix3x2>()))
this.mockPath.Setup(x => x.Transform(It.IsAny<Matrix3x2>()))
.Callback<Matrix3x2>(m =>
{
//validate matrix in here
Expand All @@ -78,11 +78,11 @@ public void TranslateVector()
Assert.Equal(targetMatrix, m);
}).Returns(mockPath.Object);
}).Returns(this.mockPath.Object);

mockPath.Object.Translate(point);
this.mockPath.Object.Translate(point);

mockPath.Verify(x => x.Transform(It.IsAny<Matrix3x2>()), Times.Once);
this.mockPath.Verify(x => x.Transform(It.IsAny<Matrix3x2>()), Times.Once);
}

[Fact]
Expand All @@ -91,7 +91,7 @@ public void TranslateXY()
float x = 76;
float y = 7;

mockPath.Setup(p => p.Transform(It.IsAny<Matrix3x2>()))
this.mockPath.Setup(p => p.Transform(It.IsAny<Matrix3x2>()))
.Callback<Matrix3x2>(m =>
{
//validate matrix in here
Expand All @@ -100,11 +100,11 @@ public void TranslateXY()
Assert.Equal(targetMatrix, m);
}).Returns(mockPath.Object);
}).Returns(this.mockPath.Object);

mockPath.Object.Translate(x, y);
this.mockPath.Object.Translate(x, y);

mockPath.Verify(p => p.Transform(It.IsAny<Matrix3x2>()), Times.Once);
this.mockPath.Verify(p => p.Transform(It.IsAny<Matrix3x2>()), Times.Once);
}
}
}
12 changes: 6 additions & 6 deletions tests/SixLabors.Shapes.Tests/PolygonClipper/ClipperTests.cs
View file
Expand Up @@ -65,15 +65,15 @@ public void OverlappingTriangleCutRightSide()
new Vector2(20, 100)));

IEnumerable<IPath> shapes = this.Clip(triangle, cutout);
Assert.Equal(1, shapes.Count());
Assert.Single(shapes);
Assert.DoesNotContain(triangle, shapes);
}

[Fact]
public void OverlappingTriangles()
{
IEnumerable<IPath> shapes = this.Clip(this.BigTriangle, this.LittleTriangle);
Assert.Equal(1, shapes.Count());
Assert.Single(shapes);
IReadOnlyList<PointF> path = shapes.Single().Flatten().First().Points;
Assert.Equal(7, path.Count);
foreach (Vector2 p in this.BigTriangle.Flatten().First().Points)
Expand All @@ -88,7 +88,7 @@ public void NonOverlapping()
IEnumerable<RectangularPolygon> shapes = this.Clip(this.TopLeft, this.TopRight)
.OfType<Polygon>().Select(x => (RectangularPolygon)x);

Assert.Equal(1, shapes.Count());
Assert.Single(shapes);
Assert.Contains(this.TopLeft, shapes);

Assert.DoesNotContain(this.TopRight, shapes);
Expand All @@ -99,7 +99,7 @@ public void OverLappingReturns1NewShape()
{
IEnumerable<IPath> shapes = this.Clip(this.BigSquare, this.TopLeft);

Assert.Equal(1, shapes.Count());
Assert.Single(shapes);
Assert.DoesNotContain(this.BigSquare, shapes);
Assert.DoesNotContain(this.TopLeft, shapes);
}
Expand All @@ -119,7 +119,7 @@ public void OverlappingButNotCrossingRetuensOrigionalShapes()
public void TouchingButNotOverlapping()
{
IEnumerable<IPath> shapes = this.Clip(this.TopMiddle, this.TopLeft);
Assert.Equal(1, shapes.Count());
Assert.Single(shapes);
Assert.DoesNotContain(this.TopMiddle, shapes);
Assert.DoesNotContain(this.TopLeft, shapes);
}
Expand All @@ -128,7 +128,7 @@ public void TouchingButNotOverlapping()
public void ClippingRectanglesCreateCorrectNumberOfPoints()
{
IEnumerable<ISimplePath> paths = new RectangularPolygon(10, 10, 40, 40).Clip(new RectangularPolygon(20, 0, 20, 20)).Flatten();
Assert.Equal(1, paths.Count());
Assert.Single(paths);
IReadOnlyList<PointF> points = paths.First().Points;

Assert.Equal(8, points.Count);
Expand Down
4 changes: 2 additions & 2 deletions tests/SixLabors.Shapes.Tests/PolygonTests.cs
View file
Expand Up @@ -148,7 +148,7 @@ public void ReturnsWrapperOfSelfASOwnPath_SingleSegment()
{
Polygon poly = new Polygon(new LinearLineSegment(new PointF(0, 0), new PointF(0, 10), new PointF(5, 5)));
ISimplePath[] paths = poly.Flatten().ToArray();
Assert.Equal(1, paths.Length);
Assert.Single(paths);
Assert.Equal(poly, paths[0]);
}

Expand All @@ -157,7 +157,7 @@ public void ReturnsWrapperOfSelfASOwnPath_MultiSegment()
{
Polygon poly = new Polygon(new LinearLineSegment(new PointF(0, 0), new PointF(0, 10)), new LinearLineSegment(new PointF(2, 5), new PointF(5, 5)));
ISimplePath[] paths = poly.Flatten().ToArray();
Assert.Equal(1, paths.Length);
Assert.Single(paths);
Assert.Equal(poly, paths[0]);
}

Expand Down
4 changes: 2 additions & 2 deletions tests/SixLabors.Shapes.Tests/RectangleTests.cs
View file
Expand Up @@ -201,7 +201,7 @@ public void Intersections_1()
IPath shape = new RectangularPolygon(1, 1, 10, 10);
IEnumerable<PointF> intersections = shape.FindIntersections(new PointF(0, 5), new PointF(5, 5));

Assert.Equal(1, intersections.Count());
Assert.Single(intersections);
Assert.Equal(new PointF(1, 5), intersections.First());
}

Expand All @@ -211,7 +211,7 @@ public void Intersections_0()
IPath shape = new RectangularPolygon(1, 1, 10, 10);
IEnumerable<PointF> intersections = shape.FindIntersections(new PointF(0, 5), new PointF(-5, 5));

Assert.Equal(0, intersections.Count());
Assert.Empty(intersections);
}

[Fact]
Expand Down
10 changes: 5 additions & 5 deletions tests/SixLabors.Shapes.Tests/SixLabors.Shapes.Tests.csproj
View file
Expand Up @@ -21,11 +21,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="System.Memory" Version="4.5.0-rc1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="Moq" Version="4.7.99" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
<PackageReference Include="System.Memory" Version="4.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="Moq" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions tests/SixLabors.Shapes.Tests/Structs/TestPoint.cs
View file
Expand Up @@ -31,13 +31,13 @@ public void Deserialize(IXunitSerializationInfo info)

public void Serialize(IXunitSerializationInfo info)
{
info.AddValue("X", X);
info.AddValue("Y", Y);
info.AddValue("X", this.X);
info.AddValue("Y", this.Y);
}

public override string ToString()
{
return $"({X}, {Y})";
return $"({this.X}, {this.Y})";
}

public static implicit operator PointF(TestPoint p)
Expand Down
6 changes: 3 additions & 3 deletions tests/SixLabors.Shapes.Tests/Structs/TestSize.cs
View file
Expand Up @@ -29,8 +29,8 @@ public void Deserialize(IXunitSerializationInfo info)

public void Serialize(IXunitSerializationInfo info)
{
info.AddValue("width", Width);
info.AddValue("height", Height);
info.AddValue("width", this.Width);
info.AddValue("height", this.Height);
}

public static implicit operator SizeF(TestSize p)
Expand All @@ -43,7 +43,7 @@ public void Serialize(IXunitSerializationInfo info)
}
public override string ToString()
{
return $"{Width}x{Height}";
return $"{this.Width}x{this.Height}";
}
}
}

0 comments on commit 0004da8

Please sign in to comment.