Skip to content

Commit 4ecfd24

Browse files
kylejuliandevbeeme1mraskpt
authored
chore: remove FluentAssertions (#361)
<!-- Please use this template for your pull request. --> <!-- Please use the sections that you need and delete other sections --> ## This PR <!-- add the description of the PR here --> - Removes FluentAssertions in unit, integration, and E2E tests - Update CONTRIBUTING.md to fix out of date documentation ### Related Issues <!-- add here the GitHub issue that this PR resolves if applicable --> Fixes #353 ### Notes <!-- any additional notes for this PR --> ### Follow-up Tasks <!-- anything that is related to this PR but not done here should be noted under this section --> <!-- if there is a need for a new issue, please link it here --> ### How to test <!-- if applicable, add testing instructions under this section --> --------- Signed-off-by: Kyle Julian <[email protected]> Co-authored-by: Michael Beemer <[email protected]> Co-authored-by: André Silva <[email protected]>
1 parent e74e8e7 commit 4ecfd24

16 files changed

+170
-189
lines changed

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ dotnet test test/OpenFeature.Tests/
6464
To be able to run the e2e tests, first we need to initialize the submodule and copy the test files:
6565

6666
```bash
67-
git submodule update --init --recursive && cp test-harness/features/evaluation.feature test/OpenFeature.E2ETests/Features/
67+
git submodule update --init --recursive && cp spec/specification/assets/gherkin/evaluation.feature test/OpenFeature.E2ETests/Features/
6868
```
6969

7070
Now you can run the tests using:

‎Directory.Packages.props

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
2222
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
2323
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
24-
<PackageVersion Include="FluentAssertions" Version="7.1.0" />
2524
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
2625
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0" />
2726
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />

‎test/OpenFeature.DependencyInjection.Tests/FeatureLifecycleManagerTests.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using FluentAssertions;
21
using Microsoft.Extensions.DependencyInjection;
32
using Microsoft.Extensions.Logging;
43
using Microsoft.Extensions.Options;
@@ -44,7 +43,7 @@ public async Task EnsureInitializedAsync_ShouldLogAndSetProvider_WhenProviderExi
4443
await _systemUnderTest.EnsureInitializedAsync().ConfigureAwait(true);
4544

4645
// Assert
47-
Api.Instance.GetProvider().Should().BeSameAs(featureProvider);
46+
Assert.Equal(featureProvider, Api.Instance.GetProvider());
4847
}
4948

5049
[Fact]
@@ -58,7 +57,7 @@ public async Task EnsureInitializedAsync_ShouldThrowException_WhenProviderDoesNo
5857

5958
// Assert
6059
var exception = await Assert.ThrowsAsync<InvalidOperationException>(act).ConfigureAwait(true);
61-
exception.Should().NotBeNull();
62-
exception.Message.Should().NotBeNullOrWhiteSpace();
60+
Assert.NotNull(exception);
61+
Assert.False(string.IsNullOrWhiteSpace(exception.Message));
6362
}
6463
}

‎test/OpenFeature.DependencyInjection.Tests/OpenFeature.DependencyInjection.Tests.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>
23-
<PackageReference Include="FluentAssertions" />
2423
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2524
<PackageReference Include="NSubstitute" />
2625
<PackageReference Include="xunit" />

‎test/OpenFeature.DependencyInjection.Tests/OpenFeatureBuilderExtensionsTests.cs

+24-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using FluentAssertions;
21
using Microsoft.Extensions.DependencyInjection;
32
using Microsoft.Extensions.Options;
43
using OpenFeature.Model;
@@ -28,12 +27,11 @@ public void AddContext_Delegate_ShouldAddServiceToCollection(bool useServiceProv
2827
_systemUnderTest.AddContext((_, _) => { });
2928

3029
// Assert
31-
featureBuilder.Should().BeSameAs(_systemUnderTest, "The method should return the same builder instance.");
32-
_systemUnderTest.IsContextConfigured.Should().BeTrue("The context should be configured.");
33-
_services.Should().ContainSingle(serviceDescriptor =>
30+
Assert.Equal(_systemUnderTest, featureBuilder);
31+
Assert.True(_systemUnderTest.IsContextConfigured, "The context should be configured.");
32+
Assert.Single(_services, serviceDescriptor =>
3433
serviceDescriptor.ServiceType == typeof(EvaluationContext) &&
35-
serviceDescriptor.Lifetime == ServiceLifetime.Transient,
36-
"A transient service of type EvaluationContext should be added.");
34+
serviceDescriptor.Lifetime == ServiceLifetime.Transient);
3735
}
3836

