BREAKING: 3-tier split step 2 + engine-bridge v3 EgBim lambdas wired
Completes the Generic / HmEG-aware / App-specific separation started in
f6b6e74. The legacy EgPlugin / EngineBridge / EngineBridge.Client /
EngineBridge.Probe modules are moved into their proper tiers, namespaces
and csproj/sln entries are renamed, and the HmegDirectStateProvider
lambdas are finally populated with real handles from the EgBim plugin
host. A new Recordingtest.Architecture.Tests project enforces the tier
rule at build time.
Moves (git mv + csproj/RootNamespace/AssemblyName rename + sln):
src/Recordingtest.EgPlugin
-> src/Sut/EgBim/Recordingtest.Sut.EgBim.PluginHost
src/Recordingtest.EngineBridge
-> src/Hmeg/Recordingtest.Hmeg.Catalog
src/Recordingtest.EngineBridge.Client
-> src/Hmeg/Recordingtest.Hmeg.Bridge.Client
src/Recordingtest.EngineBridge.Probe
-> src/Hmeg/Recordingtest.Hmeg.Catalog.Probe
tests/Recordingtest.EgPlugin.Tests
-> tests/Sut/EgBim/Recordingtest.Sut.EgBim.PluginHost.Tests
tests/Recordingtest.EngineBridge.Tests
-> tests/Hmeg/Recordingtest.Hmeg.Catalog.Tests
tests/Recordingtest.EngineBridge.IntegrationTests
-> tests/Hmeg/Recordingtest.Hmeg.Catalog.IntegrationTests
Namespace rename applied across all .cs files and csproj RootNamespace:
Recordingtest.EgPlugin -> Recordingtest.Sut.EgBim.PluginHost
Recordingtest.EngineBridge -> Recordingtest.Hmeg.Catalog
Recordingtest.EngineBridge.Client -> Recordingtest.Hmeg.Bridge.Client
Recordingtest.EngineBridge.Probe -> Recordingtest.Hmeg.Catalog.Probe
New: tests/Recordingtest.Architecture.Tests/
DependencyGraphTests walks Assembly.GetReferencedAssemblies() for each
tier and fails if a forbidden reference leaks in:
- Generic modules must not reference HmEG or any app-specific DLL
- HmEG-aware modules must not reference app-specific DLLs
- Recordingtest.Hmeg.Bridge must reference HmEG (positive check)
11 tests, all passing. Prevents future drift from CLAUDE.md §8.1.
Engine-bridge v3 wire-up (HmEgBridgePlugin.BuildProvider):
Previously the HmegDirectStateProvider lambdas returned null and the
chain fell through to reflection. They now call directly into the
EditorPlugin base class that HmEgBridgePlugin inherits:
spaceProvider = () => RootSpace
// AppManager.ViewportManager.RootSpace
viewportProvider = () => View
// EGViewport : Control, HmEGViewport
documentPathProvider = () => AppManager?.FileManager?.CurrentFile
Every lambda is wrapped in try/catch so plugin construction still
cannot throw back into the SUT. Editor02.HmEGAppManager.dll added as
a reference on Recordingtest.Sut.EgBim.PluginHost.csproj — app-
specific tier, which is allowed by the architecture tests.
Entry points were confirmed from read-only review of the SUT sources at
D:\GiteaAll\EG-BIM_Modeler\EditorPluginInterface\EditorPlugin.cs
D:\GiteaAll\EG-BIM_Modeler\HmEGApplicationManagementLibrary\HmEGAppManager.cs
D:\GiteaAll\EG-BIM_Modeler\HmEGApplicationManagementLibrary\SubManager\FileManager.cs
closing out Q1/Q2/Q6/Q7 from docs/hmeg-api-survey.md.
Tests: 115 -> 126 (+11 Architecture), 0 failures.
Next step: live verification of /scene /camera /selection with a real
SUT session; any discrepancy in HmegDirectStateProvider reflection will
be tightened after observing real HmEG camera field names.
Ref: #10 follow-up, #14 follow-up, docs/contracts/generic-sut-split.md.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,65 @@
|
||||
using System.Net;
|
||||
using Recordingtest.Bridge;
|
||||
using Recordingtest.Sut.EgBim.PluginHost;
|
||||
using Xunit;
|
||||
|
||||
namespace Recordingtest.Sut.EgBim.PluginHost.Tests;
|
||||
|
||||
public class StateRouterTests
|
||||
{
|
||||
private sealed class FixedProvider : IEngineStateProvider
|
||||
{
|
||||
public IReadOnlyList<string> GetSelectedIds() => new[] { "x", "y" };
|
||||
public CameraSnapshot GetCamera() => new(new double[] { 1, 2, 3 }, new double[] { 0, 0, 0 }, new double[] { 0, 0, 1 }, 45);
|
||||
public SceneSnapshot GetScene() => new(7, "doc.hmeg");
|
||||
public bool GetRenderComplete() => true;
|
||||
}
|
||||
|
||||
private sealed class FaultyProvider : IEngineStateProvider
|
||||
{
|
||||
public IReadOnlyList<string> GetSelectedIds() => throw new InvalidOperationException("boom");
|
||||
public CameraSnapshot GetCamera() => throw new InvalidOperationException();
|
||||
public SceneSnapshot GetScene() => throw new InvalidOperationException();
|
||||
public bool GetRenderComplete() => throw new InvalidOperationException();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void StateRouter_SelectionPath_UsesProvider_ReturnsJson()
|
||||
{
|
||||
var r = new StateRouter(new FixedProvider(), 38080);
|
||||
var (status, body) = r.Route("/selection");
|
||||
Assert.Equal(HttpStatusCode.OK, status);
|
||||
Assert.Contains("\"selected_ids\":[\"x\",\"y\"]", body);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void StateRouter_FaultyProvider_ReturnsErrorPayload()
|
||||
{
|
||||
var r = new StateRouter(new FaultyProvider(), 38080);
|
||||
var (_, body) = r.Route("/selection");
|
||||
Assert.Contains("\"error\"", body);
|
||||
Assert.Contains("boom", body);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void StateRouter_UnknownPath_Returns404()
|
||||
{
|
||||
var r = new StateRouter(new FixedProvider(), 38080);
|
||||
var (status, _) = r.Route("/nope");
|
||||
Assert.Equal(HttpStatusCode.NotFound, status);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void PortResolver_EnvVarSet_ReturnsEnvPort()
|
||||
{
|
||||
var p = PortResolver.Resolve(_ => "45000");
|
||||
Assert.Equal(45000, p);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void PortResolver_EnvVarMissing_ReturnsDefault()
|
||||
{
|
||||
var p = PortResolver.Resolve(_ => null);
|
||||
Assert.Equal(PortResolver.DefaultPort, p);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user