Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsVersion)" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NSubstitute" Version="6.0.0" />
<PackageVersion Include="OpenTelemetry" Version="1.16.0" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.16.0" />
<PackageVersion Include="Reqnroll.xunit.v3" Version="3.3.4" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ public async Task EvaluateAsync_WithStrategySkippingProvider_DoesNotCallSkippedP
this._mockStrategy.ShouldEvaluateThisProvider(Arg.Any<StrategyPerProviderContext<bool>>(), this._evaluationContext)
.Returns(callInfo =>
{
var context = callInfo.Arg<StrategyPerProviderContext<bool>>();
var context = callInfo.Arg<StrategyPerProviderContext<bool>>()!;
return context.ProviderName == Provider1Name; // Only evaluate provider1
});
this._mockStrategy.DetermineFinalResult(Arg.Any<StrategyEvaluationContext<bool>>(), TestFlagKey, defaultValue, this._evaluationContext, Arg.Any<List<ProviderResolutionResult<bool>>>())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,14 @@ public async Task Track_WithCustomStrategy_RespectsStrategyDecision()

// Only allow tracking with the first provider
customStrategy.ShouldTrackWithThisProvider(
Arg.Is<StrategyPerProviderContext<object>>(ctx => ctx.ProviderName == Provider1Name),
Arg.Is<StrategyPerProviderContext<object>>(ctx => ctx!.ProviderName == Provider1Name),
Arg.Any<EvaluationContext>(),
Arg.Any<string>(),
Arg.Any<TrackingEventDetails>()
).Returns(true);

customStrategy.ShouldTrackWithThisProvider(
Arg.Is<StrategyPerProviderContext<object>>(ctx => ctx.ProviderName != Provider1Name),
Arg.Is<StrategyPerProviderContext<object>>(ctx => ctx!.ProviderName != Provider1Name),
Arg.Any<EvaluationContext>(),
Arg.Any<string>(),
Arg.Any<TrackingEventDetails>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ public async Task EvaluateAsync_WhenAfterHookThrowsException_LogsWarningButSucce
this._mockLogger.Received(1).Log(
LogLevel.Warning,
Arg.Any<EventId>(),
Arg.Is<object>(v => v.ToString()!.Contains("Provider after/finally hook execution failed")),
Arg.Is<object>(v => v!.ToString()!.Contains("Provider after/finally hook execution failed")),
Arg.Is<Exception>(ex => ex == hookException),
Arg.Any<Func<object, Exception?, string>>());
}
Expand Down
54 changes: 27 additions & 27 deletions test/OpenFeature.Tests/OpenFeatureEventTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public async Task Event_Executor_Should_Propagate_Events_ToGlobal_Handler()

eventHandler.DidNotReceive().Invoke(newEventPayload);

eventHandler.DidNotReceive().Invoke(Arg.Is<ProviderEventPayload>(payload => payload.Type == ProviderEventTypes.ProviderStale));
eventHandler.DidNotReceive().Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.Type == ProviderEventTypes.ProviderStale));
}

[Fact]
Expand Down Expand Up @@ -79,28 +79,28 @@ await Utils.AssertUntilAsync(_ => eventHandler
.Received()
.Invoke(
Arg.Is<ProviderEventPayload>(
payload => payload.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderReady
payload => payload!.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderReady
)));

await Utils.AssertUntilAsync(_ => eventHandler
.Received()
.Invoke(
Arg.Is<ProviderEventPayload>(
payload => payload.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderConfigurationChanged
payload => payload!.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderConfigurationChanged
)));

await Utils.AssertUntilAsync(_ => eventHandler
.Received()
.Invoke(
Arg.Is<ProviderEventPayload>(
payload => payload.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderError
payload => payload!.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderError
)));

await Utils.AssertUntilAsync(_ => eventHandler
.Received()
.Invoke(
Arg.Is<ProviderEventPayload>(
payload => payload.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderStale
payload => payload!.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderStale
)));
}

Expand All @@ -124,7 +124,7 @@ await Utils.AssertUntilAsync(_ => eventHandler
.Received()
.Invoke(
Arg.Is<ProviderEventPayload>(
payload => payload.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderReady
payload => payload!.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderReady
)));
}

Expand All @@ -148,7 +148,7 @@ await Utils.AssertUntilAsync(_ => eventHandler
.Received()
.Invoke(
Arg.Is<ProviderEventPayload>(
payload => payload.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderReady
payload => payload!.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderReady
)));
}

Expand All @@ -174,7 +174,7 @@ await Utils.AssertUntilAsync(_ => eventHandler
.Received()
.Invoke(
Arg.Is<ProviderEventPayload>(
payload => payload.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderError
payload => payload!.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderError
)));
}

Expand All @@ -199,7 +199,7 @@ await Utils.AssertUntilAsync(_ => eventHandler
.Received()
.Invoke(
Arg.Is<ProviderEventPayload>(
payload => payload.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderStale
payload => payload!.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderStale
)));
}

Expand Down Expand Up @@ -227,10 +227,10 @@ public async Task API_Level_Event_Handlers_Should_Be_Exchangeable()
await newTestProvider.SendEventAsync(ProviderEventTypes.ProviderConfigurationChanged, TestContext.Current.CancellationToken);

await Utils.AssertUntilAsync(
_ => eventHandler.Received(2).Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderReady))
_ => eventHandler.Received(2).Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderReady))
);
await Utils.AssertUntilAsync(
_ => eventHandler.Received(2).Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderConfigurationChanged))
_ => eventHandler.Received(2).Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == testProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderConfigurationChanged))
);
}

