Merge pull request #41 from OSGP/feature/FDP-2551-firmware

FDP-2551 Firmware update added

application/src/integrationTest/kotlin/org/gxf/crestdevicesimulator/SimulatorIntegrationTest.kt

@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.gxf.crestdevicesimulator
 
-import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.dataformat.cbor.databind.CBORMapper
 import java.net.URI
 import java.time.Duration
@@ -15,17 +14,14 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.core.io.ClassPathResource
 
 @SpringBootTest
 class SimulatorIntegrationTest {
 
     @Value("\${simulator.config.uri}") private lateinit var uri: URI
 
-    private val mapper = ObjectMapper()
     private lateinit var coapServer: CoapServer
     private val coapResourceStub = CoapResourceStub()
-    private val expectedJsonNode = mapper.readTree(ClassPathResource("messages/kod-message.json").file)
 
     @BeforeEach
     fun setup() {
@@ -39,7 +35,7 @@ class SimulatorIntegrationTest {
     fun shouldSendCoapRequestToConfiguredEndpoint() {
         Awaitility.await().atMost(Duration.ofSeconds(5)).untilAsserted {
             val jsonNodeStub = CBORMapper().readTree(coapResourceStub.lastRequestPayload)
-            assertThat(jsonNodeStub).isEqualTo(expectedJsonNode)
+            assertThat(jsonNodeStub.has("FMC")).isTrue()
         }
     }
 }

application/src/integrationTest/resources/application.yaml

@@ -16,10 +16,6 @@ spring:
 
 simulator:
   config:
-    scheduled-message: "classpath:messages/kod-message.json"
-    success-message: "classpath:messages/psk-change-success-message.json"
-    failure-message: "classpath:messages/psk-change-failure-message.json"
-    reboot-success-message: "classpath:messages/kod-reboot-success-message.json"
     # Simulator will produce valid/invalid CBOR messages
     produce-valid-cbor: true
     # Uri of the target coap server