mirror of
https://github.com/ajisaacs/OpenNest.git
synced 2026-10-10 17:54:15 -04:00
aj
0a1d021bf7
The multi-phase lattice fill (linear, pairs, rectangle best-fit, remainder) is no longer meant to be the engine used by default, so it gets a name for what it does. The registry lists it as Fill and maps the old name Default to it; PlateFillService, PlateNesterFactory and NestJobOptions use Fill, and every fill-strategy caller still accepts Default. Console --autonest now validates engine names through NestingEngineRegistry.ResolveName so renamed names work. Layouts are unchanged: Default and Fill resolve to the same fillers and the golden layouts pass under the new name.
82 lines
3.0 KiB
C#
82 lines
3.0 KiB
C#
using OpenNest.Engine.Jobs;
|
|
using OpenNest.Engine.Jobs.Placement;
|
|
using OpenNest.Engine.Tests.Jobs;
|
|
using OpenNest.Geometry;
|
|
|
|
namespace OpenNest.Engine.Tests;
|
|
|
|
/// <summary>
|
|
/// The fill engine and placement strategy are named "Fill"; the old name "Default" remains a
|
|
/// hidden alias so saved selections, scripts and API requests keep their behavior.
|
|
/// </summary>
|
|
public class FillStrategyNameTests
|
|
{
|
|
[Fact]
|
|
public void FillIsListedAndDefaultIsNot()
|
|
{
|
|
var engines = NestingEngineRegistry.AvailableEngines.Select(e => e.Name).ToList();
|
|
|
|
Assert.Contains("Fill", engines);
|
|
Assert.DoesNotContain("Default", engines, StringComparer.OrdinalIgnoreCase);
|
|
Assert.Equal(new[] { "Fill", "Strip", "Vertical Remnant", "Horizontal Remnant" },
|
|
PlateFillService.BuiltInStrategies);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData("Default")]
|
|
[InlineData(" default ")]
|
|
public void LegacyDefaultEngineNameResolvesToFill(string name)
|
|
{
|
|
Assert.Equal("Fill", NestingEngineRegistry.ResolveName(name));
|
|
Assert.IsType<FixedStrategyNestingEngine>(NestingEngineRegistry.Create(name));
|
|
Assert.Equal(NestJobStatus.Complete, NestingEngineRegistry.Create(name).Solve(FiniteStockJobTests.Job(1)).Status);
|
|
}
|
|
|
|
[Fact]
|
|
public void PlugInNamedDefaultCannotShadowFill()
|
|
{
|
|
var before = NestingEngineRegistry.AvailableEngines.Count;
|
|
|
|
NestingEngineRegistry.Register("Default", "stale plug-in", () => new FixedStrategyNestingEngine("Strip"));
|
|
|
|
Assert.Equal(before, NestingEngineRegistry.AvailableEngines.Count);
|
|
Assert.Equal("Fill", NestingEngineRegistry.ResolveName("Default"));
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(null, "Fill")]
|
|
[InlineData("", "Fill")]
|
|
[InlineData("fill", "Fill")]
|
|
[InlineData("Default", "Fill")]
|
|
[InlineData("DEFAULT", "Fill")]
|
|
public void PlacementStrategyResolvesFillAndItsLegacyName(string? strategy, string expected)
|
|
{
|
|
Assert.Equal(expected, PlateFillService.ResolveStrategy(strategy!));
|
|
}
|
|
|
|
[Fact]
|
|
public void LegacyStrategyNameStillFillsAPlate()
|
|
{
|
|
var plate = new Plate(new Size(60, 80));
|
|
var drawing = new Drawing("part", TestDrawingFactory.Rectangle(6, 4));
|
|
|
|
var parts = PlateFillService.FillItem("Default", plate,
|
|
new NestItem { Drawing = drawing, Quantity = 6 }, plate.WorkArea(), null, CancellationToken.None);
|
|
|
|
Assert.Equal(6, parts.Count);
|
|
}
|
|
|
|
[Fact]
|
|
public void WholeJobRunnerAcceptsFillAndItsLegacyName()
|
|
{
|
|
Assert.IsType<DefaultPlateNester>(PlateNesterFactory.Create("Fill"));
|
|
Assert.IsType<DefaultPlateNester>(PlateNesterFactory.Create("Default"));
|
|
Assert.Equal("Fill", new NestJobOptions().PlacementStrategy);
|
|
|
|
var job = FiniteStockJobTests.Job(1);
|
|
var legacy = new NestJobRunner(PlateNesterFactory.Create)
|
|
.Solve(new NestJob(job.Parts, job.Plates, new NestJobOptions("Default")));
|
|
Assert.Equal(NestJobStatus.Complete, legacy.Status);
|
|
}
|
|
}
|