Skip to content

Add test for import of non-standard units. #1521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hsorby wants to merge 1 commit into
base: main
Choose a base branch
from
+112 −0
Open

Add test for import of non-standard units. #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions tests/importer/model_flattening.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1940,3 +1940,58 @@ TEST(ModelFlattening, multiLayeredImportOfNonStandardUnits)

EXPECT_NE(nullptr, flattenModel);
}

TEST(ModelFlattening, nestedImportOfUnitsWithNonStandardChildren)
{
const std::string e =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<model xmlns=\"http://www.cellml.org/cellml/2.0#\" name=\"main_model\">\n"
" <units name=\"rate\">\n"
" <unit units=\"mM\"/>\n"
" <unit units=\"per_s\"/>\n"
" </units>\n"
" <units name=\"mM\">\n"
" <unit prefix=\"milli\" units=\"mole\"/>\n"
" </units>\n"
" <units name=\"per_s\">\n"
" <unit exponent=\"-1\" units=\"second\"/>\n"
" </units>\n"
" <units name=\"compound\">\n"
" <unit units=\"rate\"/>\n"
" <unit units=\"volt\"/>\n"
" </units>\n"
" <component name=\"parent\">\n"
" <variable name=\"p\" units=\"rate\" interface=\"public_and_private\"/>\n"
" <variable name=\"q\" units=\"compound\" interface=\"public\"/>\n"
" </component>\n"
" <component name=\"child\">\n"
" <variable name=\"r\" units=\"rate\" interface=\"public\"/>\n"
" </component>\n"
" <connection component_1=\"parent\" component_2=\"child\">\n"
" <map_variables variable_1=\"p\" variable_2=\"r\"/>\n"
" </connection>\n"
" <encapsulation>\n"
" <component_ref component=\"parent\">\n"
" <component_ref component=\"child\"/>\n"
" </component_ref>\n"
" </encapsulation>\n"
"</model>\n";

auto parser = libcellml::Parser::create();
auto model = parser->parseModel(fileContents("modelflattening/nestedimportofunits.xml"));
auto importer = libcellml::Importer::create();

EXPECT_TRUE(model->hasUnresolvedImports());
importer->resolveImports(model, resourcePath("modelflattening/"));
EXPECT_FALSE(model->hasUnresolvedImports());

model = importer->flattenModel(model);
EXPECT_EQ(size_t(0), importer->issueCount());

EXPECT_FALSE(model->hasUnits("rate_1"));

auto printer = libcellml::Printer::create();

auto a = printer->printModel(model);
EXPECT_EQ(e, a);
}
9 changes: 9 additions & 0 deletions tests/resources/modelflattening/import_for_import_for_nestedimportofunits.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<model xmlns="http://www.cellml.org/cellml/2.0#" xmlns:xlink="http://www.w3.org/1999/xlink" name="model_b">
<import xlink:href="units_for_nestedimportofunits.xml">
<units name="rate" units_ref="rate"/>
</import>
<component name="b_component">
<variable name="r" units="rate" interface="public"/>
</component>
</model>
22 changes: 22 additions & 0 deletions tests/resources/modelflattening/import_for_nestedimportofunits.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?>
<model xmlns="http://www.cellml.org/cellml/2.0#" xmlns:xlink="http://www.w3.org/1999/xlink" name="model_a">
<import xlink:href="units_for_nestedimportofunits.xml">
<units name="rate" units_ref="rate"/>
<units name="compound" units_ref="compound"/>
</import>
<import xlink:href="import_for_import_for_nestedimportofunits.xml">
<component component_ref="b_component" name="child"/>
</import>
<component name="parent">
<variable name="p" units="rate" interface="public_and_private"/>
<variable name="q" units="compound" interface="public"/>
</component>
<connection component_1="parent" component_2="child">
<map_variables variable_1="p" variable_2="r"/>
</connection>
<encapsulation>
<component_ref component="parent">
<component_ref component="child"/>
</component_ref>
</encapsulation>
</model>
9 changes: 9 additions & 0 deletions tests/resources/modelflattening/nestedimportofunits.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<model xmlns="http://www.cellml.org/cellml/2.0#" xmlns:xlink="http://www.w3.org/1999/xlink" name="main_model">
<import xlink:href="units_for_nestedimportofunits.xml">
<units name="rate" units_ref="rate"/>
</import>
<import xlink:href="import_for_nestedimportofunits.xml">
<component component_ref="parent" name="parent"/>
</import>
</model>
17 changes: 17 additions & 0 deletions tests/resources/modelflattening/units_for_nestedimportofunits.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<model xmlns="http://www.cellml.org/cellml/2.0#" name="units_model">
<units name="per_s">
<unit exponent="-1" units="second"/>
</units>
<units name="mM">
<unit prefix="milli" units="mole"/>
</units>
<units name="rate">
<unit units="mM"/>
<unit units="per_s"/>
</units>
<units name="compound">
<unit units="rate"/>
<unit units="volt"/>
</units>
</model>
Loading