Skip to content

Commit 4aeb0af

Browse files
vfrzvfrz
committed
Remove FluentAssertions and some cleaning
1 parent ccb6d0d commit 4aeb0af

33 files changed

Lines changed: 230 additions & 257 deletions

‎.github/workflows/dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ jobs:
3636
- name: Build
3737
run: dotnet build ./Sources -c Release
3838
- name: Test
39-
if: matrix.dotnet.version == '8.0.x'
39+
if: matrix.dotnet.version == '9.0.x'
4040
run: dotnet test ./Sources -v n --no-restore --no-build -c Release

‎Sources/DotNetGraph.Tests/Attributes/DotAttributeTests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Threading.Tasks;
33
using DotNetGraph.Attributes;
44
using DotNetGraph.Compilation;
5-
using FluentAssertions;
65
using Microsoft.VisualStudio.TestTools.UnitTesting;
76

87
namespace DotNetGraph.Tests.Attributes;
@@ -14,12 +13,12 @@ public class DotAttributeTests
1413
public async Task Compile()
1514
{
1615
var attribute = new DotAttribute("testing");
17-
16+
1817
await using var writer = new StringWriter();
1918
var context = new CompilationContext(writer, new CompilationOptions());
2019
await attribute.CompileAsync(context);
2120

2221
var result = writer.GetStringBuilder().ToString();
23-
result.Should().Be("testing");
22+
Assert.AreEqual("testing", result);
2423
}
2524
}

‎Sources/DotNetGraph.Tests/Attributes/DotColorAttributeTests.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using DotNetGraph.Attributes;
44
using DotNetGraph.Compilation;
55
using DotNetGraph.Core;
6-
using FluentAssertions;
76
using Microsoft.VisualStudio.TestTools.UnitTesting;
87

98
namespace DotNetGraph.Tests.Attributes;
@@ -21,9 +20,9 @@ public async Task CompileFromString()
2120
await attribute.CompileAsync(context);
2221

2322
var result = writer.GetStringBuilder().ToString();
24-
result.Should().Be("\"red\"");
23+
Assert.AreEqual("\"red\"", result);
2524
}
26-
25+
2726
[TestMethod]
2827
public async Task CompileFromColor()
2928
{
@@ -34,20 +33,20 @@ public async Task CompileFromColor()
3433
await attribute.CompileAsync(context);
3534

3635
var result = writer.GetStringBuilder().ToString();
37-
result.Should().Be("\"#FF0000\"");
36+
Assert.AreEqual("\"#FF0000\"", result);
3837
}
3938

4039
[TestMethod]
4140
public void ImplicitConversionFromColor()
4241
{
4342
DotColorAttribute attribute = DotColor.Red;
44-
attribute.Value.Should().Be("#FF0000");
43+
Assert.AreEqual("#FF0000", attribute.Value);
4544
}
46-
45+
4746
[TestMethod]
4847
public void ImplicitConversionFromString()
4948
{
5049
DotColorAttribute attribute = "#FF0000";
51-
attribute.Value.Should().Be("#FF0000");
50+
Assert.AreEqual("#FF0000", attribute.Value);
5251
}
5352
}

‎Sources/DotNetGraph.Tests/Attributes/DotDoubleAttributeTests.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Threading.Tasks;
33
using DotNetGraph.Attributes;
44
using DotNetGraph.Compilation;
5-
using FluentAssertions;
65
using Microsoft.VisualStudio.TestTools.UnitTesting;
76

87
namespace DotNetGraph.Tests.Attributes;
@@ -20,7 +19,7 @@ public async Task CompileWithDefaultFormat()
2019
await attribute.CompileAsync(context);
2120

2221
var result = writer.GetStringBuilder().ToString();
23-
result.Should().Be("123.46");
22+
Assert.AreEqual("123.46", result);
2423
}
2524

2625
[TestMethod]
@@ -33,13 +32,13 @@ public async Task CompileWithSpecifiedFormat()
3332
await attribute.CompileAsync(context);
3433

3534
var result = writer.GetStringBuilder().ToString();
36-
result.Should().Be("123.456");
35+
Assert.AreEqual("123.456", result);
3736
}
38-
37+
3938
[TestMethod]
4039
public void ImplicitConversionFromDouble()
4140
{
4241
DotDoubleAttribute attribute = 123.456d;
43-
attribute.Value.Should().Be(123.456d);
42+
Assert.AreEqual(123.456d, attribute.Value);
4443
}
4544
}

‎Sources/DotNetGraph.Tests/Attributes/DotEdgeArrowTypeAttributeTests.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using DotNetGraph.Attributes;
44
using DotNetGraph.Compilation;
55
using DotNetGraph.Core;
6-
using FluentAssertions;
76
using Microsoft.VisualStudio.TestTools.UnitTesting;
87

98
namespace DotNetGraph.Tests.Attributes;
@@ -21,9 +20,9 @@ public async Task CompileFromString()
2120
await attribute.CompileAsync(context);
2221

