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

Merge branch 'issue-8' into 'master'

Browse Source 
Closes issue #8

Closes #8

See merge request coupled/iphreeqc!15
This commit is contained in:
Charlton, Scott R 2020-07-24 19:23:03 +00:00
commit e349521504
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unit/TestIPhreeqc.cpp
View File

@ -2093,7 +2093,7 @@ void TestIPhreeqc::TestSetOutputFileName(void)
IPhreeqc obj;
CPPUNIT_ASSERT_EQUAL( 0, obj.LoadDatabase("phreeqc.dat"));
CPPUNIT_ASSERT_EQUAL( 0, obj.LoadDatabase("phreeqc.dat.old"));
// add solution block
CPPUNIT_ASSERT_EQUAL( VR_OK, ::SOLUTION(obj, 1.0, 1.0, 1.0) );
@ -2305,7 +2305,7 @@ void TestIPhreeqc::TestGetOutputStringLineCount(void)
IPhreeqc obj;
CPPUNIT_ASSERT_EQUAL( 0, obj.GetOutputStringLineCount() );
CPPUNIT_ASSERT_EQUAL( 0, obj.LoadDatabase("phreeqc.dat"));
CPPUNIT_ASSERT_EQUAL( 0, obj.LoadDatabase("phreeqc.dat.old"));
CPPUNIT_ASSERT_EQUAL( 0, obj.GetOutputStringLineCount() );
@ -2356,7 +2356,7 @@ void TestIPhreeqc::TestGetOutputStringLine(void)
IPhreeqc obj;
CPPUNIT_ASSERT_EQUAL( 0, obj.GetOutputStringLineCount() );
CPPUNIT_ASSERT_EQUAL( 0, obj.LoadDatabase("phreeqc.dat"));
CPPUNIT_ASSERT_EQUAL( 0, obj.LoadDatabase("phreeqc.dat.old"));
CPPUNIT_ASSERT_EQUAL( 0, obj.GetOutputStringLineCount() );

6
unit/TestIPhreeqcLib.cpp
View File

@ -2394,7 +2394,7 @@ void TestIPhreeqcLib::TestSetOutputFileName(void)
int n = ::CreateIPhreeqc();
CPPUNIT_ASSERT(n >= 0);
CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "phreeqc.dat"));
CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "phreeqc.dat.old"));
// add solution block
CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SOLUTION(n, 1.0, 1.0, 1.0) );
@ -2627,7 +2627,7 @@ void TestIPhreeqcLib::TestGetOutputStringLineCount(void)
CPPUNIT_ASSERT(n >= 0);
CPPUNIT_ASSERT_EQUAL( 0, ::GetOutputStringLineCount(n) );
CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "phreeqc.dat"));
CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "phreeqc.dat.old"));
CPPUNIT_ASSERT_EQUAL( 0, ::GetOutputStringLineCount(n) );
// add solution block
@ -2683,7 +2683,7 @@ void TestIPhreeqcLib::TestGetOutputStringLine(void)
CPPUNIT_ASSERT(n >= 0);
CPPUNIT_ASSERT_EQUAL( 0, ::GetOutputStringLineCount(n) );
CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "phreeqc.dat"));
CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "phreeqc.dat.old"));
CPPUNIT_ASSERT_EQUAL( 0, ::GetOutputStringLineCount(n) );
// add solution block

0
unit/llnl.dat → unit/llnl.dat.old
View File

0
unit/phreeqc.dat → unit/phreeqc.dat.old
View File