revert 1a01b46 to 1b167b5

tests/CMakeLists.txt

@@ -19,19 +19,18 @@ endif(UNIX)
 set(toolkit_test_srcs
      test_toolkit.cpp
      test_project.cpp
-#     test_hydraulics.cpp
-#     test_quality.cpp
-#     test_report.cpp
-#     test_analysis.cpp
-#     test_node.cpp
-#     test_demand.cpp
-#     test_link.cpp
+     test_hydraulics.cpp
+     test_quality.cpp
+     test_report.cpp
+     test_analysis.cpp
+     test_node.cpp
+     test_demand.cpp
+     test_link.cpp
 #     test_pump.cpp
-#     test_pattern.cpp
-#     test_curve.cpp
-#     test_control.cpp
-#     test_net_builder.cpp
-)
+     test_pattern.cpp
+     test_curve.cpp
+     test_control.cpp
+     test_net_builder.cpp)
 
 add_executable(test_toolkit ${toolkit_test_srcs})
 

tests/test_analysis.cpp

@@ -11,6 +11,7 @@
  ******************************************************************************
 */
 
+//#define BOOST_ALL_DYN_LINK
 #include <boost/test/unit_test.hpp>
 
 #include "test_toolkit.hpp"

tests/test_project.cpp

@@ -56,47 +56,35 @@ BOOST_AUTO_TEST_CASE(test_save)
 {
     int error;
 
-	EN_Project ph = NULL;
+	EN_Project ph_save;
 
-	error = EN_createproject(&ph);
-	BOOST_REQUIRE(error == 0);
-
-    error = EN_open(ph, DATA_PATH_NET1, DATA_PATH_RPT, DATA_PATH_OUT);
+	EN_createproject(&ph_save);
+    error = EN_open(ph_save, DATA_PATH_NET1, DATA_PATH_RPT, DATA_PATH_OUT);
     BOOST_REQUIRE(error == 0);
 
-    error = EN_saveinpfile(ph, DATA_PATH_TMP);
+    error = EN_saveinpfile(ph_save, "test_reopen.inp");
     BOOST_REQUIRE(error == 0);
 
-	BOOST_CHECK(boost::filesystem::exists(DATA_PATH_TMP) == true);
+	BOOST_CHECK(boost::filesystem::exists("test_reopen.inp") == true);
 
-	error = EN_close(ph);
+	error = EN_close(ph_save);
 	BOOST_REQUIRE(error == 0);
-    
-	error = EN_deleteproject(&ph);
-	BOOST_REQUIRE(error == 0);
-
-	BOOST_CHECK(ph == NULL);
+    EN_deleteproject(&ph_save);
 }
 
 BOOST_AUTO_TEST_CASE(test_reopen, * boost::unit_test::depends_on("test_project/test_save"))
 {
     int error;
 
-    EN_Project ph = NULL;
+    EN_Project ph_reopen;
 
-	error = EN_createproject(&ph);
-	BOOST_REQUIRE(error == 0);
+    EN_createproject(&ph_reopen);
+	error = EN_open(ph_reopen, "test_reopen.inp", DATA_PATH_RPT, DATA_PATH_OUT);
+    BOOST_REQUIRE(error == 0);
 
-	error = EN_open(ph, DATA_PATH_TMP, DATA_PATH_RPT, DATA_PATH_OUT);
-	BOOST_REQUIRE(error == 0);
-
-	error = EN_close(ph);
-	BOOST_REQUIRE(error == 0);
-
-	EN_deleteproject(&ph);
-	BOOST_REQUIRE(error == 0);
-
-	BOOST_CHECK(ph == NULL);
+    error = EN_close(ph_reopen);
+    BOOST_REQUIRE(error == 0);
+	EN_deleteproject(&ph_reopen);
 }
 
 BOOST_AUTO_TEST_CASE(test_run)

tests/test_toolkit.hpp

@@ -14,12 +14,6 @@
 #ifndef TEST_TOOLKIT_HPP
 #define TEST_TOOLKIT_HPP
 
-// MSVC ONLY 
-#ifdef _DEBUG
-    #define _CRTDBG_MAP_ALLOC
-    #include <stdlib.h>
-    #include <crtdbg.h>
-#endif
 
 #include "epanet2_2.h"