From 5c5993abc8f50b22bcecde5779fab45764630f0f Mon Sep 17 00:00:00 2001 From: David Parkhurst Date: Mon, 19 Feb 2018 19:14:17 -0700 Subject: [PATCH] added new databases to unit tester --- unit/TestIPhreeqc.cpp | 3 ++- unit/TestIPhreeqcLib.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/unit/TestIPhreeqc.cpp b/unit/TestIPhreeqc.cpp index e86d2191..de6e2bbd 100644 --- a/unit/TestIPhreeqc.cpp +++ b/unit/TestIPhreeqc.cpp @@ -29,7 +29,8 @@ void TestIPhreeqc::TestLoadDatabase(void) std::string FILES[] = {"../database/phreeqc.dat", "../database/pitzer.dat", "../database/wateq4f.dat", "../database/Amm.dat", "../database/frezchem.dat", "../database/iso.dat", "../database/llnl.dat", "../database/minteq.dat", "../database/minteq.v4.dat", - "../database/sit.dat" + "../database/sit.dat","../database/ColdChem.dat","../database/core10.dat", + "../database/Tipping_Hurley.dat" }; for (int j = 0; j < sizeof(FILES)/sizeof(std::string); ++j) { diff --git a/unit/TestIPhreeqcLib.cpp b/unit/TestIPhreeqcLib.cpp index e1687f28..62575f01 100644 --- a/unit/TestIPhreeqcLib.cpp +++ b/unit/TestIPhreeqcLib.cpp @@ -137,11 +137,11 @@ void TestIPhreeqcLib::TestLoadDatabase(void) { int n = ::CreateIPhreeqc(); CPPUNIT_ASSERT(n >= 0); - - std::string FILES[] = {"../database/phreeqc.dat", "../database/pitzer.dat", "../database/wateq4f.dat", + std::string FILES[] = { "../database/phreeqc.dat", "../database/pitzer.dat", "../database/wateq4f.dat", "../database/Amm.dat", "../database/frezchem.dat", "../database/iso.dat", "../database/llnl.dat", "../database/minteq.dat", "../database/minteq.v4.dat", - "../database/sit.dat" + "../database/sit.dat","../database/ColdChem.dat","../database/core10.dat", + "../database/Tipping_Hurley.dat" }; for (int j = 0; j < sizeof(FILES)/sizeof(std::string); ++j) {