Skip to content

Commit e35c082

Browse files
OleRossOleRoss
authored
build: Drop FluentAssertions (#103)
Drop fluent assertions to not maintain two assertion libraries
1 parent f23a843 commit e35c082

68 files changed

Lines changed: 935 additions & 985 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Directory.Packages.props‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@
1111
</PackageVersion>
1212
<PackageVersion Include="Darp.BinaryObjects" Version="0.7.0" />
1313
<PackageVersion Include="Darp.Utils.Messaging" Version="1.19.2" />
14-
<PackageVersion Include="FluentAssertions" Version="[7.1.0,8.0.0)" />
15-
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.34.1" />
16-
<PackageVersion Include="FluentAssertions.Reactive" Version="0.2.0" />
1714
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.215">
1815
<PrivateAssets>all</PrivateAssets>
1916
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2017
</PackageVersion>
2118
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
2219
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.6" />
23-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
20+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
21+
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.1.0" />
2422
<PackageVersion Include="NSubstitute" Version="5.3.0" />
2523
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
2624
<PackageVersion Include="PolySharp" Version="1.15.0" />
@@ -44,8 +42,8 @@
4442
<PackageVersion Include="System.IO.Ports" Version="9.0.8" />
4543
<PackageVersion Include="System.Linq.Async" Version="6.0.3" />
4644
<PackageVersion Include="System.Numerics.Tensors" Version="9.0.6" />
47-
<PackageVersion Include="System.Reactive" Version="6.0.1" />
48-
<PackageVersion Include="System.Reactive.Linq" Version="6.0.1" />
45+
<PackageVersion Include="System.Reactive" Version="6.1.0" />
46+
<PackageVersion Include="System.Reactive.Linq" Version="6.1.0" />
4947
<PackageVersion Include="System.Text.Json" Version="9.0.6" />
5048
<PackageVersion Include="Verify" Version="31.9.4" />
5149
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />

‎src/Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
2-
<Import Project="../Directory.Build.props"/>
2+
<Import Project="../Directory.Build.props" />
33
<PropertyGroup>
44
<AnalysisLevel>latest-all</AnalysisLevel>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -14,8 +14,8 @@
1414
<Version>1.10.1</Version>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<None Include="../../README.md" Pack="true" PackagePath="/"/>
18-
<None Include="../../LICENSE.md" Pack="true" PackagePath="/"/>
19-
<None Include="../../LICENSE-COMMERCIAL.md" Pack="true" PackagePath="/"/>
17+
<None Include="../../README.md" Pack="true" PackagePath="/" />
18+
<None Include="../../LICENSE.md" Pack="true" PackagePath="/" />
19+
<None Include="../../LICENSE-COMMERCIAL.md" Pack="true" PackagePath="/" />
2020
</ItemGroup>
2121
</Project>

‎test/Darp.Ble.Hci.Tests/Darp.Ble.Hci.Tests.csproj‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,9 @@
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
</PackageReference>
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" />
13+
<PackageReference Include="Shouldly" />
1314
<PackageReference Include="xunit.v3" />
1415
<PackageReference Include="xunit.runner.visualstudio" />
15-
<PackageReference Include="FluentAssertions" />
16-
<PackageReference Include="FluentAssertions.Analyzers">
17-
<PrivateAssets>all</PrivateAssets>
18-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19-
</PackageReference>
20-
<PackageReference Include="FluentAssertions.Reactive" />
2116
</ItemGroup>
2217
<ItemGroup>
2318
<Using Include="Xunit" />

‎test/Darp.Ble.Hci.Tests/Payload/Att/AttErrorRspTests.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Darp.Ble.Hci.Payload.Att;
2-
using FluentAssertions;
2+
using Shouldly;
33

44
namespace Darp.Ble.Hci.Tests.Payload.Att;
55

@@ -10,7 +10,7 @@ public sealed class AttErrorRspTests
1010
[Fact]
1111
public void ExpectedOpCode_ShouldBeValid()
1212
{
13-
AttErrorRsp.ExpectedOpCode.Should().Be(ExpectedOpCode);
13+
AttErrorRsp.ExpectedOpCode.ShouldBe(ExpectedOpCode);
1414
}
1515

1616
[Theory]
@@ -27,12 +27,12 @@ AttErrorCode expectedErrorCode
2727
byte[] bytes = Convert.FromHexString(hexBytes);
2828
bool success = AttErrorRsp.TryReadLittleEndian(bytes, out AttErrorRsp value, out int decoded);
2929

30-
success.Should().BeTrue();
31-
decoded.Should().Be(5);
32-
value.OpCode.Should().Be(ExpectedOpCode);
33-
value.RequestOpCode.Should().Be(expectedRequestOpCode);
34-
value.Handle.Should().Be(expectedHandle);
35-
value.ErrorCode.Should().Be(expectedErrorCode);
30+
success.ShouldBeTrue();
31+
decoded.ShouldBe(5);
32+
value.OpCode.ShouldBe(ExpectedOpCode);
33+
value.RequestOpCode.ShouldBe(expectedRequestOpCode);
34+
value.Handle.ShouldBe(expectedHandle);
35+
value.ErrorCode.ShouldBe(expectedErrorCode);
3636
}
3737

