Commit Graph

158 Commits

Author SHA1 Message Date
Michael Tryby
927cf9770e merging upstream dev 2019-04-03 16:40:58 -04:00
Michael Tryby
9f867b10ca Merge pull request #443 from OpenWaterAnalytics/lrossman-dev17
Removed the EN_DEFDEMANDPAT option
2019-04-03 16:35:47 -04:00
Michael Tryby
502e5f16a0 Fixing index error in test 2019-04-03 16:25:51 -04:00
Michael Tryby
84bf6f98d0 Cleaning up include statements adding crtdbg.h 2019-04-03 15:55:23 -04:00
Michael Tryby
be2b0a3ac8 Update CMakeLists.txt
Restoring test_net_builder to test_toolkit.exe
2019-04-03 14:56:01 -04:00
Michael Tryby
b578380675 Update test_toolkit.hpp
removing crtdbg.h from header
2019-04-03 14:13:40 -04:00
Michael Tryby
efd86c3ddd Fixing memory problems with test_toolkit
Fixes memory leaks and some minor refactoring.
2019-04-03 14:05:41 -04:00
Michael Tryby
f99d417301 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev-unittesting 2019-04-03 11:10:52 -04:00
Michael Tryby
568f89ff9e removing reference to strncpy 2019-04-03 11:10:36 -04:00
Michael Tryby
0f7c07555b Merge pull request #444 from michaeltryby/dev
Cleaning up build on gcc
2019-04-03 10:58:46 -04:00
Lew Rossman
fa4952a265 Fixed failure to update test_analysis.cpp 2019-04-03 10:56:24 -04:00
Lew Rossman
af825005d4 Fixed failure to update test_net_builder.cpp 2019-04-03 10:43:19 -04:00
Lew Rossman
83ffc1cfc7 Removed the EN_DEFDEMANDPAT option
See issue #429. Also allowed the EN_HEADLOSSFORM option to be changed if the solver is not active.
2019-04-03 10:25:37 -04:00
Michael Tryby
207cc53b04 Cleaning up build on gcc 2019-04-03 09:27:51 -04:00
Lew Rossman
23b11ab672 Add test of EN_setcurve & EN_getcurve to test_curve.cpp 2019-04-03 01:15:57 -04:00
Michael Tryby
ecf0e5173c revert 1a01b46 to 1b167b5 2019-04-02 15:27:05 -04:00
Michael Tryby
a89f3c9005 Making sure filename is null terminated string
Added file_handle validation
2019-04-02 12:31:05 -04:00
Michael Tryby
c98d13de80 Updated filemanager to use dynamically allocated strings
converted filename to dynamically allocated string
created cstr_helper
2019-04-02 11:05:56 -04:00
Michael Tryby
2c6d4ca74d Work in progress
Added test for temp files, getter for filename, and wrappers for fwrite, fprintf, and fgets
2019-04-01 18:05:02 -04:00
Michael Tryby
a0b08921fc Tweaking header doc 2019-04-01 15:24:52 -04:00
Michael Tryby
36a12cd4b6 Adding test_filemanager to ctest 2019-04-01 15:23:13 -04:00
Michael Tryby
b9f00421dd Adding header info 2019-04-01 15:16:58 -04:00
Michael Tryby
23ac179ec1 Implementing filemanager
Implementing and testing filemanager and upgrading epanet_output library to use it.
2019-04-01 15:03:02 -04:00
Michael Tryby
69da9a4997 Work in progress 2019-03-29 17:04:55 -04:00
Michael Tryby
1b167b5caf Cleaning up include statements
Removing inclusion of malloc.h. Adding crtdbg.h
2019-03-28 09:26:26 -04:00
Michael Tryby
1e7cba167c Delete test_comments.cpp 2019-03-22 15:35:35 -04:00
Michael Tryby
df4e62b550 Adding comment test 2019-03-22 15:34:34 -04:00
Michael Tryby
b02f1ef346 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev 2019-03-22 14:10:41 -04:00
Michael Tryby
2bf3be4c64 Adding tests at test root
Couldn't get tests in subdirectores to work so adding them at test root instead.
2019-03-22 11:51:08 -04:00
Michael Tryby
ec72db5d82 pulling up call to find_packages
eliminates multiple calls to find_packages
2019-03-22 11:08:54 -04:00
Michael Tryby
c9903620cb Fine tuning linking strategy
static linking on Windows (MSVC and mingw) dyn linking everywhere else.
2019-03-22 09:55:34 -04:00
Michael Tryby
84341c3237 Switching MSVC to static link 2019-03-22 09:20:33 -04:00
Michael Tryby
66c274c343 Adding BOOST_TEST_MAIN for gcc build 2019-03-22 09:14:26 -04:00
Michael Tryby
eb4ae7f670 Adding boost system for gcc build 2019-03-21 18:19:17 -04:00
Michael Tryby
48facd89d0 Fixing test build on gcc 2019-03-21 18:08:05 -04:00
Michael Tryby
0c56df4041 Reorganizing tests
Adding test_net_builder and test_reent to cmake build script.
2019-03-21 13:44:31 -04:00
Michael Tryby
5687c63548 Reorganizing unit tests
Unit tests for the toolkit are consolidated into one test module with a separate test suite for related API functions.
2019-03-21 13:11:10 -04:00
Michael Tryby
ccbb422259 Reorganizing src and test folders
Moving epanet_output library from tools to src folder. Setting up parallel folder hierarchy in tests folder.
2019-03-20 17:58:24 -04:00
Michael Tryby
7eadbc25ce Adding unit test and refactoring
Added unit test for errormanager and refactored to simplify use of error_check() method.
2019-03-20 15:43:27 -04:00
Lew Rossman
34705d442d Merge pull request #423 from OpenWaterAnalytics/lrossman-dev15
Replace fixed-sized comment strings with dynamic strings
2019-03-20 09:13:15 -04:00
Michael Tryby
260bdef2cf Update test_net_builder.cpp
Removing strings and adding test fixture
2019-03-19 14:10:29 -04:00
Michael Tryby
a566f914d4 Eliminating build warnings on gcc 2019-03-19 13:50:39 -04:00
Michael Tryby
29cfe43e5a Cleaning up tests
Fixing memory leak associated with using string objects to pass filepath arguments to toolkit
2019-03-19 13:27:07 -04:00
Michael Tryby
ed9a89763b Reorganizing tests to improve build performance 2019-03-18 16:06:21 -04:00
Lew Rossman
18f65eb8b0 Replace fixed-sized comment strings with dynamic strings 2019-03-17 19:54:51 -04:00
Michael Tryby
e70ce35e60 Cleaning up tests 2019-03-15 17:25:59 -04:00
Michael Tryby
d61a1aa786 Minor cleanup 2019-03-12 15:07:52 -04:00
Michael Tryby
32091830c6 Adding test for EN_getnodevalue 2019-03-12 13:35:24 -04:00
Michael Tryby
516ae498c3 Changing DLLEXPORT to EXPORT_OUT_API and creating epanet_output_enums.h 2019-03-11 17:11:47 -04:00
Michael Tryby
0b76cfb2df Adding test for EN_getnodevalue 2019-03-08 18:15:47 -05:00