From 740a1f56d651956a6a44d99e7185b4d41affe407 Mon Sep 17 00:00:00 2001 From: Sviatoslav Nekhaienko <snekhaienko@slb.com> Date: Mon, 1 Feb 2021 15:18:45 +0200 Subject: [PATCH] add anyOf and oneOf to integration tests --- .../integration-tests/index_records_1.schema | 12 +++++++++-- .../testData/index_records_1.schema.json | 20 ++++++++++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/indexer-core/src/test/resources/converter/integration-tests/index_records_1.schema b/indexer-core/src/test/resources/converter/integration-tests/index_records_1.schema index 672c3d965..779d2d209 100644 --- a/indexer-core/src/test/resources/converter/integration-tests/index_records_1.schema +++ b/indexer-core/src/test/resources/converter/integration-tests/index_records_1.schema @@ -20,7 +20,11 @@ }, "County": { "type": "string" - }, + }}}], + "anyOf": [ + { + "type": "object", + "properties": { "State": { "type": "string" }, @@ -41,7 +45,11 @@ }, "EmptyAttribute": { "type": "string" - }, + }}}], + "oneOf": [ + { + "type": "object", + "properties": { "Rank": { "type": "integer" }, diff --git a/testing/indexer-test-core/src/main/resources/testData/index_records_1.schema.json b/testing/indexer-test-core/src/main/resources/testData/index_records_1.schema.json index 2a6e6301a..9e54b3386 100644 --- a/testing/indexer-test-core/src/main/resources/testData/index_records_1.schema.json +++ b/testing/indexer-test-core/src/main/resources/testData/index_records_1.schema.json @@ -4,7 +4,7 @@ "authority": "tenant1", "source": "indexer-int-test", "entityType": "sample-schema-1", - "schemaVersionMajor": "1", + "schemaVersionMajor": "2", "schemaVersionMinor": "0", "schemaVersionPatch": "4" }, @@ -32,7 +32,14 @@ }, "County": { "type": "string" - }, + } + } + } + ], + "anyOf": [ + { + "type": "object", + "properties": { "State": { "type": "string" }, @@ -53,7 +60,14 @@ }, "EmptyAttribute": { "type": "string" - }, + } + } + } + ], + "oneOf": [ + { + "type": "object", + "properties": { "Rank": { "type": "integer" }, -- GitLab