From ce12b2297e58263d0e5db4c1debedb8657672a8e Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Fri, 12 Apr 2019 15:22:38 -0400 Subject: [PATCH] Updating unit tests --- tests/test_link.cpp | 35 +++ tests/test_net_builder.cpp | 444 ++++++++++++++++++------------------- tests/test_node.cpp | 30 +++ 3 files changed, 287 insertions(+), 222 deletions(-) diff --git a/tests/test_link.cpp b/tests/test_link.cpp index aa20d23..b645ab6 100644 --- a/tests/test_link.cpp +++ b/tests/test_link.cpp @@ -20,6 +20,41 @@ BOOST_AUTO_TEST_SUITE (test_link) + +BOOST_FIXTURE_TEST_CASE(test_adddelete_link, FixtureInitClose) +{ + int index; + + // 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 *)"N3", (char *)"N1"); + BOOST_REQUIRE(error == 0); + + error = EN_addlink(ph, (char *)"L2", EN_PIPE, (char *)"N1", (char *)"N3"); + BOOST_REQUIRE(error == 0); + + error = EN_getlinkindex(ph, "L2", &index); + BOOST_REQUIRE(error == 0); + error = EN_deletelink(ph, index, EN_UNCONDITIONAL); + BOOST_REQUIRE(error == 0); + + error = EN_addlink(ph, (char *)"L3", EN_PIPE, (char *)"N1", (char *)"N2"); + BOOST_REQUIRE(error == 0); + + error = EN_getlinkindex(ph, "L1", &index); + BOOST_REQUIRE(error == 0); + error = EN_deletelink(ph, index, EN_UNCONDITIONAL); + BOOST_REQUIRE(error == 0); + error = EN_getlinkindex(ph, "L3", &index); + BOOST_REQUIRE(error == 0); + error = EN_deletelink(ph, index, EN_UNCONDITIONAL); + BOOST_REQUIRE(error == 0); + +} + BOOST_AUTO_TEST_CASE(test_setlinktype) { int error = 0; diff --git a/tests/test_net_builder.cpp b/tests/test_net_builder.cpp index fb4cd3c..c4dafc4 100644 --- a/tests/test_net_builder.cpp +++ b/tests/test_net_builder.cpp @@ -1,25 +1,25 @@ /* - ****************************************************************************** - Project: OWA EPANET - Version: 2.2 - Module: test_net_builder.cpp - Description: Tests EPANET toolkit api functions - Authors: see AUTHORS - Copyright: see AUTHORS - License: see LICENSE - Last Updated: 03/21/2019 - ****************************************************************************** +****************************************************************************** +Project: OWA EPANET +Version: 2.2 +Module: test_net_builder.cpp +Description: Tests EPANET toolkit api functions +Authors: see AUTHORS +Copyright: see AUTHORS +License: see LICENSE +Last Updated: 04/12/2019 +****************************************************************************** */ #define BOOST_TEST_MODULE net_builder #ifdef _DEBUG - #define _CRTDBG_MAP_ALLOC - #include - #include +#define _CRTDBG_MAP_ALLOC +#include +#include #else - #include +#include #endif #include @@ -33,20 +33,20 @@ struct FixtureInitClose { - FixtureInitClose() { + FixtureInitClose() { error = 0; ph = NULL; - EN_createproject(&ph); - EN_init(ph, DATA_PATH_RPT, DATA_PATH_OUT, EN_GPM, EN_HW); - } + EN_createproject(&ph); + EN_init(ph, DATA_PATH_RPT, DATA_PATH_OUT, EN_GPM, EN_HW); + } - ~FixtureInitClose() { - EN_close(ph); - EN_deleteproject(&ph); - } - int error; - EN_Project ph; + ~FixtureInitClose() { + EN_close(ph); + EN_deleteproject(&ph); + } + int error; + EN_Project ph; }; @@ -105,163 +105,163 @@ BOOST_AUTO_TEST_SUITE(test_net_builder) BOOST_FIXTURE_TEST_CASE(test_build_net1, FixtureInitClose) { - int flag = 00; - long t, tstep; - int i, ind, Lindex, Nindex, Cindex; - double h_build; + int flag = 00; + long t, tstep; + int i, ind, Lindex, Nindex, Cindex; + double h_build; - // now we build Net1 from scratch... - char juncs[9][10] = { "10", "11", "12", "13", "21", "22", "23", "31", "32" }; - double e[9] = { 710, 710, 700, 695, 700, 695, 690, 700, 710 }; - double d[9] = { 0, 150, 150, 100, 150, 200, 150, 100, 100 }; - double X[9] = { 20, 30, 50, 70, 30, 50, 70, 30, 50 }; - double Y[9] = { 70, 70, 70, 70, 40, 40, 40, 10, 10 }; - double L[12] = { 10530, 5280, 5280, 5280, 5280, 5280, 200, 5280, 5280, 5280, 5280, 5280 }; - double dia[12] = { 18, 14, 10, 10, 12, 6, 18, 10, 12, 8, 8, 6 }; - double P[12] = { 1.0f, 1.2f, 1.4f, 1.6f, 1.4f, 1.2f, 1.0f, 0.8f, 0.6f, 0.4f, 0.6f, 0.8f }; + // now we build Net1 from scratch... + char juncs[9][10] = { "10", "11", "12", "13", "21", "22", "23", "31", "32" }; + double e[9] = { 710, 710, 700, 695, 700, 695, 690, 700, 710 }; + double d[9] = { 0, 150, 150, 100, 150, 200, 150, 100, 100 }; + double X[9] = { 20, 30, 50, 70, 30, 50, 70, 30, 50 }; + double Y[9] = { 70, 70, 70, 70, 40, 40, 40, 10, 10 }; + double L[12] = { 10530, 5280, 5280, 5280, 5280, 5280, 200, 5280, 5280, 5280, 5280, 5280 }; + double dia[12] = { 18, 14, 10, 10, 12, 6, 18, 10, 12, 8, 8, 6 }; + double P[12] = { 1.0f, 1.2f, 1.4f, 1.6f, 1.4f, 1.2f, 1.0f, 0.8f, 0.6f, 0.4f, 0.6f, 0.8f }; - error = EN_addpattern(ph, (char *)"pat1"); - BOOST_REQUIRE(error == 0); - error = EN_setpattern(ph, 1, P, 12); - BOOST_REQUIRE(error == 0); - //error = EN_setoption(ph, EN_DEFDEMANDPAT, 1); - //BOOST_REQUIRE(error == 0); - for (i = 0; i < 9; i++) - { - error = EN_addnode(ph, juncs[i], EN_JUNCTION); - BOOST_REQUIRE(error == 0); - error = EN_setnodevalue(ph, i + 1, EN_ELEVATION, e[i]); - BOOST_REQUIRE(error == 0); - error = EN_setnodevalue(ph, i + 1, EN_BASEDEMAND, d[i]); - BOOST_REQUIRE(error == 0); + error = EN_addpattern(ph, (char *)"pat1"); + BOOST_REQUIRE(error == 0); + error = EN_setpattern(ph, 1, P, 12); + BOOST_REQUIRE(error == 0); + //error = EN_setoption(ph, EN_DEFDEMANDPAT, 1); + //BOOST_REQUIRE(error == 0); + for (i = 0; i < 9; i++) + { + error = EN_addnode(ph, juncs[i], EN_JUNCTION); + BOOST_REQUIRE(error == 0); + error = EN_setnodevalue(ph, i + 1, EN_ELEVATION, e[i]); + BOOST_REQUIRE(error == 0); + error = EN_setnodevalue(ph, i + 1, EN_BASEDEMAND, d[i]); + BOOST_REQUIRE(error == 0); error = EN_setnodevalue(ph, i+1, EN_PATTERN, 1); - BOOST_REQUIRE(error == 0); - error = EN_setcoord(ph, i + 1, X[i], Y[i]); - BOOST_REQUIRE(error == 0); - //error = EN_setdemandpattern(ph, i + 1, 1, 1); - //BOOST_REQUIRE(error == 0); - } - error = EN_addnode(ph, (char *)"9", EN_RESERVOIR); - BOOST_REQUIRE(error == 0); - error = EN_setcoord(ph, 10, 10, 70); - BOOST_REQUIRE(error == 0); - error = EN_setnodevalue(ph, 10, EN_ELEVATION, 800); - BOOST_REQUIRE(error == 0); + BOOST_REQUIRE(error == 0); + error = EN_setcoord(ph, i + 1, X[i], Y[i]); + BOOST_REQUIRE(error == 0); + //error = EN_setdemandpattern(ph, i + 1, 1, 1); + //BOOST_REQUIRE(error == 0); + } + error = EN_addnode(ph, (char *)"9", EN_RESERVOIR); + BOOST_REQUIRE(error == 0); + error = EN_setcoord(ph, 10, 10, 70); + BOOST_REQUIRE(error == 0); + error = EN_setnodevalue(ph, 10, EN_ELEVATION, 800); + BOOST_REQUIRE(error == 0); - error = EN_addnode(ph, (char *)"2", EN_TANK); - BOOST_REQUIRE(error == 0); - error = EN_setcoord(ph, 11, 50, 90); - BOOST_REQUIRE(error == 0); - error = EN_setnodevalue(ph, 11, EN_TANKDIAM, 50.5); - BOOST_REQUIRE(error == 0); - error = EN_setnodevalue(ph, 11, EN_ELEVATION, 850); - BOOST_REQUIRE(error == 0); - error = EN_setnodevalue(ph, 11, EN_MAXLEVEL, 150); - BOOST_REQUIRE(error == 0); - error = EN_setnodevalue(ph, 11, EN_TANKLEVEL, 120); - BOOST_REQUIRE(error == 0); - error = EN_setnodevalue(ph, 11, EN_MINLEVEL, 100); - BOOST_REQUIRE(error == 0); - error = EN_setnodevalue(ph, 11, EN_MIXFRACTION, 1); - BOOST_REQUIRE(error == 0); + error = EN_addnode(ph, (char *)"2", EN_TANK); + BOOST_REQUIRE(error == 0); + error = EN_setcoord(ph, 11, 50, 90); + BOOST_REQUIRE(error == 0); + error = EN_setnodevalue(ph, 11, EN_TANKDIAM, 50.5); + BOOST_REQUIRE(error == 0); + error = EN_setnodevalue(ph, 11, EN_ELEVATION, 850); + BOOST_REQUIRE(error == 0); + error = EN_setnodevalue(ph, 11, EN_MAXLEVEL, 150); + BOOST_REQUIRE(error == 0); + error = EN_setnodevalue(ph, 11, EN_TANKLEVEL, 120); + BOOST_REQUIRE(error == 0); + error = EN_setnodevalue(ph, 11, EN_MINLEVEL, 100); + BOOST_REQUIRE(error == 0); + error = EN_setnodevalue(ph, 11, EN_MIXFRACTION, 1); + BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"10", EN_PIPE, (char *)"10", (char *)"11"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"11", EN_PIPE, (char *)"11", (char *)"12"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"12", EN_PIPE, (char *)"12", (char *)"13"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"21", EN_PIPE, (char *)"21", (char *)"22"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"22", EN_PIPE, (char *)"22", (char *)"23"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"31", EN_PIPE, (char *)"31", (char *)"32"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"110", EN_PIPE, (char *)"2", (char *)"12"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"111", EN_PIPE, (char *)"11", (char *)"21"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"112", EN_PIPE, (char *)"12", (char *)"22"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"113", EN_PIPE, (char *)"13", (char *)"23"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"121", EN_PIPE, (char *)"21", (char *)"31"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"122", EN_PIPE, (char *)"22", (char *)"32"); - BOOST_REQUIRE(error == 0); - for (i = 0; i < 12; i++) - { - error = EN_setlinkvalue(ph, i + 1, EN_LENGTH, L[i]); - BOOST_REQUIRE(error == 0); - error = EN_setlinkvalue(ph, i + 1, EN_DIAMETER, dia[i]); - BOOST_REQUIRE(error == 0); - } + error = EN_addlink(ph, (char *)"10", EN_PIPE, (char *)"10", (char *)"11"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"11", EN_PIPE, (char *)"11", (char *)"12"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"12", EN_PIPE, (char *)"12", (char *)"13"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"21", EN_PIPE, (char *)"21", (char *)"22"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"22", EN_PIPE, (char *)"22", (char *)"23"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"31", EN_PIPE, (char *)"31", (char *)"32"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"110", EN_PIPE, (char *)"2", (char *)"12"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"111", EN_PIPE, (char *)"11", (char *)"21"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"112", EN_PIPE, (char *)"12", (char *)"22"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"113", EN_PIPE, (char *)"13", (char *)"23"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"121", EN_PIPE, (char *)"21", (char *)"31"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"122", EN_PIPE, (char *)"22", (char *)"32"); + BOOST_REQUIRE(error == 0); + for (i = 0; i < 12; i++) + { + error = EN_setlinkvalue(ph, i + 1, EN_LENGTH, L[i]); + BOOST_REQUIRE(error == 0); + error = EN_setlinkvalue(ph, i + 1, EN_DIAMETER, dia[i]); + BOOST_REQUIRE(error == 0); + } - error = EN_addlink(ph, (char *)"9", EN_PUMP, (char *)"9", (char *)"10"); - BOOST_REQUIRE(error == 0); - error = EN_addcurve(ph, (char *)"1"); - BOOST_REQUIRE(error == 0); - error = EN_setcurvevalue(ph, 1, 1, 1500, 250); - BOOST_REQUIRE(error == 0); - error = EN_getlinkindex(ph, (char *)"9", &ind); - BOOST_REQUIRE(error == 0); - error = EN_setheadcurveindex(ph, ind, 1); - BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"9", EN_PUMP, (char *)"9", (char *)"10"); + BOOST_REQUIRE(error == 0); + error = EN_addcurve(ph, (char *)"1"); + BOOST_REQUIRE(error == 0); + error = EN_setcurvevalue(ph, 1, 1, 1500, 250); + BOOST_REQUIRE(error == 0); + error = EN_getlinkindex(ph, (char *)"9", &ind); + BOOST_REQUIRE(error == 0); + error = EN_setheadcurveindex(ph, ind, 1); + BOOST_REQUIRE(error == 0); - error = EN_settimeparam(ph, EN_DURATION, 24 * 3600); - BOOST_REQUIRE(error == 0); - error = EN_settimeparam(ph, EN_PATTERNSTEP, 2 * 3600); - BOOST_REQUIRE(error == 0); + error = EN_settimeparam(ph, EN_DURATION, 24 * 3600); + BOOST_REQUIRE(error == 0); + error = EN_settimeparam(ph, EN_PATTERNSTEP, 2 * 3600); + BOOST_REQUIRE(error == 0); - error = EN_getlinkindex(ph, (char *)"9", &Lindex); - BOOST_REQUIRE(error == 0); - error = EN_getnodeindex(ph, (char *)"2", &Nindex); - BOOST_REQUIRE(error == 0); + error = EN_getlinkindex(ph, (char *)"9", &Lindex); + BOOST_REQUIRE(error == 0); + error = EN_getnodeindex(ph, (char *)"2", &Nindex); + BOOST_REQUIRE(error == 0); - // Add controls - error = EN_addcontrol(ph, EN_LOWLEVEL, Lindex, 1, Nindex, 110, &Cindex); - BOOST_REQUIRE(error == 0); - error = EN_addcontrol(ph, EN_HILEVEL, Lindex, 0, Nindex, 140, &Cindex); - BOOST_REQUIRE(error == 0); + // Add controls + error = EN_addcontrol(ph, EN_LOWLEVEL, Lindex, 1, Nindex, 110, &Cindex); + BOOST_REQUIRE(error == 0); + error = EN_addcontrol(ph, EN_HILEVEL, Lindex, 0, Nindex, 140, &Cindex); + BOOST_REQUIRE(error == 0); - error = EN_openH(ph); - BOOST_REQUIRE(error == 0); - error = EN_initH(ph, 0); - BOOST_REQUIRE(error == 0); - do { - error = EN_runH(ph, &t); - BOOST_REQUIRE(error == 0); - // this is the head at the end of the simulation after building the network *without* saving it to file - error = EN_getnodevalue(ph, Nindex, EN_HEAD, &h_build); - BOOST_REQUIRE(error == 0); - error = EN_nextH(ph, &tstep); - BOOST_REQUIRE(error == 0); - } while (tstep > 0); - error = EN_closeH(ph); - BOOST_REQUIRE(error == 0); + error = EN_openH(ph); + BOOST_REQUIRE(error == 0); + error = EN_initH(ph, 0); + BOOST_REQUIRE(error == 0); + do { + error = EN_runH(ph, &t); + BOOST_REQUIRE(error == 0); + // this is the head at the end of the simulation after building the network *without* saving it to file + error = EN_getnodevalue(ph, Nindex, EN_HEAD, &h_build); + BOOST_REQUIRE(error == 0); + error = EN_nextH(ph, &tstep); + BOOST_REQUIRE(error == 0); + } while (tstep > 0); + error = EN_closeH(ph); + BOOST_REQUIRE(error == 0); - error = EN_saveinpfile(ph, "net_builder.inp"); - BOOST_REQUIRE(error == 0); + error = EN_saveinpfile(ph, "net_builder.inp"); + BOOST_REQUIRE(error == 0); } BOOST_AUTO_TEST_CASE(test_open_net1, * boost::unit_test::depends_on("test_net_builder/test_build_net1")) { - int error = 0; - int flag = 00; - long t, tstep; - int Nindex = -1; - double h_orig = 0.0, h_build = 0.0, h_build_loaded = 0.0; + int error = 0; + int flag = 00; + long t, tstep; + int Nindex = -1; + double h_orig = 0.0, h_build = 0.0, h_build_loaded = 0.0; - EN_Project ph = NULL; + EN_Project ph = NULL; // now we load the netwok we just built and saved EN_createproject(&ph); error = EN_open(ph, "net_builder.inp", DATA_PATH_RPT, DATA_PATH_OUT); BOOST_REQUIRE(error == 0); - error = EN_getnodeindex(ph, (char *)"2", &Nindex); - BOOST_REQUIRE(error == 0); + error = EN_getnodeindex(ph, (char *)"2", &Nindex); + BOOST_REQUIRE(error == 0); error = EN_openH(ph); BOOST_REQUIRE(error == 0); @@ -292,86 +292,86 @@ BOOST_AUTO_TEST_CASE(test_open_net1, * boost::unit_test::depends_on("test_net_bu // if we got this far we can compare results // compare the original to the build & saved network - // BOOST_CHECK(abs(h_orig - h_build_loaded) < 0.0001); + // BOOST_CHECK(abs(h_orig - h_build_loaded) < 0.0001); // compare the original to the build without saving - // BOOST_CHECK(abs(h_orig - h_build) < 0.0001); + // BOOST_CHECK(abs(h_orig - h_build) < 0.0001); } BOOST_FIXTURE_TEST_CASE(test_save_net2, FixtureInitClose) { - //char id[EN_MAXID+1]; - double p1_1, p2_1; // p1_2, p2_2; - double q1_1, q2_1; // q1_2, q2_2; + //char id[EN_MAXID+1]; + double p1_1, p2_1; // p1_2, p2_2; + double q1_1, q2_1; // q1_2, q2_2; - // Build a network - error = EN_addnode(ph, (char *)"N1", EN_JUNCTION); - BOOST_REQUIRE(error == 0); - error = EN_addnode(ph, (char *)"N2", EN_JUNCTION); - BOOST_REQUIRE(error == 0); - error = EN_addnode(ph, (char *)"N3", EN_RESERVOIR); - BOOST_REQUIRE(error == 0); - error = EN_addnode(ph, (char *)"N4", EN_TANK); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"L1", EN_PUMP, (char *)"N3", (char *)"N1"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"L2", EN_PIPE, (char *)"N1", (char *)"N3"); - BOOST_REQUIRE(error == 0); - error = EN_addlink(ph, (char *)"L3", EN_PIPE, (char *)"N1", (char *)"N2"); - BOOST_REQUIRE(error == 0); - error = EN_addcurve(ph, (char *)"C1"); - BOOST_REQUIRE(error == 0); + // Build a network + error = EN_addnode(ph, (char *)"N1", EN_JUNCTION); + BOOST_REQUIRE(error == 0); + error = EN_addnode(ph, (char *)"N2", EN_JUNCTION); + BOOST_REQUIRE(error == 0); + error = EN_addnode(ph, (char *)"N3", EN_RESERVOIR); + BOOST_REQUIRE(error == 0); + error = EN_addnode(ph, (char *)"N4", EN_TANK); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"L1", EN_PUMP, (char *)"N3", (char *)"N1"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"L2", EN_PIPE, (char *)"N1", (char *)"N3"); + BOOST_REQUIRE(error == 0); + error = EN_addlink(ph, (char *)"L3", EN_PIPE, (char *)"N1", (char *)"N2"); + BOOST_REQUIRE(error == 0); + error = EN_addcurve(ph, (char *)"C1"); + BOOST_REQUIRE(error == 0); - // Set network data using the new helper functions - error = EN_setcurvevalue(ph, 1, 1, 1500, 250); - BOOST_REQUIRE(error == 0); - error = EN_setjuncdata(ph, 1, 700, 500, (char *)""); - BOOST_REQUIRE(error == 0); - error = EN_setjuncdata(ph, 2, 710, 500, (char *)""); - BOOST_REQUIRE(error == 0); - error = EN_setnodevalue(ph, 3, EN_ELEVATION, 800); - BOOST_REQUIRE(error == 0); - error = EN_settankdata(ph, 4, 850, 120, 100, 150, 50.5, 0, (char *)""); - BOOST_REQUIRE(error == 0); - error = EN_setlinkvalue(ph, 1, EN_PUMP_HCURVE, 1); - BOOST_REQUIRE(error == 0); - error = EN_setpipedata(ph, 2, 10560, 12, 100, 0); - BOOST_REQUIRE(error == 0); - error = EN_setpipedata(ph, 3, 5280, 14, 100, 0); - BOOST_REQUIRE(error == 0); + // Set network data using the new helper functions + error = EN_setcurvevalue(ph, 1, 1, 1500, 250); + BOOST_REQUIRE(error == 0); + error = EN_setjuncdata(ph, 1, 700, 500, (char *)""); + BOOST_REQUIRE(error == 0); + error = EN_setjuncdata(ph, 2, 710, 500, (char *)""); + BOOST_REQUIRE(error == 0); + error = EN_setnodevalue(ph, 3, EN_ELEVATION, 800); + BOOST_REQUIRE(error == 0); + error = EN_settankdata(ph, 4, 850, 120, 100, 150, 50.5, 0, (char *)""); + BOOST_REQUIRE(error == 0); + error = EN_setlinkvalue(ph, 1, EN_PUMP_HCURVE, 1); + BOOST_REQUIRE(error == 0); + error = EN_setpipedata(ph, 2, 10560, 12, 100, 0); + BOOST_REQUIRE(error == 0); + error = EN_setpipedata(ph, 3, 5280, 14, 100, 0); + BOOST_REQUIRE(error == 0); - // Run hydraulics - error = EN_solveH(ph); - BOOST_REQUIRE(error == 0); + // Run hydraulics + error = EN_solveH(ph); + BOOST_REQUIRE(error == 0); - // Save results - error = EN_getnodevalue(ph, 1, EN_PRESSURE, &p1_1); - BOOST_REQUIRE(error == 0); - error = EN_getnodevalue(ph, 2, EN_PRESSURE, &p2_1); - BOOST_REQUIRE(error == 0); - error = EN_getlinkvalue(ph, 1, EN_FLOW, &q1_1); - BOOST_REQUIRE(error == 0); - error = EN_getlinkvalue(ph, 2, EN_FLOW, &q2_1); - BOOST_REQUIRE(error == 0); + // Save results + error = EN_getnodevalue(ph, 1, EN_PRESSURE, &p1_1); + BOOST_REQUIRE(error == 0); + error = EN_getnodevalue(ph, 2, EN_PRESSURE, &p2_1); + BOOST_REQUIRE(error == 0); + error = EN_getlinkvalue(ph, 1, EN_FLOW, &q1_1); + BOOST_REQUIRE(error == 0); + error = EN_getlinkvalue(ph, 2, EN_FLOW, &q2_1); + BOOST_REQUIRE(error == 0); - // Save project - error = EN_saveinpfile(ph, "netbuilder_test2.inp"); - BOOST_REQUIRE(error == 0); + // Save project + error = EN_saveinpfile(ph, "netbuilder_test2.inp"); + BOOST_REQUIRE(error == 0); } BOOST_AUTO_TEST_CASE(test_reopen_net2, *boost::unit_test::depends_on("test_net_builder/test_save_net2")) { - int error, index; + int error, index; - double p1_2, p2_2; - double q1_2, q2_2; + double p1_2, p2_2; + double q1_2, q2_2; // Open the saved project file - EN_Project ph = NULL; - error = EN_createproject(&ph); - BOOST_REQUIRE(error == 0); + EN_Project ph = NULL; + error = EN_createproject(&ph); + BOOST_REQUIRE(error == 0); error = EN_open(ph, "netbuilder_test2.inp", DATA_PATH_RPT, DATA_PATH_OUT); BOOST_REQUIRE(error == 0); @@ -400,10 +400,10 @@ BOOST_AUTO_TEST_CASE(test_reopen_net2, *boost::unit_test::depends_on("test_net_b //cout << "\n Link L2 Flow: " << q2_1 << " " << q2_2; // Compare old & new results -// BOOST_CHECK(abs(p1_1 - p1_2) < 1.e-5); -// BOOST_CHECK(abs(q1_1 - q1_2) < 1.e-5); -// BOOST_CHECK(abs(p2_1 - p2_2) < 1.e-5); -// BOOST_CHECK(abs(q2_1 - q2_2) < 1.e-5); + // BOOST_CHECK(abs(p1_1 - p1_2) < 1.e-5); + // BOOST_CHECK(abs(q1_1 - q1_2) < 1.e-5); + // BOOST_CHECK(abs(p2_1 - p2_2) < 1.e-5); + // BOOST_CHECK(abs(q2_1 - q2_2) < 1.e-5); // Close project EN_close(ph); diff --git a/tests/test_node.cpp b/tests/test_node.cpp index cc79c48..058fc77 100644 --- a/tests/test_node.cpp +++ b/tests/test_node.cpp @@ -18,6 +18,35 @@ BOOST_AUTO_TEST_SUITE (test_node) + +BOOST_FIXTURE_TEST_CASE(test_adddelete_node, FixtureInitClose) +{ + int index; + + error = EN_addnode(ph, (char *)"N2", EN_JUNCTION); + BOOST_REQUIRE(error == 0); + error = EN_addnode(ph, (char *)"N3", EN_RESERVOIR); + BOOST_REQUIRE(error == 0); + + error = EN_getnodeindex(ph, "N2", &index); + BOOST_REQUIRE(error == 0); + error = EN_deletenode(ph, index, EN_UNCONDITIONAL); + BOOST_REQUIRE(error == 0); + + error = EN_addnode(ph, (char *)"N4", EN_TANK); + BOOST_REQUIRE(error == 0); + + error = EN_getnodeindex(ph, "N4", &index); + BOOST_REQUIRE(error == 0); + error = EN_deletenode(ph, index, EN_UNCONDITIONAL); + BOOST_REQUIRE(error == 0); + error = EN_getnodeindex(ph, "N3", &index); + BOOST_REQUIRE(error == 0); + error = EN_deletenode(ph, index, EN_UNCONDITIONAL); + BOOST_REQUIRE(error == 0); + +} + BOOST_FIXTURE_TEST_CASE(test_junc_props, FixtureOpenClose) { int index; @@ -297,4 +326,5 @@ BOOST_AUTO_TEST_CASE(test_reopen_comment, * boost::unit_test::depends_on("node_c EN_deleteproject(&ph); } + BOOST_AUTO_TEST_SUITE_END()