From bb2bda43ff3c59efae8cfcde7c1161cf4cda47bf Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Fri, 22 Nov 2013 02:54:46 +0000 Subject: [PATCH] updated for -soln_vol to dump files git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8228 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- unit/TestIPhreeqc.cpp | 6 ++++-- unit/TestIPhreeqc.h | 2 +- unit/TestIPhreeqcLib.cpp | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/unit/TestIPhreeqc.cpp b/unit/TestIPhreeqc.cpp index 3006a257..537b2f8e 100644 --- a/unit/TestIPhreeqc.cpp +++ b/unit/TestIPhreeqc.cpp @@ -1651,7 +1651,7 @@ void TestIPhreeqc::TestGetDumpStringLineCount(void) obj.SetDumpStringOn(true); CPPUNIT_ASSERT_EQUAL( true, obj.GetDumpStringOn() ); CPPUNIT_ASSERT_EQUAL( 0, obj.RunAccumulated() ); - CPPUNIT_ASSERT_EQUAL( 31, obj.GetDumpStringLineCount() ); + CPPUNIT_ASSERT_EQUAL( 32, obj.GetDumpStringLineCount() ); } void TestIPhreeqc::TestGetDumpStringLine(void) @@ -1677,7 +1677,7 @@ void TestIPhreeqc::TestGetDumpStringLine(void) obj.SetDumpStringOn(true); CPPUNIT_ASSERT_EQUAL( true, obj.GetDumpStringOn() ); CPPUNIT_ASSERT_EQUAL( 0, obj.RunAccumulated() ); - CPPUNIT_ASSERT_EQUAL( 31, obj.GetDumpStringLineCount() ); + CPPUNIT_ASSERT_EQUAL( 32, obj.GetDumpStringLineCount() ); 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++), "-ah2o") != 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++), "-activities") != 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(), "-ah2o") != 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(), "-activities") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), " C(-4) ") != NULL); diff --git a/unit/TestIPhreeqc.h b/unit/TestIPhreeqc.h index b7a1b9dc..d57e1bd0 100644 --- a/unit/TestIPhreeqc.h +++ b/unit/TestIPhreeqc.h @@ -31,7 +31,7 @@ class TestIPhreeqc : public CppUnit::TestFixture CPPUNIT_TEST( TestLogFileOnOff ); CPPUNIT_TEST( TestDumpFileOnOff ); CPPUNIT_TEST( TestSelOutFileOnOff ); -CPPUNIT_TEST( TestLongHeadings ); + CPPUNIT_TEST( TestLongHeadings ); CPPUNIT_TEST( TestDatabaseKeyword ); CPPUNIT_TEST( TestDumpString ); CPPUNIT_TEST( TestGetDumpStringLineCount ); diff --git a/unit/TestIPhreeqcLib.cpp b/unit/TestIPhreeqcLib.cpp index 36fde1b2..26015c1c 100644 --- a/unit/TestIPhreeqcLib.cpp +++ b/unit/TestIPhreeqcLib.cpp @@ -1809,7 +1809,7 @@ void TestIPhreeqcLib::TestGetDumpStringLineCount(void) CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpFileOn(n, 0) ); CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpStringOn(n, 1) ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated(n) ); - CPPUNIT_ASSERT_EQUAL( 31, ::GetDumpStringLineCount(n) ); + CPPUNIT_ASSERT_EQUAL( 32, ::GetDumpStringLineCount(n) ); if (n >= 0) { @@ -1838,7 +1838,7 @@ void TestIPhreeqcLib::TestGetDumpStringLine(void) CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpFileOn(n, 0) ); CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpStringOn(n, 1) ); CPPUNIT_ASSERT_EQUAL( 0, ::RunAccumulated(n) ); - CPPUNIT_ASSERT_EQUAL( 31, ::GetDumpStringLineCount(n) ); + CPPUNIT_ASSERT_EQUAL( 32, ::GetDumpStringLineCount(n) ); 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++), "-ah2o") != 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++), "-activities") != 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(), "-ah2o") != 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(), "-activities") != NULL); CPPUNIT_ASSERT(::strstr(lines[line++].c_str(), " C(-4) ") != NULL);