3838
[Theory]
@@ -44,7 +44,7 @@ public void TryReadLittleEndian_ShouldBeInvalid(string hexBytes, int expectedByt
4444
byte[] bytes = Convert.FromHexString(hexBytes);
4545
bool success = AttErrorRsp.TryReadLittleEndian(bytes, out _, out int decoded);
4646

47-
success.Should().BeFalse();
48-
decoded.Should().Be(expectedBytesDecoded);
47+
success.ShouldBeFalse();
48+
decoded.ShouldBe(expectedBytesDecoded);
4949
}
5050
}

‎test/Darp.Ble.Hci.Tests/Payload/Att/AttExchangeMtuReqTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Darp.Ble.Hci.Payload.Att;
2-
using FluentAssertions;
2+
using Shouldly;
33

44
namespace Darp.Ble.Hci.Tests.Payload.Att;
55

@@ -8,7 +8,7 @@ public sealed class AttExchangeMtuReqTests
88
[Fact]
99
public void ExpectedOpCode_ShouldBeValid()
1010
{
11-
AttExchangeMtuReq.ExpectedOpCode.Should().HaveValue(0x02);
11+
AttExchangeMtuReq.ExpectedOpCode.ShouldHaveValue(0x02);
1212
}
1313

1414
[Theory]
@@ -20,10 +20,10 @@ public void TryWriteLittleEndian_ShouldBeValid(ushort clientRxMtu, string expect
2020

2121
bool success = value.TryWriteLittleEndian(buffer);
2222

23-
value.OpCode.Should().Be(AttOpCode.ATT_EXCHANGE_MTU_REQ);
24-
value.GetByteCount().Should().Be(3);
25-
success.Should().BeTrue();
26-
Convert.ToHexString(buffer).Should().Be(expectedHexBytes);
23+
value.OpCode.ShouldBe(AttOpCode.ATT_EXCHANGE_MTU_REQ);
24+
value.GetByteCount().ShouldBe(3);
25+
success.ShouldBeTrue();
26+
Convert.ToHexString(buffer).ShouldBe(expectedHexBytes);
2727
}
2828

2929
[Fact]
@@ -33,6 +33,6 @@ public void TryWriteLittleEndian_ShouldBeInvalid()
3333
AttExchangeMtuReq value = default;
3434

3535
bool success = value.TryWriteLittleEndian(buffer);
36-
success.Should().BeFalse();
36+
success.ShouldBeFalse();
3737
}
3838
}

‎test/Darp.Ble.Hci.Tests/Payload/Att/AttExchangeMtuRspTests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Darp.Ble.Hci.Payload.Att;
2-
using FluentAssertions;
2+
using Shouldly;
33

44
namespace Darp.Ble.Hci.Tests.Payload.Att;
55

@@ -8,7 +8,7 @@ public sealed class AttExchangeMtuRspTests
88
[Fact]
99
public void ExpectedOpCode_ShouldBeValid()
1010
{
11-
AttExchangeMtuRsp.ExpectedOpCode.Should().HaveValue(0x03);
11+
AttExchangeMtuRsp.ExpectedOpCode.ShouldHaveValue(0x03);
1212
}
1313