3937
[Theory]
@@ -54,9 +52,9 @@ public void AddContext_Delegate_ShouldCorrectlyHandles(bool useServiceProviderDe
5452
var context = serviceProvider.GetService<EvaluationContext>();
5553

5654
// Assert
57-
_systemUnderTest.IsContextConfigured.Should().BeTrue("The context should be configured.");
58-
context.Should().NotBeNull("The EvaluationContext should be resolvable.");
59-
delegateCalled.Should().BeTrue("The delegate should be invoked.");
55+
Assert.True(_systemUnderTest.IsContextConfigured, "The context should be configured.");
56+
Assert.NotNull(context);
57+
Assert.True(delegateCalled, "The delegate should be invoked.");
6058
}
6159

6260
#if NET8_0_OR_GREATER
@@ -80,15 +78,14 @@ public void AddProvider_ShouldAddProviderToCollection(int providerRegistrationTy
8078
};
8179

8280
// Assert
83-
_systemUnderTest.IsContextConfigured.Should().BeFalse("The context should not be configured.");
84-
_systemUnderTest.HasDefaultProvider.Should().Be(expectsDefaultProvider, "The default provider flag should be set correctly.");
85-
_systemUnderTest.IsPolicyConfigured.Should().BeFalse("The policy should not be configured.");
86-
_systemUnderTest.DomainBoundProviderRegistrationCount.Should().Be(expectsDomainBoundProvider, "The domain-bound provider count should be correct.");
87-
featureBuilder.Should().BeSameAs(_systemUnderTest, "The method should return the same builder instance.");
88-
_services.Should().ContainSingle(serviceDescriptor =>
81+
Assert.False(_systemUnderTest.IsContextConfigured, "The context should not be configured.");
82+
Assert.Equal(expectsDefaultProvider, _systemUnderTest.HasDefaultProvider);
83+
Assert.False(_systemUnderTest.IsPolicyConfigured, "The policy should not be configured.");
84+
Assert.Equal(expectsDomainBoundProvider, _systemUnderTest.DomainBoundProviderRegistrationCount);
85+
Assert.Equal(_systemUnderTest, featureBuilder);
86+
Assert.Single(_services, serviceDescriptor =>
8987
serviceDescriptor.ServiceType == typeof(FeatureProvider) &&
90-
serviceDescriptor.Lifetime == ServiceLifetime.Transient,
91-
"A singleton service of type FeatureProvider should be added.");
88+
serviceDescriptor.Lifetime == ServiceLifetime.Transient);
9289
}
9390

9491
class TestOptions : OpenFeatureOptions { }
@@ -124,8 +121,8 @@ public void AddProvider_ShouldResolveCorrectProvider(int providerRegistrationTyp
124121
};
125122

126123
// Assert
127-
provider.Should().NotBeNull("The FeatureProvider should be resolvable.");
128-
provider.Should().BeOfType<NoOpFeatureProvider>("The resolved provider should be of type DefaultFeatureProvider.");
124+
Assert.NotNull(provider);
125+
Assert.IsType<NoOpFeatureProvider>(provider);
129126
}
130127

131128
[Theory]
@@ -172,11 +169,11 @@ public void AddProvider_VerifiesDefaultAndDomainBoundProvidersBasedOnConfigurati
172169
};
173170

174171
// Assert
175-
_systemUnderTest.IsContextConfigured.Should().BeFalse("The context should not be configured.");
176-
_systemUnderTest.HasDefaultProvider.Should().Be(expectsDefaultProvider, "The default provider flag should be set correctly.");
177-
_systemUnderTest.IsPolicyConfigured.Should().BeFalse("The policy should not be configured.");
178-
_systemUnderTest.DomainBoundProviderRegistrationCount.Should().Be(expectsDomainBoundProvider, "The domain-bound provider count should be correct.");
179-
featureBuilder.Should().BeSameAs(_systemUnderTest, "The method should return the same builder instance.");
172+
Assert.False(_systemUnderTest.IsContextConfigured, "The context should not be configured.");
173+
Assert.Equal(expectsDefaultProvider, _systemUnderTest.HasDefaultProvider);
174+
Assert.False(_systemUnderTest.IsPolicyConfigured, "The policy should not be configured.");
175+
Assert.Equal(expectsDomainBoundProvider, _systemUnderTest.DomainBoundProviderRegistrationCount);
176+
Assert.Equal(_systemUnderTest, featureBuilder);
180177
}
181178

