Work in progress

code cleanup, addressed issue raised in review, and implemented EN_adddemand()

tests/test_demand.cpp

@@ -82,5 +82,19 @@ BOOST_AUTO_TEST_CASE(test_categories_reopen, * boost::unit_test::depends_on("tes
     BOOST_REQUIRE(error == 0);
 }
 
+BOOST_FIXTURE_TEST_CASE(test_adddemand, FixtureSingleNode)
+{
+    int demand_index;
+
+    error = EN_adddemand(ph, node_qhut, 100.0, "PrimaryPattern", "PrimaryDemand", &demand_index);
+    BOOST_CHECK(error != 0);
+
+    error = EN_addpattern(ph, (char *)"PrimaryPattern");
+    BOOST_REQUIRE(error == 0);
+
+    error = EN_adddemand(ph, node_qhut, 100.0, "PrimaryPattern", "PrimaryDemand", &demand_index);
+    BOOST_CHECK(error == 0);
+}
+
 
 BOOST_AUTO_TEST_SUITE_END()

tests/test_demand_data.cpp

@@ -291,4 +291,5 @@ BOOST_FIXTURE_TEST_CASE(test_pattern_edits, FixtureSingleNode)
 
 
 
+
 BOOST_AUTO_TEST_SUITE_END()

tests/test_toolkit.hpp

@@ -102,6 +102,26 @@ struct FixtureAfterStep{
     EN_Project ph;
 };
 
+struct FixtureSingleNode {
+    FixtureSingleNode() {
+        error = 0;
+        ph = NULL;
+
+        EN_createproject(&ph);
+        EN_init(ph, DATA_PATH_RPT, DATA_PATH_OUT, EN_GPM, EN_HW);
+
+        EN_addnode(ph, (char *)"CUB_SCOUT_QUONSET_HUT", EN_JUNCTION, &node_qhut);
+    }
+
+    ~FixtureSingleNode() {
+        EN_close(ph);
+        EN_deleteproject(&ph);
+    }
+    int error, index, node_qhut;
+    EN_Project ph;
+};
+
+
 boost::test_tools::predicate_result check_cdd_double(std::vector<double>& test,
     std::vector<double>& ref, long cdd_tol);
 boost::test_tools::predicate_result check_string(std::string test, std::string ref);