From 508bfb1cd4f8eb68faf8f829836ba22887509255 Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Fri, 16 Feb 2018 14:17:12 -0500
Subject: [PATCH] Adding support for unit testing using boost unit test and
 ctest

---
 CMakeLists.txt         |   1 +
 tests/CMakeLists.txt   |  42 ++++++
 tests/data/net1.out    | Bin 0 -> 16832 bytes
 tests/test_output.cpp  | 308 +++++++++++++++++++++++++++++++++++++++++
 tests/test_toolkit.cpp |  68 +++++++++
 5 files changed, 419 insertions(+)
 create mode 100644 tests/CMakeLists.txt
 create mode 100644 tests/data/net1.out
 create mode 100644 tests/test_output.cpp
 create mode 100644 tests/test_toolkit.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c64c03..214f94a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,7 @@
 cmake_minimum_required (VERSION 2.8.8)
 
 project(EPANET)
+add_subdirectory(tests)
 
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..52feb09
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,42 @@
+#
+# CMakeLists.txt - CMake configuration file for epanet/tests
+#
+# Created: February 13, 2018
+# Author:  Constantin Savtchenko
+# Ref: http://neyasystems.com/an-engineers-guide-to-unit-testing-cmake-and-boost-unit-tests/
+#
+# Modified by: Michael E. Tryby
+#              US EPA ORD/NRMRL
+# 
+
+#Setup CMake to run tests
+enable_testing()
+
+#Prep ourselves for compiling boost
+find_package(Boost COMPONENTS unit_test_framework REQUIRED)
+include_directories (${Boost_INCLUDE_DIRS} ../include ../tools/epanet-output/src)
+
+#I like to keep test files in a separate source directory called test
+file(GLOB TEST_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test_*.cpp)
+
+#Run through each source
+foreach(testSrc ${TEST_SRCS})
+        #Extract the filename without an extension (NAME_WE)
+        get_filename_component(testName ${testSrc} NAME_WE)
+
+        #Add compile target
+        add_executable(${testName} ${testSrc})
+
+        #link to Boost libraries AND your targets and dependencies
+        target_link_libraries(${testName} ${Boost_LIBRARIES} epanet epanet-output)
+
+        #I like to move testing binaries into a testBin directory
+        set_target_properties(${testName} PROPERTIES 
+            RUNTIME_OUTPUT_DIRECTORY  ${CMAKE_BINARY_DIR}/bin)
+
+        #Finally add it to test execution - 
+        #Notice the WORKING_DIRECTORY and COMMAND
+        add_test(NAME ${testName}
+                 COMMAND ${CMAKE_BINARY_DIR}/bin/${testName}  
+                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data)
+endforeach(testSrc)
diff --git a/tests/data/net1.out b/tests/data/net1.out
new file mode 100644
index 0000000000000000000000000000000000000000..6cede26b23767e4bd91a30d2ccaba14f34904ba3
GIT binary patch
literal 16832
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
VZ{1BMO!v?feK@&oH21$7{s%(sdMW?_

literal 0
HcmV?d00001

diff --git a/tests/test_output.cpp b/tests/test_output.cpp
new file mode 100644
index 0000000..dc48616
--- /dev/null
+++ b/tests/test_output.cpp
@@ -0,0 +1,308 @@
+/*
+ *   test_epanet_output.cpp
+ *
+ *   Created: 8/4/2017
+ *   Author: Michael E. Tryby
+ *           US EPA - ORD/NRMRL
+ *
+ *   Unit testing for EPANET Output API.
+*/
+
+#define BOOST_TEST_DYN_LINK
+
+#define BOOST_TEST_MODULE "output"
+#include <boost/test/included/unit_test.hpp>
+#include <boost/tuple/tuple.hpp>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string>
+#include <math.h>
+
+#include "epanet_output.h"
+
+//#define PROJECT_HOME "C:/Users/mtryby/Workspace/GitRepo/michaeltryby/epanet/"
+#define DATA_PATH "./net1.out"
+
+using namespace std; 
+
+// Custom test to check the minimum number of correct decimal digits between 
+// the test and the ref vectors.  
+boost::test_tools::predicate_result check_cdd(std::vector<float>& test, 
+    std::vector<float>& ref, long cdd_tol)
+{
+    float tmp, min_cdd = 100.0;
+    
+    // TODO: What is the vectors aren't the same length? 
+
+    std::vector<float>::iterator test_it;
+    std::vector<float>::iterator ref_it;
+
+    for (test_it = test.begin(); test_it < test.end(); ++test_it) {
+        for (ref_it = ref.begin(); ref_it < ref.end(); ++ref_it) {
+             
+             if (*test_it != *ref_it) {
+                tmp = - log10f(abs(*test_it - *ref_it));
+                if (tmp < min_cdd) min_cdd = tmp;
+            }
+        }
+    }
+
+    if (min_cdd == 100.0)
+        return true; 
+    else
+        return std::lround(min_cdd) <= cdd_tol;
+}
+
+
+BOOST_AUTO_TEST_SUITE (test_output_auto)
+
+BOOST_AUTO_TEST_CASE(InitTest) {
+    ENR_Handle p_handle = NULL;
+
+    int error = ENR_init(&p_handle);
+    BOOST_REQUIRE(error == 0);
+    BOOST_CHECK(p_handle != NULL);
+}
+
+BOOST_AUTO_TEST_CASE(OpenTest) {
+    std::string path = std::string(DATA_PATH);
+    ENR_Handle p_handle = NULL;
+    ENR_init(&p_handle);
+
+    int error = ENR_open(p_handle, path.c_str());
+    BOOST_REQUIRE(error == 0);
+    ENR_close(&p_handle);
+}
+
+BOOST_AUTO_TEST_CASE(CloseTest) {
+    ENR_Handle p_handle = NULL;
+    int error = ENR_init(&p_handle);
+
+    error = ENR_close(&p_handle);
+    BOOST_REQUIRE(error == -1);
+    BOOST_CHECK(p_handle != NULL);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+
+struct Fixture{
+    Fixture() {
+        path = std::string(DATA_PATH);
+
+        error = ENR_init(&p_handle);
+        ENR_clearError(p_handle);
+        error = ENR_open(p_handle, path.c_str());
+    }
+    ~Fixture() {
+        ENR_free((void**)&array);
+        error = ENR_close(&p_handle);
+    }
+    
+    std::string path;
+    int error = 0;
+    ENR_Handle p_handle = NULL;
+
+    float* array = NULL;
+    int array_dim = 0;
+
+};
+
+BOOST_AUTO_TEST_SUITE(test_output_fixture)
+
+BOOST_FIXTURE_TEST_CASE(test_getNetSize, Fixture)
+{
+    int *i_array = NULL;
+    
+    error = ENR_getNetSize(p_handle, &i_array, &array_dim);
+    BOOST_REQUIRE(error == 0);
+
+    // nodes, tanks, links, pumps, valves
+    std::vector<int> test_vec;
+    test_vec.assign(i_array, i_array + array_dim);
+    std::vector<int> ref_vec({11,2,13,1,0});
+
+    BOOST_TEST(ref_vec == test_vec, boost::test_tools::per_element());
+
+    ENR_free((void**)&i_array);
+}
+
+BOOST_FIXTURE_TEST_CASE(test_getElementName, Fixture) {
+    char* name = new char[MAXID];
+    int length, index = 1;
+
+    error = ENR_getElementName(p_handle, ENR_node, index, &name, &length);
+    BOOST_REQUIRE(error == 0);
+
+    BOOST_TEST("10" == name);
+
+    delete(name);
+}
+
+BOOST_FIXTURE_TEST_CASE(test_getNodeAttribute, Fixture) {
+    
+    error = ENR_getNodeAttribute(p_handle, 1, ENR_quality, &array, &array_dim);
+    BOOST_REQUIRE(error == 0);
+
+    std::vector<float> ref_vec({ 1.0,
+                                 0.44407997,
+                                 0.43766347,
+                                 0.42827705,
+                                 0.41342604,
+                                 0.42804748,
+                                 0.44152543,
+                                 0.40502965,
+                                 0.38635802,
+                                 1.0,
+                                 0.96745253 });
+
+    std::vector<float> test_vec;
+    test_vec.assign(array, array + array_dim);
+
+    BOOST_TEST(ref_vec == test_vec, boost::test_tools::per_element());
+}
+
+BOOST_FIXTURE_TEST_CASE(test_getLinkAttribute, Fixture) {
+
+    error = ENR_getLinkAttribute(p_handle, 1, ENR_flow, &array ,&array_dim);
+    BOOST_REQUIRE(error == 0);
+
+    std::vector<float> ref_vec({ 1848.5812,
+                                 1220.4274,
+                                 130.11162,
+                                 187.6893,
+                                 119.8884,
+                                 40.464489,
+                                 -748.58112,
+                                 478.15378,
+                                 191.73459,
+                                 30.111609,
+                                 140.46449,
+                                 59.535515,
+                                 1848.5812});
+
+
+    std::vector<float> test_vec;
+    test_vec.assign(array, array + array_dim);
+
+    BOOST_TEST(ref_vec == test_vec, boost::test_tools::per_element());
+}
+
+BOOST_FIXTURE_TEST_CASE(test_getNodeResult, Fixture) {
+    
+    error = ENR_getNodeResult(p_handle, 1, 2, &array, &array_dim);
+    BOOST_REQUIRE(error == 0);
+    
+    std::vector<float> ref_vec({0.041142918,
+                                150.0,
+                                987.98358,
+                                120.45029});
+
+    std::vector<float> test_vec;
+    test_vec.assign(array, array + array_dim);
+
+    BOOST_TEST(ref_vec == test_vec, boost::test_tools::per_element());
+}
+
+BOOST_FIXTURE_TEST_CASE(test_getLinkResult, Fixture) {
+    
+    error = ENR_getLinkResult(p_handle, 24, 13, &array, &array_dim);
+    BOOST_REQUIRE(error == 0);
+
+    std::vector<float> ref_vec({0.58586824,
+                                1892.2433,
+                                0.0,
+                                -200.71875,
+                                1.0,
+                                3.0,
+                                1.0,
+                                0.0});
+
+    std::vector<float> test_vec;
+    test_vec.assign(array, array + array_dim);
+
+    BOOST_TEST(ref_vec == test_vec, boost::test_tools::per_element());
+}
+
+BOOST_FIXTURE_TEST_CASE(test_getNodeSeries, Fixture){
+    
+    error = ENR_getNodeSeries(p_handle, 2, ENR_pressure, 0, 10, &array, &array_dim);
+    BOOST_REQUIRE(error == 0);
+
+    std::vector<float> ref_vec({119.25731,
+                                120.45029,
+                                121.19854,
+                                122.00622,
+                                122.37414,
+                                122.8122,
+                                122.82034,
+                                122.90379,
+                                123.40434,
+                                123.81807});
+
+    std::vector<float> test_vec;
+    test_vec.assign(array, array + array_dim);
+    
+    BOOST_TEST(check_cdd(test_vec, ref_vec, 3));
+}
+
+BOOST_FIXTURE_TEST_CASE(test_getLinkSeries, Fixture) {
+    
+    error = ENR_getLinkSeries(p_handle, 2, ENR_flow, 0, 10, &array, &array_dim);
+    BOOST_REQUIRE(error == 0);
+
+    std::vector<float> ref_vec({1234.2072,
+                                1220.4274,
+                                1164.4,
+                                1154.8175,
+                                1100.0635,
+                                1094.759,
+                                1041.7854,
+                                1040.7617,
+                                1087.556,
+                                1082.5011});
+
+    std::vector<float> test_vec;
+    test_vec.assign(array, array + array_dim);
+
+    BOOST_TEST(ref_vec == test_vec, boost::test_tools::per_element());
+}
+
+BOOST_FIXTURE_TEST_CASE(test_getNetReacts, Fixture) {
+    
+    error = ENR_getNetReacts(p_handle, &array, &array_dim);
+    BOOST_REQUIRE(error == 0);
+
+    std::vector<float> ref_vec({18806.59,
+                                85424.438,
+                                115174.05,
+                                238972.66});
+
+    std::vector<float> test_vec;
+    test_vec.assign(array, array + array_dim);
+
+    BOOST_TEST(check_cdd(test_vec, ref_vec, 2));
+}
+
+BOOST_FIXTURE_TEST_CASE(test_getEnergyUsage, Fixture) {
+    
+    int linkIdx;
+
+    error = ENR_getEnergyUsage(p_handle, 1, &linkIdx, &array, &array_dim);
+    BOOST_REQUIRE(error == 0);
+
+    std::vector<float> ref_vec({57.712959,
+                                75.0,
+                                880.41583,
+                                96.254318,
+                                96.707115,
+                                0.0});
+
+    std::vector<float> test_vec;
+    test_vec.assign(array, array + array_dim);
+
+    BOOST_TEST(ref_vec == test_vec, boost::test_tools::per_element());
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/test_toolkit.cpp b/tests/test_toolkit.cpp
new file mode 100644
index 0000000..e64ffe1
--- /dev/null
+++ b/tests/test_toolkit.cpp
@@ -0,0 +1,68 @@
+//
+// test_epanet_toolkit.cpp
+//
+// Date Created: January 24, 2018
+//
+// Author: Michael E. Tryby
+//         US EPA - ORD/NRMRL
+//
+
+#define BOOST_TEST_DYN_LINK
+
+#define BOOST_TEST_MODULE "toolkit"
+#include <boost/test/included/unit_test.hpp>
+
+#include <string>
+#include "epanet2.h"
+
+// NOTE: Project Home needs to be updated to run unit test
+#define PROJECT_HOME "C:/Users/mtryby/Workspace/GitRepo/michaeltryby/epanet"
+#define DATA_PATH "/tests/network_tests/net1"
+
+using namespace std;
+
+BOOST_AUTO_TEST_SUITE (test_toolkit)
+
+BOOST_AUTO_TEST_CASE (test_alloc_free)
+{
+   int error = 0;
+   EN_ProjectHandle ph = NULL;
+
+   error = EN_alloc(&ph);
+
+   BOOST_REQUIRE(error == 0);
+   BOOST_CHECK(ph != NULL);
+
+   error = EN_free(&ph);
+
+   BOOST_REQUIRE(error == 0);
+   BOOST_CHECK(ph == NULL);
+}
+
+BOOST_AUTO_TEST_SUITE_END( )
+
+// int main(int argc, char *argv[])
+// {
+//     int error = 0;
+//     EN_ProjectHandle project = NULL;
+
+//     std::string data_path = std::string(PROJECT_HOME) + std::string(DATA_PATH);
+//     std::string inputFile(data_path);
+//     inputFile.append(std::string("/net1.inp"));
+//     std::string reportFile(data_path);
+//     reportFile.append(std::string("/net1.rpt"));
+//     std::string outputFile(data_path);
+//     outputFile.append(std::string("/net1.out"));
+
+//     error = EN_alloc(&project);
+//     error = EN_open(project, inputFile.c_str(), reportFile.c_str(), outputFile.c_str());
+
+//     error = EN_solveH(project);
+//     error = EN_solveQ(project);
+//     error = EN_report(project);
+
+//     error = EN_close(project);
+//     error = EN_free(&project);
+
+//     return error;
+// }