Skip to content

Commit d4d57b7

Browse files
committed
Fix inequality assertions for real numbers failing on Valgrind (1/2)
EXPECT_DOUBLE_EQ
1 parent e4ca307 commit d4d57b7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

tests/Column_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static void test_column_basis(bool utf16)
9898
EXPECT_STREQ("first", ptxt);
9999
EXPECT_EQ("first", msg);
100100
EXPECT_EQ(-123, integer);
101-
EXPECT_EQ(0.123, real);
101+
EXPECT_DOUBLE_EQ(0.123, real);
102102
EXPECT_EQ(0, memcmp("bl\0b", pblob, size));
103103
#if !defined(_MSC_VER) || _MSC_VER >= 1900
104104
EXPECT_EQ((size_t)size, sblob.size());
@@ -129,7 +129,7 @@ static void test_column_basis(bool utf16)
129129
EXPECT_EQ("first", msg1);
130130
EXPECT_EQ("first", msg2);
131131
EXPECT_EQ(-123, integer);
132-
EXPECT_EQ(0.123, real);
132+
EXPECT_DOUBLE_EQ(0.123, real);
133133
EXPECT_EQ(0, memcmp("bl\0b", pblob, 4));
134134
EXPECT_EQ(0, memcmp("bl\0b", &sblob[0], 4));
135135
}
@@ -195,7 +195,7 @@ static void test_column_basis(bool utf16)
195195
const SQLite::Column integer = query.getColumn(2);
196196
EXPECT_EQ(-123, integer.getInt());
197197
const SQLite::Column dbl = query.getColumn(3);
198-
EXPECT_EQ(0.123, dbl.getDouble());
198+
EXPECT_DOUBLE_EQ(0.123, dbl.getDouble());
199199
}
200200
}
201201

tests/Statement_test.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ TEST(Statement, executeStep)
174174
EXPECT_EQ("first", msg);
175175
EXPECT_EQ(123, integer);
176176
EXPECT_EQ(123, integer2);
177-
EXPECT_EQ(0.123, real);
177+
EXPECT_DOUBLE_EQ(0.123, real);
178178

179179
// Step one more time to discover there is nothing more
180180
query.executeStep();
@@ -227,7 +227,7 @@ TEST(Statement, tryExecuteStep)
227227
EXPECT_EQ("first", msg);
228228
EXPECT_EQ(123, integer);
229229
EXPECT_EQ(123, integer2);
230-
EXPECT_EQ(0.123, real);
230+
EXPECT_DOUBLE_EQ(0.123, real);
231231

232232
// Step one more time to discover there is nothing more
233233
EXPECT_EQ(query.tryExecuteStep(), SQLITE_DONE);
@@ -595,7 +595,7 @@ TEST(Statement, bindByNameString)
595595
EXPECT_EQ(1, query.getColumn(0).getInt64());
596596
EXPECT_STREQ("first", query.getColumn(1).getText());
597597
EXPECT_EQ(123, query.getColumn(2).getInt());
598-
EXPECT_EQ(0.123, query.getColumn(3).getDouble());
598+
EXPECT_DOUBLE_EQ(0.123, query.getColumn(3).getDouble());
599599
EXPECT_EQ(-123, query.getColumn(4).getInt());
600600

601601
// reset() with clearbindings() and new bindings
@@ -899,7 +899,7 @@ TEST(Statement, getColumnByName)
899899
const double real = query.getColumn("double");
900900
EXPECT_EQ("first", msg);
901901
EXPECT_EQ(123, integer);
902-
EXPECT_EQ(0.123, real);
902+
EXPECT_DOUBLE_EQ(0.123, real);
903903
}
904904

905905
TEST(Statement, getName)
@@ -1000,14 +1000,14 @@ TEST(Statement, getColumns)
10001000
EXPECT_EQ(1, testStruct.id);
10011001
EXPECT_EQ("first", testStruct.msg);
10021002
EXPECT_EQ(123, testStruct.integer);
1003-
EXPECT_EQ(0.123, testStruct.real);
1003+
EXPECT_DOUBLE_EQ(0.123, testStruct.real);
10041004

10051005
// Get only the first 2 columns
10061006
auto testStruct2 = query.getColumns<GetRowTestStruct, 2>();
10071007
EXPECT_EQ(1, testStruct2.id);
10081008
EXPECT_EQ("first", testStruct2.msg);
10091009
EXPECT_EQ(-1, testStruct2.integer);
1010-
EXPECT_EQ(0.0, testStruct2.real);
1010+
EXPECT_DOUBLE_EQ(0.0, testStruct2.real);
10111011
}
10121012
#endif
10131013

0 commit comments

Comments
 (0)