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

Fixing indent

Browse Source
This commit is contained in:
Michael Tryby
2018-07-05 18:45:13 -04:00
parent 245e2c5060
commit efcf8735f0
1 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
tests/test_toolkit.cpp
View File

@@ -27,74 +27,73 @@ BOOST_AUTO_TEST_SUITE (test_toolkit)
BOOST_AUTO_TEST_CASE (test_alloc_free) BOOST_AUTO_TEST_CASE (test_alloc_free)
{ {
int error = 0; int error = 0;
EN_ProjectHandle ph = NULL; EN_ProjectHandle ph = NULL;
error = EN_alloc(&ph); error = EN_alloc(&ph);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
BOOST_CHECK(ph != NULL); BOOST_CHECK(ph != NULL);
error = EN_free(&ph); error = EN_free(&ph);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
BOOST_CHECK(ph == NULL); BOOST_CHECK(ph == NULL);
} }
BOOST_AUTO_TEST_CASE (test_open_close) BOOST_AUTO_TEST_CASE (test_open_close)
{ {
EN_ProjectHandle ph = NULL; EN_ProjectHandle ph = NULL;
EN_alloc(&ph); EN_alloc(&ph);
std::string path_inp = std::string(DATA_PATH_INP); std::string path_inp = std::string(DATA_PATH_INP);
std::string path_rpt = std::string(DATA_PATH_RPT); std::string path_rpt = std::string(DATA_PATH_RPT);
std::string path_out = std::string(DATA_PATH_OUT); std::string path_out = std::string(DATA_PATH_OUT);
int error = EN_open(ph, path_inp.c_str(), path_rpt.c_str(), path_out.c_str()); int error = EN_open(ph, path_inp.c_str(), path_rpt.c_str(), path_out.c_str());
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
error = EN_close(ph); error = EN_close(ph);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
EN_free(&ph); EN_free(&ph);
} }
BOOST_AUTO_TEST_CASE(test_epanet) BOOST_AUTO_TEST_CASE(test_epanet)
{ {
std::string path_inp = std::string(DATA_PATH_INP); std::string path_inp = std::string(DATA_PATH_INP);
std::string path_rpt = std::string(DATA_PATH_RPT); std::string path_rpt = std::string(DATA_PATH_RPT);
std::string path_out = std::string(DATA_PATH_OUT); std::string path_out = std::string(DATA_PATH_OUT);
int error = ENepanet(path_inp.c_str(), path_rpt.c_str(), path_out.c_str(), NULL); int error = ENepanet(path_inp.c_str(), path_rpt.c_str(), path_out.c_str(), NULL);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
struct Fixture{ struct Fixture{
Fixture() { Fixture() {
path_inp = std::string(DATA_PATH_INP);
path_rpt = std::string(DATA_PATH_RPT);
path_out = std::string(DATA_PATH_OUT);
path_inp = std::string(DATA_PATH_INP); EN_alloc(&ph);
path_rpt = std::string(DATA_PATH_RPT); error = EN_open(ph, path_inp.c_str(), path_rpt.c_str(), path_out.c_str());
path_out = std::string(DATA_PATH_OUT);
EN_alloc(&ph); }
error = EN_open(ph, path_inp.c_str(), path_rpt.c_str(), path_out.c_str());
} ~Fixture() {
error = EN_close(&ph);
EN_free(&ph);
}
~Fixture() { std::string path_inp;
error = EN_close(&ph); std::string path_rpt;
EN_free(&ph); std::string path_out;
}
std::string path_inp; int error;
std::string path_rpt; EN_ProjectHandle ph;
std::string path_out;
int error;
EN_ProjectHandle ph;
}; };