@design-core/core 0.0.7 → 51.1.0

package/test/tools/extend.test.js

@@ -24,9 +24,9 @@ test.each(inputScenarios)('Trim.execute handles $desc', async (scenario) => {
   // clear all scene entities
   core.scene.clear();
   // create line
-  core.scene.addItem('Line', { points: [new Point(), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(), new Point(10, 0)] });
   // create circle
-  core.scene.addItem('Circle', { points: [new Point(), new Point(10, 0)] });
+  core.scene.addEntity('Circle', { points: [new Point(), new Point(10, 0)] });
   // select line
   core.scene.selectionManager.selectionSet.selectionSet.push(0);
 
@@ -35,7 +35,7 @@ test.each(inputScenarios)('Trim.execute handles $desc', async (scenario) => {
     await extend.execute();
 
     expect(extend.selectedBoundaryItems[0]).toEqual(core.scene.entities.get(0));
-    expect(extend.selectedItem).toBe(core.scene.entities.get(1));
+    expect(extend.selectedEntity).toBe(core.scene.entities.get(1));
     expect(actionSpy).toHaveBeenCalled();
   }, { extraMethods: { actionCommand: () => actionSpy() } });
 });
@@ -63,12 +63,12 @@ test('Test Extend.action', () => {
   // clear all scene entities
   core.scene.clear();
   // Add items to scene
-  core.scene.addItem('Line', { points: [lineOneStart, lineOneEnd] });
-  core.scene.addItem('Line', { points: [lineTwoStart, lineTwoEnd] });
+  core.scene.addEntity('Line', { points: [lineOneStart, lineOneEnd] });
+  core.scene.addEntity('Line', { points: [lineTwoStart, lineTwoEnd] });
   // Select boundary item
   extend.selectedBoundaryItems = [core.scene.entities.get(0)];
   // select item to trim
-  extend.selectedItem = core.scene.entities.get(1);
+  extend.selectedEntity = core.scene.entities.get(1);
   // set mouse location - required for Extend
   core.mouse.setPosFromScenePoint(new Point(40, 50));
   // Perform Extend
@@ -95,12 +95,12 @@ test('Test Extend.action', () => {
   // clear scene items
   core.scene.clear();
   // Add items to scene
-  core.scene.addItem('Line', { points: [lineTwoStart, lineTwoEnd] });
-  core.scene.addItem('Line', { points: [lineThreeStart, lineThreeEnd] });
+  core.scene.addEntity('Line', { points: [lineTwoStart, lineTwoEnd] });
+  core.scene.addEntity('Line', { points: [lineThreeStart, lineThreeEnd] });
   // Select boundary item
   extend.selectedBoundaryItems = [core.scene.entities.get(0)];
   // select item to extend
-  extend.selectedItem = core.scene.entities.get(1);
+  extend.selectedEntity = core.scene.entities.get(1);
   // set mouse location - required for Extend
   core.mouse.setPosFromScenePoint(new Point(0, 20));
   // Perform Extend
@@ -126,12 +126,12 @@ test('Test Extend.action', () => {
   // clear scene items
   core.scene.clear();
   // Add items to scene
-  core.scene.addItem('Line', { points: [lineOneStart, lineOneEnd] });
-  core.scene.addItem('Line', { points: [crossingLineStart, crossingLineEnd] });
+  core.scene.addEntity('Line', { points: [lineOneStart, lineOneEnd] });
+  core.scene.addEntity('Line', { points: [crossingLineStart, crossingLineEnd] });
   // Select boundary item
   extend.selectedBoundaryItems = [core.scene.entities.get(0)];
   // select item to extend
-  extend.selectedItem = core.scene.entities.get(1);
+  extend.selectedEntity = core.scene.entities.get(1);
   // set mouse location - required for Extend
   core.mouse.setPosFromScenePoint(new Point(35, 35));
   // Perform Extend
@@ -158,8 +158,8 @@ test('Test Extend.action line - endpoint coincident with intersection', () => {
   const extend = new Extend();
   core.scene.clear();
 
-  core.scene.addItem('Line', { points: [new Point(0, 50), new Point(25, 50)] });
-  core.scene.addItem('Lwpolyline', { points: [
+  core.scene.addEntity('Line', { points: [new Point(0, 50), new Point(25, 50)] });
+  core.scene.addEntity('Lwpolyline', { points: [
     new Point(50, 0), new Point(50, 100), new Point(100, 100),
     new Point(100, 0), new Point(150, 0), new Point(150, 100),
     new Point(200, 100), new Point(200, 0),
@@ -171,7 +171,7 @@ test('Test Extend.action line - endpoint coincident with intersection', () => {
   const expected = [50, 100, 150, 200];
   for (const ex of expected) {
     extend.selectedBoundaryItems = [boundary];
-    extend.selectedItem = line;
+    extend.selectedEntity = line;
     core.mouse.setPosFromScenePoint(new Point(line.points[1].x - 5, 50));
     extend.action();
     expect(line.points[1].x).toBe(ex);
@@ -188,11 +188,11 @@ test('Test Extend.action polyline - endpoint coincident with intersection', () =
   const extend = new Extend();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(50, 50)] });
-  core.scene.addItem('Line', { points: [new Point(100, 0), new Point(100, 100)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(50, 50)] });
+  core.scene.addEntity('Line', { points: [new Point(100, 0), new Point(100, 100)] });
 
   extend.selectedBoundaryItems = [core.scene.entities.get(1)];
-  extend.selectedItem = core.scene.entities.get(0);
+  extend.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(45, 45));
   extend.action();
 
@@ -210,11 +210,11 @@ test('Test Extend.action polyline - 2-point polyline extend start', () => {
   const extend = new Extend();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(50, 0), new Point(100, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, -50), new Point(0, 50)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(50, 0), new Point(100, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, -50), new Point(0, 50)] });
 
   extend.selectedBoundaryItems = [core.scene.entities.get(1)];
-  extend.selectedItem = core.scene.entities.get(0);
+  extend.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(55, 0));
   extend.action();
 
@@ -234,11 +234,11 @@ test('Test Extend.action polyline - extend end segment', () => {
   const extend = new Extend();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0), new Point(75, 0)] });
-  core.scene.addItem('Line', { points: [new Point(100, -50), new Point(100, 50)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0), new Point(75, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(100, -50), new Point(100, 50)] });
 
   extend.selectedBoundaryItems = [core.scene.entities.get(1)];
-  extend.selectedItem = core.scene.entities.get(0);
+  extend.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(80, 0));
   extend.action();
 
@@ -261,11 +261,11 @@ test('Test Extend.action polyline - extend start segment', () => {
   const extend = new Extend();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(25, 0), new Point(50, 0), new Point(100, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, -50), new Point(0, 50)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(25, 0), new Point(50, 0), new Point(100, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, -50), new Point(0, 50)] });
 
   extend.selectedBoundaryItems = [core.scene.entities.get(1)];
-  extend.selectedItem = core.scene.entities.get(0);
+  extend.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(20, 0));
   extend.action();
 
@@ -288,11 +288,11 @@ test('Test Extend.action polyline - reject arc end segment', () => {
   const extend = new Extend();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0, 1), new Point(100, 0)] });
-  core.scene.addItem('Line', { points: [new Point(125, -50), new Point(125, 50)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0, 1), new Point(100, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(125, -50), new Point(125, 50)] });
 
   extend.selectedBoundaryItems = [core.scene.entities.get(1)];
-  extend.selectedItem = core.scene.entities.get(0);
+  extend.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(100, 0));
   extend.action();
 
@@ -316,11 +316,11 @@ test('Test Extend.action polyline - reject intersection behind endpoint', () =>
   const extend = new Extend();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(50, 0), new Point(75, 0), new Point(100, 0)] });
-  core.scene.addItem('Line', { points: [new Point(25, -50), new Point(25, 50)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(50, 0), new Point(75, 0), new Point(100, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(25, -50), new Point(25, 50)] });
 
   extend.selectedBoundaryItems = [core.scene.entities.get(1)];
-  extend.selectedItem = core.scene.entities.get(0);
+  extend.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(95, 0));
   extend.action();
 
@@ -339,11 +339,11 @@ test('Test Extend.action polyline - reject shortening intersection', () => {
   const extend = new Extend();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0), new Point(100, 0)] });
