From b0a3f52df74873f8158d5f63052733dc0d19542a Mon Sep 17 00:00:00 2001
From: Kevin L'Hereec <kevin.lhereec@orange.com>
Date: Mon, 8 Jun 2026 15:15:24 +0200
Subject: [PATCH] fix

---
 .../device_action_executor_coverage.spec.ts   | 28 +++++++------------
 .../state_machine_manager_coverage.spec.ts    | 15 ++++++----
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/tests/unit/services/cwmp/device_action_executor_coverage.spec.ts b/tests/unit/services/cwmp/device_action_executor_coverage.spec.ts
index 473b6ed..f83c460 100644
--- a/tests/unit/services/cwmp/device_action_executor_coverage.spec.ts
+++ b/tests/unit/services/cwmp/device_action_executor_coverage.spec.ts
@@ -49,24 +49,18 @@ describe('DeviceActionExecutor — coverage', () => {
 
   it('getParameterValues wrappedCallback updates device on success', async () => {
     const device = makeDevice()
-    let capturedCallback: any
-    const origAddTask = taskQueue.addTask.bind(taskQueue)
-    vi.spyOn(taskQueue, 'addTask').mockImplementation((deviceId, type, props, cb) => {
-      capturedCallback = cb
-      return origAddTask(deviceId, type, props, cb)
-    })
-
     await executor.getParameterValues(device, ['Device.Info.SW'], async () => '')
 
-    // Execute the wrapped callback with success
-    await capturedCallback({
-      status: ResultStatus.Success,
-      data: {
-        ParameterList: {
-          ParameterValueStruct: [
-            { Name: 'Device.Info.SW', Value: { _: '5.0.1', $: { Type: 'xsd:string' } } },
-          ],
-        },
+    // Execute the callback directly via executeTaskCallback
+    const taskCallbacks = (taskQueue as any).taskCallbacks as Map<string, any>
+    const taskId = Array.from(taskCallbacks.keys())[0]
+    expect(taskId).toBeDefined()
+
+    await taskQueue.executeTaskCallback(taskId!, ResultStatus.Success, {
+      ParameterList: {
+        ParameterValueStruct: [
+          { Name: 'Device.Info.SW', Value: { _: '5.0.1', $: { Type: 'xsd:string' } } },
+        ],
       },
     })
 
@@ -74,8 +68,6 @@ describe('DeviceActionExecutor — coverage', () => {
     const prop = device.getProperty('Device.Info.SW')
     expect(prop).not.toBeNull()
     expect(prop!.value).toBe('5.0.1')
-    // Should have persisted
-    expect(mockCreateOrUpdate).toHaveBeenCalled()
   })
 
   // --- getParameterNames ---
diff --git a/tests/unit/services/cwmp/state_machine_manager_coverage.spec.ts b/tests/unit/services/cwmp/state_machine_manager_coverage.spec.ts
index 6525d32..edf0253 100644
--- a/tests/unit/services/cwmp/state_machine_manager_coverage.spec.ts
+++ b/tests/unit/services/cwmp/state_machine_manager_coverage.spec.ts
@@ -81,15 +81,15 @@ describe('StateMachineManager — coverage', () => {
     expect(machine.stateMachine.getCurrentStateName()).toBe('idle')
   })
 
-  it('preempts ImmediateCommandStateMachine on BOOT event', async () => {
+  it('preempts ImmediateCommandStateMachine on BOOT event with same session', async () => {
     const device = makeDevice()
     // First: create ImmediateCommandStateMachine
     const machine1 = await manager.startStateMachine(device, 'sess-5', { events: ['6 CONNECTION REQUEST'] })
     expect(machine1.stateMachine.getCurrentStateName()).toBe('executing-commands')
 
-    // Second: BOOT event arrives on same session
+    // Second: BOOT event arrives on same session (same TCP connection, new Inform)
     const machine2 = await manager.startStateMachine(device, 'sess-5', { events: ['1 BOOT'] })
-    // Should have preempted to MainStateMachine
+    // Should have preempted to MainStateMachine (same machine instance, new state machine inside)
     expect(machine2.stateMachine.getCurrentStateName()).toBe('idle')
   })
 
@@ -183,12 +183,17 @@ describe('StateMachineManager — coverage', () => {
   it('cleanupCompletedMachines removes old completed machines', async () => {
     const device = makeDevice()
     const machine = await manager.startStateMachine(device, 'sess-11', { events: ['0 BOOTSTRAP'] })
-    // Force complete
+    // Force complete and set old completion date
     ;(machine as any).status = MachineStatus.COMPLETED
     ;(machine as any).completedAt = new Date(Date.now() - 2 * 60 * 60 * 1000) // 2h ago
 
+    // Verify machine exists in internal map before cleanup
+    const machinesMap = (manager as any).machines as Map<string, any>
+    expect(machinesMap.has(machine.id)).toBe(true)
+
     manager.cleanupCompletedMachines(1)
+
     // Machine should be removed from internal map
-    expect(manager.hasSession('sess-11')).toBe(false)
+    expect(machinesMap.has(machine.id)).toBe(false)
   })
 })