Increase configuration_evaluation_state.ts coverage to 100% stmts/lines, 88% branches, 77% functions. Added tests for inventory GPN callback (error/success), phase 2 GPV callback, SPV callback, download callback, firmware transition, and ComplianceUpdateState provCode callback. All 766 tests pass. Build status: Success

tests/unit/services/cwmp/config_eval_extra.spec.ts

@@ -23,10 +23,14 @@ vi.mock('#models/configuration', () => ({
 }))
 
 // Mock FirmwareCatalogService
-vi.mock('../../../../app/services/firmware_catalog_service.js', () => ({
-  default: class { async resolveUpgradePath() { return [] } },
-  FirmwareCatalogService: class { async resolveUpgradePath() { return [] } },
-}))
+vi.mock('../../../../app/services/firmware_catalog_service.js', () => {
+  const fn = vi.fn().mockResolvedValue([])
+  return {
+    default: class { resolveUpgradePath = fn },
+    FirmwareCatalogService: class { resolveUpgradePath = fn },
+    __mockResolveUpgradePath: fn,
+  }
+})
 
 // Mock schedule_window
 vi.mock('../../../../app/utils/schedule_window.js', () => ({
@@ -53,7 +57,7 @@ import { ConfigurationEvaluationState, FirmwareUpgradeState, ComplianceUpdateSta
 import { Device } from '../../../../app/domain/device/device.js'
 import { DeviceId } from '../../../../app/domain/device/device_id.js'
 import { DeviceParameter } from '../../../../app/domain/device/device_parameter.js'
-import { CWMPTaskQueue } from '../../../../app/services/cwmp/task_queue.js'
+import { CWMPTaskQueue, ResultStatus } from '../../../../app/services/cwmp/task_queue.js'
 import { DeviceActionExecutor } from '../../../../app/services/cwmp/device_action_executor.js'
 import { ParameterType } from '../../../../app/domain/shared/types.js'
 import ConfigurationModel from '#models/configuration'
@@ -256,6 +260,67 @@ describe('ConfigurationEvaluationState — inventory GPN phase (device supports
     expect(result.response).toContain('Device.ManagementServer.')
   })
 
+  it('GPN callback records failure on error and extracts leaf names on success', async () => {
+    const config = makeConfig({
+      desiredParameters: [{ name: 'Device.X', value: '1', type: 'string' }],
+      inventory: [{ path: 'Device.ManagementServer.' }],
+    })
+    vi.mocked(ConfigurationModel.find).mockResolvedValue([config])
+
+    const device = makeDevice()
+    device.setGpnStatus('supported')
+    const context = makeContext(device)
+
+    const state = new ConfigurationEvaluationState()
+    await state.handle(context as any)
+
+    // Get the GPN task callback from the queue
+    const taskCallbacks = (context.taskQueue as any).taskCallbacks as Map<string, any>
+    const taskId = Array.from(taskCallbacks.keys())[0]
+    expect(taskId).toBeDefined()
+
+    // Execute callback with SUCCESS + leaf names
+    await context.taskQueue.executeTaskCallback(taskId!, ResultStatus.Success, {
+      ParameterList: {
+        ParameterInfoStruct: [
+          { Name: 'Device.ManagementServer.PeriodicInformInterval', Writable: '1' },
+          { Name: 'Device.ManagementServer.ConnectionRequestURL', Writable: '0' },
+          { Name: 'Device.ManagementServer.', Writable: '0' }, // non-leaf, should be filtered
+        ],
+      },
+    })
+
+    // Now handle again — should enter phase 2 (GPV for discovered leaves)
+    const result2 = await state.handle(context as any)
+    expect(result2.response).toContain('GetParameterValues')
+    expect(result2.response).toContain('Device.ManagementServer.PeriodicInformInterval')
+  })
+
+  it('GPN callback records failure when result is error', async () => {
+    const config = makeConfig({
+      desiredParameters: [{ name: 'Device.X', value: '1', type: 'string' }],
+      inventory: [{ path: 'Device.ManagementServer.' }],
+    })
+    vi.mocked(ConfigurationModel.find).mockResolvedValue([config])
+
+    const device = makeDevice()
+    device.setGpnStatus('supported')
+    const context = makeContext(device)
+
+    const state = new ConfigurationEvaluationState()
+    await state.handle(context as any)
+
+    // Get the GPN task callback
+    const taskCallbacks = (context.taskQueue as any).taskCallbacks as Map<string, any>
+    const taskId = Array.from(taskCallbacks.keys())[0]
+
+    // Execute callback with ERROR
+    await context.taskQueue.executeTaskCallback(taskId!, ResultStatus.Error, { FaultCode: 9001 })
+
+    // Device should have recorded GPN failure (may be called by both executor and ConfigEval callbacks)
+    expect(device.gpnCircuitBreaker.failureCount).toBeGreaterThanOrEqual(1)
+  })
+
   it('inventory GPN response then sends SPV for diffs after inventory completes', async () => {
     const config = makeConfig({
       desiredParameters: [{ name: 'Device.ManagementServer.PeriodicInformInterval', value: '300', type: 'unsignedInt' }],
@@ -333,6 +398,13 @@ describe('ComplianceUpdateState — second call after provCode write', () => {
     const result1 = await state.handle(context as any)
     expect(result1.response).toContain('SetParameterValues')
 
+    // Execute the provCode task callback (covers the anonymous callback at line ~285)
+    const taskCallbacks = (context.taskQueue as any).taskCallbacks as Map<string, any>
+    const taskId = Array.from(taskCallbacks.keys()).pop()
+    if (taskId) {
+      await context.taskQueue.executeTaskCallback(taskId, ResultStatus.Success, {})
+    }
+
     // Second call: after SPV response, transitions to ExecutingCommandsState
     const result2 = await state.handle(context as any)
     expect(result2.nextState).toBeDefined()
@@ -340,3 +412,132 @@ describe('ComplianceUpdateState — second call after provCode write', () => {
   })
 })
 
+describe('ConfigurationEvaluationState — phase 2 GPV callback and SPV callback', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('inventory phase 2 GPV callback is invoked', async () => {
+    const config = makeConfig({
+      desiredParameters: [{ name: 'Device.X', value: '1', type: 'string' }],
+      inventory: [{ path: 'Device.ManagementServer.' }],
+    })
+    vi.mocked(ConfigurationModel.find).mockResolvedValue([config])
+
+    const device = makeDevice()
+    device.setGpnStatus('supported')
+    const context = makeContext(device)
+
+    const state = new ConfigurationEvaluationState()
+    // First call: sends GPN
+    await state.handle(context as any)
+
+    // Execute GPN callback with leaf names to populate pendingValuesQueue
+    const taskCallbacks = (context.taskQueue as any).taskCallbacks as Map<string, any>
+    const gpnTaskId = Array.from(taskCallbacks.keys())[0]
+    await context.taskQueue.executeTaskCallback(gpnTaskId!, ResultStatus.Success, {
+      ParameterList: { ParameterInfoStruct: [{ Name: 'Device.ManagementServer.X', Writable: '1' }] },
+    })
+
+    // Second call: sends GPV for discovered leaves (phase 2)
+    const result2 = await state.handle(context as any)
+    expect(result2.response).toContain('GetParameterValues')
+
+    // Execute the GPV callback (covers line ~135 `() => Promise.resolve('')`)
+    const gpvTaskId = Array.from(taskCallbacks.keys()).pop()
+    await context.taskQueue.executeTaskCallback(gpvTaskId!, ResultStatus.Success, {
+      ParameterList: { ParameterValueStruct: [] },
+    })
+  })
+
+  it('SPV callback is invoked after applying diffs', async () => {
+    const config = makeConfig({
+      desiredParameters: [{ name: 'Device.ManagementServer.PeriodicInformInterval', value: '300', type: 'unsignedInt' }],
+      inventory: [],
+    })
+    vi.mocked(ConfigurationModel.find).mockResolvedValue([config])
+
+    const device = makeDevice()
+    device.setGpnStatus('unsupported')
+    device.setParameter(new DeviceParameter(
+      'Device.ManagementServer.PeriodicInformInterval', '60', ParameterType.UNSIGNED_INT
+    ))
+    const context = makeContext(device)
+
+    const state = new ConfigurationEvaluationState()
+    const result = await state.handle(context as any)
+    expect(result.response).toContain('SetParameterValues')
+
+    // Execute the SPV callback (covers line ~147 `() => Promise.resolve('')`)
+    const taskCallbacks = (context.taskQueue as any).taskCallbacks as Map<string, any>
+    const spvTaskId = Array.from(taskCallbacks.keys()).pop()
+    await context.taskQueue.executeTaskCallback(spvTaskId!, ResultStatus.Success, {})
+  })
+})
+
+describe('FirmwareUpgradeState — download callback', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('download callback is invoked on success', async () => {
+    const device = makeDevice()
+    const context = makeContext(device)
+
+    const steps = [{ fromVersion: '4.0', toVersion: '5.0', downloadUrl: 'http://fw.bin', fileSize: 1024, checksum: '' }]
+    const engineResult = { configuration: makeConfig() } as any
+
+    const state = new FirmwareUpgradeState(steps, 0, engineResult)
+    const result = await state.handle(context as any)
+    expect(result.response).toContain('Download')
+
+    // Execute the download callback (covers line ~206 `async () => ''`)
+    const taskCallbacks = (context.taskQueue as any).taskCallbacks as Map<string, any>
+    const dlTaskId = Array.from(taskCallbacks.keys()).pop()
+    if (dlTaskId) {
+      await context.taskQueue.executeTaskCallback(dlTaskId, ResultStatus.Success, {})
+    }
+  })
+})
+
+
+describe('ConfigurationEvaluationState — firmware upgrade transition (lines 154-158)', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('transitions to FirmwareUpgradeState when firmwareMigrationPath has steps', async () => {
+    // Directly test by creating state with pre-set internal state
+    const config = makeConfig({ inventory: [] })
+    vi.mocked(ConfigurationModel.find).mockResolvedValue([config])
+
+    const device = makeDevice()
+    device.setGpnStatus('unsupported')
+    const context = makeContext(device)
+
+    const state = new ConfigurationEvaluationState()
+
+    // Manually override the engine result after initialization
+    // First, trigger initialization
+    await state.handle(context as any)
+
+    // The state already ran - but if already compliant it transitions.
+    // Instead, set up the engineResult with firmware steps directly:
+    ;(state as any).engineResult = {
+      configuration: config,
+      inventoryPaths: [],
+      parameterDiffs: [],
+      firmwareMigrationPath: [{ fromVersion: '4.0', toVersion: '5.0', downloadUrl: 'http://fw.bin', fileSize: 1024, checksum: '' }],
+      isAlreadyCompliant: false,
+      skipFirmware: false,
+    }
+    ;(state as any).inventoryQueue = []
+    ;(state as any).paramDiffs = []
+
+    // Call handle again - should hit firmware transition branch
+    const result = await state.handle(context as any)
+    expect(result.nextState).toBeDefined()
+    expect((result.nextState as any).name).toBe('firmware-upgrade')
+  })
+})
+

tests/unit/services/cwmp/main_state_machine_extended.spec.ts

@@ -53,7 +53,7 @@ describe('MainStateMachine', () => {
     const sm = new MainStateMachine(makeDevice('tr-181'), 'sess-1', new CWMPTaskQueue())
     await sm.start()
     // Simulate GPN success response
-    const response = await sm.handleResponse(true, {
+    await sm.handleResponse(true, {
       ParameterList: {
         ParameterInfoStruct: [{ Name: 'Device.ManagementServer.URL', Writable: '1' }],
       },