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
1 change: 1 addition & 0 deletions .github/workflows/nuget_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
dotnet-quality: preview

- name: Install dependencies
run: npm install
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
dotnet-quality: preview
- run: dotnet tool restore
- run: dotnet csharpier check .
- run: dotnet build --configuration Release
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,6 @@ _NCrunch*
BenchmarkDotNet.Artifacts/
# Semantic Release version file
.release-version

# Node modules (semantic-release)
node_modules/
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma warning disable CS8766 // Nullability mismatch on Metadata property inherited from EffectTrain

namespace Trax.Dashboard.Tests.Integration.Fakes;
namespace Trax.Dashboard.Tests.Integration.Fakes.Trains;

// --- Manifest-compatible fakes for scheduler builder tests ---
// These satisfy TTrain : IServiceTrain<TInput, Unit> where TInput : IManifestProperties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma warning disable CS8766 // Nullability mismatch on Metadata property inherited from EffectTrain

namespace Trax.Dashboard.Tests.Integration.Fakes;
namespace Trax.Dashboard.Tests.Integration.Fakes.Trains;

// --- Simple train A ---
public record FakeInputA;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Trax.Effect.Models.Manifest;
using Trax.Effect.Models.Metadata;

namespace Trax.Dashboard.Tests.Integration;
namespace Trax.Dashboard.Tests.Integration.UnitTests;

[TestFixture]
public class AdminQueryFiltersTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using FluentAssertions;
using Microsoft.Extensions.DependencyInjection;
using Trax.Dashboard.Tests.Integration.Fakes;
using Trax.Dashboard.Tests.Integration.Fakes.Trains;
using Trax.Effect.Configuration.TraxBuilder;
using Trax.Effect.Extensions;
using Trax.Effect.Services.EffectRegistry;
Expand All @@ -9,7 +9,7 @@
using Trax.Scheduler.Extensions;
using Trax.Scheduler.Services.Scheduling;

namespace Trax.Dashboard.Tests.Integration;
namespace Trax.Dashboard.Tests.Integration.UnitTests;

[TestFixture]
public class CyclicDependencyValidationTests
Expand All @@ -22,7 +22,8 @@ public void SetUp()
{
_services = new ServiceCollection();
var root = new TraxBuilder(_services, new EffectRegistry());
_parentBuilder = root.AddEffects(_ => { }).AddMediator();
_parentBuilder = root.AddEffects(effects => effects)
.AddMediator(typeof(IFakeSchedulerTrainA).Assembly);
}

#region Valid DAGs (no cycles)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Trax.Dashboard.Models;
using Trax.Dashboard.Utilities;

namespace Trax.Dashboard.Tests.Integration;
namespace Trax.Dashboard.Tests.Integration.UnitTests;

[TestFixture]
public class DagLayoutEngineTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using FluentAssertions;
using Trax.Scheduler.Utilities;

namespace Trax.Dashboard.Tests.Integration;
namespace Trax.Dashboard.Tests.Integration.UnitTests;

[TestFixture]
public class DagValidatorTests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Radzen;
using Trax.Dashboard.Utilities;

namespace Trax.Dashboard.Tests.Integration;
namespace Trax.Dashboard.Tests.Integration.UnitTests;

[TestFixture]
public class DashboardFormattersAdditionalTests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Trax.Dashboard.Utilities;
using Trax.Effect.Enums;

namespace Trax.Dashboard.Tests.Integration;
namespace Trax.Dashboard.Tests.Integration.UnitTests;

[TestFixture]
public class DashboardFormattersTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using FluentAssertions;
using Trax.Dashboard.Configuration;

namespace Trax.Dashboard.Tests.Integration;
namespace Trax.Dashboard.Tests.Integration.UnitTests;

[TestFixture]
public class DashboardOptionsTests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Trax.Effect.Configuration.TraxBuilder;
using Trax.Mediator.Services.TrainDiscovery;

namespace Trax.Dashboard.Tests.Integration;
namespace Trax.Dashboard.Tests.Integration.UnitTests;

[TestFixture]
public class DashboardServiceExtensionsTests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Trax.Dashboard.Services.DashboardSettings;
using Trax.Dashboard.Services.LocalStorage;

namespace Trax.Dashboard.Tests.Integration;
namespace Trax.Dashboard.Tests.Integration.UnitTests;

[TestFixture]
public class DashboardSettingsServiceTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using FluentAssertions;
using Microsoft.Extensions.DependencyInjection;
using Trax.Dashboard.Tests.Integration.Fakes;
using Trax.Dashboard.Tests.Integration.Fakes.Trains;
using Trax.Effect.Configuration.TraxBuilder;
using Trax.Effect.Extensions;
using Trax.Effect.Services.EffectRegistry;
Expand All @@ -10,7 +10,7 @@
using Trax.Scheduler.Extensions;
using Trax.Scheduler.Services.Scheduling;

namespace Trax.Dashboard.Tests.Integration;
namespace Trax.Dashboard.Tests.Integration.UnitTests;

[TestFixture]
public class InferredSchedulingApiTests
Expand All @@ -23,7 +23,8 @@ public void SetUp()
{
_services = new ServiceCollection();
var root = new TraxBuilder(_services, new EffectRegistry());
_parentBuilder = root.AddEffects(_ => { }).AddMediator();
_parentBuilder = root.AddEffects(effects => effects)
.AddMediator(typeof(IFakeSchedulerTrainA).Assembly);
}

#region Single-type-param: Schedule, Include, ThenInclude
Expand Down Expand Up @@ -469,6 +470,8 @@ public void IncludeMany_CrossGroupCycle_ThrowsInvalidOperationException()
new FakeManifestInputD(),
options => options.Group("group-a")
);

return scheduler;
});

act.Should().Throw<InvalidOperationException>().WithMessage("*Circular dependency*");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using FluentAssertions;
using Microsoft.Extensions.DependencyInjection;
using Trax.Dashboard.Extensions;
using Trax.Dashboard.Tests.Integration.Fakes;
using Trax.Dashboard.Tests.Integration.Fakes.Trains;
using Trax.Effect.Extensions;
using Trax.Mediator.Extensions;
using Trax.Mediator.Services.TrainDiscovery;

namespace Trax.Dashboard.Tests.Integration;
namespace Trax.Dashboard.Tests.Integration.UnitTests;

[TestFixture]
public class TrainBusIntegrationTests
Expand All @@ -18,7 +18,8 @@ public void DiscoverTrains_WithEffectTrainBus_FindsAssemblyScannedTrains()
var services = new ServiceCollection();

services.AddTrax(trax =>
trax.AddEffects(_ => { }).AddMediator(assemblies: [typeof(FakeTrainA).Assembly])
trax.AddEffects(effects => effects)
.AddMediator(assemblies: [typeof(FakeTrainA).Assembly])
);

services.AddTraxDashboard();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using FluentAssertions;
using Microsoft.Extensions.DependencyInjection;
using Trax.Dashboard.Tests.Integration.Fakes;
using Trax.Dashboard.Tests.Integration.Fakes.Trains;
using Trax.Effect.Extensions;
using Trax.Mediator.Services.TrainDiscovery;

namespace Trax.Dashboard.Tests.Integration;
namespace Trax.Dashboard.Tests.Integration.UnitTests;

[TestFixture]
public class TrainDiscoveryServiceTests
Expand Down