diff --git a/unittests/table_json_conversion/example_template.xlsx b/unittests/table_json_conversion/example_template.xlsx index 815c17a5789bbf129c5ee88eb7ac559940ef659d..e1991e2d39503c7b2dcf1b85d46a1da482becd5e 100644 Binary files a/unittests/table_json_conversion/example_template.xlsx and b/unittests/table_json_conversion/example_template.xlsx differ diff --git a/unittests/table_json_conversion/model.yml b/unittests/table_json_conversion/model.yml index 3ee3b20e92e7d4cabddb668db66540169cfad27e..74fb5bc5dc4251bb3834ea2f6201f991cab510d1 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 f7d9738a17f07f6779f2253e60f6da434f926e30..6f2fffdea938da3e4e3a39397a1ddbfbaa47724c 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 21a9ce17f857687df3af90c1be0dd0b9c147799b..3198f34dc9f4d757cbe8dcb2ed4f4b28ba043064 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',