1414
[Theory]
@@ -19,10 +19,10 @@ public void TryReadLittleEndian_ShouldBeValid(string hexBytes, ushort serverRxMt
1919
byte[] bytes = Convert.FromHexString(hexBytes);
2020
bool success = AttExchangeMtuRsp.TryReadLittleEndian(bytes, out AttExchangeMtuRsp value, out int decoded);
2121

22-
success.Should().BeTrue();
23-
decoded.Should().Be(3);
24-
value.OpCode.Should().Be(AttOpCode.ATT_EXCHANGE_MTU_RSP);
25-
value.ServerRxMtu.Should().Be(serverRxMtu);
22+
success.ShouldBeTrue();
23+
decoded.ShouldBe(3);
24+
value.OpCode.ShouldBe(AttOpCode.ATT_EXCHANGE_MTU_RSP);
25+
value.ServerRxMtu.ShouldBe(serverRxMtu);
2626
}
2727

2828
[Theory]
@@ -34,7 +34,7 @@ public void TryReadLittleEndian_ShouldBeInvalid(string hexBytes, int expectedByt
3434
byte[] bytes = Convert.FromHexString(hexBytes);
3535
bool success = AttExchangeMtuRsp.TryReadLittleEndian(bytes, out _, out int decoded);
3636

37-
success.Should().BeFalse();
38-
decoded.Should().Be(expectedBytesDecoded);
37+
success.ShouldBeFalse();
38+
decoded.ShouldBe(expectedBytesDecoded);
3939
}
4040
}

‎test/Darp.Ble.Hci.Tests/Payload/Att/AttFindByTypeValueReqTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Darp.Ble.Hci.Payload.Att;
2-
using FluentAssertions;
2+
using Shouldly;
33

44
namespace Darp.Ble.Hci.Tests.Payload.Att;
55

@@ -8,7 +8,7 @@ public sealed class AttFindByTypeValueReqTests
88
[Fact]
99
public void ExpectedOpCode_ShouldBeValid()
1010
{
11-
AttFindByTypeValueReq.ExpectedOpCode.Should().HaveValue(0x06);
11+
AttFindByTypeValueReq.ExpectedOpCode.ShouldHaveValue(0x06);
1212
}
1313

1414
[Theory]
@@ -32,10 +32,10 @@ string expectedHexBytes
3232

3333
bool success = value.TryWriteLittleEndian(buffer);
3434

35-
value.OpCode.Should().Be(AttOpCode.ATT_FIND_BY_TYPE_VALUE_REQ);
36-
value.GetByteCount().Should().Be(9);
37-
success.Should().BeTrue();
38-
Convert.ToHexString(buffer).Should().Be(expectedHexBytes);
35+
value.OpCode.ShouldBe(AttOpCode.ATT_FIND_BY_TYPE_VALUE_REQ);
36+
value.GetByteCount().ShouldBe(9);
37+
success.ShouldBeTrue();
38+
Convert.ToHexString(buffer).ShouldBe(expectedHexBytes);
3939
}
4040

4141
[Theory]
@@ -54,6 +54,6 @@ public void TryWriteLittleEndian_ShouldBeInvalid(int bufferLength, string valueH
5454
};
5555

5656
bool success = value.TryWriteLittleEndian(buffer);
57-
success.Should().BeFalse();
57+
success.ShouldBeFalse();
5858
}
5959
}

‎test/Darp.Ble.Hci.Tests/Payload/Att/AttFindByTypeValueRspTests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Darp.Ble.Hci.Payload.Att;
2-
using FluentAssertions;
2+
using Shouldly;
33

44
namespace Darp.Ble.Hci.Tests.Payload.Att;
55

@@ -8,7 +8,7 @@ public sealed class AttFindByTypeValueRspTests
88
[Fact]
99
public void ExpectedOpCode_ShouldBeValid()
1010
{
11-
AttFindByTypeValueRsp.ExpectedOpCode.Should().HaveValue(0x07);
11+
AttFindByTypeValueRsp.ExpectedOpCode.ShouldHaveValue(0x07);
1212
}
1313

