aj
5b88d85937
Replace name-based quantity deduction with reference-based drawing identity in the engine paths the whole-job runner reaches (NestEngineBase fill/pack, StripNestEngine deduction, RemnantFiller ledger, IterativeShrinkFiller leftovers). Add instance-scoped PlateNesterFactory that resolves built-in strategies without touching the global NestEngineRegistry. Add identity and engine-selection tests. 44 net8.0 tests pass in Debug and Release; no new warnings.
87 lines
3.6 KiB
C#
87 lines
3.6 KiB
C#
using OpenNest.CNC;
|
|
using OpenNest.Geometry;
|
|
|
|
namespace OpenNest.Engine.Tests.Jobs;
|
|
|
|
/// <summary>
|
|
/// Strategy selection must be instance-scoped: explicit engine choices work without touching the
|
|
/// process-global NestEngineRegistry.ActiveEngineName, and unknown strategies are rejected.
|
|
/// </summary>
|
|
public class NestJobEngineSelectionTests
|
|
{
|
|
[Fact]
|
|
public void ExplicitDefaultAndStripSelectionsDoNotTouchGlobalRegistry()
|
|
{
|
|
var original = NestEngineRegistry.ActiveEngineName;
|
|
var job = FiniteStockJobTests.Job(1);
|
|
|
|
var defaultResult = new NestJobRunner(PlateNesterFactory.Create).Solve(job);
|
|
Assert.Equal(NestJobStatus.Complete, defaultResult.Status);
|
|
|
|
var stripResult = new NestJobRunner(PlateNesterFactory.Create)
|
|
.Solve(new NestJob(job.Parts, job.Plates, new NestJobOptions("Strip")));
|
|
Assert.Equal(NestJobStatus.Complete, stripResult.Status);
|
|
|
|
Assert.Equal(original, NestEngineRegistry.ActiveEngineName);
|
|
}
|
|
|
|
[Fact]
|
|
public void FactoryResolvesNamedEnginesWithoutGlobalState()
|
|
{
|
|
var original = NestEngineRegistry.ActiveEngineName;
|
|
var defaultNester = PlateNesterFactory.Create("Default");
|
|
var stripNester = PlateNesterFactory.Create("Strip");
|
|
var verticalNester = PlateNesterFactory.Create("Vertical Remnant");
|
|
var horizontalNester = PlateNesterFactory.Create("Horizontal Remnant");
|
|
|
|
Assert.NotNull(defaultNester);
|
|
Assert.NotNull(stripNester);
|
|
Assert.NotNull(verticalNester);
|
|
Assert.NotNull(horizontalNester);
|
|
Assert.NotSame(defaultNester, stripNester);
|
|
Assert.Equal(original, NestEngineRegistry.ActiveEngineName);
|
|
}
|
|
|
|
[Fact]
|
|
public void UnknownStrategyIsRejected()
|
|
{
|
|
Assert.Throws<NotSupportedException>(() => PlateNesterFactory.Create("Not A Real Engine"));
|
|
var job = FiniteStockJobTests.Job(1);
|
|
Assert.Throws<NotSupportedException>(() =>
|
|
new NestJobRunner(key => throw new NotSupportedException($"Unknown placement strategy: {key}"))
|
|
.Solve(new NestJob(job.Parts, job.Plates, new NestJobOptions("Bogus"))));
|
|
}
|
|
|
|
[Fact]
|
|
public void LegacyRegistryPluginsDoNotLeakIntoJobSelection()
|
|
{
|
|
// A plugin engine registered through the legacy registry must not become selectable
|
|
// through the job factory; the new boundary is independent of registry state.
|
|
NestEngineRegistry.Register("ProbePlugin", "test plugin", plate => new PluginShapeEngine(plate));
|
|
Assert.Contains(NestEngineRegistry.AvailableEngines, e => e.Name == "ProbePlugin");
|
|
|
|
Assert.Throws<NotSupportedException>(() => PlateNesterFactory.Create("ProbePlugin"));
|
|
Assert.NotNull(PlateNesterFactory.Create("Default"));
|
|
}
|
|
|
|
[Fact]
|
|
public void StripEngineEndToEndPlacesAndAccounts()
|
|
{
|
|
var drawing = new Drawing("strip part", TestDrawingFactory.Rectangle(30, 30));
|
|
var job = new NestJob(new[] { DrawingJobMapper.FromDrawing("part", drawing, 2) },
|
|
new[] { new NestPlateStock("s", new Size(90, 90), 1) });
|
|
var result = new NestJobRunner(PlateNesterFactory.Create)
|
|
.Solve(new NestJob(job.Parts, job.Plates, new NestJobOptions("Strip")));
|
|
|
|
Assert.True(result.Plates.SelectMany(p => p.Placements).Count() >= 1);
|
|
foreach (var f in result.Fulfillment)
|
|
Assert.Equal(f.Requested, f.Placed + f.Unplaced);
|
|
}
|
|
|
|
private sealed class PluginShapeEngine(Plate plate) : NestEngineBase(plate)
|
|
{
|
|
public override string Name => "ProbePlugin";
|
|
public override string Description => "registered via legacy registry only";
|
|
}
|
|
}
|