182179
[Theory]
@@ -240,8 +237,8 @@ public void AddProvider_ConfiguresPolicyNameAcrossMultipleProviderSetups(int pro
240237
serviceProvider.GetRequiredKeyedService<FeatureProvider>(name);
241238

242239
// Assert
243-
featureBuilder.IsPolicyConfigured.Should().BeTrue("The policy should be configured.");
244-
provider.Should().NotBeNull("The FeatureProvider should be resolvable.");
245-
provider.Should().BeOfType<NoOpFeatureProvider>("The resolved provider should be of type DefaultFeatureProvider.");
240+
Assert.True(featureBuilder.IsPolicyConfigured, "The policy should be configured.");
241+
Assert.NotNull(provider);
242+
Assert.IsType<NoOpFeatureProvider>(provider);
246243
}
247244
}

‎test/OpenFeature.DependencyInjection.Tests/OpenFeatureServiceCollectionExtensionsTests.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using FluentAssertions;
21
using Microsoft.Extensions.DependencyInjection;
32
using NSubstitute;
43
using Xunit;
@@ -22,9 +21,9 @@ public void AddOpenFeature_ShouldRegisterApiInstanceAndLifecycleManagerAsSinglet
2221
// Act
2322
_systemUnderTest.AddOpenFeature(_configureAction);
2423

25-
_systemUnderTest.Should().ContainSingle(s => s.ServiceType == typeof(Api) && s.Lifetime == ServiceLifetime.Singleton);
26-
_systemUnderTest.Should().ContainSingle(s => s.ServiceType == typeof(IFeatureLifecycleManager) && s.Lifetime == ServiceLifetime.Singleton);
27-
_systemUnderTest.Should().ContainSingle(s => s.ServiceType == typeof(IFeatureClient) && s.Lifetime == ServiceLifetime.Scoped);
24+
Assert.Single(_systemUnderTest, s => s.ServiceType == typeof(Api) && s.Lifetime == ServiceLifetime.Singleton);
25+
Assert.Single(_systemUnderTest, s => s.ServiceType == typeof(IFeatureLifecycleManager) && s.Lifetime == ServiceLifetime.Singleton);
26+
Assert.Single(_systemUnderTest, s => s.ServiceType == typeof(IFeatureClient) && s.Lifetime == ServiceLifetime.Scoped);
2827
}
2928

3029
[Fact]

‎test/OpenFeature.E2ETests/OpenFeature.E2ETests.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<PackageReference Include="SpecFlow" />
2020
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" />
2121
<PackageReference Include="SpecFlow.xUnit" />
22-
<PackageReference Include="FluentAssertions" />
2322
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2423
<PackageReference Include="xunit" />
2524
<PackageReference Include="xunit.runner.visualstudio">

‎test/OpenFeature.IntegrationTests/FeatureFlagIntegrationTest.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Net.Http.Json;
22
using System.Text.Json;
3-
using FluentAssertions;
43
using Microsoft.AspNetCore.Builder;
54
using Microsoft.AspNetCore.Http;
65
using Microsoft.AspNetCore.TestHost;
@@ -54,10 +53,10 @@ public async Task VerifyFeatureFlagBehaviorAcrossServiceLifetimesAsync(string us
5453
var responseContent = await response.Content.ReadFromJsonAsync<FeatureFlagResponse<bool>>().ConfigureAwait(true); ;
5554

5655
// Assert
57-
response.IsSuccessStatusCode.Should().BeTrue("Expected HTTP status code 200 OK.");
58-
responseContent.Should().NotBeNull("Expected response content to be non-null.");
59-
responseContent!.FeatureName.Should().Be(FeatureA, "Expected feature name to be 'feature-a'.");
60-
responseContent.FeatureValue.Should().Be(expectedResult, "Expected feature value to match the expected result.");
56+
Assert.True(response.IsSuccessStatusCode, "Expected HTTP status code 200 OK.");
57+
Assert.NotNull(responseContent);
58+
Assert.Equal(FeatureA, responseContent!.FeatureName);
59+
Assert.Equal(expectedResult, responseContent.FeatureValue);
6160
}
6261

6362
private static async Task<TestServer> CreateServerAsync(Action<IServiceCollection>? configureServices = null)