2322
var result = writer.GetStringBuilder().ToString();
24-
result.Should().Be("\"custom\"");
23+
Assert.AreEqual("\"custom\"", result);
2524
}
26-
25+
2726
[TestMethod]
2827
public async Task CompileFromEnum()
2928
{
@@ -34,20 +33,20 @@ public async Task CompileFromEnum()
3433
await attribute.CompileAsync(context);
3534

3635
var result = writer.GetStringBuilder().ToString();
37-
result.Should().Be("\"box\"");
36+
Assert.AreEqual("\"box\"", result);
3837
}
39-
38+
4039
[TestMethod]
4140
public void ImplicitConversionFromDotEdgeArrowType()
4241
{
4342
DotEdgeArrowTypeAttribute attribute = DotEdgeArrowType.Box;
44-
attribute.Value.Should().Be("box");
43+
Assert.AreEqual("box", attribute.Value);
4544
}
46-
45+
4746
[TestMethod]
4847
public void ImplicitConversionFromString()
4948
{
5049
DotEdgeArrowTypeAttribute attribute = "box";
51-
attribute.Value.Should().Be("box");
50+
Assert.AreEqual("box", attribute.Value);
5251
}
5352
}

‎Sources/DotNetGraph.Tests/Attributes/DotEdgeStyleAttributeTests.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using DotNetGraph.Attributes;
44
using DotNetGraph.Compilation;
55
using DotNetGraph.Core;
6-
using FluentAssertions;
76
using Microsoft.VisualStudio.TestTools.UnitTesting;
87

98
namespace DotNetGraph.Tests.Attributes;
@@ -21,7 +20,7 @@ public async Task CompileFromString()
2120
await attribute.CompileAsync(context);
2221

2322
var result = writer.GetStringBuilder().ToString();
24-
result.Should().Be("\"custom\"");
23+
Assert.AreEqual("\"custom\"", result);
2524
}
2625

2726
[TestMethod]
@@ -34,20 +33,20 @@ public async Task CompileFromEnum()
3433
await attribute.CompileAsync(context);
3534

3635
var result = writer.GetStringBuilder().ToString();
37-
result.Should().Be("\"solid\"");
36+
Assert.AreEqual("\"solid\"", result);
3837
}
3938

4039
[TestMethod]
4140
public void ImplicitConversionFromDotEdgeStyle()
4241
{
4342
DotEdgeStyleAttribute attribute = DotEdgeStyle.Solid;
44-
attribute.Value.Should().Be("solid");
43+
Assert.AreEqual("solid", attribute.Value);
4544
}
4645

4746
[TestMethod]
4847
public void ImplicitConversionFromString()
4948
{
5049
DotEdgeStyleAttribute attribute = "solid";
51-
attribute.Value.Should().Be("solid");
50+
Assert.AreEqual("solid", attribute.Value);
5251
}
5352
}

‎Sources/DotNetGraph.Tests/Attributes/DotLabelAttributeTests.cs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Threading.Tasks;
33
using DotNetGraph.Attributes;
44
using DotNetGraph.Compilation;
5-
using FluentAssertions;
65
using Microsoft.VisualStudio.TestTools.UnitTesting;
76

87
namespace DotNetGraph.Tests.Attributes;
@@ -20,7 +19,7 @@ public async Task CompileDefault()
2019
await attribute.CompileAsync(context);
2120

2221
var result = writer.GetStringBuilder().ToString();
23-
result.Should().Be("\"Hello,\\n \\\"world\\\"!\"");
22+
Assert.AreEqual("\"Hello,\\n \\\"world\\\"!\"", result);
2423
}
2524

2625
[TestMethod]
@@ -36,9 +35,9 @@ public async Task CompileWithoutAutomaticEscapedCharactersFormat()
3635
await attribute.CompileAsync(context);
3736

3837
var result = writer.GetStringBuilder().ToString();
39-
result.Should().Be("\"Hello,\r\n \"world\"!\"");
38+
Assert.AreEqual("\"Hello,\r\n \"world\"!\"", result);
4039
}
41-
40+
4241
[TestMethod]
4342
public async Task CompileHtml()
4443
{
@@ -49,15 +48,14 @@ public async Task CompileHtml()
4948
await attribute.CompileAsync(context);
5049

5150
var result = writer.GetStringBuilder().ToString();
52-
result.Should().Be("<<b>Hello, world!</b>>");
51+
Assert.AreEqual("<<b>Hello, world!</b>>", result);
5352
}
5453

5554
[TestMethod]
5655
public void ImplicitConversionFromString()
5756
{
5857
DotLabelAttribute attribute = "Hello, world!";
59-
60-
attribute.Value.Should().Be("Hello, world!");
61-
attribute.IsHtml.Should().Be(false);
58+
Assert.AreEqual("Hello, world!", attribute.Value);
59+
Assert.IsFalse(attribute.IsHtml);
6260
}
6361
}

