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

Reorganizing src and test folders

Browse Source 
Moving epanet_output library from tools to src folder. Setting up parallel folder hierarchy in tests folder.
This commit is contained in:
Michael Tryby
2019-03-20 17:58:24 -04:00
parent 7eadbc25ce
commit ccbb422259
10 changed files with 1304 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/outfile/CMakeLists.txt Normal file
View File

@@ -0,0 +1,19 @@
enable_testing()
# Sets for output directory for executables and libraries
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set (Boost_USE_STATIC_LIBS OFF)
find_package(Boost COMPONENTS unit_test_framework)
include_directories (${Boost_INCLUDE_DIRS} ../../src/outfile/include)
add_executable(test_errormanager test_output.cpp)
target_link_libraries(test_errormanager ${Boost_LIBRARIES} epanet-output)

97
tests/test_output.cpp → tests/outfile/test_output.cpp
View File

@@ -1,5 +1,5 @@
/*
* test_epanet_output.cpp
* test_output.cpp
*
* Created: 8/4/2017
* Author: Michael E. Tryby
@@ -13,17 +13,18 @@
//#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE "output"
#define BOOST_TEST_DYN_LINK
#include <stdlib.h>
#include <stdio.h>
#include <string>
#include <math.h>
#define BOOST_TEST_MODULE "output"
//#include <boost/test/included/unit_test.hpp>
#include "shared_test.hpp"
#include <boost/test/unit_test.hpp>
#include "epanet_output.h"
#include "epanet2_2.h"
//#include "epanet2_2.h"
boost::test_tools::predicate_result check_cdd_float(std::vector<float>& test,
@@ -60,6 +61,14 @@ boost::test_tools::predicate_result check_cdd_float(std::vector<float>& test,
return floor(min_cdd) >= cdd_tol;
}
boost::test_tools::predicate_result check_string(std::string test, std::string ref)
{
if (ref.compare(test) == 0)
return true;
else
return false;
}
#define DATA_PATH_OUTPUT "./example1.out"
@@ -85,45 +94,45 @@ BOOST_AUTO_TEST_CASE(OpenCloseTest) {
}
// Test access to output file with the project open
BOOST_AUTO_TEST_CASE(AccessTest){
std::string path_inp(DATA_PATH_NET1);
std::string path_rpt(DATA_PATH_RPT);
std::string path_out(DATA_PATH_OUT);
EN_Project ph = NULL;
ENR_Handle p_handle = NULL;
EN_createproject(&ph);
int error = EN_open(ph, path_inp.c_str(), path_rpt.c_str(), path_out.c_str());
BOOST_REQUIRE(error == 0);
error = EN_solveH(ph);
BOOST_REQUIRE(error == 0);
error = EN_solveQ(ph);
BOOST_REQUIRE(error == 0);
error = EN_report(ph);
BOOST_REQUIRE(error == 0);
// Access to output file prior to project close
error = ENR_init(&p_handle);
BOOST_REQUIRE(error == 0);
error = ENR_open(p_handle, path_out.c_str());
BOOST_REQUIRE(error == 0);
error = ENR_close(&p_handle);
BOOST_REQUIRE(error == 0);
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph);
}
// // Test access to output file with the project open
// BOOST_AUTO_TEST_CASE(AccessTest){
//
// std::string path_inp(DATA_PATH_NET1);
// std::string path_rpt(DATA_PATH_RPT);
// std::string path_out(DATA_PATH_OUT);
//
// EN_Project ph = NULL;
// ENR_Handle p_handle = NULL;
//
// EN_createproject(&ph);
//
// int error = EN_open(ph, path_inp.c_str(), path_rpt.c_str(), path_out.c_str());
// BOOST_REQUIRE(error == 0);
//
// error = EN_solveH(ph);
// BOOST_REQUIRE(error == 0);
//
// error = EN_solveQ(ph);
// BOOST_REQUIRE(error == 0);
//
// error = EN_report(ph);
// BOOST_REQUIRE(error == 0);
//
//
// // Access to output file prior to project close
// error = ENR_init(&p_handle);
// BOOST_REQUIRE(error == 0);
// error = ENR_open(p_handle, path_out.c_str());
// BOOST_REQUIRE(error == 0);
// error = ENR_close(&p_handle);
// BOOST_REQUIRE(error == 0);
//
//
// error = EN_close(ph);
// BOOST_REQUIRE(error == 0);
//
// EN_deleteproject(&ph);
// }
BOOST_AUTO_TEST_SUITE_END()