1414
[Theory]
@@ -33,10 +33,10 @@ ushort groupEndHandle
3333
out int decoded
3434
);
3535

36-
success.Should().BeTrue();
37-
decoded.Should().Be(expectedBytesRead);
38-
value.OpCode.Should().Be(AttOpCode.ATT_FIND_BY_TYPE_VALUE_RSP);
39-
value.HandlesInformationList.Should().BeEquivalentTo(handlesInformation);
36+
success.ShouldBeTrue();
37+
decoded.ShouldBe(expectedBytesRead);
38+
value.OpCode.ShouldBe(AttOpCode.ATT_FIND_BY_TYPE_VALUE_RSP);
39+
value.HandlesInformationList.ShouldBe(handlesInformation);
4040
}
4141

4242
[Theory]
@@ -48,7 +48,7 @@ public void TryReadLittleEndian_ShouldBeInvalid(string hexBytes, int expectedByt
4848
byte[] bytes = Convert.FromHexString(hexBytes);
4949
bool success = AttFindByTypeValueRsp.TryReadLittleEndian(bytes, out _, out int decoded);
5050

51-
success.Should().BeFalse();
52-
decoded.Should().Be(expectedBytesDecoded);
51+
success.ShouldBeFalse();
52+
decoded.ShouldBe(expectedBytesDecoded);
5353
}
5454
}

‎test/Darp.Ble.Hci.Tests/Payload/Att/AttFindInformationReqTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Darp.Ble.Hci.Payload.Att;
2-
using FluentAssertions;
2+
using Shouldly;
33

44
namespace Darp.Ble.Hci.Tests.Payload.Att;
55

@@ -8,7 +8,7 @@ public sealed class AttFindInformationReqTests
88
[Fact]
99
public void ExpectedOpCode_ShouldBeValid()
1010
{
11-
AttFindInformationReq.ExpectedOpCode.Should().HaveValue(0x04);
11+
AttFindInformationReq.ExpectedOpCode.ShouldHaveValue(0x04);
1212
}
1313

1414
[Theory]
@@ -21,10 +21,10 @@ public void TryWriteLittleEndian_ShouldBeValid(ushort startingHandle, ushort end
2121

2222
bool success = value.TryWriteLittleEndian(buffer);
2323

24-
value.OpCode.Should().Be(AttOpCode.ATT_FIND_INFORMATION_REQ);
25-
value.GetByteCount().Should().Be(5);
26-
success.Should().BeTrue();
27-
Convert.ToHexString(buffer).Should().Be(expectedHexBytes);
24+
value.OpCode.ShouldBe(AttOpCode.ATT_FIND_INFORMATION_REQ);
25+
value.GetByteCount().ShouldBe(5);
26+
success.ShouldBeTrue();
27+
Convert.ToHexString(buffer).ShouldBe(expectedHexBytes);
2828
}
2929

3030
[Fact]
@@ -34,6 +34,6 @@ public void TryWriteLittleEndian_ShouldBeInvalid()
3434
var value = new AttFindInformationReq { StartingHandle = 1, EndingHandle = 0xFFFF };
3535

3636
bool success = value.TryWriteLittleEndian(buffer);
37-
success.Should().BeFalse();
37+
success.ShouldBeFalse();
3838
}
3939
}

‎test/Darp.Ble.Hci.Tests/Payload/Att/AttFindInformationRspTests.cs‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Buffers.Binary;
22
using Darp.Ble.Hci.Payload.Att;
3-
using FluentAssertions;
3+
using Shouldly;
44

55
namespace Darp.Ble.Hci.Tests.Payload.Att;
66

@@ -9,7 +9,7 @@ public sealed class AttFindInformationRspTests
99
[Fact]
1010
public void ExpectedOpCode_ShouldBeValid()
1111
{
12-
AttFindInformationRsp.ExpectedOpCode.Should().HaveValue(0x05);
12+
AttFindInformationRsp.ExpectedOpCode.ShouldHaveValue(0x05);
1313
}
1414

