From 27dc4c6297a2c67a1b0fa1dd72e1c359debf52e3 Mon Sep 17 00:00:00 2001 From: Daniel <d.hornung@indiscale.com> Date: Tue, 5 Mar 2024 11:02:27 +0100 Subject: [PATCH] TEST: More extensive test data. --- .../example_template.xlsx | Bin 10178 -> 9473 bytes unittests/table_json_conversion/model.yml | 4 ++-- .../table_json_conversion/model_schema.json | 6 +++--- .../test_table_template_generator.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/unittests/table_json_conversion/example_template.xlsx b/unittests/table_json_conversion/example_template.xlsx index 815c17a5789bbf129c5ee88eb7ac559940ef659d..e1991e2d39503c7b2dcf1b85d46a1da482becd5e 100644 GIT binary patch delta 7567 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 delta 8302 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 diff --git a/unittests/table_json_conversion/model.yml b/unittests/table_json_conversion/model.yml index 3ee3b20e..74fb5bc5 100644 --- a/unittests/table_json_conversion/model.yml +++ b/unittests/table_json_conversion/model.yml @@ -9,10 +9,10 @@ Training: recommended_properties: date: datatype: DATETIME - description: 'date' + description: 'The date of the training.' url: datatype: TEXT - description: 'url' + description: 'The URL' subjects: datatype: LIST<TEXT> coach: diff --git a/unittests/table_json_conversion/model_schema.json b/unittests/table_json_conversion/model_schema.json index f7d9738a..6f2fffde 100644 --- a/unittests/table_json_conversion/model_schema.json +++ b/unittests/table_json_conversion/model_schema.json @@ -12,7 +12,7 @@ "description": "The name of the Record to be created" }, "date": { - "description": "date", + "description": "The date of the training.", "anyOf": [ { "type": "string", @@ -26,7 +26,7 @@ }, "url": { "type": "string", - "description": "url" + "description": "The URL" }, "subjects": { "type": "array", @@ -126,4 +126,4 @@ ], "additionalProperties": false, "$schema": "https://json-schema.org/draft/2020-12/schema" -} \ No newline at end of file +} diff --git a/unittests/table_json_conversion/test_table_template_generator.py b/unittests/table_json_conversion/test_table_template_generator.py index 21a9ce17..3198f34d 100644 --- a/unittests/table_json_conversion/test_table_template_generator.py +++ b/unittests/table_json_conversion/test_table_template_generator.py @@ -116,8 +116,8 @@ def test_generate_sheets_from_schema(): foreign_keys={'Training': {"__this__": ['date', 'url']}}) assert "Training" in sdef tdef = sdef['Training'] - assert tdef['date'] == (ColumnType.SCALAR, 'date', ["Training", 'date']) - assert tdef['url'] == (ColumnType.SCALAR, 'url', ["Training", 'url']) + assert tdef['date'] == (ColumnType.SCALAR, 'The date of the training.', ["Training", 'date']) + assert tdef['url'] == (ColumnType.SCALAR, 'The URL', ["Training", 'url']) assert tdef['supervisor.family_name'] == (ColumnType.SCALAR, None, ["Training", 'supervisor', 'family_name']) assert tdef['supervisor.given_name'] == (ColumnType.SCALAR, None, ["Training", 'supervisor', -- GitLab