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

added standard return values

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4356 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-05-10 01:06:08 +00:00
parent 0afbe0bc72
commit 34ddf3b190
4 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/IPhreeqc.h
View File

@ -1,3 +1,6 @@
/*! @file IPhreeqc.h
@brief C/Fortran Documentation
*/
#ifndef INC_IPHREEQC_H #ifndef INC_IPHREEQC_H
#define INC_IPHREEQC_H #define INC_IPHREEQC_H

4
include/IPhreeqc.hpp
View File

@ -1,3 +1,7 @@
/*! @file IPhreeqc.hpp
@brief C++ Documentation
*/
#ifndef INC_IPHREEQC_HPP #ifndef INC_IPHREEQC_HPP
#define INC_IPHREEQC_HPP #define INC_IPHREEQC_HPP

3
include/Var.h
View File

@ -1,3 +1,6 @@
/*! @file Var.h
@brief %IPhreeqc VARIANT Documentation
*/
// Var.h // Var.h
#ifndef __VAR_H_INC #ifndef __VAR_H_INC

40
tests/test_cxx.cxx
View File

@ -23,20 +23,20 @@ public:
} }
(*_p.*_set)(true); (*_p.*_set)(true);
if (!(*_p.*_get)()) if (!(*_p.*_get)())
{ {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
(*_p.*_set)(false); (*_p.*_set)(false);
if ((*_p.*_get)()) if ((*_p.*_get)())
{ {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
return 0; return EXIT_SUCCESS;
} }
}; };
@ -44,60 +44,60 @@ int
main(int argc, const char* argv[]) main(int argc, const char* argv[])
{ {
IPhreeqc iphreeqc; IPhreeqc iphreeqc;
// Dump // Dump
TTestGetSet<IPhreeqc> testDump(&iphreeqc, &IPhreeqc::GetDumpOn, &IPhreeqc::SetDumpOn); TTestGetSet<IPhreeqc> testDump(&iphreeqc, &IPhreeqc::GetDumpOn, &IPhreeqc::SetDumpOn);
if (testDump.Test() != 0) if (testDump.Test() != EXIT_SUCCESS)
{ {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
// Dump string // Dump string
TTestGetSet<IPhreeqc> testDumpString(&iphreeqc, &IPhreeqc::GetDumpStringOn, &IPhreeqc::SetDumpStringOn); TTestGetSet<IPhreeqc> testDumpString(&iphreeqc, &IPhreeqc::GetDumpStringOn, &IPhreeqc::SetDumpStringOn);
if (testDumpString.Test() != 0) if (testDumpString.Test() != EXIT_SUCCESS)
{ {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
// Error // Error
TTestGetSet<IPhreeqc> testError(&iphreeqc, &IPhreeqc::GetErrorOn, &IPhreeqc::SetErrorOn); TTestGetSet<IPhreeqc> testError(&iphreeqc, &IPhreeqc::GetErrorOn, &IPhreeqc::SetErrorOn);
if (testError.Test() != 0) if (testError.Test() != EXIT_SUCCESS)
{ {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
// Log // Log
TTestGetSet<IPhreeqc> testLog(&iphreeqc, &IPhreeqc::GetLogOn, &IPhreeqc::SetLogOn); TTestGetSet<IPhreeqc> testLog(&iphreeqc, &IPhreeqc::GetLogOn, &IPhreeqc::SetLogOn);
if (testLog.Test() != 0) if (testLog.Test() != EXIT_SUCCESS)
{ {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
// Output // Output
TTestGetSet<IPhreeqc> testOutput(&iphreeqc, &IPhreeqc::GetOutputOn, &IPhreeqc::SetOutputOn); TTestGetSet<IPhreeqc> testOutput(&iphreeqc, &IPhreeqc::GetOutputOn, &IPhreeqc::SetOutputOn);
if (testOutput.Test() != 0) if (testOutput.Test() != EXIT_SUCCESS)
{ {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
// Selected output // Selected output
TTestGetSet<IPhreeqc> testSelectedOutput(&iphreeqc, &IPhreeqc::GetSelectedOutputOn, &IPhreeqc::SetSelectedOutputOn); TTestGetSet<IPhreeqc> testSelectedOutput(&iphreeqc, &IPhreeqc::GetSelectedOutputOn, &IPhreeqc::SetSelectedOutputOn);
if (testSelectedOutput.Test() != 0) if (testSelectedOutput.Test() != EXIT_SUCCESS)
{ {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (iphreeqc.LoadDatabase("phreeqc.dat") != 0) if (iphreeqc.LoadDatabase("phreeqc.dat") != 0)
{ {
std::cout << iphreeqc.GetErrorString(); std::cout << iphreeqc.GetErrorString();
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (iphreeqc.RunFile("ex1") != 0) if (iphreeqc.RunFile("ex1") != 0)
{ {
std::cout << iphreeqc.GetErrorString(); std::cout << iphreeqc.GetErrorString();
return EXIT_FAILURE; return EXIT_FAILURE;
} }
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }