From 2e07fd1cde8c793792f9cc4827900822a4b5a9f9 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 15 Jan 2021 19:57:42 +0100 Subject: [PATCH] bimtester: steps, improve ifcdata schema test --- src/ifcbimtester/bimtester/features/steps/ifcdata.py | 4 ++-- src/ifcbimtester/bimtester/features/steps/ifcdata_de.py | 4 ++-- src/ifcbimtester/bimtester/features/steps/ifcdata_fr.py | 4 ++-- src/ifcbimtester/bimtester/features/steps/ifcdata_methods.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ifcbimtester/bimtester/features/steps/ifcdata.py b/src/ifcbimtester/bimtester/features/steps/ifcdata.py index 253b660c44..7a13b157be 100644 --- a/src/ifcbimtester/bimtester/features/steps/ifcdata.py +++ b/src/ifcbimtester/bimtester/features/steps/ifcdata.py @@ -2,7 +2,7 @@ import gettext # noqa from behave import given from behave import step -from ifcdata_methods import assert_schema +import ifcdata_methods as idm from utils import IfcFile from utils import switch_locale @@ -47,7 +47,7 @@ def step_impl(context): @step("IFC data must use the {schema} schema") def step_impl(context, schema): switch_locale(context.localedir, the_lang) - assert_schema(context, schema) + idm.has_ifcdata_specific_schema(context, schema) @step('The IFC file "{file}" is exempt from being provided') diff --git a/src/ifcbimtester/bimtester/features/steps/ifcdata_de.py b/src/ifcbimtester/bimtester/features/steps/ifcdata_de.py index 4fcc52088a..d6b3598924 100644 --- a/src/ifcbimtester/bimtester/features/steps/ifcdata_de.py +++ b/src/ifcbimtester/bimtester/features/steps/ifcdata_de.py @@ -1,6 +1,6 @@ from behave import step -from ifcdata_methods import assert_schema +import ifcdata_methods as idm from utils import switch_locale @@ -10,4 +10,4 @@ the_lang = "de" @step("Die IFC Daten müssen das {schema} Schema benutzen") def step_impl(context, schema): switch_locale(context.localedir, the_lang) - assert_schema(context, schema) + idm.has_ifcdata_specific_schema(context, schema) diff --git a/src/ifcbimtester/bimtester/features/steps/ifcdata_fr.py b/src/ifcbimtester/bimtester/features/steps/ifcdata_fr.py index bd68ba2cd3..a9f67804fd 100644 --- a/src/ifcbimtester/bimtester/features/steps/ifcdata_fr.py +++ b/src/ifcbimtester/bimtester/features/steps/ifcdata_fr.py @@ -1,6 +1,6 @@ from behave import step -from ifcdata_methods import assert_schema +import ifcdata_methods as idm from utils import switch_locale @@ -10,4 +10,4 @@ the_lang = "fr" @step("Les données IFC doivent utiliser le schéma {schema}") def step_impl(context, schema): switch_locale(context.localedir, the_lang) - assert_schema(context, schema) + idm.has_ifcdata_specific_schema(context, schema) diff --git a/src/ifcbimtester/bimtester/features/steps/ifcdata_methods.py b/src/ifcbimtester/bimtester/features/steps/ifcdata_methods.py index c084fc34b8..c39f2c4399 100644 --- a/src/ifcbimtester/bimtester/features/steps/ifcdata_methods.py +++ b/src/ifcbimtester/bimtester/features/steps/ifcdata_methods.py @@ -1,7 +1,7 @@ from utils import IfcFile -def assert_schema(context, target_schema): +def has_ifcdata_specific_schema(context, target_schema): real_schema = IfcFile.get().schema assert real_schema == target_schema, ( _("We expected a schema of {} but instead got {}")