Skip to content

Real numbers: tests for a leading plus sign, degenerate strings and empty cn elements #1516

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
LunarCapsule127 wants to merge 1 commit into
base: main
Choose a base branch
from
+463 −0
Open

Real numbers: tests for a leading plus sign, degenerate strings and empty cn elements #1516

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
60 changes: 60 additions & 0 deletions tests/parser/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,66 @@ TEST(Parser, modelWithInvalidUnits)
EXPECT_EQ(e, a);
}

TEST(Parser, unitAttributesWithLeadingPlusSign)
{
// CellML 2.0 section 1.3.3.2: a real number string may begin with a '+' sign.
const std::string in =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<model xmlns=\"http://www.cellml.org/cellml/2.0#\" name=\"model_name\">\n"
" <units name=\"millivolt_squared\">\n"
" <unit exponent=\"+2\" prefix=\"milli\" units=\"volt\"/>\n"
" </units>\n"
" <units name=\"scaled_volt\">\n"
" <unit multiplier=\"+1.5\" units=\"volt\"/>\n"
" </units>\n"
" <units name=\"scaled_e_notation_volt\">\n"
" <unit exponent=\"+1.0e+1\" multiplier=\"+2.5E-3\" units=\"volt\"/>\n"
" </units>\n"
"</model>\n";

libcellml::ParserPtr parser = libcellml::Parser::create();
libcellml::ModelPtr model = parser->parseModel(in);

EXPECT_EQ(size_t(0), parser->issueCount());

EXPECT_EQ(2.0, model->units("millivolt_squared")->unitAttributeExponent(0));
EXPECT_EQ(1.5, model->units("scaled_volt")->unitAttributeMultiplier(0));
EXPECT_EQ(10.0, model->units("scaled_e_notation_volt")->unitAttributeExponent(0));
EXPECT_EQ(2.5e-3, model->units("scaled_e_notation_volt")->unitAttributeMultiplier(0));
}

TEST(Parser, unitAttributesWithDegenerateRealNumbers)
{
const std::string in =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<model xmlns=\"http://www.cellml.org/cellml/2.0#\" name=\"model_name\">\n"
" <units name=\"degenerate_exponents\">\n"
" <unit exponent=\"-.\" units=\"volt\"/>\n"
" <unit exponent=\"-\" units=\"ampere\"/>\n"
" <unit exponent=\".\" units=\"second\"/>\n"
" </units>\n"
" <units name=\"degenerate_multipliers\">\n"
" <unit multiplier=\"-.\" units=\"volt\"/>\n"
" <unit multiplier=\"-\" units=\"ampere\"/>\n"
" <unit multiplier=\".\" units=\"second\"/>\n"
" </units>\n"
"</model>\n";

const std::vector<std::string> expectedIssues = {
"Unit referencing 'volt' in units 'degenerate_exponents' has an exponent with the value '-.' that is not a representation of a CellML real valued number.",
"Unit referencing 'ampere' in units 'degenerate_exponents' has an exponent with the value '-' that is not a representation of a CellML real valued number.",
"Unit referencing 'second' in units 'degenerate_exponents' has an exponent with the value '.' that is not a representation of a CellML real valued number.",
"Unit referencing 'volt' in units 'degenerate_multipliers' has a multiplier with the value '-.' that is not a representation of a CellML real valued number.",
"Unit referencing 'ampere' in units 'degenerate_multipliers' has a multiplier with the value '-' that is not a representation of a CellML real valued number.",
"Unit referencing 'second' in units 'degenerate_multipliers' has a multiplier with the value '.' that is not a representation of a CellML real valued number.",
};

libcellml::ParserPtr parser = libcellml::Parser::create();
parser->parseModel(in);

EXPECT_EQ_ISSUES(expectedIssues, parser);
}

TEST(Parser, emptyEncapsulation)
{
const std::string in =
Expand Down
Loading