-  core.scene.addItem('Line', { points: [new Point(75, -50), new Point(75, 50)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0), new Point(100, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(75, -50), new Point(75, 50)] });
 
   extend.selectedBoundaryItems = [core.scene.entities.get(1)];
-  extend.selectedItem = core.scene.entities.get(0);
+  extend.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(95, 0));
   extend.action();
 
@@ -362,11 +362,11 @@ test('Test Extend.action polyline - extend with arc start segment', () => {
   const extend = new Extend();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0, 1), new Point(50, 0), new Point(100, 0)] });
-  core.scene.addItem('Line', { points: [new Point(125, -50), new Point(125, 50)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0, 1), new Point(50, 0), new Point(100, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(125, -50), new Point(125, 50)] });
 
   extend.selectedBoundaryItems = [core.scene.entities.get(1)];
-  extend.selectedItem = core.scene.entities.get(0);
+  extend.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(110, 0));
   extend.action();
 
@@ -383,11 +383,11 @@ test('Test Extend.action polyline - no intersections', () => {
   const extend = new Extend();
   core.scene.clear();
 
-  core.scene.addItem('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, 50), new Point(100, 50)] });
+  core.scene.addEntity('Lwpolyline', { points: [new Point(0, 0), new Point(50, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 50), new Point(100, 50)] });
 
   extend.selectedBoundaryItems = [core.scene.entities.get(1)];
-  extend.selectedItem = core.scene.entities.get(0);
+  extend.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(45, 0));
   extend.action();
 
@@ -410,7 +410,7 @@ test('Extend.preview does not throw', () => {
 
 test('Extend.preview returns early when no boundary items set', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(100, -10), new Point(100, 10)] });
+  core.scene.addEntity('Line', { points: [new Point(100, -10), new Point(100, 10)] });
   DesignCore.Scene.previewEntities.clear();
 
   const extend = new Extend();
@@ -422,8 +422,8 @@ test('Extend.preview returns early when no boundary items set', () => {
 
 test('Extend.preview returns early when findClosestItem returns undefined', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(100, -10), new Point(100, 10)] });
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(50, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(100, -10), new Point(100, 10)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(50, 0)] });
   DesignCore.Scene.previewEntities.clear();
 
   const extend = new Extend();
