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

Use phreeqc.dat from 90a6449 for TestMultiPunchCSelectedOutput tests

Browse Source
This commit is contained in:
Charlton, Scott R 2024-04-19 16:37:58 -06:00
parent 5898c60f38
commit 5f00edf1ab
4 changed files with 1943 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtest/CMakeLists.txt
View File

@ -92,6 +92,12 @@ configure_file(
COPYONLY COPYONLY
) )
configure_file(
phreeqc.dat.90a6449
phreeqc.dat.90a6449
COPYONLY
)
configure_file( configure_file(
../database/phreeqc.dat ../database/phreeqc.dat
phreeqc.dat phreeqc.dat

2
gtest/TestIPhreeqc.cpp
View File

@ -4098,7 +4098,7 @@ TEST(TestIPhreeqc, TestMultiPunchCSelectedOutput)
CVar var; CVar var;
IPhreeqc obj; IPhreeqc obj;
ASSERT_EQ(0, obj.LoadDatabase("phreeqc.dat")); ASSERT_EQ(0, obj.LoadDatabase("phreeqc.dat.90a6449"));
ASSERT_EQ(0, obj.RunFile("multi_punch")); ASSERT_EQ(0, obj.RunFile("multi_punch"));
ASSERT_EQ(6, obj.GetSelectedOutputRowCount()); ASSERT_EQ(6, obj.GetSelectedOutputRowCount());

2
gtest/TestIPhreeqcLib.cpp
View File

@ -4064,7 +4064,7 @@ TEST(TestIPhreeqcLib, TestMultiPunchCSelectedOutput)
int id = ::CreateIPhreeqc(); int id = ::CreateIPhreeqc();
ASSERT_TRUE(id >= 0); ASSERT_TRUE(id >= 0);
ASSERT_EQ(0, ::LoadDatabase(id, "phreeqc.dat")); ASSERT_EQ(0, ::LoadDatabase(id, "phreeqc.dat.90a6449"));
ASSERT_EQ(0, ::RunFile(id, "multi_punch")); ASSERT_EQ(0, ::RunFile(id, "multi_punch"));
ASSERT_EQ(6, ::GetSelectedOutputRowCount(id)); ASSERT_EQ(6, ::GetSelectedOutputRowCount(id));

1935
gtest/phreeqc.dat.90a6449 Normal file
View File

File diff suppressed because it is too large Load Diff