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

Replaced EN_ProjectHandle with EN_Project in unit tests

Browse Source
This commit is contained in:
Lew Rossman
2018-11-27 15:16:12 -05:00
parent 9a540cc0f4
commit 24d90a530d
7 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_addrule.cpp
View File

@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
int link113, node23, link22, pump9_before, pump9_after;
float priority;
EN_ProjectHandle ph = NULL;
EN_Project ph = NULL;
EN_createproject(&ph);
std::string path_inp = std::string(DATA_PATH_INP);

2
tests/test_demand_categories.cpp
View File

@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(test_demand_categories)
int error = 0;
int Nindex, ndem;
EN_ProjectHandle ph = NULL;
EN_Project ph = NULL;
error = EN_createproject(&ph);
error = EN_open(ph, path_inp.c_str(), path_rpt.c_str(), path_out.c_str());

2
tests/test_net_builder.cpp
View File

@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE(test_net_builder)
float h_orig, h_build, h_build_loaded;
// first we load Net1.inp, run it and record the head in Tank 2 at the end of the simulation (h_orig)
EN_ProjectHandle ph = NULL;
EN_Project ph = NULL;
EN_createproject(&ph);
std::string path_inp = std::string(DATA_PATH_INP);

2
tests/test_reent.cpp
View File

@@ -23,7 +23,7 @@ using namespace std;
void epanet_thread(long i)
{
int errorcode = 0;
EN_ProjectHandle ph;
EN_Project ph;
string prefix = "example_";
string suffix = ".inp";

2
tests/test_setid.cpp
View File

@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE(test_setid)
int error = 0;
int index;
EN_ProjectHandle ph = NULL;
EN_Project ph = NULL;
EN_createproject(&ph);
error = EN_open(ph, path_inp.c_str(), path_rpt.c_str(), "");

2
tests/test_setlinktype.cpp
View File

@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE(test_setlinktype)
int p113, n31, p121, n113_1, n113_2;
float q113 = 0.0f, p31 = 0.0f, diam;
EN_ProjectHandle ph = NULL;
EN_Project ph = NULL;
EN_createproject(&ph);
std::string path_inp = std::string(DATA_PATH_INP);

9
tests/test_toolkit.cpp
View File

@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_SUITE (test_toolkit)
BOOST_AUTO_TEST_CASE (test_alloc_free)
{
int error = 0;
EN_ProjectHandle ph = NULL;
EN_Project ph = NULL;
error = EN_createproject(&ph);
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE (test_open_close)
string path_rpt(DATA_PATH_RPT);
string path_out(DATA_PATH_OUT);
EN_ProjectHandle ph = NULL;
EN_Project ph = NULL;
EN_createproject(&ph);
int error = EN_open(ph, path_inp.c_str(), path_rpt.c_str(), path_out.c_str());
@@ -74,7 +74,8 @@ BOOST_AUTO_TEST_CASE(test_save_reopen)
string path_rpt(DATA_PATH_RPT);
string path_out(DATA_PATH_OUT);
EN_ProjectHandle ph_save, ph_reopen;
EN_Project ph_save;
EN_Project ph_reopen;
EN_createproject(&ph_save);
@@ -126,7 +127,7 @@ struct Fixture{
string path_out;
int error;
EN_ProjectHandle ph;
EN_Project ph;
};
BOOST_AUTO_TEST_SUITE(test_epanet_fixture)