max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_unit_tester' into 'master'

Browse Source 
added new databases to unit tester

See merge request svn_GW/IPhreeqc!1
This commit is contained in:
David L Parkhurst 2018-02-22 16:44:14 -07:00
commit fe71fe0cfc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
unit/TestIPhreeqc.cpp
View File

@ -29,7 +29,8 @@ void TestIPhreeqc::TestLoadDatabase(void)
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/Amm.dat", "../database/frezchem.dat", "../database/iso.dat",
"../database/llnl.dat", "../database/minteq.dat", "../database/minteq.v4.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) for (int j = 0; j < sizeof(FILES)/sizeof(std::string); ++j)
{ {

6
unit/TestIPhreeqcLib.cpp
View File

@ -137,11 +137,11 @@ void TestIPhreeqcLib::TestLoadDatabase(void)
{ {
int n = ::CreateIPhreeqc(); int n = ::CreateIPhreeqc();
CPPUNIT_ASSERT(n >= 0); 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/Amm.dat", "../database/frezchem.dat", "../database/iso.dat",
"../database/llnl.dat", "../database/minteq.dat", "../database/minteq.v4.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) for (int j = 0; j < sizeof(FILES)/sizeof(std::string); ++j)
{ {