1515
[Theory]
@@ -38,7 +38,7 @@ public void TryReadLittleEndian_16BitData_ShouldBeValid(string hexBytes, params
3838
{
3939
var uuidBuffer = new byte[2];
4040
BinaryPrimitives.WriteUInt16LittleEndian(uuidBuffer, (ushort)x.Second);
41-
return new AttFindInformationData() { Handle = (ushort)x.First, Uuid = uuidBuffer };
41+
return new AttFindInformationData { Handle = (ushort)x.First, Uuid = uuidBuffer };
4242
})
4343
.ToArray();
4444

@@ -48,18 +48,17 @@ public void TryReadLittleEndian_16BitData_ShouldBeValid(string hexBytes, params
4848
out int decoded
4949
);
5050

51-
success.Should().BeTrue();
52-
decoded.Should().Be(2 + 4 * findInformationData.Length);
53-
value.OpCode.Should().Be(AttOpCode.ATT_FIND_INFORMATION_RSP);
54-
value.Format.Should().Be(AttFindInformationFormat.HandleAnd16BitUuid);
51+
success.ShouldBeTrue();
52+
decoded.ShouldBe(2 + 4 * findInformationData.Length);
53+
value.OpCode.ShouldBe(AttOpCode.ATT_FIND_INFORMATION_RSP);
54+
value.Format.ShouldBe(AttFindInformationFormat.HandleAnd16BitUuid);
5555
value
5656
.InformationData.ToArray()
5757
.Zip(findInformationData)
58-
.Should()
59-
.AllSatisfy(x =>
58+
.ShouldAllSatisfy(x =>
6059
{
61-
x.First.Handle.Should().Be(x.Second.Handle);
62-
x.First.Uuid.ToArray().Should().BeEquivalentTo(x.Second.Uuid.ToArray());
60+
x.First.Handle.ShouldBe(x.Second.Handle);
61+
x.First.Uuid.ToArray().ShouldBe(x.Second.Uuid.ToArray());
6362
});
6463
}
6564

@@ -77,19 +76,18 @@ public void TryReadLittleEndian_128BitData_ShouldBeValid(string hexBytes, ushort
7776
out int decoded
7877
);
7978

80-
success.Should().BeTrue();
81-
decoded.Should().Be(2 + 18 * findInformationData.Length);
82-
value.OpCode.Should().Be(AttOpCode.ATT_FIND_INFORMATION_RSP);
83-
value.Format.Should().Be(AttFindInformationFormat.HandleAnd128BitUuid);
79+
success.ShouldBeTrue();
80+
decoded.ShouldBe(2 + 18 * findInformationData.Length);
81+
value.OpCode.ShouldBe(AttOpCode.ATT_FIND_INFORMATION_RSP);
82+
value.Format.ShouldBe(AttFindInformationFormat.HandleAnd128BitUuid);
8483

8584
value
8685
.InformationData.ToArray()
8786
.Zip(findInformationData)
88-
.Should()
89-
.AllSatisfy(x =>
87+
.ShouldAllSatisfy(x =>
9088
{
91-
x.First.Handle.Should().Be(x.Second.Handle);
92-
x.First.Uuid.ToArray().Should().BeEquivalentTo(x.Second.Uuid.ToArray());
89+
x.First.Handle.ShouldBe(x.Second.Handle);
90+
x.First.Uuid.ToArray().ShouldBe(x.Second.Uuid.ToArray());
9391
});
9492
}
9593

@@ -105,7 +103,7 @@ public void TryReadLittleEndian_ShouldBeInvalid(string hexBytes, int expectedByt
105103
byte[] bytes = Convert.FromHexString(hexBytes);
106104
bool success = AttFindInformationRsp.TryReadLittleEndian(bytes, out _, out int decoded);
107105

108-
success.Should().BeFalse();
109-
decoded.Should().Be(expectedBytesDecoded);
106+
success.ShouldBeFalse();
107+
decoded.ShouldBe(expectedBytesDecoded);
110108
}
111109
}

0 commit comments

Comments
 (0)