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

Cleaning up tests

Browse Source 
Fixing memory leak associated with using string objects to pass filepath arguments to toolkit
This commit is contained in:
Michael Tryby
2019-03-19 13:27:07 -04:00
parent ed9a89763b
commit 29cfe43e5a
8 changed files with 75 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/shared_test.hpp
View File

@@ -1,8 +1,15 @@
//#define BOOST_ALL_DYN_LINK
#include <string>
#ifdef _WIN32
#define _CRTDBG_MAP_ALLOC
#include <stdlib.h>
#include <crtdbg.h>
#else
#include <stdlib.h>
#endif
#include <math.h>
#include <boost/filesystem.hpp>
@@ -63,12 +70,8 @@ boost::test_tools::predicate_result check_string(std::string test, std::string r
struct FixtureOpenClose{
FixtureOpenClose() {
path_inp = std::string(DATA_PATH_NET1);
path_rpt = std::string(DATA_PATH_RPT);
path_out = std::string(DATA_PATH_OUT);
EN_createproject(&ph);
error = EN_open(ph, path_inp.c_str(), path_rpt.c_str(), path_out.c_str());
error = EN_open(ph, DATA_PATH_NET1, DATA_PATH_RPT, DATA_PATH_OUT);
}
~FixtureOpenClose() {
@@ -76,10 +79,6 @@ struct FixtureOpenClose{
EN_deleteproject(&ph);
}
std::string path_inp;
std::string path_rpt;
std::string path_out;
int error;
EN_Project ph;
};
@@ -90,12 +89,8 @@ struct FixtureAfterStep{
flag = 0;
tstop = 10800;
path_inp = std::string(DATA_PATH_NET1);
path_rpt = std::string(DATA_PATH_RPT);
path_out = std::string(DATA_PATH_OUT);
EN_createproject(&ph);
error = EN_open(ph, path_inp.c_str(), path_rpt.c_str(), path_out.c_str());
error = EN_open(ph, DATA_PATH_NET1, DATA_PATH_RPT, DATA_PATH_OUT);
error = EN_solveH(ph);
BOOST_REQUIRE(error == 0);
@@ -124,10 +119,6 @@ struct FixtureAfterStep{
EN_deleteproject(&ph);
}
std::string path_inp;
std::string path_rpt;
std::string path_out;
int error, flag;
long t, tstep, tstop;
EN_Project ph;