Skip to content

Commit 9fa240c

Browse files
committed
Add testing for negative values
1 parent b4b37c9 commit 9fa240c

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

testing/adios2/derived/TestBPDerivedCorrectness.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,22 @@ class DerivedCorrectnessP : public DerivedCorrectness,
2525
adios2::DerivedVarType GetThreads() { return GetParam(); };
2626
};
2727

28-
TEST_P(DerivedCorrectnessP, BasicCorrectnessTest)
28+
TEST_P(DerivedCorrectnessP, ErrorTest)
2929
{
3030
adios2::DerivedVarType mode = GetParam();
3131
adios2::ADIOS adios;
32-
adios2::IO bpOut = adios.DeclareIO("BPNoData");
32+
adios2::IO bpOut = adios.DeclareIO("BPDerivedError");
33+
EXPECT_THROW(bpOut.DefineDerivedVariable("derived", "x= var1 \n nofunction(x)", mode),
34+
std::invalid_argument);
3335
EXPECT_THROW(bpOut.DefineDerivedVariable("derived", "x= var1 \n sqrt(x)", mode),
3436
std::invalid_argument);
37+
}
38+
39+
TEST_P(DerivedCorrectnessP, BasicCorrectnessTest)
40+
{
41+
adios2::DerivedVarType mode = GetParam();
42+
adios2::ADIOS adios;
43+
adios2::IO bpOut = adios.DeclareIO("BPNoData");
3544

3645
const size_t N = 10;
3746
std::default_random_engine generator;

testing/adios2/derived/TestBPDerivedCorrectnessMPI.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ TEST_P(DerivedCorrectnessMPIP, ScalarFunctionsCorrectnessTest)
9090
mode);
9191
bpOut.DefineDerivedVariable(derConstAdd,
9292
"x =" + varname[0] + " \n"
93-
"add(x, 4, 1)",
93+
"add(x, 6, -1)",
9494
mode);
9595
bpOut.DefineDerivedVariable(derSubtrName,
9696
"x =" + varname[0] + " \n"
@@ -106,7 +106,7 @@ TEST_P(DerivedCorrectnessMPIP, ScalarFunctionsCorrectnessTest)
106106
mode);
107107
bpOut.DefineDerivedVariable(derConstMult,
108108
"x =" + varname[0] + " \n"
109-
"multiply(x, 5, 2)",
109+
"multiply(x, 5, -2)",
110110
mode);
111111
bpOut.DefineDerivedVariable(derDivName,
112112
"x =" + varname[0] + " \n"
@@ -198,7 +198,7 @@ TEST_P(DerivedCorrectnessMPIP, ScalarFunctionsCorrectnessTest)
198198
calcFloat = readUx[ind] * readUy[ind] * readUz[ind];
199199
EXPECT_TRUE(fabs(calcFloat - readMult[ind]) < epsilon);
200200

201-
calcFloat = readUx[ind] * 10;
201+
calcFloat = readUx[ind] * (-10);
202202
EXPECT_TRUE(fabs(calcFloat - readConstMult[ind]) < epsilon);
203203

204204
calcFloat = readUx[ind] / readUy[ind] / readUz[ind];

0 commit comments

Comments
 (0)