Expand All @@ -254,7 +254,7 @@ public async Task API_Level_Event_Handlers_Should_Be_Removable()
var newTestProvider = new TestProvider();
await Api.Instance.SetProviderAsync(newTestProvider, TestContext.Current.CancellationToken);

eventHandler.Received(1).Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == testProvider.GetMetadata().Name));
eventHandler.Received(1).Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == testProvider.GetMetadata().Name));
}

[Fact]
Expand All @@ -280,10 +280,10 @@ public async Task API_Level_Event_Handlers_Should_Be_Executed_When_Other_Handler
await Api.Instance.SetProviderAsync(testProvider, TestContext.Current.CancellationToken);

await Utils.AssertUntilAsync(
_ => failingEventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == testProvider.GetMetadata().Name))
_ => failingEventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == testProvider.GetMetadata().Name))
);
await Utils.AssertUntilAsync(
_ => eventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == testProvider.GetMetadata().Name))
_ => eventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == testProvider.GetMetadata().Name))
);
}

Expand All @@ -306,7 +306,7 @@ public async Task Client_Level_Event_Handlers_Should_Be_Registered()

myClient.AddHandler(ProviderEventTypes.ProviderReady, eventHandler);

eventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == testProvider.GetMetadata().Name));
eventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == testProvider.GetMetadata().Name));
}

[Fact]
Expand Down Expand Up @@ -336,10 +336,10 @@ public async Task Client_Level_Event_Handlers_Should_Be_Executed_When_Other_Hand
await Api.Instance.SetProviderAsync(myClient.GetMetadata().Name!, testProvider, TestContext.Current.CancellationToken);

await Utils.AssertUntilAsync(
_ => failingEventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == testProvider.GetMetadata().Name))
_ => failingEventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == testProvider.GetMetadata().Name))
);
await Utils.AssertUntilAsync(
_ => eventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == testProvider.GetMetadata().Name))
_ => eventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == testProvider.GetMetadata().Name))
);
}

Expand Down Expand Up @@ -369,11 +369,11 @@ public async Task Client_Level_Event_Handlers_Should_Be_Registered_To_Default_Pr
myClientWithNoBoundProvider.AddHandler(ProviderEventTypes.ProviderReady, eventHandler);
myClientWithBoundProvider.AddHandler(ProviderEventTypes.ProviderReady, clientEventHandler);

eventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == apiProvider.GetMetadata().Name));
eventHandler.DidNotReceive().Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == clientProvider.GetMetadata().Name));
eventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == apiProvider.GetMetadata().Name));
eventHandler.DidNotReceive().Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == clientProvider.GetMetadata().Name));

clientEventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == clientProvider.GetMetadata().Name));
clientEventHandler.DidNotReceive().Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == apiProvider.GetMetadata().Name));
clientEventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == clientProvider.GetMetadata().Name));
clientEventHandler.DidNotReceive().Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == apiProvider.GetMetadata().Name));
}

[Fact]
Expand Down Expand Up @@ -403,7 +403,7 @@ public async Task Client_Level_Event_Handlers_Should_Be_Receive_Events_From_Name
// verify that the client received the event from the default provider as there is no named provider registered yet
await Utils.AssertUntilAsync(
_ => clientEventHandler.Received(1)
.Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == defaultProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderConfigurationChanged))
.Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == defaultProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderConfigurationChanged))
);

// set the other provider specifically for the client
Expand All @@ -415,12 +415,12 @@ await Utils.AssertUntilAsync(

// now the client should have received only the event from the named provider
await Utils.AssertUntilAsync(
_ => clientEventHandler.Received(1).Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == clientProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderConfigurationChanged))
_ => clientEventHandler.Received(1).Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == clientProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderConfigurationChanged))
);
// for the default provider, the number of received events should stay unchanged
await Utils.AssertUntilAsync(
_ => clientEventHandler.Received(1)
.Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == defaultProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderConfigurationChanged))
.Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == defaultProvider.GetMetadata().Name && payload.Type == ProviderEventTypes.ProviderConfigurationChanged))
);
}

Expand All @@ -444,7 +444,7 @@ public async Task Client_Level_Event_Handlers_Should_Be_Informed_About_Ready_Sta
// add the event handler after the provider has already transitioned into the ready state
myClient.AddHandler(ProviderEventTypes.ProviderReady, eventHandler);

eventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == testProvider.GetMetadata().Name));
eventHandler.Received().Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == testProvider.GetMetadata().Name));
}

[Fact]
Expand All @@ -468,7 +468,7 @@ public async Task Client_Level_Event_Handlers_Should_Be_Removable()

// wait for the first event to be received
await Utils.AssertUntilAsync(
_ => eventHandler.Received(1).Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == testProvider.GetMetadata().Name))
_ => eventHandler.Received(1).Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == testProvider.GetMetadata().Name))
);

myClient.RemoveHandler(ProviderEventTypes.ProviderReady, eventHandler);
Expand All @@ -478,7 +478,7 @@ await Utils.AssertUntilAsync(

// wait a bit and make sure we only have received the first event, but nothing after removing the event handler
await Utils.AssertUntilAsync(
_ => eventHandler.Received(1).Invoke(Arg.Is<ProviderEventPayload>(payload => payload.ProviderName == testProvider.GetMetadata().Name))
_ => eventHandler.Received(1).Invoke(Arg.Is<ProviderEventPayload>(payload => payload!.ProviderName == testProvider.GetMetadata().Name))
);
}

Expand Down
Loading