From 995a80366565a1fb216b64eff0762ef26349ce38 Mon Sep 17 00:00:00 2001 From: Loup Theron Date: Wed, 14 Aug 2024 11:07:28 +0200 Subject: [PATCH] Fix cypress test --- .../api/light/VesselLightControllerITests.kt | 54 +++- .../JpaPositionRepositoryITests.kt | 290 ++++++++++++++++-- .../cypress/e2e/vessels/vessels_list.spec.ts | 2 +- 3 files changed, 306 insertions(+), 40 deletions(-) diff --git a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/light/VesselLightControllerITests.kt b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/light/VesselLightControllerITests.kt index 8237323982..ccbeb6bdcb 100644 --- a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/light/VesselLightControllerITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/light/VesselLightControllerITests.kt @@ -117,20 +117,62 @@ class VesselLightControllerITests { // Given val now = ZonedDateTime.now().minusDays(1) val firstPosition = Position( - null, "FR224226850", "224226850", null, null, null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + id = null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = null, + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + isAtPort = false, + dateTime = now.minusHours( 4, ), ) val secondPosition = Position( - null, "FR224226850", "224226850", null, null, null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + id = null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = null, + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + isAtPort = false, + dateTime = now.minusHours( 3, ), ) val thirdPosition = Position( - null, "FR224226850", "224226850", null, null, null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = null, + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + isAtPort = false, + dateTime = now.minusHours( 2, ), ) diff --git a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaPositionRepositoryITests.kt b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaPositionRepositoryITests.kt index 280f3a71b9..c3fad203c5 100644 --- a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaPositionRepositoryITests.kt +++ b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaPositionRepositoryITests.kt @@ -32,7 +32,23 @@ class JpaPositionRepositoryITests : AbstractDBTests() { // Given val farPastFixedDateTime = ZonedDateTime.of(LocalDate.EPOCH, LocalTime.MAX.plusSeconds(1), ZoneId.of("UTC")) val expectedPosition = - Position(null, "REF_NUMBER", "224136470", null, null, null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, farPastFixedDateTime) + Position( + null, + internalReferenceNumber = "REF_NUMBER", + mmsi = "224136470", + ircs = null, + externalReferenceNumber = null, + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = farPastFixedDateTime, + ) // When jpaPositionRepository.save(expectedPosition) @@ -54,26 +70,78 @@ class JpaPositionRepositoryITests : AbstractDBTests() { // Given val now = ZonedDateTime.now() val firstPosition = Position( - null, "FR224226850", "224226850", null, null, null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = null, + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 4, ), ) val secondPosition = Position( - null, "FR224226850", "224226850", null, null, null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = null, + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 3, ), ) val thirdPosition = Position( - null, "FR224226850", "224226850", null, null, null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = null, + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 2, ), ) val fourthPosition = Position( - null, "FR224226850", "224226850", null, null, null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusMinutes( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = null, + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusMinutes( 1, ), ) @@ -102,26 +170,78 @@ class JpaPositionRepositoryITests : AbstractDBTests() { // Given val now = ZonedDateTime.now() val firstPosition = Position( - null, "FR224226850", "224226850", null, null, null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = null, + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 4, ), ) val secondPosition = Position( - null, "FR224226850", "224226850", null, null, null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = null, + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 3, ), ) val thirdPosition = Position( - null, "FR224226850", "224226850", null, null, null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = null, + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 2, ), ) val fourthPosition = Position( - null, "FR224226850", "224226850", null, null, null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = null, + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 1, ), ) @@ -150,26 +270,78 @@ class JpaPositionRepositoryITests : AbstractDBTests() { // Given val now = ZonedDateTime.now() val firstPosition = Position( - null, "FR224226850", "224226850", null, "NOT_NULL", null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = "NOT_NULL", + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 4, ), ) val secondPosition = Position( - null, "FR224226850", "224226850", null, "NOT_NULL", null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = "NOT_NULL", + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 3, ), ) val thirdPosition = Position( - null, "FR224226850", "224226850", null, "NOT_NULL", null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = "NOT_NULL", + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 2, ), ) val fourthPosition = Position( - null, "FR224226850", "224226850", null, "NOT_NULL", null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = null, + externalReferenceNumber = "NOT_NULL", + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 1, ), ) @@ -197,26 +369,78 @@ class JpaPositionRepositoryITests : AbstractDBTests() { // Given val now = ZonedDateTime.now() val firstPosition = Position( - null, "FR224226850", "224226850", "NOT_NULL", "", null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = "NOT_NULL", + externalReferenceNumber = "", + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 4, ), ) val secondPosition = Position( - null, "FR224226850", "224226850", "NOT_NULL", "", null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = "NOT_NULL", + externalReferenceNumber = "", + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 3, ), ) val thirdPosition = Position( - null, "FR224226850", "224226850", "NOT_NULL", "", null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = "NOT_NULL", + externalReferenceNumber = "", + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 2, ), ) val fourthPosition = Position( - null, "FR224226850", "224226850", "NOT_NULL", "", null, null, PositionType.AIS, false, false, 16.445, 48.2525, 1.8, 180.0, - now.minusHours( + null, + internalReferenceNumber = "FR224226850", + mmsi = "224226850", + ircs = "NOT_NULL", + externalReferenceNumber = "", + vesselName = null, + flagState = null, + positionType = PositionType.AIS, + isManual = false, + isFishing = false, + course = 16.445, + latitude = 48.2525, + longitude = 1.8, + speed = 180.0, + dateTime = now.minusHours( 1, ), ) diff --git a/frontend/cypress/e2e/vessels/vessels_list.spec.ts b/frontend/cypress/e2e/vessels/vessels_list.spec.ts index ac1752a52e..a5f0c5d123 100644 --- a/frontend/cypress/e2e/vessels/vessels_list.spec.ts +++ b/frontend/cypress/e2e/vessels/vessels_list.spec.ts @@ -93,7 +93,7 @@ context('Vessels list', () => { return cy .readFile(`cypress/downloads/${downloadedCSVFilename}`) - .should('contains', 'Quartier,CFR,C/S,Nom,GDH (UTC),MMSI,Latitude,Longitude,Cap,Vitesse,Au port') + .should('contains', 'Quartier,CFR,C/S,Nom,GDH (UTC),MMSI,Latitude,Longitude,Cap,Vitesse') .should('contains', '"Duval","ABC000021309","","GENS SAISON PARMI"') .should('contains', '"","48°43′41″N","002°44′53″W"') })