Test refactorings #208

nulltoken · 2025-02-11T20:25:37Z

Pull request description

Move test helpers in a subdirectory
Introduce various helper methods to make it easier to work with event based assertions.

PR meta checklist

Pull request is targeted at main branch for code
Pull request is linked to all related issues, if any.

Code PR specific checklist

My code follows the code style of this project and AspNetCore coding guidelines.
My change requires a change to the documentation.
- I have updated the documentation accordingly.
I have updated the appropriate sub section in the CHANGELOG.md.
I have added, updated or removed tests to according to my changes.
- All tests passed.

codecov · 2025-02-11T21:12:40Z

Codecov Report

All modified and coverable lines are covered by tests ✅

see 2 files with indirect coverage changes

nulltoken · 2025-02-11T21:32:54Z

Weirdo...

Looks unrelated to my changes as far as I can tell. Previous builds on this PR pass without any hiccup. I'll blame this on a GitHub transient issue and will give it another try tomorrow....

nulltoken · 2025-02-11T22:37:27Z

Weirdo...

Looks unrelated to my changes as far as I can tell. Previous builds on this PR pass without any hiccup. I'll blame this on a GitHub transient issue and will give it another try tomorrow....

Ok. For (some) reason, .NET SDK now doesn't detect anymore the .sln file. In order to workaround this, I had to patch the workflow file.

@linkdotnet If you've got any insights about the underlying reason behind the initial failure, I'd be a taker :-/

nulltoken · 2025-02-12T07:31:04Z

Weirdo...

Looks unrelated to my changes as far as I can tell. Previous builds on this PR pass without any hiccup. I'll blame this on a GitHub transient issue and will give it another try tomorrow....

Ok. For (some) reason, .NET SDK now doesn't detect anymore the .sln file. In order to workaround this, I had to patch the workflow file.

@linkdotnet If you've got any insights about the underlying reason behind the initial failure, I'd be a taker :-/

As far as I can tell this might be related to a new deployed .NET SDK version.

Installed version is 8.0.405 & dotnet-install: Installed version is 9.0.102 => Pass
Installed version is 8.0.406 & Installed version is 9.0.200 => Fail

