From 3866f798307b01c26275d29096df954f9c9f036b Mon Sep 17 00:00:00 2001
From: fspreck <f.spreckelsen@indiscale.com>
Date: Fri, 18 Feb 2022 08:51:31 +0100
Subject: [PATCH] MAINT: Move test schemas in separate folder
---
.../datamodel_string_properties.schema.json | 0
unittests/test_json_schema_model_parser.py | 9 +++++----
2 files changed, 5 insertions(+), 4 deletions(-)
rename unittests/{ => json-schema-models}/datamodel_string_properties.schema.json (100%)
diff --git a/unittests/datamodel_string_properties.schema.json b/unittests/json-schema-models/datamodel_string_properties.schema.json
similarity index 100%
rename from unittests/datamodel_string_properties.schema.json
rename to unittests/json-schema-models/datamodel_string_properties.schema.json
diff --git a/unittests/test_json_schema_model_parser.py b/unittests/test_json_schema_model_parser.py
index e65bf998..c8cae46e 100644
--- a/unittests/test_json_schema_model_parser.py
+++ b/unittests/test_json_schema_model_parser.py
@@ -22,7 +22,8 @@ import os
import caosdb as db
from caosadvancedtools.models.parser import parse_model_from_json_schema
-FILEPATH = os.path.dirname(os.path.abspath(__file__))
+FILEPATH = os.path.join(os.path.dirname(
+ os.path.abspath(__file__)), 'json-schema-models')
def test_rt_with_string_properties():
@@ -38,9 +39,9 @@ def test_rt_with_string_properties():
assert dataset_rt.description == ""
assert len(dataset_rt.get_properties()) == 3
- assert dataset_rt.get_property("title") != None
- assert dataset_rt.get_property("campaign") != None
- assert dataset_rt.get_property("method") != None
+ assert dataset_rt.get_property("title") is not None
+ assert dataset_rt.get_property("campaign") is not None
+ assert dataset_rt.get_property("method") is not None
title_prop = dataset_rt.get_property("title")
assert title_prop.datatype == db.TEXT
--
GitLab