Follow through the camera port in the remaining tests

- The tests that faked a follow by setting the viewer's tracked entity,
  or by raising its change event, follow through the camera port
  (followEntity, or a port with follow and followChanged), and check
  followedOf: camera handoffs, globe rotation, tilt, ground guard,
  vessels, ALPR, CCTV, Contacts, radio, orientation, share links and
  follow offsets, the tracked readout and the shell's camera listeners.
- The fake Cesium camera port delivers followChanged from the port itself.
- A ride handed to another aircraft is adopted by the follow's change, as
  the application does, not by the test calling the adoption.
- The unbound-factory record lists the scene, the map defaults, share
  restoration and the World Packet as entries whose caller loads the
  factories; the map startup test stubs the default renderer load.
This commit is contained in:
Sameh Khamis committed 2026-11-10 18:10:14 -08:00
1 parent 9a13aeab48
commit 1fbe546531
21 files changed
+476 -148

No files matched your search

+34 -13
View File
@@ -42,6 +42,7 @@ import {
} from '../hudReadouts.js';
import { createVesselIconBook } from '../layers/vessels/iconBook.js';
import { bindRenderer } from '../render/rendererOf.js';
import { entityFollowTarget } from '../data/followed.js';
test('open feed with vessels is healthy (null)', () => {
assert.equal(
@@ -1045,13 +1046,31 @@ function installWireHarness(picked, stateOverrides = {}) {
this.keydown?.(event);
},
};
const trackedEntityChanged = makeCesiumEvent();
const viewer = {
scene: { pick: () => picked },
trackedEntity: undefined,
trackedEntityChanged,
};
const input = fakeInput(viewer);
// The camera port other layers follow through, with no pose to read; its
// followChanged event counts who listens.
const followChanged = makeCesiumEvent();
const camera = {
pose: () => null,
followed: null,
follow(target) {
this.followed = target;
followChanged.raise();
},
on: (name, callback) =>
name === 'followChanged'
? followChanged.addEventListener(callback)
: () => {},
};
const unbindRenderer = bindRenderer(viewer, {
camera,
get canvas() {
return viewer.scene?.canvas;
},
});
const handler = { click: (event) => input.click(event.position) };
const record = makeRecord();
const trail = makeTrailSpy();
@@ -1088,11 +1107,14 @@ function installWireHarness(picked, stateOverrides = {}) {
trail,
hud,
viewer,
camera,
followChanged,
windowTarget,
input: input.input,
cleanup() {
stopReadout();
aisLiveVesselsLayer.destroy();
unbindRenderer();
if (hadWindow) globalThis.window = priorWindow;
else delete globalThis.window;
if (hadDocument) globalThis.document = priorDocument;
@@ -1314,19 +1336,18 @@ test('vessel interaction wire: Escape deselects the selected vessel', () => {
test('vessel interaction wire: trackedEntityChanged clears only with tracking and a selection', () => {
const harness = installWireHarness(undefined);
try {
harness.viewer.trackedEntityChanged.raise();
harness.followChanged.raise();
assert.equal(
aisLiveVesselsLayer.getSelectedInfo()?.mmsi,
harness.record.mmsi,
);
assert.equal(harness.trail.clearCalls, 0);
harness.viewer.trackedEntity = { id: 'tracked-flight' };
harness.viewer.trackedEntityChanged.raise();
harness.camera.follow(entityFollowTarget({ id: 'tracked-flight' }, {}));
assert.equal(aisLiveVesselsLayer.getSelectedInfo(), null);
assert.equal(harness.trail.clearCalls, 1);
harness.viewer.trackedEntityChanged.raise();
harness.followChanged.raise();
assert.equal(harness.trail.clearCalls, 1);
} finally {
harness.cleanup();
@@ -1344,8 +1365,8 @@ test('vessel interaction lifecycle: destroy removes the exact bound keydown list
assert.equal(harness.keyTarget.removed[0].type, 'keydown');
assert.strictEqual(harness.keyTarget.removed[0].callback, added.callback);
assert.equal(harness.keyTarget.keydown, null);
assert.equal(harness.viewer.trackedEntityChanged.removeCalls, 1);
assert.equal(harness.viewer.trackedEntityChanged.listenerCount, 0);
assert.equal(harness.followChanged.removeCalls, 1);
assert.equal(harness.followChanged.listenerCount, 0);
} finally {
harness.cleanup();
}
@@ -1363,8 +1384,8 @@ test('vessel interaction lifecycle: disable detaches input and enable reinstalls
assert.equal(harness.keyTarget.keydown, null);
assert.equal(harness.keyTarget.removed.length, 1);
assert.strictEqual(harness.keyTarget.removed[0].callback, disabledKeydown);
assert.equal(harness.viewer.trackedEntityChanged.removeCalls, 1);
assert.equal(harness.viewer.trackedEntityChanged.listenerCount, 0);
assert.equal(harness.followChanged.removeCalls, 1);
assert.equal(harness.followChanged.listenerCount, 0);
_setVesselStateForTest({
records: [harness.record],
@@ -1390,8 +1411,8 @@ test('vessel interaction lifecycle: disable detaches input and enable reinstalls
assert.equal(harness.input.subscriberCount(), 1);
assert.equal(harness.keyTarget.added.length, 2);
assert.equal(harness.viewer.trackedEntityChanged.addCalls, 2);
assert.equal(harness.viewer.trackedEntityChanged.listenerCount, 1);
assert.equal(harness.followChanged.addCalls, 2);
assert.equal(harness.followChanged.listenerCount, 1);
harness.handler.click({ position: { x: 10, y: 20 } });
assert.equal(aisLiveVesselsLayer.getSelectedInfo(), null);
+10 -3
View File
@@ -3,7 +3,10 @@
import { test } from 'node:test';
import assert from 'node:assert/strict';
import * as Cesium from 'cesium';
import { bindFakeCesiumCamera } from '../testSupport/fakeCameraPort.mjs';
import {
bindFakeCesiumCamera,
followEntity,
} from '../testSupport/fakeCameraPort.mjs';
import { fakeScenePorts } from '../testSupport/fakeCesiumScene.mjs';
import alprCamerasLayer, {
createAlprCamerasLayer,
@@ -337,6 +340,10 @@ function cameraHarness(layer = alprCamerasLayer) {
postRender: new Cesium.Event(),
pick: () => picked,
},
// Cesium's entity tracking, without entities of its own: the camera
// port follows on a tracking widget of the fake's.
trackedEntityChanged: new Cesium.Event(),
entities: {},
};
const ports = fakeScenePorts(viewer);
bindFakeCesiumCamera(viewer, ports);
@@ -1240,14 +1247,14 @@ test('nearby count and discovery control frame a real loaded camera without fetc
);
assert.equal(flights[0].options.offset.range, 800);
assert.equal(h.requests.length, 1);
h.viewer.trackedEntity = {};
followEntity(h.viewer, {});
assert.equal(alprCamerasLayer.getRowControls().chips[0].disabled, true);
assert.equal(
controls.chips[0].onClick(),
false,
'a stale button cannot steal the follow camera',
);
h.viewer.trackedEntity = undefined;
followEntity(h.viewer, null);
alprCamerasLayer.disable();
assert.equal(alprCamerasLayer.getStats().countLabel, '');
assert.equal(controls.chips[0].onClick(), false);
+17 -5
View File
@@ -13,7 +13,11 @@
//
// computeFrustumGeometry is PURE (no viewer, no scene queries) so it runs under
// plain node:test.
import { bindFakeCesiumCamera } from '../testSupport/fakeCameraPort.mjs';
import {
bindFakeCesiumCamera,
followEntity,
} from '../testSupport/fakeCameraPort.mjs';
import { entityFollowTarget, followedOf } from './followed.js';
import { test } from 'node:test';
// Preserve structural pins across component qualification and formatter wrapping.
function componentFunctionSource(fn) {
@@ -883,14 +887,18 @@ test('CCTV disable→enable defers the active-camera re-probe until its next act
test('CCTV focus distinguishes tracking ownership from a missing active camera', () => {
let flyCalls = 0;
const viewer = {
trackedEntity: { id: 'tracked-flight' },
camera: {
flyToBoundingSphere() {
flyCalls += 1;
},
},
// Cesium's entity tracking, without entities of its own: the camera
// port follows on a tracking widget of the fake's.
trackedEntityChanged: new Cesium.Event(),
entities: {},
};
bindFakeCesiumCamera(viewer);
followEntity(viewer, { id: 'tracked-flight' });
const record = {
camera: { rangeM: 210, headingDeg: 41 },
position: { x: 1, y: 2, z: 3 },
@@ -1021,7 +1029,6 @@ test('CCTV repeated in-world clicks dispatch focus only for the one real activat
function makeDeselectViewer() {
const viewer = {
isDestroyed: () => false,
trackedEntity: { id: 'sibling-track-owner' },
camera: {
positionWC: Cesium.Cartesian3.fromDegrees(-97.7431, 30.2672, 4_000),
positionCartographic: Cesium.Cartographic.fromDegrees(
@@ -1050,6 +1057,11 @@ function makeDeselectViewer() {
camera: {
pose: () => (viewer.eye ? { ...viewer.eye } : undefined),
on: () => () => {},
// A sibling layer's follow owns the camera.
followed: entityFollowTarget({ id: 'sibling-track-owner' }, {}),
follow(target) {
this.followed = target;
},
},
}).draw;
return viewer;
@@ -1263,7 +1275,7 @@ test('CCTV deselect publishes one null state and leaves the complete camera pose
pitch: viewer.camera.pitch,
roll: viewer.camera.roll,
transform: Cesium.Matrix4.clone(viewer.camera.transform),
trackedEntity: viewer.trackedEntity,
followed: followedOf(viewer),
};
assert.equal(deactivateActiveCamera(), true);
@@ -1288,7 +1300,7 @@ test('CCTV deselect publishes one null state and leaves the complete camera pose
assert.equal(viewer.camera.pitch, pose.pitch);
assert.equal(viewer.camera.roll, pose.roll);
assert.deepEqual(viewer.camera.transform, pose.transform);
assert.equal(viewer.trackedEntity, pose.trackedEntity);
assert.equal(followedOf(viewer), pose.followed);
assert.equal(viewer.camera.flyCalls || 0, 0);
unsubscribe();
} finally {
+67 -25
View File
@@ -50,7 +50,8 @@ import { withEntityRecord } from './entityRecords.js';
import { framePortFor } from '../testSupport/fakeFramePort.mjs';
import { bindFakeCesiumCamera } from '../testSupport/fakeCameraPort.mjs';
import { fakeSceneFrame } from '../testSupport/fakeCesiumScene.mjs';
import { bindRenderer } from '../render/rendererOf.js';
import { bindRenderer, rendererOf } from '../render/rendererOf.js';
import { entityFollowTarget, followedOf } from './followed.js';
import { fakeDrawPort } from '../testSupport/fakeDrawPort.mjs';
const militaryAwarenessSource = readLayerSource(
@@ -90,6 +91,46 @@ test('Contacts moves a distance that rounds to 1,000 m into kilometres', () => {
assert.equal(presentAwarenessDistance(9960), '10\u00a0km');
});
/**
* Give `viewer`'s bound camera port a follow of its own, as the renderer's
* is: `follow(target)` sets `followed` and raises `followChanged`.
*/
function followable(viewer) {
const renderer = rendererOf(viewer);
const port = renderer.camera;
const listeners = new Set();
let followed = null;
renderer.camera = Object.create(port, {
followed: { get: () => followed },
follow: {
value(target) {
followed = target;
for (const cb of [...listeners]) cb();
},
},
on: {
value(event, cb, options) {
if (event !== 'followChanged') return port.on(event, cb, options);
listeners.add(cb);
return () => listeners.delete(cb);
},
},
});
}
/**
* Follow `entity` (an entity holder) through `viewer`'s camera port, as a
* layer does; null stops following.
*/
function followIn(viewer, entity) {
rendererOf(viewer).camera.follow(
entity ? entityFollowTarget(entity, {}) : null,
);
}
/** The entity holder `viewer`'s camera follows, if any. */
const followedEntity = (viewer) => followedOf(viewer)?.entity;
function installAwarenessRuntime({
isEnabled = () => true,
isEffectivelyEnabled = isEnabled,
@@ -194,6 +235,7 @@ function installAwarenessRuntime({
draw: fakeDrawPort(),
frame: fakeSceneFrame(viewer),
});
followable(viewer);
const layers = new Map(
AWARENESS_DEPENDENCIES.map((layerId) => [
layerId,
@@ -889,7 +931,7 @@ for (const fixture of [
{},
{ trackedId: `${subject.layerId}:${subject.id}` },
);
runtime.viewer.trackedEntity = trackedEntity;
followIn(runtime.viewer, trackedEntity);
replaceMethod(
fixture.layer,
'getTrackedSubject',
@@ -930,7 +972,7 @@ for (const fixture of [
'adoption must not recreate the existing track',
);
assert.equal(
runtime.viewer.trackedEntity,
followedEntity(runtime.viewer),
trackedEntity,
'adoption must not replace the source-owned tracked entity',
);
@@ -990,9 +1032,9 @@ test('Contacts activation adopts the production military tracked-subject descrip
),
'mutating one accessor result must not alter the tracked source position',
);
runtime.viewer.trackedEntity = withEntityRecord(
{},
{ trackedId: `military:${id}` },
followIn(
runtime.viewer,
withEntityRecord({}, { trackedId: `military:${id}` }),
);
replaceMethod(flightsLayer, 'getTrackedSubject', () => null, restores);
replaceMethod(
@@ -1098,9 +1140,9 @@ test('production military tracked-subject label falls back to registration befor
'getAllPositions id stays the identity hex',
);
runtime.viewer.trackedEntity = withEntityRecord(
{},
{ trackedId: `military:${id}` },
followIn(
runtime.viewer,
withEntityRecord({}, { trackedId: `military:${id}` }),
);
replaceMethod(flightsLayer, 'getTrackedSubject', () => null, restores);
replaceMethod(flightsLayer, 'trackById', () => true, restores);
@@ -1173,9 +1215,9 @@ test('a cached Context subject re-reads its label when enrichment lands after se
meta,
});
runtime.viewer.trackedEntity = withEntityRecord(
{},
{ trackedId: `flights:${id}` },
followIn(
runtime.viewer,
withEntityRecord({}, { trackedId: `flights:${id}` }),
);
replaceMethod(
militaryFlightsLayer,
@@ -1319,9 +1361,9 @@ test('Contacts activation adopts the production civilian tracked-subject descrip
),
'mutating one accessor result must not alter the tracked source position',
);
runtime.viewer.trackedEntity = withEntityRecord(
{},
{ trackedId: `flights:${id}` },
followIn(
runtime.viewer,
withEntityRecord({}, { trackedId: `flights:${id}` }),
);
replaceMethod(
militaryFlightsLayer,
@@ -1409,9 +1451,9 @@ test('Contacts activation reconciles to a newer cross-layer tracked flight after
const restores = [];
try {
runtime.viewer.trackedEntity = withEntityRecord(
{},
{ trackedId: 'flights:first' },
followIn(
runtime.viewer,
withEntityRecord({}, { trackedId: 'flights:first' }),
);
replaceMethod(
flightsLayer,
@@ -1435,9 +1477,9 @@ test('Contacts activation reconciles to a newer cross-layer tracked flight after
civilianTracked = null;
militaryTracked = awarenessSubject('military', 'latest', positions.latest);
runtime.viewer.trackedEntity = withEntityRecord(
{},
{ trackedId: 'military:latest' },
followIn(
runtime.viewer,
withEntityRecord({}, { trackedId: 'military:latest' }),
);
releaseDependencies();
await nextTurn();
@@ -1482,9 +1524,9 @@ test('tracked flight cleared during Contacts activation suppresses fallback auto
const focused = [];
try {
runtime.viewer.trackedEntity = withEntityRecord(
{},
{ trackedId: 'flights:selected' },
followIn(
runtime.viewer,
withEntityRecord({}, { trackedId: 'flights:selected' }),
);
replaceMethod(flightsLayer, 'getTrackedSubject', () => tracked, restores);
replaceMethod(
@@ -1508,7 +1550,7 @@ test('tracked flight cleared during Contacts activation suppresses fallback auto
);
tracked = null;
runtime.viewer.trackedEntity = undefined;
followIn(runtime.viewer, null);
// Deliberately untagged: this is the DESELECT case, and an untagged clear
// must default to deliberate. An eviction (`reason: 'evicted'`) instead
// keeps the subject as CONTACT LOST — see the eviction tests below — but
+12 -4
View File
@@ -5,6 +5,7 @@ import {
fakeCameraPort,
} from '../testSupport/fakeCameraPort.mjs';
import { bindRenderer } from '../render/rendererOf.js';
import { entityFollowTarget, followedOf } from './followed.js';
import { fakeDrawPort } from '../testSupport/fakeDrawPort.mjs';
import {
buildRadioTunerBand,
@@ -1666,16 +1667,23 @@ test('Radio recovery preserves closer altitude and caps extreme full-globe zoom'
test('Radio camera navigation yields to every live tracked-entity owner', () => {
const viewer = {};
bindRenderer(viewer, { camera: fakeCameraPort().port });
// A camera port that follows: the layers' tracked entities are followed
// through it.
const { port: camera } = fakeCameraPort();
camera.followed = null;
camera.follow = (target) => {
camera.followed = target;
};
bindRenderer(viewer, { camera });
assert.equal(radioCameraNavigationAllowed(viewer), true);
assert.equal(radioCameraNavigationAllowed({}), false, 'no camera to move');
for (const trackedId of ['flights:abc123', 'military:def456']) {
const trackedEntity = withEntityRecord({}, { trackedId });
viewer.trackedEntity = trackedEntity;
camera.follow(entityFollowTarget(trackedEntity, {}));
assert.equal(radioCameraNavigationAllowed(viewer), false, trackedId);
assert.equal(viewer.trackedEntity, trackedEntity);
assert.equal(followedOf(viewer)?.entity, trackedEntity);
}
viewer.trackedEntity = undefined;
camera.follow(null);
assert.equal(radioCameraNavigationAllowed(viewer), true);
assert.equal(radioCameraNavigationAllowed({ trackedEntity: {} }), false);
assert.equal(radioCameraNavigationAllowed(null), false);
+31 -5
View File
@@ -14,6 +14,8 @@ import {
trackedLabelModelFromText,
} from './trackedReadout.js';
import { entityRecord, readEntityRecord, withEntityRecord } from './entityRecords.js';
import { entityFollowTarget } from './followed.js';
import { bindRenderer } from '../render/rendererOf.js';
function makeCesiumEvent() {
const listeners = new Set();
@@ -27,6 +29,31 @@ function makeCesiumEvent() {
};
}
/**
* A viewer whose camera port follows `entity` (null: nothing), with
* `follow(next)` to change it and announce the change on `changed`.
*/
function followingViewer(entity, changed) {
const camera = {
followed: null,
on: (event, callback) =>
event === 'followChanged' ? changed.addEventListener(callback) : () => {},
};
const viewer = {};
bindRenderer(viewer, { camera });
const follow = (next) => {
camera.followed = next ? entityFollowTarget(next, {}) : null;
};
follow(entity);
return {
viewer,
follow(next) {
follow(next);
changed.raise();
},
};
}
function makeHostRecorder() {
const calls = [];
return {
@@ -130,7 +157,7 @@ test('tracked entity publishes a protected host entry backed by the frame cache'
const changed = makeCesiumEvent();
const display = { x: 10, y: 20, z: 30 };
const entity = withEntityRecord({ id: 'generated' }, { trackedId: 'flights:abc123', displayPosition: () => display, labelModel: { title: 'UAL123', details: ['FL350 · 451 kts'], accent: '#39d0ff' } });
const viewer = { trackedEntity: entity, trackedEntityChanged: changed };
const { viewer, follow } = followingViewer(entity, changed);
const recorder = makeHostRecorder();
globalThis.window = fakeWindow;
_setTrackedOverlayHostForTest(recorder.host);
@@ -158,8 +185,7 @@ test('tracked entity publishes a protected host entry backed by the frame cache'
'FL360 · 455 kts',
]);
viewer.trackedEntity = null;
changed.raise();
follow(null);
assert.equal(getActiveTrackedReadoutId(), null);
assert.equal(recorder.calls.at(-1).op, 'clear');
} finally {
@@ -173,7 +199,7 @@ test('selection lifecycle leaves installations to their own entry and retains AL
const originalWindow = globalThis.window;
const fakeWindow = new EventTarget();
const changed = makeCesiumEvent();
const viewer = { trackedEntity: null, trackedEntityChanged: changed };
const { viewer } = followingViewer(null, changed);
const recorder = makeHostRecorder();
const installation = withEntityRecord({}, { trackedId: 'installations:fort-test', displayPosition: () => ({ x: 1, y: 2, z: 3 }), labelModel: { title: 'FORT TEST', details: ['AIRFIELD'], accent: '#5aa9ff' } });
globalThis.window = fakeWindow;
@@ -218,7 +244,7 @@ test('selection lifecycle leaves installations to their own entry and retains AL
const clearsBeforeDestroy = recorder.calls.filter(({ op }) => op === 'clear').length;
destroyTrackedReadout();
assert.ok(recorder.calls.filter(({ op }) => op === 'clear').length > clearsBeforeDestroy);
assert.equal(changed.size, 0, 'trackedEntityChanged listener was removed');
assert.equal(changed.size, 0, 'the followChanged listener was removed');
assert.ok(recorder.calls.some(({ op, visible }) => op === 'visible' && visible === false));
} finally {
destroyTrackedReadout();