I've just retriggered a previously passing action. It now fails.
Action 13272577713 => Attempt 1 => Green (https://github.com/NCronJob-Dev/NCronJob/actions/runs/13272577713/attempts/1)
Action 13272577713 => Attempt 2 => Red (https://github.com/NCronJob-Dev/NCronJob/actions/runs/13272577713/attempts/2)

nulltoken · 2025-02-12T07:42:06Z

Might be the CLI is "starting" to consider .slnx files (cf. dotnet/sdk#40913 (comment))?

linkdotnet · 2025-02-12T09:43:16Z

In any case, we could easily just delete the slnx file. Given that it is super trivial to re-create the file, once we are sure that it works.

linkdotnet · 2025-02-12T09:44:25Z

.github/workflows/dotnet.yml

@@ -33,11 +33,11 @@ jobs:
          9.0.x

    - name: Restore dependencies
-      run: dotnet restore
+      run: dotnet restore ./NCronJob.sln


Let's delete the SLNX for now. It is still not stable

linkdotnet · 2025-02-12T09:55:08Z

tests/NCronJob.Tests/Helpers/EventsHelper.cs

+
+public static class EventsHelper
+{
+    public static IList<ExecutionProgress> WithOrchestrationId(


Hmm not sure if the name sits right with me.
It might imply we Concat the events list with a new orch-Id.
Maybe?

FilterByOrchestrationId

ForOrchestration

linkdotnet · 2025-02-12T09:55:43Z

tests/NCronJob.Tests/NCronJobIntegrationTests.cs

@@ -158,28 +157,23 @@ public async Task InstantJobCanStartADisabledJob(Func<IInstantJobRegistry, strin

        await provider.GetRequiredService<IHostedService>().StartAsync(CancellationToken);

+        Guid scheduledOrchestrationId = events[0].CorrelationId;


Suggested change

Guid scheduledOrchestrationId = events[0].CorrelationId;

var scheduledOrchestrationId = events[0].CorrelationId;

linkdotnet · 2025-02-12T09:56:57Z

tests/NCronJob.Tests/Helpers/EventsHelper.cs

+        return events.Where(e => e.CorrelationId == orchestrationId).ToList();
+    }
+
+    public static void AssertScheduledThenCancelled(IList<ExecutionProgress> events)


Do we want to follow the shouldly style here?
AKA: ShouldBeScheduledThenCancelled(this ILIst<ExectuionProgress>)?

nulltoken · 2025-02-12T18:39:56Z

Next up in the queue: rewriting NCronJobIntegrationTests.

This one is going to be tedious. Hopefully, some of the changes introduced in that PR should make it a tad less cumbersome.

linkdotnet · 2025-02-12T18:54:01Z

Really appreciate your work @nulltoken

It is a curse and a blessing. As I am a bit full with tasks and can't always find the energy and motivation to work on NCronJob, I know that there is someone doing a fantastic job - leading me more towards being passive. But really - appreciate it!

Move test helpers under a dedicated folder

91bb8bb

nulltoken force-pushed the ntk/events_helper branch from 2d264de to 2bc97df Compare February 11, 2025 21:11

nulltoken requested a review from linkdotnet February 11, 2025 21:14

nulltoken force-pushed the ntk/events_helper branch 2 times, most recently from 230819d to e42e3f5 Compare February 11, 2025 22:32

linkdotnet reviewed Feb 12, 2025

View reviewed changes

nulltoken force-pushed the ntk/events_helper branch from e42e3f5 to 019c338 Compare February 12, 2025 12:59

nulltoken added 6 commits February 12, 2025 14:05

Introduce EventsHelper

c0ca537

Minor cleanups to some tests

11f3e25

Simplify assertions of Cancelled orchestrations

893aa3a

Simplify assertions of Completed orchestrations

b1c38b0

Simplify assertions of Faulted orchestrations

f93c0b6

Fix CI build

0622649

nulltoken force-pushed the ntk/events_helper branch from 019c338 to 0622649 Compare February 12, 2025 13:11

nulltoken requested a review from linkdotnet February 12, 2025 13:11

linkdotnet approved these changes Feb 12, 2025

View reviewed changes

nulltoken merged commit a80bc6b into main Feb 12, 2025
5 checks passed

nulltoken deleted the ntk/events_helper branch February 12, 2025 18:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Test refactorings #208

Test refactorings #208

nulltoken commented Feb 11, 2025 •

edited

Loading

codecov bot commented Feb 11, 2025 •

edited

Loading

nulltoken commented Feb 11, 2025

nulltoken commented Feb 11, 2025

nulltoken commented Feb 12, 2025 •

edited

Loading

nulltoken commented Feb 12, 2025

linkdotnet commented Feb 12, 2025 •

edited

Loading

linkdotnet Feb 12, 2025

nulltoken Feb 12, 2025

linkdotnet Feb 12, 2025

nulltoken Feb 12, 2025

linkdotnet Feb 12, 2025

nulltoken Feb 12, 2025

linkdotnet Feb 12, 2025 •

edited

Loading

nulltoken Feb 12, 2025

nulltoken commented Feb 12, 2025

linkdotnet commented Feb 12, 2025

		@@ -158,28 +157,23 @@ public async Task InstantJobCanStartADisabledJob(Func<IInstantJobRegistry, strin

		await provider.GetRequiredService<IHostedService>().StartAsync(CancellationToken);

		Guid scheduledOrchestrationId = events[0].CorrelationId;

	Guid scheduledOrchestrationId = events[0].CorrelationId;
	var scheduledOrchestrationId = events[0].CorrelationId;

Test refactorings #208

Test refactorings #208

Conversation

nulltoken commented Feb 11, 2025 • edited Loading

Pull request description

PR meta checklist

Code PR specific checklist

codecov bot commented Feb 11, 2025 • edited Loading

Codecov Report

nulltoken commented Feb 11, 2025

nulltoken commented Feb 11, 2025

nulltoken commented Feb 12, 2025 • edited Loading

nulltoken commented Feb 12, 2025

linkdotnet commented Feb 12, 2025 • edited Loading

linkdotnet Feb 12, 2025

Choose a reason for hiding this comment

nulltoken Feb 12, 2025

Choose a reason for hiding this comment

linkdotnet Feb 12, 2025

Choose a reason for hiding this comment

nulltoken Feb 12, 2025

Choose a reason for hiding this comment

linkdotnet Feb 12, 2025

Choose a reason for hiding this comment

nulltoken Feb 12, 2025

Choose a reason for hiding this comment

linkdotnet Feb 12, 2025 • edited Loading

Choose a reason for hiding this comment

nulltoken Feb 12, 2025

Choose a reason for hiding this comment

nulltoken commented Feb 12, 2025

linkdotnet commented Feb 12, 2025

nulltoken commented Feb 11, 2025 •

edited

Loading

codecov bot commented Feb 11, 2025 •

edited

Loading

nulltoken commented Feb 12, 2025 •

edited

Loading

linkdotnet commented Feb 12, 2025 •

edited

Loading

linkdotnet Feb 12, 2025 •

edited

Loading