From 9c5a2edecefb6077e654a0be3a10e2c66c1c6bbf Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Sun, 5 Mar 2017 00:52:44 +0100 Subject: [PATCH] Fixing schema tests. --- .../src/test/resources/common/json/no-ns/user-jack.json | 3 ++- infra/schema/src/test/resources/common/json/ns/user-jack.json | 3 ++- .../schema/src/test/resources/common/xml/no-ns/user-jack.xml | 4 +++- .../src/test/resources/common/yaml/no-ns/user-jack.yaml | 1 + infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/infra/schema/src/test/resources/common/json/no-ns/user-jack.json b/infra/schema/src/test/resources/common/json/no-ns/user-jack.json index 66845ade881..344dce3f55e 100644 --- a/infra/schema/src/test/resources/common/json/no-ns/user-jack.json +++ b/infra/schema/src/test/resources/common/json/no-ns/user-jack.json @@ -62,7 +62,8 @@ }, "construction" : { "resourceRef" : { - "oid" : "2f9b9299-5555-5555-5555-000000001111" + "oid" : "2f9b9299-5555-5555-5555-000000001111", + "targetName" : "resource1" } } } ], diff --git a/infra/schema/src/test/resources/common/json/ns/user-jack.json b/infra/schema/src/test/resources/common/json/ns/user-jack.json index a84709989b4..62072d4225a 100644 --- a/infra/schema/src/test/resources/common/json/ns/user-jack.json +++ b/infra/schema/src/test/resources/common/json/ns/user-jack.json @@ -67,7 +67,8 @@ "construction" : { "resourceRef" : { "oid" : "2f9b9299-5555-5555-5555-000000001111", - "type" : "http://midpoint.evolveum.com/xml/ns/public/common/common-3#ResourceType" + "type" : "http://midpoint.evolveum.com/xml/ns/public/common/common-3#ResourceType", + "targetName" : "resource1" } } } ], diff --git a/infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml b/infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml index bdd44b69a4e..c19aac65dc5 100644 --- a/infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml +++ b/infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml @@ -66,7 +66,9 @@ 42 - + + resource1 + diff --git a/infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml b/infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml index eadd7aac909..d297601f652 100644 --- a/infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml +++ b/infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml @@ -44,6 +44,7 @@ object: !UserType construction: resourceRef: oid: 2f9b9299-5555-5555-5555-000000001111 + targetName: resource1 activation: administrativeStatus: enabled fullName: Jack Sparrow diff --git a/infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml b/infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml index 7a6842884bd..5e6c36bdc6a 100644 --- a/infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml +++ b/infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml @@ -46,6 +46,7 @@ object: !http://midpoint.evolveum.com/xml/ns/public/common/common-3/UserType construction: resourceRef: oid: 2f9b9299-5555-5555-5555-000000001111 + targetName: resource1 activation: administrativeStatus: enabled fullName: Jack Sparrow