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 TESTING define

Browse Source
This commit is contained in:
Scott R Charlton 2021-04-08 11:21:52 -06:00
parent 2ea9dd1405
commit c4de8f2504
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtest/TestIPhreeqc.cpp
View File

@ -2204,7 +2204,11 @@ TEST(TestIPhreeqc, TestSetOutputFileName)
++i;
}
#ifndef TESTING
ASSERT_EQ((size_t)100, i);
#else
ASSERT_EQ((size_t)96, i);
#endif
int line = 0;
@ -2309,9 +2313,11 @@ TEST(TestIPhreeqc, TestSetOutputFileName)
ASSERT_TRUE(::strstr(lines[line++].c_str(), "Reading input data for simulation 2.") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "------------------------------------") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "") != NULL);
#ifndef TESTING
ASSERT_TRUE(::strstr(lines[line++].c_str(), "----------------") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "End of Run after ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "----------------") != NULL);
#endif
ASSERT_TRUE(::strstr(lines[line++].c_str(), "") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "") != NULL);
@ -2423,7 +2429,11 @@ TEST(TestIPhreeqc, TestGetOutputStringLineCount)
obj.SetOutputStringOn(true);
ASSERT_EQ(0, obj.RunAccumulated());
#ifndef TESTING
ASSERT_EQ(100, obj.GetOutputStringLineCount());
#else
ASSERT_EQ(96, obj.GetOutputStringLineCount());
#endif
// add solution block
@ -2486,7 +2496,11 @@ TEST(TestIPhreeqc, TestGetOutputStringLine)
obj.SetOutputStringOn(true);
ASSERT_EQ(0, obj.RunAccumulated());
#ifndef TESTING
ASSERT_EQ(100, obj.GetOutputStringLineCount());
#else
ASSERT_EQ(96, obj.GetOutputStringLineCount());
#endif
ASSERT_EQ(std::string("------------------------------------"), std::string(obj.GetOutputStringLine(0)));
ASSERT_EQ(std::string("Reading input data for simulation 1."), std::string(obj.GetOutputStringLine(1)));
@ -2495,8 +2509,12 @@ TEST(TestIPhreeqc, TestGetOutputStringLine)
ASSERT_EQ(std::string("----------------------------Description of solution----------------------------"), std::string(obj.GetOutputStringLine(24)));
ASSERT_EQ(std::string("----------------------------Distribution of species----------------------------"), std::string(obj.GetOutputStringLine(40)));
ASSERT_EQ(std::string("------------------------------Saturation indices-------------------------------"), std::string(obj.GetOutputStringLine(73)));
#ifndef TESTING
ASSERT_EQ(std::string("End of Run"), std::string(obj.GetOutputStringLine(97)).substr(0, 10));
ASSERT_EQ(std::string(""), std::string(obj.GetOutputStringLine(100)));
#else
ASSERT_EQ(std::string(""), std::string(obj.GetOutputStringLine(96)));
#endif
// add solution block
ASSERT_EQ(VR_OK, ::SOLUTION(obj, 1.0, 1.0, 1.0));
@ -2567,7 +2585,11 @@ TEST(TestIPhreeqc, TestSetLogFileName)
++i;
}
#ifndef TESTING
ASSERT_EQ((size_t)25, i);
#else
ASSERT_EQ((size_t)21, i);
#endif
int line = 0;
ASSERT_EQ(std::string("-------------------------------------------"), lines[line++]);
@ -2591,9 +2613,11 @@ TEST(TestIPhreeqc, TestSetLogFileName)
ASSERT_EQ(std::string("Reading input data for simulation 2."), lines[line++]);
ASSERT_EQ(std::string("------------------------------------"), lines[line++]);
ASSERT_EQ(std::string(""), lines[line++]);
#ifndef TESTING
line++;
ASSERT_EQ(std::string("End of Run"), lines[line++].substr(0, 10));
line++;
#endif
ASSERT_EQ(std::string(""), lines[line++]);
if (::FileExists(LOG_FILENAME))
@ -2715,7 +2739,11 @@ TEST(TestIPhreeqc, TestGetLogStringLineCount)
obj.SetLogStringOn(true);
ASSERT_EQ(0, obj.RunAccumulated());
#ifndef TESTING
ASSERT_EQ(29, obj.GetLogStringLineCount());
#else
ASSERT_EQ(25, obj.GetLogStringLineCount());
#endif
// add solution block
ASSERT_EQ(VR_OK, ::SOLUTION(obj, 1.0, 1.0, 1.0));
@ -2789,7 +2817,11 @@ TEST(TestIPhreeqc, TestGetLogStringLine)
obj.SetLogStringOn(true);
ASSERT_EQ(0, obj.RunAccumulated());
#ifndef TESTING
ASSERT_EQ(29, obj.GetLogStringLineCount());
#else
ASSERT_EQ(25, obj.GetLogStringLineCount());
#endif
line = 0;
ASSERT_EQ(std::string("------------------------------------"), std::string(obj.GetLogStringLine(line++)));
@ -2817,9 +2849,11 @@ TEST(TestIPhreeqc, TestGetLogStringLine)
ASSERT_EQ(std::string("Reading input data for simulation 2."), std::string(obj.GetLogStringLine(line++)));
ASSERT_EQ(std::string("------------------------------------"), std::string(obj.GetLogStringLine(line++)));
ASSERT_EQ(std::string(""), std::string(obj.GetLogStringLine(line++)));
#ifndef TESTING
ASSERT_EQ(std::string("----------"), std::string(obj.GetLogStringLine(line++)).substr(0, 10));
ASSERT_EQ(std::string("End of Run"), std::string(obj.GetLogStringLine(line++)).substr(0, 10));
ASSERT_EQ(std::string("----------"), std::string(obj.GetLogStringLine(line++)).substr(0, 10));
#endif
ASSERT_EQ(std::string(""), std::string(obj.GetLogStringLine(line++)));
// add solution block

