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

all tests passing (added "cell/soln/mix 1").

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8822 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-07-09 04:16:21 +00:00
parent 035c73c707
commit 4292284364
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
unit/TestIPhreeqc.cpp
View File

@ -405,7 +405,7 @@ void TestIPhreeqc::TestRunWithErrors(void)
CPPUNIT_ASSERT_EQUAL(1, obj.RunAccumulated()); CPPUNIT_ASSERT_EQUAL(1, obj.RunAccumulated());
const char expected[] = const char expected[] =
"ERROR: Numerical method failed on all combinations of convergence parameters\n"; "ERROR: Numerical method failed on all combinations of convergence parameters, cell/soln/mix 1\n";
const char* err = obj.GetErrorString(); const char* err = obj.GetErrorString();
CPPUNIT_ASSERT_EQUAL( std::string(expected), std::string(err) ); CPPUNIT_ASSERT_EQUAL( std::string(expected), std::string(err) );
@ -432,7 +432,7 @@ void TestIPhreeqc::TestRunFile(void)
CPPUNIT_ASSERT_EQUAL(1, obj.RunFile("conv_fail.in")); CPPUNIT_ASSERT_EQUAL(1, obj.RunFile("conv_fail.in"));
const char expected[] = const char expected[] =
"ERROR: Numerical method failed on all combinations of convergence parameters\n"; "ERROR: Numerical method failed on all combinations of convergence parameters, cell/soln/mix 1\n";
const char* err = obj.GetErrorString(); const char* err = obj.GetErrorString();
CPPUNIT_ASSERT_EQUAL(std::string(expected), std::string(err)); CPPUNIT_ASSERT_EQUAL(std::string(expected), std::string(err));
@ -2802,10 +2802,10 @@ void TestIPhreeqc::TestSetErrorFileName(void)
CPPUNIT_ASSERT_EQUAL( (size_t)84, i ); CPPUNIT_ASSERT_EQUAL( (size_t)84, i );
} }
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Maximum iterations exceeded, 100"), lines[0] ); CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Maximum iterations exceeded, 100"), lines[0] );
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Numerical method failed with this set of convergence parameters."), lines[2] ); CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Numerical method failed with this set of convergence parameters."), lines[2] );
CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Numerical method failed on all combinations of convergence parameters"), lines[82] ); CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Numerical method failed on all combinations of convergence parameters, cell/soln/mix 1"), lines[82] );
CPPUNIT_ASSERT_EQUAL( std::string("Stopping."), lines[83] ); CPPUNIT_ASSERT_EQUAL( std::string("Stopping."), lines[83] );
if (::FileExists(ERR_FILENAME)) if (::FileExists(ERR_FILENAME))
{ {
@ -2874,7 +2874,7 @@ void TestIPhreeqc::TestGetErrorString(void)
CPPUNIT_ASSERT_EQUAL( true, ::FileExists(ERR_FILENAME) ); CPPUNIT_ASSERT_EQUAL( true, ::FileExists(ERR_FILENAME) );
{ {
std::string fline("ERROR: Numerical method failed on all combinations of convergence parameters\n"); std::string fline("ERROR: Numerical method failed on all combinations of convergence parameters, cell/soln/mix 1\n");
std::string sline(obj.GetErrorString()); std::string sline(obj.GetErrorString());
CPPUNIT_ASSERT( sline.size() > 0 ); CPPUNIT_ASSERT( sline.size() > 0 );

16
unit/TestIPhreeqcLib.cpp
View File

@ -293,7 +293,7 @@ void TestIPhreeqcLib::TestRunWithErrors()
CPPUNIT_ASSERT_EQUAL(1, ::RunAccumulated(n)); CPPUNIT_ASSERT_EQUAL(1, ::RunAccumulated(n));
const char expected[] = const char expected[] =
"ERROR: Numerical method failed on all combinations of convergence parameters\n"; "ERROR: Numerical method failed on all combinations of convergence parameters, cell/soln/mix 1\n";
const char* err = ::GetErrorString(n); const char* err = ::GetErrorString(n);
CPPUNIT_ASSERT_EQUAL( std::string(expected), std::string(err) ); CPPUNIT_ASSERT_EQUAL( std::string(expected), std::string(err) );
@ -334,7 +334,7 @@ void TestIPhreeqcLib::TestRunFile(void)
CPPUNIT_ASSERT_EQUAL(1, ::RunFile(n, "conv_fail.in")); CPPUNIT_ASSERT_EQUAL(1, ::RunFile(n, "conv_fail.in"));
static const char expected[] = static const char expected[] =
"ERROR: Numerical method failed on all combinations of convergence parameters\n"; "ERROR: Numerical method failed on all combinations of convergence parameters, cell/soln/mix 1\n";
const char* err = ::GetErrorString(n); const char* err = ::GetErrorString(n);
CPPUNIT_ASSERT_EQUAL(std::string(expected), std::string(err)); CPPUNIT_ASSERT_EQUAL(std::string(expected), std::string(err));
@ -2254,7 +2254,7 @@ void TestIPhreeqcLib::TestClearAccumulatedLines(void)
CPPUNIT_ASSERT_EQUAL(1, ::GetErrorStringLineCount(id)); CPPUNIT_ASSERT_EQUAL(1, ::GetErrorStringLineCount(id));
const char expected[] = const char expected[] =
"ERROR: Numerical method failed on all combinations of convergence parameters\n"; "ERROR: Numerical method failed on all combinations of convergence parameters, cell/soln/mix 1\n";
const char* err = ::GetErrorString(id); const char* err = ::GetErrorString(id);
CPPUNIT_ASSERT_EQUAL( std::string(expected), std::string(err) ); CPPUNIT_ASSERT_EQUAL( std::string(expected), std::string(err) );
@ -3147,10 +3147,10 @@ void TestIPhreeqcLib::TestSetErrorFileName(void)
CPPUNIT_ASSERT_EQUAL( (size_t)84, i ); CPPUNIT_ASSERT_EQUAL( (size_t)84, i );
} }
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Maximum iterations exceeded, 100"), lines[0] ); CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Maximum iterations exceeded, 100"), lines[0] );
CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Numerical method failed with this set of convergence parameters."), lines[2] ); CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Numerical method failed with this set of convergence parameters."), lines[2] );
CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Numerical method failed on all combinations of convergence parameters"), lines[82] ); CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Numerical method failed on all combinations of convergence parameters, cell/soln/mix 1"), lines[82] );
CPPUNIT_ASSERT_EQUAL( std::string("Stopping."), lines[83] ); CPPUNIT_ASSERT_EQUAL( std::string("Stopping."), lines[83] );
if (::FileExists(ERR_FILENAME)) if (::FileExists(ERR_FILENAME))
{ {
@ -3228,7 +3228,7 @@ void TestIPhreeqcLib::TestGetErrorString(void)
std::ifstream ifs(ERR_FILENAME); std::ifstream ifs(ERR_FILENAME);
std::string fline((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>()); std::string fline((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
#else #else
std::string fline("ERROR: Numerical method failed on all combinations of convergence parameters\n"); std::string fline("ERROR: Numerical method failed on all combinations of convergence parameters, cell/soln/mix 1\n");
#endif #endif
std::string sline(::GetErrorString(n)); std::string sline(::GetErrorString(n));