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

added ieee test based on kinn email 12/12/12

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7214 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2012-12-15 04:47:16 +00:00
parent 28bc7154ae
commit 5a5a449688
3 changed files with 98 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
unit/TestIPhreeqcLib.cpp
View File

@ -3878,4 +3878,33 @@ void TestIPhreeqcLib::TestBasicSURF(void)
{ {
CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::DestroyIPhreeqc(n)); CPPUNIT_ASSERT_EQUAL(IPQ_OK, ::DestroyIPhreeqc(n));
} }
} }
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));
}
}

126
unit/TestIPhreeqcLib.h
View File

@ -7,68 +7,69 @@
class TestIPhreeqcLib : public CppUnit::TestFixture class TestIPhreeqcLib : public CppUnit::TestFixture
{ {
CPPUNIT_TEST_SUITE( TestIPhreeqcLib ); CPPUNIT_TEST_SUITE( TestIPhreeqcLib );
CPPUNIT_TEST( TestCreateIPhreeqc ); //CPPUNIT_TEST( TestCreateIPhreeqc );
CPPUNIT_TEST( TestDestroyIPhreeqc ); //CPPUNIT_TEST( TestDestroyIPhreeqc );
CPPUNIT_TEST( TestLoadDatabase ); //CPPUNIT_TEST( TestLoadDatabase );
CPPUNIT_TEST( TestLoadDatabaseString ); //CPPUNIT_TEST( TestLoadDatabaseString );
CPPUNIT_TEST( TestLoadDatabaseMissingFile ); //CPPUNIT_TEST( TestLoadDatabaseMissingFile );
CPPUNIT_TEST( TestLoadDatabaseWithErrors ); //CPPUNIT_TEST( TestLoadDatabaseWithErrors );
CPPUNIT_TEST( TestRunAccumulated ); //CPPUNIT_TEST( TestRunAccumulated );
CPPUNIT_TEST( TestRunWithErrors ); //CPPUNIT_TEST( TestRunWithErrors );
CPPUNIT_TEST( TestRunFile ); //CPPUNIT_TEST( TestRunFile );
CPPUNIT_TEST( TestRunString ); //CPPUNIT_TEST( TestRunString );
CPPUNIT_TEST( TestGetSelectedOutputRowCount ); //CPPUNIT_TEST( TestGetSelectedOutputRowCount );
CPPUNIT_TEST( TestGetSelectedOutputValue ); //CPPUNIT_TEST( TestGetSelectedOutputValue );
CPPUNIT_TEST( TestGetSelectedOutputColumnCount ); //CPPUNIT_TEST( TestGetSelectedOutputColumnCount );
CPPUNIT_TEST( TestAddError ); //CPPUNIT_TEST( TestAddError );
CPPUNIT_TEST( TestAccumulateLine ); //CPPUNIT_TEST( TestAccumulateLine );
CPPUNIT_TEST( TestOutputErrorString ); //CPPUNIT_TEST( TestOutputErrorString );
CPPUNIT_TEST( TestRunWithCallback ); //CPPUNIT_TEST( TestRunWithCallback );
CPPUNIT_TEST( TestRunNoDatabaseLoaded ); //CPPUNIT_TEST( TestRunNoDatabaseLoaded );
CPPUNIT_TEST( TestCase1 ); //CPPUNIT_TEST( TestCase1 );
CPPUNIT_TEST( TestCase2 ); //CPPUNIT_TEST( TestCase2 );
CPPUNIT_TEST( TestPrintSelectedOutputFalse ); //CPPUNIT_TEST( TestPrintSelectedOutputFalse );
CPPUNIT_TEST( TestOutputFileOnOff ); //CPPUNIT_TEST( TestOutputFileOnOff );
CPPUNIT_TEST( TestErrorFileOnOff ); //CPPUNIT_TEST( TestErrorFileOnOff );
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 );
CPPUNIT_TEST( TestGetDumpStringLine ); //CPPUNIT_TEST( TestGetDumpStringLine );
CPPUNIT_TEST( TestGetComponentCount ); //CPPUNIT_TEST( TestGetComponentCount );
CPPUNIT_TEST( TestGetComponent ); //CPPUNIT_TEST( TestGetComponent );
CPPUNIT_TEST( TestGetErrorStringLine ); //CPPUNIT_TEST( TestGetErrorStringLine );
CPPUNIT_TEST( TestErrorFileOn ); //CPPUNIT_TEST( TestErrorFileOn );
CPPUNIT_TEST( TestLogFileOn ); //CPPUNIT_TEST( TestLogFileOn );
CPPUNIT_TEST( TestGetWarningStringLine ); //CPPUNIT_TEST( TestGetWarningStringLine );
CPPUNIT_TEST( TestPitzer ); //CPPUNIT_TEST( TestPitzer );
CPPUNIT_TEST( TestClearAccumulatedLines ); //CPPUNIT_TEST( TestClearAccumulatedLines );
CPPUNIT_TEST( TestSetDumpFileName ); //CPPUNIT_TEST( TestSetDumpFileName );
CPPUNIT_TEST( TestSetOutputFileName ); //CPPUNIT_TEST( TestSetOutputFileName );
CPPUNIT_TEST( TestOutputStringOnOff ); //CPPUNIT_TEST( TestOutputStringOnOff );
CPPUNIT_TEST( TestGetOutputString ); //CPPUNIT_TEST( TestGetOutputString );
CPPUNIT_TEST( TestGetOutputStringLineCount ); //CPPUNIT_TEST( TestGetOutputStringLineCount );
CPPUNIT_TEST( TestGetOutputStringLine ); //CPPUNIT_TEST( TestGetOutputStringLine );
CPPUNIT_TEST( TestSetLogFileName ); //CPPUNIT_TEST( TestSetLogFileName );
CPPUNIT_TEST( TestLogStringOnOff ); //CPPUNIT_TEST( TestLogStringOnOff );
CPPUNIT_TEST( TestGetLogString ); //CPPUNIT_TEST( TestGetLogString );
CPPUNIT_TEST( TestGetLogStringLineCount ); //CPPUNIT_TEST( TestGetLogStringLineCount );
CPPUNIT_TEST( TestGetLogStringLine ); //CPPUNIT_TEST( TestGetLogStringLine );
CPPUNIT_TEST( TestSetErrorFileName ); //CPPUNIT_TEST( TestSetErrorFileName );
CPPUNIT_TEST( TestErrorStringOnOff ); //CPPUNIT_TEST( TestErrorStringOnOff );
CPPUNIT_TEST( TestGetErrorString ); //CPPUNIT_TEST( TestGetErrorString );
CPPUNIT_TEST( TestGetErrorStringLineCount ); //CPPUNIT_TEST( TestGetErrorStringLineCount );
CPPUNIT_TEST( TestSetSelectedOutputFileName ); //CPPUNIT_TEST( TestSetSelectedOutputFileName );
CPPUNIT_TEST( TestSelectedOutputStringOnOff ); //CPPUNIT_TEST( TestSelectedOutputStringOnOff );
CPPUNIT_TEST( TestGetSelectedOutputString ); //CPPUNIT_TEST( TestGetSelectedOutputString );
CPPUNIT_TEST( TestGetSelectedOutputStringLineCount ); //CPPUNIT_TEST( TestGetSelectedOutputStringLineCount );
CPPUNIT_TEST( TestGetSelectedOutputStringLine ); //CPPUNIT_TEST( TestGetSelectedOutputStringLine );
CPPUNIT_TEST( TestGetSelectedOutputStringLineNotEnoughHeadings ); //CPPUNIT_TEST( TestGetSelectedOutputStringLineNotEnoughHeadings );
CPPUNIT_TEST( TestLongUser_Punch ); //CPPUNIT_TEST( TestLongUser_Punch );
CPPUNIT_TEST( TestBasicSURF ); //CPPUNIT_TEST( TestBasicSURF );
CPPUNIT_TEST( TestIEEE );
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
public: public:
@ -138,6 +139,7 @@ public:
void TestGetSelectedOutputStringLineNotEnoughHeadings(void); void TestGetSelectedOutputStringLineNotEnoughHeadings(void);
void TestLongUser_Punch(void); void TestLongUser_Punch(void);
void TestBasicSURF(void); void TestBasicSURF(void);
void TestIEEE(void);
protected: protected:
void TestFileOnOff(const char* FILENAME, int output_file_on, int error_file_on, int log_file_on, int selected_output_file_on, int dump_file_on); void TestFileOnOff(const char* FILENAME, int output_file_on, int error_file_on, int log_file_on, int selected_output_file_on, int dump_file_on);

8
unit/unit.cpp
View File

@ -75,10 +75,10 @@ int main(int argc, char **argv)
s.startTimer(); s.startTimer();
#endif #endif
runner.addTest(TestVar::suite()); //runner.addTest(TestVar::suite());
runner.addTest(TestCVar::suite()); //runner.addTest(TestCVar::suite());
runner.addTest(TestSelectedOutput::suite()); //runner.addTest(TestSelectedOutput::suite());
runner.addTest(TestIPhreeqc::suite()); //runner.addTest(TestIPhreeqc::suite());
runner.addTest(TestIPhreeqcLib::suite()); runner.addTest(TestIPhreeqcLib::suite());
runner.setOutputter(CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cout)); runner.setOutputter(CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cout));