@@ -439,8 +439,8 @@ test('Extend.preview returns early when findClosestItem returns undefined', () =
 test('Extend.preview returns early when hovered entity does not implement extend', () => {
   // Circle does not override Entity.extend() — preview must not emit a notification.
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(100, -10), new Point(100, 10)] }); // boundary
-  core.scene.addItem('Circle', { points: [new Point(0, 0), new Point(5, 0)] }); // unsupported
+  core.scene.addEntity('Line', { points: [new Point(100, -10), new Point(100, 10)] }); // boundary
+  core.scene.addEntity('Circle', { points: [new Point(0, 0), new Point(5, 0)] }); // unsupported
   DesignCore.Scene.previewEntities.clear();
 
   const notifySpy = jest.spyOn(core, 'notify');
@@ -460,8 +460,8 @@ test('Extend.preview returns early when hovered entity does not implement extend
 test('Extend.preview returns early when hovered entity has no valid extension', () => {
   // Hovered line is parallel to the boundary — no intersection ahead of its endpoint.
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, 50), new Point(100, 50)] }); // boundary (horizontal)
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(50, 0)] }); // hovered (parallel, y=0)
+  core.scene.addEntity('Line', { points: [new Point(0, 50), new Point(100, 50)] }); // boundary (horizontal)
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(50, 0)] }); // hovered (parallel, y=0)
   DesignCore.Scene.previewEntities.clear();
 
   const extend = new Extend();
@@ -479,8 +479,8 @@ test('Extend.preview populates previewEntities when entity can be extended', ()
   // Vertical boundary at x=100; short horizontal line from (0,0) to (50,0).
   // Mouse near end (45,0) → end extends to (100,0).
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(100, -10), new Point(100, 10)] }); // boundary
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(50, 0)] }); // hovered
+  core.scene.addEntity('Line', { points: [new Point(100, -10), new Point(100, 10)] }); // boundary
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(50, 0)] }); // hovered
   DesignCore.Scene.previewEntities.clear();
 
   const extend = new Extend();
@@ -502,7 +502,7 @@ test('Extend.preview populates previewEntities when entity can be extended', ()
 test('Extend.execute returns early when boundary input is undefined', async () => {
   core.scene.clear();
   core.scene.selectionManager.reset();
-  core.scene.addItem('Line', { points: [new Point(), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(), new Point(10, 0)] });
 
   await withMockInput(core.scene, [undefined], async () => {
     const extend = new Extend();
@@ -514,8 +514,8 @@ test('Extend.execute returns early when boundary input is undefined', async () =
 test('Extend.execute exits selection loop when selection input is undefined', async () => {
   core.scene.clear();
   core.scene.selectionManager.reset();
-  core.scene.addItem('Line', { points: [new Point(100, -10), new Point(100, 10)] });
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(50, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(100, -10), new Point(100, 10)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(50, 0)] });
   core.scene.selectionManager.selectionSet.selectionSet.push(0);
 
   const executeCommandSpy = jest.fn();
@@ -530,9 +530,9 @@ test('Extend.execute exits selection loop when selection input is undefined', as
 test('Extend.execute calls actionCommand once per extend selection', async () => {
   core.scene.clear();
   core.scene.selectionManager.reset();
-  core.scene.addItem('Line', { points: [new Point(100, -10), new Point(100, 10)] });
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(50, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, 5), new Point(50, 5)] });
+  core.scene.addEntity('Line', { points: [new Point(100, -10), new Point(100, 10)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(50, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 5), new Point(50, 5)] });
   core.scene.selectionManager.selectionSet.selectionSet.push(0);
 
   const actionSpy = jest.fn();
@@ -548,11 +548,11 @@ test('Extend.execute calls actionCommand once per extend selection', async () =>
   );
 });
 
-test('Extend.action does nothing when selectedItem is null', () => {
+test('Extend.action does nothing when selectedEntity is null', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(), new Point(10, 0)] });
   const extend = new Extend();
-  extend.selectedItem = null;
+  extend.selectedEntity = null;
   extend.selectedBoundaryItems = [core.scene.entities.get(0)];
 
   expect(() => extend.action()).not.toThrow();
@@ -560,24 +560,24 @@ test('Extend.action does nothing when selectedItem is null', () => {
 
 test('Extend.action does nothing when selectedBoundaryItems is empty', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(), new Point(10, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(), new Point(10, 0)] });
   const extend = new Extend();
-  extend.selectedItem = core.scene.entities.get(0);
+  extend.selectedEntity = core.scene.entities.get(0);
   extend.selectedBoundaryItems = [];
 
   expect(() => extend.action()).not.toThrow();
-  expect(extend.selectedItem).toBeNull();
+  expect(extend.selectedEntity).toBeNull();
 });
 
 test('Extend.action notifies NOEXTEND when selected entity lacks fromPolylinePoints', () => {
   // Use a stub entity that has toPolylinePoints but no fromPolylinePoints.
   // action() must notify and not throw.
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(100, -10), new Point(100, 10)] }); // boundary
+  core.scene.addEntity('Line', { points: [new Point(100, -10), new Point(100, 10)] }); // boundary
 
   const extend = new Extend();
   extend.selectedBoundaryItems = [core.scene.entities.get(0)];
-  extend.selectedItem = {
+  extend.selectedEntity = {
     type: 'FakeEntity',
     toPolylinePoints: () => [new Point(0, 0), new Point(50, 0)],
     // deliberately no fromPolylinePoints
@@ -588,30 +588,30 @@ test('Extend.action notifies NOEXTEND when selected entity lacks fromPolylinePoi
   extend.action();
 
   expect(notifySpy).toHaveBeenCalledWith(expect.stringContaining(Strings.Message.NOEXTEND));
-  expect(extend.selectedItem).toBeNull();
+  expect(extend.selectedEntity).toBeNull();
   notifySpy.mockRestore();
 });
 
 test('Extend.action notifies NOEXTEND when selected entity is a closed polyline', () => {
   // Closed polylines have no open endpoints — extend must notify and leave the entity unchanged.
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(200, -10), new Point(200, 10)] }); // boundary
+  core.scene.addEntity('Line', { points: [new Point(200, -10), new Point(200, 10)] }); // boundary
   // Closed square: flag bit 1 set
-  core.scene.addItem('Lwpolyline', {
+  core.scene.addEntity('Lwpolyline', {
     points: [new Point(0, 0), new Point(100, 0), new Point(100, 100), new Point(0, 100)],
     flags: 1,
   });
 
   const extend = new Extend();
   extend.selectedBoundaryItems = [core.scene.entities.get(0)];
-  extend.selectedItem = core.scene.entities.get(1);
+  extend.selectedEntity = core.scene.entities.get(1);
   core.mouse.setPosFromScenePoint(new Point(95, 0));
 
   const notifySpy = jest.spyOn(core, 'notify').mockImplementation(() => {});
   extend.action();
 
   expect(notifySpy).toHaveBeenCalledWith(expect.stringContaining(Strings.Message.NOEXTEND));
-  expect(extend.selectedItem).toBeNull();
+  expect(extend.selectedEntity).toBeNull();
   notifySpy.mockRestore();
 });
 
@@ -619,7 +619,7 @@ test('Extend.preview silently skips entity that lacks fromPolylinePoints', () =>
   // Stub entity implements toPolylinePoints but not fromPolylinePoints.
   // preview() must return early without calling notify.
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(100, -10), new Point(100, 10)] }); // boundary
+  core.scene.addEntity('Line', { points: [new Point(100, -10), new Point(100, 10)] }); // boundary
   DesignCore.Scene.previewEntities.clear();
 
   const stubEntity = {
@@ -648,30 +648,30 @@ test('Extend.preview silently skips entity that lacks fromPolylinePoints', () =>
 test('Extend.action notifies when no intersection found (parallel lines)', () => {
   core.scene.clear();
   // Two parallel horizontal lines — no intersection possible
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(100, 0)] });
-  core.scene.addItem('Line', { points: [new Point(0, 50), new Point(50, 50)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(100, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 50), new Point(50, 50)] });
 
   const extend = new Extend();
   extend.selectedBoundaryItems = [core.scene.entities.get(0)];
-  extend.selectedItem = core.scene.entities.get(1);
+  extend.selectedEntity = core.scene.entities.get(1);
   core.mouse.setPosFromScenePoint(new Point(40, 50));
 
   const notifySpy = jest.spyOn(core, 'notify').mockImplementation(() => {});
   extend.action();
 
   expect(notifySpy).toHaveBeenCalledWith(expect.stringContaining(Strings.Message.NOEXTEND));
-  expect(extend.selectedItem).toBeNull();
+  expect(extend.selectedEntity).toBeNull();
   notifySpy.mockRestore();
 });
 
 test('Extend.action notifies when boundary item equals selected item', () => {
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(50, 0)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(50, 0)] });
   const entity = core.scene.entities.get(0);
 
   const extend = new Extend();
   extend.selectedBoundaryItems = [entity];
