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

updated for new error handling;

Browse Source 
updated cppunit to 1.13.2 on windows for jenkins

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10594 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2015-12-19 01:43:26 +00:00
parent 863997d3ae
commit 83a471ba07
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unit/TestIPhreeqc.cpp
View File

@ -2763,7 +2763,7 @@ void TestIPhreeqc::TestGetLogStringLine(void)
void TestIPhreeqc::TestSetErrorFileName(void)
{
char ERR_FILENAME[80];
sprintf(ERR_FILENAME, "error.%06d.out", ::rand());
sprintf(ERR_FILENAME, "error.%s.out", "TestIPhreeqc-TestSetErrorFileName");
if (::FileExists(ERR_FILENAME))
{
::DeleteFile(ERR_FILENAME);
@ -2802,18 +2802,18 @@ void TestIPhreeqc::TestSetErrorFileName(void)
std::ifstream ifs(ERR_FILENAME);
size_t i = 0;
while (i < sizeof(lines)/sizeof(lines[0]) && std::getline(ifs, lines[i]))
while (i < sizeof(lines)/sizeof(lines[0]) && std::getline(ifs, lines[i%100]))
{
++i;
}
CPPUNIT_ASSERT_EQUAL( (size_t)84, i );
CPPUNIT_ASSERT_EQUAL( (size_t)90, i );
}
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("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("ERROR: Numerical method failed on all combinations of convergence parameters, cell/soln/mix 1"), lines[88] );
CPPUNIT_ASSERT_EQUAL( std::string("Stopping."), lines[89] );
if (::FileExists(ERR_FILENAME))
{

8
unit/TestIPhreeqcLib.cpp
View File

@ -3131,7 +3131,7 @@ void TestIPhreeqcLib::TestGetLogStringLine(void)
void TestIPhreeqcLib::TestSetErrorFileName(void)
{
char ERR_FILENAME[80];
sprintf(ERR_FILENAME, "error.%06d.out", ::rand());
sprintf(ERR_FILENAME, "error.%s.out", "TestIPhreeqcLib-TestSetErrorFileName");
if (::FileExists(ERR_FILENAME))
{
::DeleteFile(ERR_FILENAME);
@ -3177,13 +3177,13 @@ void TestIPhreeqcLib::TestSetErrorFileName(void)
++i;
}
CPPUNIT_ASSERT_EQUAL( (size_t)84, i );
CPPUNIT_ASSERT_EQUAL( (size_t)90, i );
}
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("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("ERROR: Numerical method failed on all combinations of convergence parameters, cell/soln/mix 1"), lines[88] );
CPPUNIT_ASSERT_EQUAL( std::string("Stopping."), lines[89] );
if (::FileExists(ERR_FILENAME))
{

8
unit/unit.vcproj
View File

@ -48,7 +48,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(DEV_CPPUNIT_1_10)/include&quot;;../src;../src/phreeqcpp;../src/phreeqcpp/common;../src/phreeqcpp/PhreeqcKeywords"
AdditionalIncludeDirectories="&quot;$(DEV_CPPUNIT_VS2005)/include&quot;;../src;../src/phreeqcpp;../src/phreeqcpp/common;../src/phreeqcpp/PhreeqcKeywords"
PreprocessorDefinitions="CPPUNIT;WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -75,7 +75,7 @@
AdditionalDependencies="cppunitd.lib odbc32.lib odbccp32.lib Shlwapi.lib"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(DEV_CPPUNIT_1_10)/lib"
AdditionalLibraryDirectories="&quot;$(DEV_CPPUNIT_VS2005)/lib&quot;"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@ -212,7 +212,7 @@
AdditionalOptions="/MP"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="&quot;$(DEV_CPPUNIT_1_10)/include&quot;;../src;../src/phreeqcpp;../src/phreeqcpp/common;../src/phreeqcpp/PhreeqcKeywords"
AdditionalIncludeDirectories="&quot;$(DEV_CPPUNIT_VS2005)/include&quot;;../src;../src/phreeqcpp;../src/phreeqcpp/common;../src/phreeqcpp/PhreeqcKeywords"
PreprocessorDefinitions="CPPUNIT;WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
@ -237,7 +237,7 @@
AdditionalDependencies="cppunit.lib odbc32.lib odbccp32.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(DEV_CPPUNIT_1_10)/lib"
AdditionalLibraryDirectories="&quot;$(DEV_CPPUNIT_VS2005)/lib&quot;"
SubSystem="1"
TargetMachine="1"
/>