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

updated for -soln_vol to dump files

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8228 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2013-11-22 02:54:46 +00:00
parent a0ddc0a7ce
commit bb2bda43ff
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unit/TestIPhreeqc.cpp
View File

@ -1651,7 +1651,7 @@ void TestIPhreeqc::TestGetDumpStringLineCount(void)
obj.SetDumpStringOn(true); obj.SetDumpStringOn(true);
CPPUNIT_ASSERT_EQUAL( true, obj.GetDumpStringOn() ); CPPUNIT_ASSERT_EQUAL( true, obj.GetDumpStringOn() );
CPPUNIT_ASSERT_EQUAL( 0, obj.RunAccumulated() ); CPPUNIT_ASSERT_EQUAL( 0, obj.RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 31, obj.GetDumpStringLineCount() ); CPPUNIT_ASSERT_EQUAL( 32, obj.GetDumpStringLineCount() );
} }
void TestIPhreeqc::TestGetDumpStringLine(void) void TestIPhreeqc::TestGetDumpStringLine(void)
@ -1677,7 +1677,7 @@ void TestIPhreeqc::TestGetDumpStringLine(void)
obj.SetDumpStringOn(true); obj.SetDumpStringOn(true);
CPPUNIT_ASSERT_EQUAL( true, obj.GetDumpStringOn() ); CPPUNIT_ASSERT_EQUAL( true, obj.GetDumpStringOn() );
CPPUNIT_ASSERT_EQUAL( 0, obj.RunAccumulated() ); CPPUNIT_ASSERT_EQUAL( 0, obj.RunAccumulated() );
CPPUNIT_ASSERT_EQUAL( 31, obj.GetDumpStringLineCount() ); CPPUNIT_ASSERT_EQUAL( 32, obj.GetDumpStringLineCount() );
int line = 0; int line = 0;
@ -1698,6 +1698,7 @@ void TestIPhreeqc::TestGetDumpStringLine(void)
CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), "-mu") != NULL); CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), "-mu") != NULL);
CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), "-ah2o") != NULL); CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), "-ah2o") != NULL);
CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), "-mass_water") != NULL); CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), "-mass_water") != NULL);
CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), "-soln_vol") != NULL);
CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), "-total_alkalinity") != NULL); CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), "-total_alkalinity") != NULL);
CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), "-activities") != NULL); CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), "-activities") != NULL);
CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), " C(-4) ") != NULL); CPPUNIT_ASSERT(::strstr(obj.GetDumpStringLine(line++), " C(-4) ") != NULL);
@ -1863,6 +1864,7 @@ void TestIPhreeqc::TestSetDumpFileName(void)
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-mu") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-mu") != NULL);
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-ah2o") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-ah2o") != NULL);
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-mass_water") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-mass_water") != NULL);
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-soln_vol") != NULL);
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-total_alkalinity") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-total_alkalinity") != NULL);
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-activities") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-activities") != NULL);
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), " C(-4) ") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), " C(-4) ") != NULL);

2
unit/TestIPhreeqc.h
View File

@ -31,7 +31,7 @@ class TestIPhreeqc : public CppUnit::TestFixture
CPPUNIT_TEST( TestLogFileOnOff ); CPPUNIT_TEST( TestLogFileOnOff );
CPPUNIT_TEST( TestDumpFileOnOff ); CPPUNIT_TEST( TestDumpFileOnOff );
CPPUNIT_TEST( TestSelOutFileOnOff ); CPPUNIT_TEST( TestSelOutFileOnOff );
CPPUNIT_TEST( TestLongHeadings ); CPPUNIT_TEST( TestLongHeadings );
CPPUNIT_TEST( TestDatabaseKeyword ); CPPUNIT_TEST( TestDatabaseKeyword );
CPPUNIT_TEST( TestDumpString ); CPPUNIT_TEST( TestDumpString );
CPPUNIT_TEST( TestGetDumpStringLineCount ); CPPUNIT_TEST( TestGetDumpStringLineCount );

6
unit/TestIPhreeqcLib.cpp
View File

@ -1809,7 +1809,7 @@ void TestIPhreeqcLib::TestGetDumpStringLineCount(void)
CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpFileOn(n, 0) ); CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpFileOn(n, 0) );
CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpStringOn(n, 1) ); CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpStringOn(n, 1) );
CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated(n) ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated(n) );
CPPUNIT_ASSERT_EQUAL( 31, ::GetDumpStringLineCount(n) ); CPPUNIT_ASSERT_EQUAL( 32, ::GetDumpStringLineCount(n) );
if (n >= 0) if (n >= 0)
{ {
@ -1838,7 +1838,7 @@ void TestIPhreeqcLib::TestGetDumpStringLine(void)
CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpFileOn(n, 0) ); CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpFileOn(n, 0) );
CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpStringOn(n, 1) ); CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpStringOn(n, 1) );
CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated(n) ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated(n) );
CPPUNIT_ASSERT_EQUAL( 31, ::GetDumpStringLineCount(n) ); CPPUNIT_ASSERT_EQUAL( 32, ::GetDumpStringLineCount(n) );
int line = 0; int line = 0;
@ -1859,6 +1859,7 @@ void TestIPhreeqcLib::TestGetDumpStringLine(void)
CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), "-mu") != NULL); CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), "-mu") != NULL);
CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), "-ah2o") != NULL); CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), "-ah2o") != NULL);
CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), "-mass_water") != NULL); CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), "-mass_water") != NULL);
CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), "-soln_vol") != NULL);
CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), "-total_alkalinity") != NULL); CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), "-total_alkalinity") != NULL);
CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), "-activities") != NULL); CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), "-activities") != NULL);
CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), " C(-4) ") != NULL); CPPUNIT_ASSERT(::strstr(::GetDumpStringLine(n, line++), " C(-4) ") != NULL);
@ -2349,6 +2350,7 @@ void TestIPhreeqcLib::TestSetDumpFileName(void)
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-mu") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-mu") != NULL);
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-ah2o") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-ah2o") != NULL);
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-mass_water") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-mass_water") != NULL);
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-soln_vol") != NULL);
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-total_alkalinity") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-total_alkalinity") != NULL);
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-activities") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), "-activities") != NULL);
CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), " C(-4) ") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), " C(-4) ") != NULL);