‎test/OpenFeature.IntegrationTests/OpenFeature.IntegrationTests.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
1616
<PackageReference Include="xunit" />
1717
<PackageReference Include="xunit.runner.visualstudio" />
18-
<PackageReference Include="FluentAssertions" />
1918
<PackageReference Include="NSubstitute" />
2019
</ItemGroup>
2120

‎test/OpenFeature.Tests/FeatureProviderExceptionTests.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using FluentAssertions;
32
using OpenFeature.Constant;
43
using OpenFeature.Error;
54
using OpenFeature.Extension;
@@ -18,7 +17,8 @@ public class FeatureProviderExceptionTests
1817
public void FeatureProviderException_Should_Resolve_Description(ErrorType errorType, string errorDescription)
1918
{
2019
var ex = new FeatureProviderException(errorType);
21-
ex.ErrorType.GetDescription().Should().Be(errorDescription);
20+
21+
Assert.Equal(errorDescription, ex.ErrorType.GetDescription());
2222
}
2323

2424
[Theory]
@@ -27,9 +27,10 @@ public void FeatureProviderException_Should_Resolve_Description(ErrorType errorT
2727
public void FeatureProviderException_Should_Allow_Custom_ErrorCode_Messages(ErrorType errorCode, string message)
2828
{
2929
var ex = new FeatureProviderException(errorCode, message, new ArgumentOutOfRangeException("flag"));
30-
ex.ErrorType.Should().Be(errorCode);
31-
ex.Message.Should().Be(message);
32-
ex.InnerException.Should().BeOfType<ArgumentOutOfRangeException>();
30+
31+
Assert.Equal(errorCode, ex.ErrorType);
32+
Assert.Equal(message, ex.Message);
33+
Assert.IsType<ArgumentOutOfRangeException>(ex.InnerException);
3334
}
3435

3536
private enum TestEnum

‎test/OpenFeature.Tests/FeatureProviderTests.cs

+20-26
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System.Diagnostics.CodeAnalysis;
22
using System.Threading.Tasks;
33
using AutoFixture;
4-
using FluentAssertions;
54
using NSubstitute;
65
using OpenFeature.Constant;
76
using OpenFeature.Model;
@@ -19,7 +18,7 @@ public void Provider_Must_Have_Metadata()
1918
{
2019
var provider = new TestProvider();
2120

22-
provider.GetMetadata().Name.Should().Be(TestProvider.DefaultName);
21+
Assert.Equal(TestProvider.DefaultName, provider.GetMetadata().Name);
2322
}
2423

2524
[Fact]
@@ -44,28 +43,23 @@ public async Task Provider_Must_Resolve_Flag_Values()
4443

4544
var boolResolutionDetails = new ResolutionDetails<bool>(flagName, defaultBoolValue, ErrorType.None,
4645
NoOpProvider.ReasonNoOp, NoOpProvider.Variant);
47-
(await provider.ResolveBooleanValueAsync(flagName, defaultBoolValue)).Should()
48-
.BeEquivalentTo(boolResolutionDetails);
46+
Assert.Equivalent(boolResolutionDetails, await provider.ResolveBooleanValueAsync(flagName, defaultBoolValue));
4947

5048
var integerResolutionDetails = new ResolutionDetails<int>(flagName, defaultIntegerValue, ErrorType.None,
5149
NoOpProvider.ReasonNoOp, NoOpProvider.Variant);
52-
(await provider.ResolveIntegerValueAsync(flagName, defaultIntegerValue)).Should()
53-
.BeEquivalentTo(integerResolutionDetails);
50+
Assert.Equivalent(integerResolutionDetails, await provider.ResolveIntegerValueAsync(flagName, defaultIntegerValue));
5451

5552
var doubleResolutionDetails = new ResolutionDetails<double>(flagName, defaultDoubleValue, ErrorType.None,
5653
NoOpProvider.ReasonNoOp, NoOpProvider.Variant);
57-
(await provider.ResolveDoubleValueAsync(flagName, defaultDoubleValue)).Should()
58-
.BeEquivalentTo(doubleResolutionDetails);
54+
Assert.Equivalent(doubleResolutionDetails, await provider.ResolveDoubleValueAsync(flagName, defaultDoubleValue));
5955

6056
var stringResolutionDetails = new ResolutionDetails<string>(flagName, defaultStringValue, ErrorType.None,
6157
NoOpProvider.ReasonNoOp, NoOpProvider.Variant);
62-
(await provider.ResolveStringValueAsync(flagName, defaultStringValue)).Should()
63-
.BeEquivalentTo(stringResolutionDetails);
58+
Assert.Equivalent(stringResolutionDetails, await provider.ResolveStringValueAsync(flagName, defaultStringValue));
6459

6560
var structureResolutionDetails = new ResolutionDetails<Value>(flagName, defaultStructureValue,
6661
ErrorType.None, NoOpProvider.ReasonNoOp, NoOpProvider.Variant);
67-
(await provider.ResolveStructureValueAsync(flagName, defaultStructureValue)).Should()
68-
.BeEquivalentTo(structureResolutionDetails);
62+
Assert.Equivalent(structureResolutionDetails, await provider.ResolveStructureValueAsync(flagName, defaultStructureValue));
6963
}
7064

