Skip to content

Commit ee65a31

Browse files
redboltzredboltz
committed
Replaced EXPECT_EQ with EXPECT_TRUE to avoid ostream requirement.
1 parent 4650248 commit ee65a31

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

‎test/object_with_zone.cpp‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ TEST(object_with_zone, vector)
203203
v1.push_back(i);
204204
msgpack::zone z;
205205
msgpack::object obj(v1, z);
206-
EXPECT_EQ(obj.as<vector<int> >(), v1);
206+
EXPECT_TRUE(obj.as<vector<int> >() == v1);
207207
v1.front() = 42;
208208
EXPECT_EQ(obj.as<vector<int> >().front(), 1);
209209
}
@@ -219,7 +219,7 @@ TEST(object_with_zone, vector_char)
219219
v1.push_back(static_cast<char>(i));
220220
msgpack::zone z;
221221
msgpack::object obj(v1, z);
222-
EXPECT_EQ(obj.as<vector<char> >(), v1);
222+
EXPECT_TRUE(obj.as<vector<char> >() == v1);
223223
v1.front() = 42;
224224
EXPECT_EQ(obj.as<vector<char> >().front(), 1);
225225
}
@@ -233,7 +233,7 @@ TEST(object_without_zone, vector_char)
233233
for (unsigned int i = 1; i < kElements; i++)
234234
v1.push_back(static_cast<char>(i));
235235
msgpack::object obj(v1);
236-
EXPECT_EQ(obj.as<vector<char> >(), v1);
236+
EXPECT_TRUE(obj.as<vector<char> >() == v1);
237237
v1.front() = 42;
238238
// obj refer to v1
239239
EXPECT_EQ(obj.as<vector<char> >().front(), 42);
@@ -251,7 +251,7 @@ TEST(object_with_zone, vector_unsigned_char)
251251
v1.push_back(static_cast<unsigned char>(i));
252252
msgpack::zone z;
253253
msgpack::object obj(v1, z);
254-
EXPECT_EQ(obj.as<vector<unsigned char> >(), v1);
254+
EXPECT_TRUE(obj.as<vector<unsigned char> >() == v1);
255255
v1.front() = 42;
256256
EXPECT_EQ(obj.as<vector<unsigned char> >().front(), 1);
257257
}
@@ -266,7 +266,7 @@ TEST(object_without_zone, vector_unsigned_char)
266266
for (unsigned int i = 1; i < kElements; i++)
267267
v1.push_back(static_cast<unsigned char>(i));
268268
msgpack::object obj(v1);
269-
EXPECT_EQ(obj.as<vector<unsigned char> >(), v1);
269+
EXPECT_TRUE(obj.as<vector<unsigned char> >() == v1);
270270
v1.front() = 42;
271271
// obj refer to v1
272272
EXPECT_EQ(obj.as<vector<unsigned char> >().front(), 42);
@@ -283,7 +283,7 @@ TEST(object_with_zone, list)
283283
v1.push_back(i);
284284
msgpack::zone z;
285285
msgpack::object obj(v1, z);
286-
EXPECT_EQ(obj.as<list<int> >(), v1);
286+
EXPECT_TRUE(obj.as<list<int> >() == v1);
287287
v1.front() = 42;
288288
EXPECT_EQ(obj.as<list<int> >().front(), 1);
289289
}
@@ -299,7 +299,7 @@ TEST(object_with_zone, deque)
299299
v1.push_back(i);
300300
msgpack::zone z;
301301
msgpack::object obj(v1, z);
302-
EXPECT_EQ(obj.as<deque<int> >(), v1);
302+
EXPECT_TRUE(obj.as<deque<int> >() == v1);
303303
v1.front() = 42;
304304
EXPECT_EQ(obj.as<deque<int> >().front(), 1);
305305
}
@@ -355,12 +355,12 @@ TEST(object_with_zone, raw_ref)
355355
msgpack::type::raw_ref v(s.data(), static_cast<uint32_t>(s.size()));
356356
msgpack::zone z;
357357
msgpack::object obj(v, z);
358-
EXPECT_EQ(obj.as<msgpack::type::raw_ref>(), v);
358+
EXPECT_TRUE(obj.as<msgpack::type::raw_ref>() == v);
359359
s[0] = 'd';
360360
// even if with_zone, not copied due to raw_ref
361361
// Basically, the combination raw_ref and object::wit_zone
362362
// is meaningless.
363-
EXPECT_EQ(obj.as<msgpack::type::raw_ref>(), v);
363+
EXPECT_TRUE(obj.as<msgpack::type::raw_ref>() == v);
364364
}
365365

