Skip to content

Commit eb3dc38

Browse files
committed
iox-#2055 Make test expecting result more readable
Signed-off-by: Dennis Liu <[email protected]>
1 parent 8cb0caa commit eb3dc38

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

iceoryx_hoofs/test/moduletests/test_utility_convert.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,12 @@ TEST_F(convert_test, fromString_SignedChar_EdgeCase_InRange_Success)
322322
std::string source = "-128";
323323
auto signed_char_min = iox::convert::from_string<signed char>(source.c_str());
324324
ASSERT_THAT(signed_char_min.has_value(), Eq(true));
325-
EXPECT_THAT(signed_char_min.value(), Eq(static_cast<signed char>(-128)));
325+
EXPECT_THAT(signed_char_min.value(), Eq(std::numeric_limits<signed char>::min()));
326326

327327
source = "127";
328328
auto signed_char_max = iox::convert::from_string<signed char>(source.c_str());
329329
ASSERT_THAT(signed_char_max.has_value(), Eq(true));
330-
EXPECT_THAT(signed_char_max.value(), Eq(static_cast<signed char>(127)));
330+
EXPECT_THAT(signed_char_max.value(), Eq(std::numeric_limits<signed char>::max()));
331331
}
332332

333333
TEST_F(convert_test, fromString_SignedChar_EdgeCase_OutOfRange_Fail)
@@ -350,12 +350,12 @@ TEST_F(convert_test, fromString_SignedShort_EdgeCase_InRange_Success)
350350
std::string source = "-32768";
351351
auto short_min = iox::convert::from_string<short>(source.c_str());
352352
ASSERT_THAT(short_min.has_value(), Eq(true));
353-
EXPECT_THAT(short_min.value(), Eq(static_cast<short>(-32768)));
353+
EXPECT_THAT(short_min.value(), Eq(std::numeric_limits<short>::min()));
354354

355355
source = "32767";
356356
auto short_max = iox::convert::from_string<short>(source.c_str());
357357
ASSERT_THAT(short_max.has_value(), Eq(true));
358-
EXPECT_THAT(short_max.value(), Eq(static_cast<short>(32767)));
358+
EXPECT_THAT(short_max.value(), Eq(std::numeric_limits<short>::max()));
359359
}
360360

361361
TEST_F(convert_test, fromString_SignedShort_EdgeCase_OutOfRange_Fail)
@@ -378,12 +378,12 @@ TEST_F(convert_test, fromString_SignedInt_EdgeCase_InRange_Success)
378378
std::string source = "-2147483648";
379379
auto int_min = iox::convert::from_string<int>(source.c_str());
380380
ASSERT_THAT(int_min.has_value(), Eq(true));
381-
EXPECT_THAT(int_min.value(), Eq(-2147483648));
381+
EXPECT_THAT(int_min.value(), Eq(std::numeric_limits<int>::min()));
382382

383383
source = "2147483647";
384384
auto int_max = iox::convert::from_string<int>(source.c_str());
385385
ASSERT_THAT(int_max.has_value(), Eq(true));
386-
EXPECT_THAT(int_max.value(), Eq(2147483647));
386+
EXPECT_THAT(int_max.value(), Eq(std::numeric_limits<int>::max()));
387387
}
388388

389389
TEST_F(convert_test, fromString_SignedInt_EdgeCase_OutOfRange_Fail)
@@ -443,7 +443,7 @@ TEST_F(convert_test, fromString_SignedLongLong_EdgeCase_InRange_Success)
443443
source = "9223372036854775807";
444444
auto long_long_max = iox::convert::from_string<long long>(source.c_str());
445445
ASSERT_THAT(long_long_max.has_value(), Eq(true));
446-
EXPECT_THAT(long_long_max.value(), Eq(9223372036854775807LL));
446+
EXPECT_THAT(long_long_max.value(), Eq(std::numeric_limits<long long>::max()));
447447
}
448448

449449
TEST_F(convert_test, fromString_SignedLongLong_EdgeCase_OutOfRange_Fail)
@@ -475,7 +475,7 @@ TEST_F(convert_test, fromString_UnSignedChar_EdgeCase_InRange_Success)
475475
source = "255";
476476
auto unchar_max = iox::convert::from_string<unsigned char>(source.c_str());
477477
ASSERT_THAT(unchar_max.has_value(), Eq(true));
478-
EXPECT_THAT(unchar_max.value(), Eq(static_cast<unsigned char>(255)));
478+
EXPECT_THAT(unchar_max.value(), Eq(std::numeric_limits<unsigned char>::max()));
479479
}
480480

481481
TEST_F(convert_test, fromString_UnSignedChar_EdgeCase_OutOfRange_Fail)
@@ -503,7 +503,7 @@ TEST_F(convert_test, fromString_UnSignedShort_EdgeCase_InRange_Success)
503503
source = "65535";
504504
auto unshort_max = iox::convert::from_string<unsigned short>(source.c_str());
505505
ASSERT_THAT(unshort_max.has_value(), Eq(true));
506-
EXPECT_THAT(unshort_max.value(), Eq(static_cast<unsigned short>(65535)));
506+
EXPECT_THAT(unshort_max.value(), Eq(std::numeric_limits<unsigned short>::max()));
507507
}
508508

509509
TEST_F(convert_test, fromString_UnSignedShort_EdgeCase_OutOfRange_Fail)
@@ -531,7 +531,7 @@ TEST_F(convert_test, fromString_UnSignedInt_EdgeCase_InRange_Success)
531531
source = "4294967295";
532532
auto unint_max = iox::convert::from_string<unsigned int>(source.c_str());
533533
ASSERT_THAT(unint_max.has_value(), Eq(true));
534-
EXPECT_THAT(unint_max.value(), Eq(4294967295U));
534+
EXPECT_THAT(unint_max.value(), Eq(std::numeric_limits<unsigned int>::max()));
535535
}
536536

537537
TEST_F(convert_test, fromString_UnSignedInt_EdgeCase_OutOfRange_Fail)
@@ -590,7 +590,7 @@ TEST_F(convert_test, fromString_UnSignedLongLong_EdgeCase_InRange_Success)
590590
source = "18446744073709551615";
591591
auto unlong_long_max = iox::convert::from_string<unsigned long long>(source.c_str());
592592
ASSERT_THAT(unlong_long_max.has_value(), Eq(true));
593-
EXPECT_THAT(unlong_long_max.value(), Eq(18446744073709551615ULL));
593+
EXPECT_THAT(unlong_long_max.value(), Eq(std::numeric_limits<unsigned long long>::max()));
594594
}
595595

596596
TEST_F(convert_test, fromString_UnSignedLongLong_EdgeCase_OutOfRange_Fail)

0 commit comments

Comments
 (0)