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 unit tests for 3.8.3

Browse Source
This commit is contained in:
Charlton, Scott R. 2024-10-24 17:16:35 -06:00
parent a0734a1d0c
commit 2b0f329c45
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtest/TestIPhreeqc.cpp
View File

@ -1929,7 +1929,7 @@ TEST(TestIPhreeqc, TestGetDumpStringLineCount)
obj.SetDumpStringOn(true);
ASSERT_EQ(true, obj.GetDumpStringOn());
ASSERT_EQ(0, obj.RunAccumulated());
ASSERT_EQ(34, obj.GetDumpStringLineCount());
ASSERT_EQ(35, obj.GetDumpStringLineCount());
}
TEST(TestIPhreeqc, TestGetDumpStringLine)
@ -1955,7 +1955,7 @@ TEST(TestIPhreeqc, TestGetDumpStringLine)
obj.SetDumpStringOn(true);
ASSERT_EQ(true, obj.GetDumpStringOn());
ASSERT_EQ(0, obj.RunAccumulated());
ASSERT_EQ(34, obj.GetDumpStringLineCount());
ASSERT_EQ(35, obj.GetDumpStringLineCount());
int line = 0;
@ -1968,6 +1968,7 @@ TEST(TestIPhreeqc, TestGetDumpStringLine)
EXPECT_THAT(obj.GetDumpStringLine(line++), HasSubstr("-cb"));
EXPECT_THAT(obj.GetDumpStringLine(line++), HasSubstr("-density"));
EXPECT_THAT(obj.GetDumpStringLine(line++), HasSubstr("-viscosity"));
EXPECT_THAT(obj.GetDumpStringLine(line++), HasSubstr("-viscos_0"));
EXPECT_THAT(obj.GetDumpStringLine(line++), HasSubstr("-totals"));
EXPECT_THAT(obj.GetDumpStringLine(line++), HasSubstr(" C(4) "));
EXPECT_THAT(obj.GetDumpStringLine(line++), HasSubstr(" Ca "));
@ -2125,6 +2126,7 @@ TEST(TestIPhreeqc, TestSetDumpFileName)
{
++i;
}
ifs.close();
int line = 0;
EXPECT_THAT(lines[line++], HasSubstr("SOLUTION_RAW"));
@ -2136,6 +2138,7 @@ TEST(TestIPhreeqc, TestSetDumpFileName)
EXPECT_THAT(lines[line++], HasSubstr("-cb"));
EXPECT_THAT(lines[line++], HasSubstr("-density"));
EXPECT_THAT(lines[line++], HasSubstr("-viscosity"));
EXPECT_THAT(lines[line++], HasSubstr("-viscos_0"));
EXPECT_THAT(lines[line++], HasSubstr("-totals"));
EXPECT_THAT(lines[line++], HasSubstr(" C(4) "));
EXPECT_THAT(lines[line++], HasSubstr(" Ca "));

9
gtest/TestIPhreeqcLib.cpp
View File

@ -1819,7 +1819,7 @@ TEST(TestIPhreeqcLib, TestGetDumpStringLineCount)
ASSERT_EQ(IPQ_OK, ::SetDumpFileOn(n, 0));
ASSERT_EQ(IPQ_OK, ::SetDumpStringOn(n, 1));
ASSERT_EQ(0, ::RunAccumulated(n));
ASSERT_EQ(34, ::GetDumpStringLineCount(n));
ASSERT_EQ(35, ::GetDumpStringLineCount(n));
if (n >= 0)
{
@ -1847,8 +1847,8 @@ TEST(TestIPhreeqcLib, TestGetDumpStringLine)
ASSERT_EQ(IPQ_OK, ::SetSelectedOutputFileOn(n, 0));
ASSERT_EQ(IPQ_OK, ::SetDumpFileOn(n, 0));
ASSERT_EQ(IPQ_OK, ::SetDumpStringOn(n, 1));
ASSERT_EQ(0, ::RunAccumulated(n));
ASSERT_EQ(34, ::GetDumpStringLineCount(n));
ASSERT_EQ(0, ::RunAccumulated(n));
ASSERT_EQ(35, ::GetDumpStringLineCount(n));
int line = 0;
@ -1861,6 +1861,7 @@ TEST(TestIPhreeqcLib, TestGetDumpStringLine)
EXPECT_THAT(::GetDumpStringLine(n, line++), HasSubstr("-cb"));
EXPECT_THAT(::GetDumpStringLine(n, line++), HasSubstr("-density"));
EXPECT_THAT(::GetDumpStringLine(n, line++), HasSubstr("-viscosity"));
EXPECT_THAT(::GetDumpStringLine(n, line++), HasSubstr("-viscos_0"));
EXPECT_THAT(::GetDumpStringLine(n, line++), HasSubstr("-totals"));
EXPECT_THAT(::GetDumpStringLine(n, line++), HasSubstr(" C(4) "));
EXPECT_THAT(::GetDumpStringLine(n, line++), HasSubstr(" Ca "));
@ -2343,6 +2344,7 @@ TEST(TestIPhreeqcLib, TestSetDumpFileName)
{
++i;
}
ifs.close();
int line = 0;
EXPECT_THAT(lines[line++], HasSubstr("SOLUTION_RAW"));
@ -2354,6 +2356,7 @@ TEST(TestIPhreeqcLib, TestSetDumpFileName)
EXPECT_THAT(lines[line++], HasSubstr("-cb"));
EXPECT_THAT(lines[line++], HasSubstr("-density"));
EXPECT_THAT(lines[line++], HasSubstr("-viscosity"));
EXPECT_THAT(lines[line++], HasSubstr("-viscos_0"));
EXPECT_THAT(lines[line++], HasSubstr("-totals"));
EXPECT_THAT(lines[line++], HasSubstr(" C(4) "));
EXPECT_THAT(lines[line++], HasSubstr(" Ca "));