366366
TEST(object_without_zone, raw_ref)
@@ -369,9 +369,9 @@ TEST(object_without_zone, raw_ref)
369369
msgpack::type::raw_ref v(s.data(), static_cast<uint32_t>(s.size()));
370370
msgpack::zone z;
371371
msgpack::object obj(v);
372-
EXPECT_EQ(obj.as<msgpack::type::raw_ref>(), v);
372+
EXPECT_TRUE(obj.as<msgpack::type::raw_ref>() == v);
373373
s[0] = 'd';
374-
EXPECT_EQ(obj.as<msgpack::type::raw_ref>(), v);
374+
EXPECT_TRUE(obj.as<msgpack::type::raw_ref>() == v);
375375
}
376376

377377
// pair
@@ -381,7 +381,7 @@ TEST(object_with_zone, pair)
381381
test_t v(1, "abc");
382382
msgpack::zone z;
383383
msgpack::object obj(v, z);
384-
EXPECT_EQ(obj.as<test_t>(), v);
384+
EXPECT_TRUE(obj.as<test_t>() == v);
385385
v.first = 42;
386386
EXPECT_EQ(obj.as<test_t>().first, 1);
387387
}
@@ -395,7 +395,7 @@ TEST(object_with_zone, set)
395395
v1.insert(i);
396396
msgpack::zone z;
397397
msgpack::object obj(v1, z);
398-
EXPECT_EQ(obj.as<set<int> >(), v1);
398+
EXPECT_TRUE(obj.as<set<int> >() == v1);
399399
}
400400
}
401401

@@ -408,7 +408,7 @@ TEST(object_with_zone, multiset)
408408
v1.insert(i % (kElements / 2));
409409
msgpack::zone z;
410410
msgpack::object obj(v1, z);
411-
EXPECT_EQ(obj.as<multiset<int> >(), v1);
411+
EXPECT_TRUE(obj.as<multiset<int> >() == v1);
412412
}
413413
}
414414

@@ -422,7 +422,7 @@ TEST(object_with_zone, map)
422422
v1.insert(std::make_pair(i, i*2));
423423
msgpack::zone z;
424424
msgpack::object obj(v1, z);
425-
EXPECT_EQ(obj.as<test_t >(), v1);
425+
EXPECT_TRUE(obj.as<test_t >() == v1);
426426
}
427427
}
428428

@@ -436,7 +436,7 @@ TEST(object_with_zone, multimap)
436436
v1.insert(std::make_pair(i % (kElements / 2), i*2));
437437
msgpack::zone z;
438438
msgpack::object obj(v1, z);
439-
EXPECT_EQ(obj.as<test_t >(), v1);
439+
EXPECT_TRUE(obj.as<test_t >() == v1);
440440
}
441441
}
442442

@@ -825,7 +825,7 @@ TEST(object_with_zone, array)
825825
v1[i] = rand();
826826
msgpack::zone z;
827827
msgpack::object obj(v1, z);
828-
EXPECT_EQ(obj.as<test_t>(), v1);
828+
EXPECT_TRUE(obj.as<test_t>() == v1);
829829
v1.front() = 42;
830830
EXPECT_EQ(obj.as<test_t>().front(), 1);
831831
}
@@ -841,7 +841,7 @@ TEST(object_with_zone, array_char)
841841
v1[i] = rand();
842842
msgpack::zone z;
843843
msgpack::object obj(v1, z);
844-
EXPECT_EQ(obj.as<test_t>(), v1);
844+
EXPECT_TRUE(obj.as<test_t>() == v1);
845845
v1.front() = 42;
846846
EXPECT_EQ(obj.as<test_t>().front(), 1);
847847
}
@@ -856,7 +856,7 @@ TEST(object_without_zone, array_char)
856856
for (unsigned int i = 1; i < kElements; i++)
857857
v1[i] = rand();
858858
msgpack::object obj(v1);
859-
EXPECT_EQ(obj.as<test_t>(), v1);
859+
EXPECT_TRUE(obj.as<test_t>() == v1);
860860
v1.front() = 42;
861861
// obj refer to v1
862862
EXPECT_EQ(obj.as<test_t>().front(), 42);
@@ -874,7 +874,7 @@ TEST(object_with_zone, array_unsigned_char)
874874
v1[i] = rand();
875875
msgpack::zone z;
876876
msgpack::object obj(v1, z);
877-
EXPECT_EQ(obj.as<test_t>(), v1);
877+
EXPECT_TRUE(obj.as<test_t>() == v1);
878878
v1.front() = 42;
879879
EXPECT_EQ(obj.as<test_t>().front(), 1);
880880
}
@@ -890,7 +890,7 @@ TEST(object_without_zone, array_unsigned_char)
890890
for (unsigned int i = 1; i < kElements; i++)
891891
v1[i] = rand();
892892
msgpack::object obj(v1);
893-
EXPECT_EQ(obj.as<test_t>(), v1);
893+
EXPECT_TRUE(obj.as<test_t>() == v1);
894894
v1.front() = 42;
895895
// obj refer to v1
896896
EXPECT_EQ(obj.as<test_t>().front(), 42);
@@ -906,7 +906,7 @@ TEST(object_with_zone, forward_list)
906906
v1.push_front(i);
907907
msgpack::zone z;
908908
msgpack::object obj(v1, z);
909-
EXPECT_EQ(obj.as<forward_list<int> >(), v1);
909+
EXPECT_TRUE(obj.as<forward_list<int> >() == v1);
910910
v1.front() = 42;
911911
EXPECT_EQ(obj.as<forward_list<int> >().front(), static_cast<int>(kElements - 1));
912912
}
@@ -918,7 +918,7 @@ TEST(object_with_zone, tuple)
918918
test_t v(1, "abc", true);
919919
msgpack::zone z;
920920
msgpack::object obj(v, z);
921-
EXPECT_EQ(obj.as<test_t>(), v);
921+
EXPECT_TRUE(obj.as<test_t>() == v);
922922
}
923923