27
gtest/TestIPhreeqcLib.cpp
View File

@ -2426,7 +2426,11 @@ TEST(TestIPhreeqcLib, TestSetOutputFileName)
++i;
}
#ifndef TESTING
ASSERT_EQ((size_t)100, i);
#else
ASSERT_EQ((size_t)96, i);
#endif
int line = 0;
@ -2526,9 +2530,11 @@ TEST(TestIPhreeqcLib, TestSetOutputFileName)
ASSERT_TRUE(::strstr(lines[line++].c_str(), "Reading input data for simulation 2.") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "------------------------------------") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "") != NULL);
#ifndef TESTING
ASSERT_TRUE(::strstr(lines[line++].c_str(), "----------------") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "End of Run after ") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "----------------") != NULL);
#endif
ASSERT_TRUE(::strstr(lines[line++].c_str(), "") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "") != NULL);
ASSERT_TRUE(::strstr(lines[line++].c_str(), "") != NULL);
@ -2657,8 +2663,11 @@ TEST(TestIPhreeqcLib, TestGetOutputStringLineCount)
ASSERT_EQ(IPQ_OK, ::SetOutputStringOn(n, 1));
ASSERT_EQ(0, ::RunAccumulated(n));
#ifndef TESTING
ASSERT_EQ(100, ::GetOutputStringLineCount(n));
#else
ASSERT_EQ(96, ::GetOutputStringLineCount(n));
#endif
// add solution block
ASSERT_EQ(IPQ_OK, ::SOLUTION(n, 1.0, 1.0, 1.0));
@ -2725,7 +2734,11 @@ TEST(TestIPhreeqcLib, TestGetOutputStringLine)
ASSERT_EQ(IPQ_OK, ::SetOutputStringOn(n, 1));
ASSERT_EQ(0, ::RunAccumulated(n));
#ifndef TESTING
ASSERT_EQ(100, ::GetOutputStringLineCount(n));
#else
ASSERT_EQ(96, ::GetOutputStringLineCount(n));
#endif
ASSERT_EQ(std::string("------------------------------------"), std::string(::GetOutputStringLine(n, 0)));
ASSERT_EQ(std::string("Reading input data for simulation 1."), std::string(::GetOutputStringLine(n, 1)));
@ -2812,7 +2825,11 @@ TEST(TestIPhreeqcLib, TestSetLogFileName)
++i;
}
#ifndef TESTING
ASSERT_EQ((size_t)25, i);
#else
ASSERT_EQ((size_t)21, i);
#endif
int line = 0;
ASSERT_EQ(std::string("-------------------------------------------"), lines[line++]);
@ -2982,7 +2999,11 @@ TEST(TestIPhreeqcLib, TestGetLogStringLineCount)
ASSERT_EQ(IPQ_OK, ::SetLogStringOn(n, 1));
ASSERT_EQ(0, ::RunAccumulated(n));
#ifndef TESTING
ASSERT_EQ(29, ::GetLogStringLineCount(n));
#else
ASSERT_EQ(25, ::GetLogStringLineCount(n));
#endif
// add solution block
ASSERT_EQ(IPQ_OK, ::SOLUTION(n, 1.0, 1.0, 1.0));
@ -3062,7 +3083,11 @@ TEST(TestIPhreeqcLib, TestGetLogStringLine)
ASSERT_EQ(IPQ_OK, ::SetLogStringOn(n, 1));
ASSERT_EQ(0, ::RunAccumulated(n));
#ifndef TESTING
ASSERT_EQ(29, ::GetLogStringLineCount(n));
#else
ASSERT_EQ(25, ::GetLogStringLineCount(n));
#endif
line = 0;
ASSERT_EQ(std::string("------------------------------------"), std::string(::GetLogStringLine(n, line++)));