diff --git a/IPhreeqc.2005.vcproj b/IPhreeqc.2005.vcproj index 6589c68e..b91a232f 100644 --- a/IPhreeqc.2005.vcproj +++ b/IPhreeqc.2005.vcproj @@ -47,7 +47,7 @@ AdditionalOptions="/MP" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories="src;src/phreeqcpp" PreprocessorDefinitions="NDEBUG;WIN32;_LIB" StringPooling="true" RuntimeLibrary="0" @@ -120,7 +120,7 @@ AdditionalOptions="/MP" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories="src;src/phreeqcpp" PreprocessorDefinitions="NDEBUG;WIN32;_LIB" StringPooling="true" RuntimeLibrary="0" @@ -191,7 +191,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories="src;src/phreeqcpp" PreprocessorDefinitions="_DEBUG;WIN32;_LIB" MinimalRebuild="false" BasicRuntimeChecks="3" @@ -265,7 +265,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories="src;src/phreeqcpp" PreprocessorDefinitions="_DEBUG;WIN32;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -339,7 +339,7 @@ AdditionalOptions="/MP" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories="src;src/phreeqcpp" PreprocessorDefinitions="NDEBUG;WIN32;_LIB" StringPooling="true" RuntimeLibrary="2" @@ -422,7 +422,7 @@ AdditionalOptions="/MP" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories="src;src/phreeqcpp" PreprocessorDefinitions="NDEBUG;WIN32;_LIB" StringPooling="true" RuntimeLibrary="2" @@ -503,7 +503,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories="src;src/phreeqcpp" PreprocessorDefinitions="_DEBUG;WIN32;_LIB" MinimalRebuild="false" BasicRuntimeChecks="3" @@ -587,7 +587,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories="src;src/phreeqcpp" PreprocessorDefinitions="_DEBUG;WIN32;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -672,7 +672,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories="src;src/phreeqcpp" PreprocessorDefinitions="_DEBUG;WIN32;_LIB;MULTICHART" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -758,7 +758,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories="src;src/phreeqcpp" PreprocessorDefinitions="_DEBUG;WIN32;_LIB;MULTICHART" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -845,7 +845,7 @@ AdditionalOptions="/MP" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories="src;src/phreeqcpp" PreprocessorDefinitions="NDEBUG;WIN32;_LIB;MULTICHART" StringPooling="true" RuntimeLibrary="2" @@ -929,7 +929,7 @@ AdditionalOptions="/MP" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories="src;src/phreeqcpp" PreprocessorDefinitions="NDEBUG;WIN32;_LIB;MULTICHART" StringPooling="true" RuntimeLibrary="2" @@ -984,7 +984,7 @@ @@ -1495,11 +1495,11 @@ > @@ -1077,11 +1077,11 @@ > + @@ -491,42 +491,42 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -539,11 +539,11 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb" - - + + - + @@ -551,37 +551,37 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb" - - - + + + - + - - - - + + + + - + - - - + + + - + @@ -589,8 +589,8 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb" - - + + diff --git a/IPhreeqc.vcxproj.filters b/IPhreeqc.vcxproj.filters index 5150253d..7503399c 100644 --- a/IPhreeqc.vcxproj.filters +++ b/IPhreeqc.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -152,112 +152,112 @@ Source Files\phreeqcpp - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc - + Source Files\phreeqcpp\phreeqc @@ -280,10 +280,10 @@ Header Files - + Header Files - + Header Files @@ -292,7 +292,7 @@ Header Files - + Header Files @@ -316,13 +316,13 @@ Header Files - + Header Files - + Header Files - + Header Files @@ -334,7 +334,7 @@ Header Files - + Header Files @@ -346,16 +346,16 @@ Header Files - + Header Files - + Header Files - + Header Files - + Header Files @@ -364,7 +364,7 @@ Header Files - + Header Files @@ -379,13 +379,13 @@ Header Files - + Header Files - + Header Files - + Header Files @@ -406,7 +406,7 @@ Header Files - + Header Files @@ -430,10 +430,10 @@ Header Files - + Header Files - + Header Files diff --git a/unit/TestIPhreeqc.cpp b/unit/TestIPhreeqc.cpp index b63720e4..ec1fbdbc 100644 --- a/unit/TestIPhreeqc.cpp +++ b/unit/TestIPhreeqc.cpp @@ -1591,7 +1591,7 @@ void TestIPhreeqc::TestDatabaseKeyword() CPPUNIT_ASSERT_EQUAL(1, obj.RunFile("dump")); const char *expected = - "ERROR: Gas not found in PHASES data base, Amm(g).\n" + "ERROR: Gas not found in PHASES database, Amm(g).\n" "ERROR: Calculations terminating due to input errors.\n"; const char* err = obj.GetErrorString(); diff --git a/unit/TestIPhreeqcLib.cpp b/unit/TestIPhreeqcLib.cpp index 007cbae8..4609e460 100644 --- a/unit/TestIPhreeqcLib.cpp +++ b/unit/TestIPhreeqcLib.cpp @@ -1703,7 +1703,7 @@ void TestIPhreeqcLib::TestDatabaseKeyword() CPPUNIT_ASSERT_EQUAL( 1, ::RunFile(n, "dump")); const char *exp_errs = - "ERROR: Gas not found in PHASES data base, Amm(g).\n" + "ERROR: Gas not found in PHASES database, Amm(g).\n" "ERROR: Calculations terminating due to input errors.\n"; const char* err = ::GetErrorString(n); @@ -2050,7 +2050,7 @@ void TestIPhreeqcLib::TestGetErrorStringLine(void) CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 100."), std::string(::GetErrorStringLine(n, line++)) ); CPPUNIT_ASSERT_EQUAL( std::string("WARNING: No dispersivities were read; disp = 0 assumed."), std::string(::GetErrorStringLine(n, line++)) ); #endif - CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Gas not found in PHASES data base, Amm(g)."), std::string(::GetErrorStringLine(n, line++)) ); + CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Gas not found in PHASES database, Amm(g)."), std::string(::GetErrorStringLine(n, line++)) ); #if 0 CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Could not find element in database, Amm."), std::string(::GetErrorStringLine(n, line++)) ); CPPUNIT_ASSERT_EQUAL( std::string("\tConcentration is set to zero."), std::string(::GetErrorStringLine(n, line++)) ); @@ -2102,7 +2102,7 @@ void TestIPhreeqcLib::TestErrorFileOn(void) CPPUNIT_ASSERT_EQUAL( std::string("WARNING: DATABASE keyword is ignored by IPhreeqc."), lines[0] ); CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 100."), lines[1] ); CPPUNIT_ASSERT_EQUAL( std::string("WARNING: No dispersivities were read; disp = 0 assumed."), lines[2] ); - CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Gas not found in PHASES data base, Amm(g)."), lines[3] ); + CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Gas not found in PHASES database, Amm(g)."), lines[3] ); CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Could not find element in database, Amm."), lines[4] ); CPPUNIT_ASSERT_EQUAL( std::string("\tConcentration is set to zero."), lines[5] ); CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Calculations terminating due to input errors."), lines[6] ); @@ -2152,7 +2152,7 @@ void TestIPhreeqcLib::TestLogFileOn(void) CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 100."), lines[0] ); CPPUNIT_ASSERT_EQUAL( std::string("WARNING: No dispersivities were read; disp = 0 assumed."), lines[1] ); - CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Gas not found in PHASES data base, Amm(g)."), lines[2] ); + CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Gas not found in PHASES database, Amm(g)."), lines[2] ); CPPUNIT_ASSERT_EQUAL( std::string("WARNING: Could not find element in database, Amm."), lines[3] ); CPPUNIT_ASSERT_EQUAL( std::string("\tConcentration is set to zero."), lines[4] ); CPPUNIT_ASSERT_EQUAL( std::string("ERROR: Calculations terminating due to input errors."), lines[5] ); @@ -3882,29 +3882,29 @@ void TestIPhreeqcLib::TestBasicSURF(void) void TestIPhreeqcLib::TestIEEE(void) { - int n = ::CreateIPhreeqc(); - CPPUNIT_ASSERT(n >= 0); - - CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "wateq4f.dat") ); - //CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "cdmusic_hiemstra.dat") ); - //::LoadDatabase(n, "cdmusic_hiemstra.dat"); - //const char* errdb = ::GetErrorString(n); - //fprintf(stderr, "%s\n", errdb); - - CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetOutputFileOn(n, 0) ); - CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetOutputStringOn(n, 0) ); - CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetErrorFileOn(n, 0) ); - CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetLogFileOn(n, 0) ); - CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetSelectedOutputFileOn(n, 0) ); - CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpStringOn(n, 0) ); - CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpFileOn(n, 0) ); - - ::RunFile(n, "IEEE"); - const char* err = ::GetErrorString(n); - fprintf(stderr, "%s\n", err); - - if (n >= 0) - { - CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::DestroyIPhreeqc(n)); - } +// COMMENT: {1/18/2013 6:34:57 PM} int n = ::CreateIPhreeqc(); +// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT(n >= 0); +// COMMENT: {1/18/2013 6:34:57 PM} +// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "wateq4f.dat") ); +// COMMENT: {1/18/2013 6:34:57 PM} //CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "cdmusic_hiemstra.dat") ); +// COMMENT: {1/18/2013 6:34:57 PM} //::LoadDatabase(n, "cdmusic_hiemstra.dat"); +// COMMENT: {1/18/2013 6:34:57 PM} //const char* errdb = ::GetErrorString(n); +// COMMENT: {1/18/2013 6:34:57 PM} //fprintf(stderr, "%s\n", errdb); +// COMMENT: {1/18/2013 6:34:57 PM} +// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetOutputFileOn(n, 0) ); +// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetOutputStringOn(n, 0) ); +// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetErrorFileOn(n, 0) ); +// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetLogFileOn(n, 0) ); +// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetSelectedOutputFileOn(n, 0) ); +// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpStringOn(n, 0) ); +// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SetDumpFileOn(n, 0) ); +// COMMENT: {1/18/2013 6:34:57 PM} +// COMMENT: {1/18/2013 6:34:57 PM} ::RunFile(n, "IEEE"); +// COMMENT: {1/18/2013 6:34:57 PM} const char* err = ::GetErrorString(n); +// COMMENT: {1/18/2013 6:34:57 PM} fprintf(stderr, "%s\n", err); +// COMMENT: {1/18/2013 6:34:57 PM} +// COMMENT: {1/18/2013 6:34:57 PM} if (n >= 0) +// COMMENT: {1/18/2013 6:34:57 PM} { +// COMMENT: {1/18/2013 6:34:57 PM} CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::DestroyIPhreeqc(n)); +// COMMENT: {1/18/2013 6:34:57 PM} } } diff --git a/unit/TestIPhreeqcLib.h b/unit/TestIPhreeqcLib.h index b8c5c995..8da6c2db 100644 --- a/unit/TestIPhreeqcLib.h +++ b/unit/TestIPhreeqcLib.h @@ -7,68 +7,68 @@ class TestIPhreeqcLib : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE( TestIPhreeqcLib ); - //CPPUNIT_TEST( TestCreateIPhreeqc ); - //CPPUNIT_TEST( TestDestroyIPhreeqc ); - //CPPUNIT_TEST( TestLoadDatabase ); - //CPPUNIT_TEST( TestLoadDatabaseString ); - //CPPUNIT_TEST( TestLoadDatabaseMissingFile ); - //CPPUNIT_TEST( TestLoadDatabaseWithErrors ); - //CPPUNIT_TEST( TestRunAccumulated ); - //CPPUNIT_TEST( TestRunWithErrors ); - //CPPUNIT_TEST( TestRunFile ); - //CPPUNIT_TEST( TestRunString ); - //CPPUNIT_TEST( TestGetSelectedOutputRowCount ); - //CPPUNIT_TEST( TestGetSelectedOutputValue ); - //CPPUNIT_TEST( TestGetSelectedOutputColumnCount ); - //CPPUNIT_TEST( TestAddError ); - //CPPUNIT_TEST( TestAccumulateLine ); - //CPPUNIT_TEST( TestOutputErrorString ); - //CPPUNIT_TEST( TestRunWithCallback ); - //CPPUNIT_TEST( TestRunNoDatabaseLoaded ); - //CPPUNIT_TEST( TestCase1 ); - //CPPUNIT_TEST( TestCase2 ); - //CPPUNIT_TEST( TestPrintSelectedOutputFalse ); - //CPPUNIT_TEST( TestOutputFileOnOff ); - //CPPUNIT_TEST( TestErrorFileOnOff ); - //CPPUNIT_TEST( TestLogFileOnOff ); - //CPPUNIT_TEST( TestDumpFileOnOff ); - //CPPUNIT_TEST( TestSelOutFileOnOff ); - //CPPUNIT_TEST( TestLongHeadings ); - //CPPUNIT_TEST( TestDatabaseKeyword ); - //CPPUNIT_TEST( TestDumpString ); - //CPPUNIT_TEST( TestGetDumpStringLineCount ); - //CPPUNIT_TEST( TestGetDumpStringLine ); - //CPPUNIT_TEST( TestGetComponentCount ); - //CPPUNIT_TEST( TestGetComponent ); - //CPPUNIT_TEST( TestGetErrorStringLine ); - //CPPUNIT_TEST( TestErrorFileOn ); - //CPPUNIT_TEST( TestLogFileOn ); - //CPPUNIT_TEST( TestGetWarningStringLine ); - //CPPUNIT_TEST( TestPitzer ); - //CPPUNIT_TEST( TestClearAccumulatedLines ); - //CPPUNIT_TEST( TestSetDumpFileName ); - //CPPUNIT_TEST( TestSetOutputFileName ); - //CPPUNIT_TEST( TestOutputStringOnOff ); - //CPPUNIT_TEST( TestGetOutputString ); - //CPPUNIT_TEST( TestGetOutputStringLineCount ); - //CPPUNIT_TEST( TestGetOutputStringLine ); - //CPPUNIT_TEST( TestSetLogFileName ); - //CPPUNIT_TEST( TestLogStringOnOff ); - //CPPUNIT_TEST( TestGetLogString ); - //CPPUNIT_TEST( TestGetLogStringLineCount ); - //CPPUNIT_TEST( TestGetLogStringLine ); - //CPPUNIT_TEST( TestSetErrorFileName ); - //CPPUNIT_TEST( TestErrorStringOnOff ); - //CPPUNIT_TEST( TestGetErrorString ); - //CPPUNIT_TEST( TestGetErrorStringLineCount ); - //CPPUNIT_TEST( TestSetSelectedOutputFileName ); - //CPPUNIT_TEST( TestSelectedOutputStringOnOff ); - //CPPUNIT_TEST( TestGetSelectedOutputString ); - //CPPUNIT_TEST( TestGetSelectedOutputStringLineCount ); - //CPPUNIT_TEST( TestGetSelectedOutputStringLine ); - //CPPUNIT_TEST( TestGetSelectedOutputStringLineNotEnoughHeadings ); - //CPPUNIT_TEST( TestLongUser_Punch ); - //CPPUNIT_TEST( TestBasicSURF ); + CPPUNIT_TEST( TestCreateIPhreeqc ); + CPPUNIT_TEST( TestDestroyIPhreeqc ); + CPPUNIT_TEST( TestLoadDatabase ); + CPPUNIT_TEST( TestLoadDatabaseString ); + CPPUNIT_TEST( TestLoadDatabaseMissingFile ); + CPPUNIT_TEST( TestLoadDatabaseWithErrors ); + CPPUNIT_TEST( TestRunAccumulated ); + CPPUNIT_TEST( TestRunWithErrors ); + CPPUNIT_TEST( TestRunFile ); + CPPUNIT_TEST( TestRunString ); + CPPUNIT_TEST( TestGetSelectedOutputRowCount ); + CPPUNIT_TEST( TestGetSelectedOutputValue ); + CPPUNIT_TEST( TestGetSelectedOutputColumnCount ); + CPPUNIT_TEST( TestAddError ); + CPPUNIT_TEST( TestAccumulateLine ); + CPPUNIT_TEST( TestOutputErrorString ); + CPPUNIT_TEST( TestRunWithCallback ); + CPPUNIT_TEST( TestRunNoDatabaseLoaded ); + CPPUNIT_TEST( TestCase1 ); + CPPUNIT_TEST( TestCase2 ); + CPPUNIT_TEST( TestPrintSelectedOutputFalse ); + CPPUNIT_TEST( TestOutputFileOnOff ); + CPPUNIT_TEST( TestErrorFileOnOff ); + CPPUNIT_TEST( TestLogFileOnOff ); + CPPUNIT_TEST( TestDumpFileOnOff ); + CPPUNIT_TEST( TestSelOutFileOnOff ); + CPPUNIT_TEST( TestLongHeadings ); + CPPUNIT_TEST( TestDatabaseKeyword ); + CPPUNIT_TEST( TestDumpString ); + CPPUNIT_TEST( TestGetDumpStringLineCount ); + CPPUNIT_TEST( TestGetDumpStringLine ); + CPPUNIT_TEST( TestGetComponentCount ); + CPPUNIT_TEST( TestGetComponent ); + CPPUNIT_TEST( TestGetErrorStringLine ); + CPPUNIT_TEST( TestErrorFileOn ); + CPPUNIT_TEST( TestLogFileOn ); + CPPUNIT_TEST( TestGetWarningStringLine ); + CPPUNIT_TEST( TestPitzer ); + CPPUNIT_TEST( TestClearAccumulatedLines ); + CPPUNIT_TEST( TestSetDumpFileName ); + CPPUNIT_TEST( TestSetOutputFileName ); + CPPUNIT_TEST( TestOutputStringOnOff ); + CPPUNIT_TEST( TestGetOutputString ); + CPPUNIT_TEST( TestGetOutputStringLineCount ); + CPPUNIT_TEST( TestGetOutputStringLine ); + CPPUNIT_TEST( TestSetLogFileName ); + CPPUNIT_TEST( TestLogStringOnOff ); + CPPUNIT_TEST( TestGetLogString ); + CPPUNIT_TEST( TestGetLogStringLineCount ); + CPPUNIT_TEST( TestGetLogStringLine ); + CPPUNIT_TEST( TestSetErrorFileName ); + CPPUNIT_TEST( TestErrorStringOnOff ); + CPPUNIT_TEST( TestGetErrorString ); + CPPUNIT_TEST( TestGetErrorStringLineCount ); + CPPUNIT_TEST( TestSetSelectedOutputFileName ); + CPPUNIT_TEST( TestSelectedOutputStringOnOff ); + CPPUNIT_TEST( TestGetSelectedOutputString ); + CPPUNIT_TEST( TestGetSelectedOutputStringLineCount ); + CPPUNIT_TEST( TestGetSelectedOutputStringLine ); + CPPUNIT_TEST( TestGetSelectedOutputStringLineNotEnoughHeadings ); + CPPUNIT_TEST( TestLongUser_Punch ); + CPPUNIT_TEST( TestBasicSURF ); CPPUNIT_TEST( TestIEEE ); CPPUNIT_TEST_SUITE_END(); diff --git a/unit/unit.cpp b/unit/unit.cpp index 9ba58f4c..012fbcc9 100644 --- a/unit/unit.cpp +++ b/unit/unit.cpp @@ -75,10 +75,10 @@ int main(int argc, char **argv) s.startTimer(); #endif - //runner.addTest(TestVar::suite()); - //runner.addTest(TestCVar::suite()); - //runner.addTest(TestSelectedOutput::suite()); - //runner.addTest(TestIPhreeqc::suite()); + runner.addTest(TestVar::suite()); + runner.addTest(TestCVar::suite()); + runner.addTest(TestSelectedOutput::suite()); + runner.addTest(TestIPhreeqc::suite()); runner.addTest(TestIPhreeqcLib::suite()); runner.setOutputter(CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cout)); diff --git a/unit/unit.vcproj b/unit/unit.vcproj index 50de04ab..460e7e3d 100644 --- a/unit/unit.vcproj +++ b/unit/unit.vcproj @@ -48,7 +48,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp;../src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp" PreprocessorDefinitions="CPPUNIT;WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -133,7 +133,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp;../src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp" PreprocessorDefinitions="CPPUNIT;WIN32;_DEBUG;_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -212,7 +212,7 @@ AdditionalOptions="/MP" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp;../src/phreeqcpp/phreeqc" + AdditionalIncludeDirectories=""$(DEV_CPPUNIT_1_10)/include";../src;../src/phreeqcpp" PreprocessorDefinitions="CPPUNIT;WIN32;NDEBUG;_CONSOLE" StringPooling="true" RuntimeLibrary="2" @@ -295,7 +295,7 @@ @@ -748,19 +748,19 @@ Name="phreeqc" >