924924
TEST(object_with_zone, tuple_empty)
@@ -927,7 +927,7 @@ TEST(object_with_zone, tuple_empty)
927927
test_t v;
928928
msgpack::zone z;
929929
msgpack::object obj(v, z);
930-
EXPECT_EQ(obj.as<test_t>(), v);
930+
EXPECT_TRUE(obj.as<test_t>() == v);
931931
}
932932

933933
#endif // !defined(MSGPACK_USE_CPP03)
@@ -937,8 +937,8 @@ TEST(object_with_zone, ext_empty)
937937
msgpack::type::ext v;
938938
msgpack::zone z;
939939
msgpack::object obj(v, z);
940-
EXPECT_EQ(obj.as<msgpack::type::ext>(), v);
941-
EXPECT_EQ(obj.as<msgpack::type::ext_ref>(), v);
940+
EXPECT_TRUE(obj.as<msgpack::type::ext>() == v);
941+
EXPECT_TRUE(obj.as<msgpack::type::ext_ref>() == v);
942942
}
943943

944944
TEST(object_with_zone, ext)
@@ -947,8 +947,8 @@ TEST(object_with_zone, ext)
947947
for (int i = 0; i < 10; ++i) v.data()[i] = i;
948948
msgpack::zone z;
949949
msgpack::object obj(v, z);
950-
EXPECT_EQ(obj.as<msgpack::type::ext>(), v);
951-
EXPECT_EQ(obj.as<msgpack::type::ext_ref>(), v);
950+
EXPECT_TRUE(obj.as<msgpack::type::ext>() == v);
951+
EXPECT_TRUE(obj.as<msgpack::type::ext_ref>() == v);
952952
}
953953

954954
TEST(object_with_zone, ext_from_buf)
@@ -957,17 +957,17 @@ TEST(object_with_zone, ext_from_buf)
957957
msgpack::type::ext v(42, buf, sizeof(buf));
958958
msgpack::zone z;
959959
msgpack::object obj(v, z);
960-
EXPECT_EQ(obj.as<msgpack::type::ext>(), v);
961-
EXPECT_EQ(obj.as<msgpack::type::ext_ref>(), v);
960+
EXPECT_TRUE(obj.as<msgpack::type::ext>() == v);
961+
EXPECT_TRUE(obj.as<msgpack::type::ext_ref>() == v);
962962
}
963963

964964
TEST(object_with_zone, ext_ref_empty)
965965
{
966966
msgpack::type::ext_ref v;
967967
msgpack::zone z;
968968
msgpack::object obj(v, z);
969-
EXPECT_EQ(obj.as<msgpack::type::ext>(), v);
970-
EXPECT_EQ(obj.as<msgpack::type::ext_ref>(), v);
969+
EXPECT_TRUE(obj.as<msgpack::type::ext>() == v);
970+
EXPECT_TRUE(obj.as<msgpack::type::ext_ref>() == v);
971971
}
972972

973973
TEST(object_with_zone, ext_ref_from_buf)
@@ -976,6 +976,6 @@ TEST(object_with_zone, ext_ref_from_buf)
976976
msgpack::type::ext_ref v(buf, sizeof(buf));
977977
msgpack::zone z;
978978
msgpack::object obj(v, z);
979-
EXPECT_EQ(obj.as<msgpack::type::ext>(), v);
980-
EXPECT_EQ(obj.as<msgpack::type::ext_ref>(), v);
979+
EXPECT_TRUE(obj.as<msgpack::type::ext>() == v);
980+
EXPECT_TRUE(obj.as<msgpack::type::ext_ref>() == v);
981981
}

0 commit comments

Comments
 (0)