7165
[Fact]
@@ -113,32 +107,32 @@ public async Task Provider_Must_ErrorType()
113107
NoOpProvider.ReasonNoOp, NoOpProvider.Variant));
114108

115109
var boolRes = await providerMock.ResolveBooleanValueAsync(flagName, defaultBoolValue);
116-
boolRes.ErrorType.Should().Be(ErrorType.General);
117-
boolRes.ErrorMessage.Should().Be(testMessage);
110+
Assert.Equal(ErrorType.General, boolRes.ErrorType);
111+
Assert.Equal(testMessage, boolRes.ErrorMessage);
118112

119113
var intRes = await providerMock.ResolveIntegerValueAsync(flagName, defaultIntegerValue);
120-
intRes.ErrorType.Should().Be(ErrorType.ParseError);
121-
intRes.ErrorMessage.Should().Be(testMessage);
114+
Assert.Equal(ErrorType.ParseError, intRes.ErrorType);
115+
Assert.Equal(testMessage, intRes.ErrorMessage);
122116

123117
var doubleRes = await providerMock.ResolveDoubleValueAsync(flagName, defaultDoubleValue);
124-
doubleRes.ErrorType.Should().Be(ErrorType.InvalidContext);
125-
doubleRes.ErrorMessage.Should().Be(testMessage);
118+
Assert.Equal(ErrorType.InvalidContext, doubleRes.ErrorType);
119+
Assert.Equal(testMessage, doubleRes.ErrorMessage);
126120

127121
var stringRes = await providerMock.ResolveStringValueAsync(flagName, defaultStringValue);
128-
stringRes.ErrorType.Should().Be(ErrorType.TypeMismatch);
129-
stringRes.ErrorMessage.Should().Be(testMessage);
122+
Assert.Equal(ErrorType.TypeMismatch, stringRes.ErrorType);
123+
Assert.Equal(testMessage, stringRes.ErrorMessage);
130124

131125
var structRes1 = await providerMock.ResolveStructureValueAsync(flagName, defaultStructureValue);
132-
structRes1.ErrorType.Should().Be(ErrorType.FlagNotFound);
133-
structRes1.ErrorMessage.Should().Be(testMessage);
126+
Assert.Equal(ErrorType.FlagNotFound, structRes1.ErrorType);
127+
Assert.Equal(testMessage, structRes1.ErrorMessage);
134128

135129
var structRes2 = await providerMock.ResolveStructureValueAsync(flagName2, defaultStructureValue);
136-
structRes2.ErrorType.Should().Be(ErrorType.ProviderNotReady);
137-
structRes2.ErrorMessage.Should().Be(testMessage);
130+
Assert.Equal(ErrorType.ProviderNotReady, structRes2.ErrorType);
131+
Assert.Equal(testMessage, structRes2.ErrorMessage);
138132

139133
var boolRes2 = await providerMock.ResolveBooleanValueAsync(flagName2, defaultBoolValue);
140-
boolRes2.ErrorType.Should().Be(ErrorType.TargetingKeyMissing);
141-
boolRes2.ErrorMessage.Should().BeNull();
134+
Assert.Equal(ErrorType.TargetingKeyMissing, boolRes2.ErrorType);
135+
Assert.Null(boolRes2.ErrorMessage);
142136
}
143137
}
144138
}

‎test/OpenFeature.Tests/OpenFeature.Tests.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>
19-
<PackageReference Include="FluentAssertions" />
2019
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" />
2120
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2221
<PackageReference Include="NSubstitute" />

0 commit comments

Comments
 (0)