Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Strengthen display orientation coverage and trim redundant reruns

Yuechen Li10b59dbcc4ec
diff --git a/Aetheris.Kernel.Core.Tests/Brep/Tessellation/DisplayMeshOrientationCorpusTests.cs b/Aetheris.Kernel.Core.Tests/Brep/Tessellation/DisplayMeshOrientationCorpusTests.cs
index 9ab5253d..d4390f0d 100644
--- a/Aetheris.Kernel.Core.Tests/Brep/Tessellation/DisplayMeshOrientationCorpusTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Brep/Tessellation/DisplayMeshOrientationCorpusTests.cs
@@ -1,5 +1,6 @@
using Aetheris.Kernel.Core.Brep;
using Aetheris.Kernel.Core.Brep.Tessellation;
+using Aetheris.Kernel.Core.Diagnostics;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Core.Step242;
using Aetheris.Kernel.Core.Tests.Step242;
@@ -21,22 +22,8 @@ public sealed class DisplayMeshOrientationCorpusTests
{
public static TheoryData<string> ClosedBrepFiles => new()
{
- "testdata/step242/nist/CTC/nist_ctc_01_asme1_ap242-e1.stp",
- "testdata/step242/nist/CTC/nist_ctc_02_asme1_ap242-e2.stp",
- "testdata/step242/nist/CTC/nist_ctc_03_asme1_ap242-e2.stp",
- "testdata/step242/nist/CTC/nist_ctc_04_asme1_ap242-e1.stp",
- "testdata/step242/nist/CTC/nist_ctc_05_asme1_ap242-e1.stp",
"testdata/step242/nist/FTC/nist_ftc_06_asme1_ap242-e2.stp",
- "testdata/step242/nist/FTC/nist_ftc_07_asme1_ap242-e2.stp",
- "testdata/step242/nist/FTC/nist_ftc_08_asme1_ap242-e2.stp",
- "testdata/step242/nist/FTC/nist_ftc_09_asme1_ap242-e1.stp",
- "testdata/step242/nist/FTC/nist_ftc_10_asme1_ap242-e2.stp",
- "testdata/step242/nist/FTC/nist_ftc_11_asme1_ap242-e2.stp",
"testdata/step242/nist/STC/nist_stc_06_asme1_ap242-e3.stp",
- "testdata/step242/nist/STC/nist_stc_07_asme1_ap242-e3.stp",
- "testdata/step242/nist/STC/nist_stc_08_asme1_ap242-e3.stp",
- "testdata/step242/nist/STC/nist_stc_09_asme1_ap242-e3.stp",
- "testdata/step242/nist/STC/nist_stc_10_asme1_ap242-e2.stp",
};
[Theory]
@@ -47,18 +34,25 @@ public sealed class DisplayMeshOrientationCorpusTests
var import = Step242Importer.ImportBody(ReadFixture(relativePath));
Assert.True(import.IsSuccess);
- var unresolvedShells = import.Value.FaceOrientationReport?.Shells
+ var display = DisplayPreparationFallbackBuilder.Build(import.Value, null, null, TimeSpan.FromSeconds(30));
+ Assert.True(display.IsSuccess);
+ AssertOutwardOrientation(import.Value, import.Diagnostics, display.Value);
+ }
+
+ internal static void AssertOutwardOrientation(BrepBody body, IReadOnlyList<KernelDiagnostic> diagnostics, DisplayTessellationResult display)
+ {
+ var unresolvedShells = body.FaceOrientationReport?.Shells
.Where(shell => shell.Qualification == FaceOrientationQualification.DerivedLocallyConsistentGlobalUnknown)
.ToArray() ?? [];
if (unresolvedShells.Length > 0)
{
Assert.All(unresolvedShells, shell => Assert.False(shell.IsClosedManifold));
- Assert.Contains(import.Diagnostics, diagnostic =>
+ Assert.Contains(diagnostics, diagnostic =>
diagnostic.Source == "Importer.StepOrientation.GlobalOrientationUnknown");
return;
}
- var (windingVolume, normalVolume) = MeasureVolumes(import.Value);
+ var (windingVolume, normalVolume) = MeasureVolumes(display);
Assert.True(windingVolume > 0d, $"triangle winding encloses a negative volume ({windingVolume:G6}), so the mesh is not outward-oriented");
// Winding and stored normals are two independent statements of the same orientation; they have to agree.
@@ -67,14 +61,11 @@ public sealed class DisplayMeshOrientationCorpusTests
$"winding volume {windingVolume:G6} and stored-normal volume {normalVolume:G6} disagree");
}
- private static (double WindingVolume, double NormalVolume) MeasureVolumes(BrepBody body)
+ private static (double WindingVolume, double NormalVolume) MeasureVolumes(DisplayTessellationResult display)
{
- var display = DisplayPreparationFallbackBuilder.Build(body, null, null, TimeSpan.FromSeconds(30));
- Assert.True(display.IsSuccess);
-
var windingVolume = 0d;
var normalVolume = 0d;
- foreach (var patch in display.Value.FacePatches)
+ foreach (var patch in display.FacePatches)
{
for (var index = 0; index + 2 < patch.TriangleIndices.Count; index += 3)
{
diff --git a/Aetheris.Kernel.Core.Tests/Brep/Tessellation/NistDisplayCorpusRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Brep/Tessellation/NistDisplayCorpusRegressionTests.cs
index b2b8f7d9..d02f918c 100644
--- a/Aetheris.Kernel.Core.Tests/Brep/Tessellation/NistDisplayCorpusRegressionTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Brep/Tessellation/NistDisplayCorpusRegressionTests.cs
@@ -45,6 +45,7 @@ public sealed class NistDisplayCorpusRegressionTests
var warnings = display.Diagnostics.Where(d => d.Severity != KernelDiagnosticSeverity.Info).Select(d => d.Message).ToArray();
Assert.True(warnings.Length == 0, string.Join(Environment.NewLine, warnings.Take(5)));
Assert.DoesNotContain(display.Value.FacePatches, patch => patch.TriangleIndices.Count == 0);
+ DisplayMeshOrientationCorpusTests.AssertOutwardOrientation(import.Value, import.Diagnostics, display.Value);
}
/// <summary>
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242BSplineEdgeTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242BSplineEdgeTests.cs
index 08208864..356cad94 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242BSplineEdgeTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242BSplineEdgeTests.cs
@@ -115,12 +115,9 @@ public sealed class Step242BSplineEdgeTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
Assert.DoesNotContain("EDGE_CURVE geometry 'BOUNDED_CURVE' is unsupported.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
Assert.DoesNotContain("B_SPLINE_CURVE_WITH_KNOTS self_intersect", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
}
[Theory]
@@ -141,11 +138,8 @@ public sealed class Step242BSplineEdgeTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
Assert.DoesNotContain("B_SPLINE_CURVE_WITH_KNOTS self_intersect", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
Assert.False(string.IsNullOrWhiteSpace(first.FirstDiagnostic.MessagePrefix));
}
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242BSplineSurfaceWithKnotsTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242BSplineSurfaceWithKnotsTests.cs
index 4323085a..f4e6f668 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242BSplineSurfaceWithKnotsTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242BSplineSurfaceWithKnotsTests.cs
@@ -75,12 +75,8 @@ public sealed class Step242BSplineSurfaceWithKnotsTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
Assert.DoesNotContain("ADVANCED_FACE surface 'B_SPLINE_SURFACE_WITH_KNOTS' is unsupported.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
}
[Theory]
@@ -131,7 +127,6 @@ public sealed class Step242BSplineSurfaceWithKnotsTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
Assert.DoesNotContain("sphere tessellation supports only untrimmed sphere faces with zero loops.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
if (!string.IsNullOrEmpty(expectedLayer))
@@ -155,8 +150,5 @@ public sealed class Step242BSplineSurfaceWithKnotsTests
Assert.DoesNotContain("unsupported surface kind 'BSplineSurfaceWithKnots'", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
Assert.DoesNotContain("Unsupported surface kind 'Sphere'.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
}
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
}
}
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242ConicalSurfaceRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242ConicalSurfaceRegressionTests.cs
index 21de28eb..14accd33 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242ConicalSurfaceRegressionTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242ConicalSurfaceRegressionTests.cs
@@ -104,7 +104,6 @@ public sealed class Step242ConicalSurfaceRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
Assert.DoesNotContain("CONICAL_SURFACE radius", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
Assert.DoesNotContain("expected mirrored line uses for this cone/revolved topology", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
@@ -137,9 +136,6 @@ public sealed class Step242ConicalSurfaceRegressionTests
Assert.DoesNotContain("Unsupported surface kind 'Sphere'.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
}
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
Assert.False(string.IsNullOrWhiteSpace(first.FirstDiagnostic.MessagePrefix));
}
@@ -172,7 +168,6 @@ public sealed class Step242ConicalSurfaceRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
if (!string.IsNullOrEmpty(expectedLayer))
{
@@ -196,9 +191,6 @@ public sealed class Step242ConicalSurfaceRegressionTests
Assert.DoesNotContain("Unsupported surface kind 'Sphere'.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
}
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
}
@@ -306,13 +298,9 @@ public sealed class Step242ConicalSurfaceRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
Assert.DoesNotContain("AXIS2_PLACEMENT_3D ref direction: expected entity reference argument.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
Assert.NotEqual("AXIS2_PLACEMENT_3D axis and ref direction must not be parallel.", first.FirstDiagnostic.MessagePrefix);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
}
[Fact]
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestGateTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestGateTests.cs
index c5e52d46..9feccf91 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestGateTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestGateTests.cs
@@ -29,12 +29,6 @@ public sealed class Step242CorpusManifestGateTests
Assert.Equal(manifestEntry.ExpectTopologyCounts.F, report.TopologyCounts.Faces);
}
- if (manifestEntry.ExpectHashStableAfterCanonicalization ?? true)
- {
- var rerun = Step242CorpusManifestRunner.RunOne(manifestEntry);
- Assert.Equal(report.CanonicalSha256, rerun.CanonicalSha256);
- Assert.Equal(report.ExportedCanonicalText, rerun.ExportedCanonicalText);
- }
}
foreach (var report in reports.Where(r => string.Equals(r.Group, "expectedFail", StringComparison.Ordinal)))
@@ -51,9 +45,6 @@ public sealed class Step242CorpusManifestGateTests
var deferredCount = reports.Count(r => string.Equals(r.Group, "deferred", StringComparison.Ordinal));
Assert.True(deferredCount >= 0);
- var first = Step242CorpusManifestRunner.BuildReportJson(entries);
- var second = Step242CorpusManifestRunner.BuildReportJson(entries);
- Assert.Equal(first, second);
}
[Fact]
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestRunner.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestRunner.cs
index d12fec6b..0699b7d0 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestRunner.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestRunner.cs
@@ -31,22 +31,6 @@ internal static class Step242CorpusManifestRunner
return manifest;
}
- public static string BuildReportJson(IEnumerable<Step242CorpusManifestEntry> entries)
- {
- var reportEntries = entries
- .OrderBy(e => e.Path, StringComparer.Ordinal)
- .Select(entry => RunOne(entry))
- .ToArray();
-
- var report = JsonSerializer.Serialize(reportEntries, new JsonSerializerOptions
- {
- PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
- WriteIndented = true
- });
-
- return NormalizeLf(report) + "\n";
- }
-
public static Step242CorpusReportEntry RunOne(Step242CorpusManifestEntry entry, bool includeDisplayAudit = false)
{
var fullPath = Path.Combine(RepoRoot(), entry.Path.Replace('/', Path.DirectorySeparatorChar));
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTests.cs
index 14b2bd3a..5e308656 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTests.cs
@@ -33,14 +33,9 @@ public sealed class Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTes
{
const string relativePath = "testdata/step242/nist/CTC/nist_ctc_05_asme1_ap242-e1.stp";
var first = Step242CorpusManifestRunner.RunOne(new Step242CorpusManifestEntry("ctc05", relativePath, "nist-regression", null, null, null, null, null));
- var second = Step242CorpusManifestRunner.RunOne(new Step242CorpusManifestEntry("ctc05", relativePath, "nist-regression", null, null, null, null, null));
Assert.Equal("success", first.Status);
Assert.Equal(string.Empty, first.FirstFailureLayer);
- Assert.Equal(first.Status, second.Status);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
}
[Fact]
@@ -48,7 +43,6 @@ public sealed class Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTes
{
const string relativePath = "testdata/step242/nist/FTC/nist_ftc_11_asme1_ap242-e2.stp";
var first = Step242CorpusManifestRunner.RunOne(new Step242CorpusManifestEntry("ftc11", relativePath, "nist-regression", null, null, null, null, null), includeDisplayAudit: true);
- var second = Step242CorpusManifestRunner.RunOne(new Step242CorpusManifestEntry("ftc11", relativePath, "nist-regression", null, null, null, null, null), includeDisplayAudit: true);
Assert.Equal("success", first.Status);
Assert.Equal(string.Empty, first.FirstFailureLayer);
@@ -56,10 +50,6 @@ public sealed class Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTes
Assert.Equal("success", first.DisplayStatus);
Assert.Equal(string.Empty, first.DisplayFirstFailureLayer);
- Assert.Equal(first.DisplayStatus, second.DisplayStatus);
- Assert.Equal(first.DisplayFirstFailureLayer, second.DisplayFirstFailureLayer);
- Assert.Equal(first.DisplayFirstDiagnostic.Source, second.DisplayFirstDiagnostic.Source);
- Assert.Equal(first.DisplayFirstDiagnostic.MessagePrefix, second.DisplayFirstDiagnostic.MessagePrefix);
}
[Fact]
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs
index 959169da..0be458b5 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs
@@ -23,15 +23,11 @@ public sealed class Step242EdgeCurveSenseRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
Assert.NotEqual("Importer.Orientation.EdgeCurveSense", first.FirstDiagnostic.Source);
Assert.NotEqual("Importer.LoopRole.CylinderNonNormalizableDegenerateProjection", first.FirstDiagnostic.Source);
Assert.NotEqual("Importer.LoopRole.UnsupportedSurfaceForHoles", first.FirstDiagnostic.Source);
Assert.False(string.IsNullOrWhiteSpace(first.FirstDiagnostic.MessagePrefix));
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
}
}
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242EllipseEdgeRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242EllipseEdgeRegressionTests.cs
index 948bd23d..b50d32ac 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242EllipseEdgeRegressionTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242EllipseEdgeRegressionTests.cs
@@ -20,7 +20,6 @@ public sealed class Step242EllipseEdgeRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
Assert.DoesNotContain("EDGE_CURVE geometry 'ELLIPSE' is unsupported.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
Assert.DoesNotContain("Unsupported curve kind 'Ellipse3'.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
@@ -46,8 +45,5 @@ public sealed class Step242EllipseEdgeRegressionTests
Assert.DoesNotContain("Unsupported surface kind 'Sphere'.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
}
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
}
}
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242LoopRoleNormalizationRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242LoopRoleNormalizationRegressionTests.cs
index 0df46bfe..2d0a20c3 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242LoopRoleNormalizationRegressionTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242LoopRoleNormalizationRegressionTests.cs
@@ -30,7 +30,6 @@ public sealed class Step242LoopRoleNormalizationRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
if (expectedSource is null)
{
@@ -49,9 +48,6 @@ public sealed class Step242LoopRoleNormalizationRegressionTests
}
}
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
}
[Theory]
@@ -112,11 +108,7 @@ public sealed class Step242LoopRoleNormalizationRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
Assert.NotEqual("Importer.LoopRole.TorusDegenerateMinorSpan", first.FirstDiagnostic.Source);
Assert.DoesNotContain("TorusDegenerateMinorSpan", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242NistAuditHarnessTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242NistAuditHarnessTests.cs
index 95f7003b..20c7204b 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242NistAuditHarnessTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242NistAuditHarnessTests.cs
@@ -8,46 +8,33 @@ public sealed class Step242NistAuditHarnessTests
[Theory]
[MemberData(nameof(NistCorpusEntries))]
[Trait("Category", "SlowCorpus")]
- public void NistCorpus_PerFile_AuditReport_IsStable_AndMatchesSnapshot(string relativePath)
+ public void NistCorpus_PerFile_AuditReport_MatchesSnapshot(string relativePath)
{
+ if (string.Equals(Environment.GetEnvironmentVariable("AETHERIS_UPDATE_STEP242_SNAPSHOT"), "1", StringComparison.Ordinal)) return;
var entry = BuildNistEntry(relativePath);
- var first = ExecutePerFileLegacyAudit(entry);
- var second = ExecutePerFileLegacyAudit(entry);
-
- Assert.Equal(first, second);
- if (string.Equals(Environment.GetEnvironmentVariable("AETHERIS_UPDATE_STEP242_SNAPSHOT"), "1", StringComparison.Ordinal))
- {
- return;
- }
+ var actual = ExecutePerFileLegacyAudit(entry);
var expectedByPath = LoadLegacySnapshotEntriesByPath();
Assert.True(expectedByPath.TryGetValue(entry.Path, out var expected), $"Missing snapshot entry for '{entry.Path}'.");
- Assert.Equal(expected, first);
+ Assert.Equal(expected, actual);
}
[Fact]
- [Trait("Category", "SlowCorpus")]
- public void NistCorpus_AggregateAuditReport_IsByteStableAcrossConsecutiveRuns_AndMatchesSnapshot()
+ public void NistCorpus_SnapshotCoversEveryFile()
{
- var entries = GetNistCorpusEntries();
-
- var first = BuildLegacyAuditJson(entries);
- var second = BuildLegacyAuditJson(entries);
- Assert.Equal(first, second);
-
- var snapshotPath = NistSnapshotPath();
- var expected = Step242CorpusManifestRunner.NormalizeLf(File.ReadAllText(snapshotPath, Encoding.UTF8));
- if (!string.Equals(expected, first, StringComparison.Ordinal))
+ if (string.Equals(Environment.GetEnvironmentVariable("AETHERIS_UPDATE_STEP242_SNAPSHOT"), "1", StringComparison.Ordinal))
{
- if (string.Equals(Environment.GetEnvironmentVariable("AETHERIS_UPDATE_STEP242_SNAPSHOT"), "1", StringComparison.Ordinal))
+ var reports = GetNistCorpusRelativePaths().Select(path => ExecutePerFileLegacyAudit(BuildNistEntry(path))).ToArray();
+ var json = JsonSerializer.Serialize(reports, new JsonSerializerOptions
{
- File.WriteAllText(snapshotPath, first, new UTF8Encoding(false));
- return;
- }
-
- Assert.Fail("NIST audit snapshot mismatch.");
+ PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+ WriteIndented = true
+ });
+ File.WriteAllText(NistSnapshotPath(), Step242CorpusManifestRunner.NormalizeLf(json) + "\n", new UTF8Encoding(false));
+ return;
}
+ Assert.Equal(GetNistCorpusRelativePaths(), LoadLegacySnapshotEntriesByPath().Keys.OrderBy(path => path, StringComparer.Ordinal));
}
[Fact]
@@ -57,13 +44,11 @@ public sealed class Step242NistAuditHarnessTests
var entry = BuildNistEntry(relativePath);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
Assert.Equal("success", first.Status);
Assert.Equal(string.Empty, first.FirstFailureLayer);
Assert.Equal("notRun", first.DisplayStatus);
Assert.Equal(string.Empty, first.DisplayFirstFailureLayer);
- Assert.Equal(first.DisplayStatus, second.DisplayStatus);
}
[Fact]
@@ -73,16 +58,11 @@ public sealed class Step242NistAuditHarnessTests
var entry = BuildNistEntry(relativePath);
var first = Step242CorpusManifestRunner.RunOne(entry, includeDisplayAudit: true);
- var second = Step242CorpusManifestRunner.RunOne(entry, includeDisplayAudit: true);
Assert.Equal("success", first.Status);
Assert.Equal(string.Empty, first.FirstFailureLayer);
Assert.Equal("success", first.DisplayStatus);
Assert.Equal(string.Empty, first.DisplayFirstFailureLayer);
- Assert.Equal(first.DisplayStatus, second.DisplayStatus);
- Assert.Equal(first.DisplayFirstFailureLayer, second.DisplayFirstFailureLayer);
- Assert.Equal(first.DisplayFirstDiagnostic.Source, second.DisplayFirstDiagnostic.Source);
- Assert.Equal(first.DisplayFirstDiagnostic.MessagePrefix, second.DisplayFirstDiagnostic.MessagePrefix);
}
[Fact]
@@ -102,8 +82,6 @@ public sealed class Step242NistAuditHarnessTests
public static IEnumerable<object[]> NistCorpusEntries() => GetNistCorpusRelativePaths().Select(path => new object[] { path });
- private static IReadOnlyList<Step242CorpusManifestEntry> GetNistCorpusEntries() => GetNistCorpusRelativePaths().Select(BuildNistEntry).ToArray();
-
private static IReadOnlyList<string> GetNistCorpusRelativePaths()
{
return Directory
@@ -116,19 +94,6 @@ public sealed class Step242NistAuditHarnessTests
private static Step242CorpusManifestEntry BuildNistEntry(string relativePath)
=> new(FileId(relativePath), relativePath, "deferred", "NIST audit corpus", null, null, null, null);
- private static string BuildLegacyAuditJson(IReadOnlyList<Step242CorpusManifestEntry> entries)
- {
- var report = entries.Select(ExecutePerFileLegacyAudit).ToArray();
-
- var json = JsonSerializer.Serialize(report, new JsonSerializerOptions
- {
- PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
- WriteIndented = true
- });
-
- return Step242CorpusManifestRunner.NormalizeLf(json) + "\n";
- }
-
private static LegacyAuditEntry ExecutePerFileLegacyAudit(Step242CorpusManifestEntry entry)
{
var r = Step242CorpusManifestRunner.RunOne(entry);
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242RevolvedTopologyFamilyRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242RevolvedTopologyFamilyRegressionTests.cs
index 5c37330e..ba5140dd 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242RevolvedTopologyFamilyRegressionTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242RevolvedTopologyFamilyRegressionTests.cs
@@ -24,11 +24,7 @@ public sealed class Step242RevolvedTopologyFamilyRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
Assert.DoesNotContain("supports repeated torus/revolved families with mixed line/circle loops; this topology family is still unsupported", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
Assert.DoesNotContain("supports repeated cone/revolved families with mixed line/circle loops; this topology family is still unsupported", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
@@ -53,11 +49,7 @@ public sealed class Step242RevolvedTopologyFamilyRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
Assert.DoesNotContain("unsupported subfamily 'six-coedge bspline-only revolved loop'", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
Assert.Equal("No diagnostics.", first.FirstDiagnostic.MessagePrefix);
@@ -79,11 +71,7 @@ public sealed class Step242RevolvedTopologyFamilyRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
Assert.DoesNotContain("unsupported subfamily 'circle-only seam reused loop'", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
Assert.DoesNotContain("requires exactly one loop", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
@@ -107,11 +95,7 @@ public sealed class Step242RevolvedTopologyFamilyRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
if (expectedMessagePrefix.Contains("Observed", StringComparison.Ordinal))
{
@@ -137,12 +121,8 @@ public sealed class Step242RevolvedTopologyFamilyRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
Assert.Equal(string.Empty, first.FirstFailureLayer);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
Assert.Equal("No diagnostics.", first.FirstDiagnostic.MessagePrefix);
}
}
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242RoundTripCorpusTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242RoundTripCorpusTests.cs
index e28030ff..7f71f700 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242RoundTripCorpusTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242RoundTripCorpusTests.cs
@@ -18,21 +18,14 @@ namespace Aetheris.Kernel.Core.Tests.Step242;
/// </summary>
public sealed class Step242RoundTripCorpusTests
{
- public static TheoryData<string> CorpusFiles
+ // The manifest audit imports and exports every NIST file. Reimport a bounded
+ // sample here to cover the edge-sense failure without a second corpus sweep.
+ public static TheoryData<string> CorpusFiles => new()
{
- get
- {
- var data = new TheoryData<string>();
- foreach (var path in Directory
- .EnumerateFiles(Path.Combine(Step242CorpusManifestRunner.RepoRoot(), "testdata", "step242", "nist"), "*.stp", SearchOption.AllDirectories)
- .OrderBy(path => path, StringComparer.Ordinal))
- {
- data.Add(Path.GetFileName(path));
- }
-
- return data;
- }
- }
+ "nist_ctc_01_asme1_ap242-e1.stp",
+ "nist_ftc_08_asme1_ap242-e2.stp",
+ "nist_stc_08_asme1_ap242-e3.stp"
+ };
[Theory]
[MemberData(nameof(CorpusFiles))]
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242SphericalTrimSingleCoedgeDiagnosticsTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242SphericalTrimSingleCoedgeDiagnosticsTests.cs
index 3ec3ce8b..8d3be1a9 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242SphericalTrimSingleCoedgeDiagnosticsTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242SphericalTrimSingleCoedgeDiagnosticsTests.cs
@@ -51,14 +51,10 @@ public sealed class Step242SphericalTrimSingleCoedgeDiagnosticsTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
Assert.Equal(string.Empty, first.FirstFailureLayer);
Assert.Equal("Audit.None", first.FirstDiagnostic.Source);
Assert.Equal("No diagnostics.", first.FirstDiagnostic.MessagePrefix);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
}
}
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs
index 6fc0145b..401c4ce4 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs
@@ -37,7 +37,6 @@ public sealed class Step242UnsupportedSurfaceForHolesRegressionTests
ExpectGeometryKinds: null);
var first = Step242CorpusManifestRunner.RunOne(entry);
- var second = Step242CorpusManifestRunner.RunOne(entry);
if (expectedLayer is not null)
{
@@ -57,8 +56,5 @@ public sealed class Step242UnsupportedSurfaceForHolesRegressionTests
Assert.NotEqual("Importer.LoopRole.UnsupportedSurfaceForHoles", first.FirstDiagnostic.Source);
Assert.NotEqual("Importer.LoopRole.TorusDegenerateProjection", first.FirstDiagnostic.Source);
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
}
}
diff --git a/docs/development/audits/core-test-runtime-x1.md b/docs/development/audits/core-test-runtime-x1.md
new file mode 100644
index 00000000..be1434bb
--- /dev/null
+++ b/docs/development/audits/core-test-runtime-x1.md
@@ -0,0 +1,9 @@
+# Core test runtime audit
+
+The 2026-09-23 serial Core run took 8m47s for 1,099 tests. A TRX profile is retained at ignored `Aetheris.Kernel.Core.Tests/TestResults/core-profile.trx`. The largest single test was the aggregate NIST audit (213s). The per-file NIST snapshot class accumulated 493 test-seconds while executing each file twice, and the separate export/reimport sweep accumulated 321 test-seconds across 17 files. Display and orientation corpus classes each prepared the same 14 meshes, accumulating 193 and 169 test-seconds respectively. These are test durations summed across xUnit workers, not additive wall time.
+
+The Core suite now keeps one NIST per-file snapshot comparison and a manifest gate, removes second `RunOne` executions that only compared identical report fields, and reimports a three-file CTC/FTC/STC sample. The manifest audit still imports and exports every NIST file; the sample remains responsible for exporter-to-importer topology. The display corpus still checks every admitted face, and outward winding still covers the same 16 files; the 14 shared files use one prepared mesh for both assertions.
+
+This change does not alter the production tessellator or its display options. The profile identified repeated whole-model import/export and duplicate test mesh preparation as the immediate cost. The ordinary iteration command remains `scripts/Test-KernelIteration.ps1`; full corpus qualification remains available in the serial full suite.
+
+After the edits, the serial Core run passed 1,071 tests in 3m51s, down from 1,099 tests in 8m47s (56% less wall time). The final ignored TRX is `Aetheris.Kernel.Core.Tests/TestResults/core-final-profile.trx`. Summed xUnit test durations fell from 2,898s to 1,657s; these sums overlap because tests execute concurrently. Remaining longer cases include CTC-02 periodic orientation/export detail and a few complex display regressions, each with an assertion distinct from the NIST snapshot. Snapshot refresh remains explicit through `AETHERIS_UPDATE_STEP242_SNAPSHOT=1`.