-  extend.selectedItem = entity;
+  extend.selectedEntity = entity;
   core.mouse.setPosFromScenePoint(new Point(40, 0));
 
   const notifySpy = jest.spyOn(core, 'notify').mockImplementation(() => {});
@@ -686,12 +686,12 @@ test('Extend.action extends the start of a line', () => {
   // Boundary: vertical line at x=0
   // Mouse near the start (50,50) → extend start back to x=0
   core.scene.clear();
-  core.scene.addItem('Line', { points: [new Point(0, 0), new Point(0, 100)] });
-  core.scene.addItem('Line', { points: [new Point(50, 50), new Point(100, 50)] });
+  core.scene.addEntity('Line', { points: [new Point(0, 0), new Point(0, 100)] });
+  core.scene.addEntity('Line', { points: [new Point(50, 50), new Point(100, 50)] });
 
   const extend = new Extend();
   extend.selectedBoundaryItems = [core.scene.entities.get(0)];
-  extend.selectedItem = core.scene.entities.get(1);
+  extend.selectedEntity = core.scene.entities.get(1);
   core.mouse.setPosFromScenePoint(new Point(55, 50));
   extend.action();
 
@@ -705,22 +705,22 @@ test('Extend.action notifies NOEXTEND when end segment of an Arc is curved', ()
   // A standalone Arc always has a non-zero bulge on its single segment.
   // #extendEntity must reject the extension and notify because endSegmentBulge !== 0.
   core.scene.clear();
-  core.scene.addItem('Arc', {
+  core.scene.addEntity('Arc', {
     points: [new Point(0, 0), new Point(10, 0), new Point(0, 10)],
     direction: 1,
   });
   // Vertical boundary at x=5 — intersects the CCW quarter-arc
-  core.scene.addItem('Line', { points: [new Point(5, -20), new Point(5, 20)] });
+  core.scene.addEntity('Line', { points: [new Point(5, -20), new Point(5, 20)] });
 
   const extend = new Extend();
   extend.selectedBoundaryItems = [core.scene.entities.get(1)];
-  extend.selectedItem = core.scene.entities.get(0);
+  extend.selectedEntity = core.scene.entities.get(0);
   core.mouse.setPosFromScenePoint(new Point(9, 1)); // near arc start (10,0)
 
   const notifySpy = jest.spyOn(core, 'notify').mockImplementation(() => {});
   extend.action();
 
   expect(notifySpy).toHaveBeenCalledWith(expect.stringContaining(Strings.Message.NOEXTEND));
-  expect(extend.selectedItem).toBeNull();
+  expect(extend.selectedEntity).toBeNull();
   notifySpy.mockRestore();
 });