JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Adding element id validity checks

Browse Source
This commit is contained in:
Michael Tryby
2019-04-16 16:57:38 -04:00
parent ea8e0439e3
commit 22a7993c8c
9 changed files with 93 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/test_curve.cpp
View File

@@ -66,4 +66,21 @@ BOOST_FIXTURE_TEST_CASE(test_curve_comments, FixtureOpenClose)
}
}
BOOST_FIXTURE_TEST_CASE(test_curve_id_isvalid, FixtureInitClose)
{
error = EN_addcurve(ph, "C1");
BOOST_REQUIRE(error == 0);
error = EN_addcurve(ph, "C 2");
BOOST_REQUIRE(error == 250);
error = EN_addcurve(ph, "C\"2");
BOOST_REQUIRE(error == 250);
error = EN_addcurve(ph, "C;2");
BOOST_REQUIRE(error == 250);
}
BOOST_AUTO_TEST_SUITE_END()

20
tests/test_link.cpp
View File

@@ -55,6 +55,26 @@ BOOST_FIXTURE_TEST_CASE(test_adddelete_link, FixtureInitClose)
}
BOOST_FIXTURE_TEST_CASE(test_link_isvalid, FixtureInitClose)
{
// Build a network
EN_addnode(ph, (char *)"N1", EN_JUNCTION);
EN_addnode(ph, (char *)"N2", EN_JUNCTION);
EN_addnode(ph, (char *)"N3", EN_RESERVOIR);
error = EN_addlink(ph, (char *)"L1", EN_PUMP, (char *)"N1", (char *)"N2");
BOOST_REQUIRE(error == 0);
error = EN_addlink(ph, (char *)"L 2", EN_PIPE, (char *)"N1", (char *)"N2");
BOOST_REQUIRE(error == 250);
error = EN_addlink(ph, (char *)"L\"2", EN_PIPE, (char *)"N1", (char *)"N2");
BOOST_REQUIRE(error == 250);
error = EN_addlink(ph, (char *)"L;2", EN_PIPE, (char *)"N1", (char *)"N2");
BOOST_REQUIRE(error == 250);
}
BOOST_AUTO_TEST_CASE(test_setlinktype)
{
int error = 0;

16
tests/test_node.cpp
View File

@@ -47,6 +47,22 @@ BOOST_FIXTURE_TEST_CASE(test_adddelete_node, FixtureInitClose)
}
BOOST_FIXTURE_TEST_CASE(test_node_validate_id, FixtureInitClose)
{
error = EN_addnode(ph, (char *)"N2", EN_JUNCTION);
BOOST_REQUIRE(error == 0);
error = EN_addnode(ph, (char *)"N 2", EN_JUNCTION);
BOOST_REQUIRE(error == 250);
error = EN_addnode(ph, (char *)"N\"2", EN_JUNCTION);
BOOST_REQUIRE(error == 250);
error = EN_addnode(ph, (char *)"N;2", EN_JUNCTION);
BOOST_REQUIRE(error == 250);
}
BOOST_FIXTURE_TEST_CASE(test_junc_props, FixtureOpenClose)
{
int index;

16
tests/test_pattern.cpp
View File

@@ -147,4 +147,20 @@ BOOST_FIXTURE_TEST_CASE(test_pattern_comments, FixtureOpenClose)
BOOST_CHECK(check_string(comment, (char *)"Time Pattern 1"));
}
BOOST_FIXTURE_TEST_CASE(test_pat_isvalid_id, FixtureInitClose)
{
error = EN_addpattern(ph, "P1");
BOOST_REQUIRE(error == 0);
error = EN_addpattern(ph, "P 2");
BOOST_REQUIRE(error == 250);
error = EN_addpattern(ph, "P\"2");
BOOST_REQUIRE(error == 250);
error = EN_addpattern(ph, "P;2");
BOOST_REQUIRE(error == 250);
}
BOOST_AUTO_TEST_SUITE_END()

10
tests/util/test_cstrhelper.cpp
View File

@@ -44,13 +44,13 @@ BOOST_AUTO_TEST_CASE(test_duplicate) {
}
BOOST_AUTO_TEST_CASE(test_validate_id) {
BOOST_AUTO_TEST_CASE(test_isvalid) {
BOOST_CHECK(cstr_validate_id("big tank") == false);
BOOST_CHECK(cstr_validate_id("big\"tank") == false);
BOOST_CHECK(cstr_validate_id("big;tank") == false);
BOOST_CHECK(cstr_isvalid("big tank") == false);
BOOST_CHECK(cstr_isvalid("big\"tank") == false);
BOOST_CHECK(cstr_isvalid("big;tank") == false);
BOOST_CHECK(cstr_validate_id("big-tank") == true);
BOOST_CHECK(cstr_isvalid("big-tank") == true);
}