‎Sources/DotNetGraph.Tests/Attributes/DotNodeShapeAttributeTests.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using DotNetGraph.Attributes;
44
using DotNetGraph.Compilation;
55
using DotNetGraph.Core;
6-
using FluentAssertions;
76
using Microsoft.VisualStudio.TestTools.UnitTesting;
87

98
namespace DotNetGraph.Tests.Attributes;
@@ -21,9 +20,9 @@ public async Task CompileFromString()
2120
await attribute.CompileAsync(context);
2221

2322
var result = writer.GetStringBuilder().ToString();
24-
result.Should().Be("\"custom\"");
23+
Assert.AreEqual("\"custom\"", result);
2524
}
26-
25+
2726
[TestMethod]
2827
public async Task CompileFromEnum()
2928
{
@@ -34,20 +33,20 @@ public async Task CompileFromEnum()
3433
await attribute.CompileAsync(context);
3534

3635
var result = writer.GetStringBuilder().ToString();
37-
result.Should().Be("\"terminator\"");
36+
Assert.AreEqual("\"terminator\"", result);
3837
}
39-
38+
4039
[TestMethod]
4140
public void ImplicitConversionFromDotNodeShape()
4241
{
4342
DotNodeShapeAttribute attribute = DotNodeShape.Terminator;
44-
attribute.Value.Should().Be("terminator");
43+
Assert.AreEqual("terminator", attribute.Value);
4544
}
4645

4746
[TestMethod]
4847
public void ImplicitConversionFromString()
4948
{
5049
DotNodeShapeAttribute attribute = "terminator";
51-
attribute.Value.Should().Be("terminator");
50+
Assert.AreEqual("terminator", attribute.Value);
5251
}
5352
}

‎Sources/DotNetGraph.Tests/Attributes/DotNodeStyleAttributeTests.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using DotNetGraph.Attributes;
44
using DotNetGraph.Compilation;
55
using DotNetGraph.Core;
6-
using FluentAssertions;
76
using Microsoft.VisualStudio.TestTools.UnitTesting;
87

98
namespace DotNetGraph.Tests.Attributes;
@@ -21,9 +20,9 @@ public async Task CompileFromString()
2120
await attribute.CompileAsync(context);
2221

2322
var result = writer.GetStringBuilder().ToString();
24-
result.Should().Be("\"custom\"");
23+
Assert.AreEqual("\"custom\"", result);
2524
}
26-
25+
2726
[TestMethod]
2827
public async Task CompileFromEnum()
2928
{
@@ -34,20 +33,20 @@ public async Task CompileFromEnum()
3433
await attribute.CompileAsync(context);
3534

3635
var result = writer.GetStringBuilder().ToString();
37-
result.Should().Be("\"bold\"");
36+
Assert.AreEqual("\"bold\"", result);
3837
}
39-
38+
4039
[TestMethod]
4140
public void ImplicitConversionFromDotNodeStyle()
4241
{
4342
DotNodeStyleAttribute attribute = DotNodeStyle.Bold;
44-
attribute.Value.Should().Be("bold");
43+
Assert.AreEqual("bold", attribute.Value);
4544
}
4645

4746
[TestMethod]
4847
public void ImplicitConversionFromString()
4948
{
5049
DotNodeStyleAttribute attribute = "bold";
51-
attribute.Value.Should().Be("bold");
50+
Assert.AreEqual("bold", attribute.Value);
5251
}
5352
}

‎Sources/DotNetGraph.Tests/Attributes/DotPointAttributeTests.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using DotNetGraph.Attributes;
44
using DotNetGraph.Compilation;
55
using DotNetGraph.Core;
6-
using FluentAssertions;
76
using Microsoft.VisualStudio.TestTools.UnitTesting;
87

98
namespace DotNetGraph.Tests.Attributes;
@@ -21,9 +20,9 @@ public async Task CompileFromString()
2120
await attribute.CompileAsync(context);
2221

2322
var result = writer.GetStringBuilder().ToString();
24-
result.Should().Be("66,99");
23+
Assert.AreEqual("66,99", result);
2524
}
26-
25+
2726
[TestMethod]
2827
public async Task CompileFromDotPoint()
2928
{
@@ -34,20 +33,20 @@ public async Task CompileFromDotPoint()
3433
await attribute.CompileAsync(context);
3534

3635
var result = writer.GetStringBuilder().ToString();
37-
result.Should().Be("42,69,75!");
36+
Assert.AreEqual("42,69,75!", result);
3837
}
39-
38+
4039
[TestMethod]
4140
public void ImplicitConversionFromDotPoint()
4241
{
4342
DotPointAttribute attribute = new DotPoint(42, 69, 75, true);
44-
attribute.Value.Should().Be("42,69,75!");
43+
Assert.AreEqual("42,69,75!", attribute.Value);
4544
}
4645

4746
[TestMethod]
4847
public void ImplicitConversionFromString()
4948
{
5049
DotPointAttribute attribute = "42,69,75!";
51-
attribute.Value.Should().Be("42,69,75!");
50+
Assert.AreEqual("42,69,75!", attribute.Value);
5251
}
5352
}

0 commit comments

Comments
 (0)