generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-11-02 05:46:23 +01:00
Code Issues Projects Releases Wiki Activity

Modernize codebase

Browse Source 
- Enhance CMakeLists.txt files.
- Move to Boost Test from Google Test to support pre-C++11 compilers.
- Add more configurations on CI matrix builds.
- Other minor fixes
This commit is contained in:
Daniil Kovalev
2021-07-01 11:17:20 -04:00
committed by GitHub
parent 0af15e45de
commit 7b7615a6d9
80 changed files with 3451 additions and 3799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
test/convert.cpp
View File

@@ -1,15 +1,7 @@
#include <msgpack.hpp>
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif //defined(__GNUC__)
#include <gtest/gtest.h>
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif //defined(__GNUC__)
#define BOOST_TEST_MODULE convert
#include <boost/test/unit_test.hpp>
class enum_member {
public:
@@ -37,7 +29,7 @@ public:
MSGPACK_DEFINE(str1, str2);
};
TEST(convert, compatibility_less)
BOOST_AUTO_TEST_CASE(compatibility_less)
{
std::vector<std::string> src(1);
src[0] = "kumofs";
@@ -46,13 +38,13 @@ TEST(convert, compatibility_less)
msgpack::object obj(src, z);
compatibility c;
EXPECT_NO_THROW( obj.convert(c) );
BOOST_CHECK_NO_THROW( obj.convert(c) );
EXPECT_EQ("kumofs", c.str1);
EXPECT_EQ("default", c.str2);
BOOST_CHECK_EQUAL("kumofs", c.str1);
BOOST_CHECK_EQUAL("default", c.str2);
}
TEST(convert, compatibility_more)
BOOST_AUTO_TEST_CASE(compatibility_more)
{
std::vector<std::string> src(3);
src[0] = "kumofs";
@@ -63,13 +55,13 @@ TEST(convert, compatibility_more)
msgpack::object obj(src, z);
compatibility to;
EXPECT_NO_THROW( obj.convert(to) );
BOOST_CHECK_NO_THROW( obj.convert(to) );
EXPECT_EQ("kumofs", to.str1);
EXPECT_EQ("mpio", to.str2);
BOOST_CHECK_EQUAL("kumofs", to.str1);
BOOST_CHECK_EQUAL("mpio", to.str2);
}
TEST(convert, enum_member)
BOOST_AUTO_TEST_CASE(enum_member_)
{
enum_member src;
src.flag = enum_member::B;
@@ -78,25 +70,25 @@ TEST(convert, enum_member)
msgpack::object obj(src, z);
enum_member to;
EXPECT_NO_THROW( obj.convert(to) );
BOOST_CHECK_NO_THROW( obj.convert(to) );
EXPECT_EQ(enum_member::B, to.flag);
BOOST_CHECK_EQUAL(enum_member::B, to.flag);
}
TEST(convert, return_value_ref)
BOOST_AUTO_TEST_CASE(return_value_ref)
{
msgpack::zone z;
msgpack::object obj(1, z);
int i;
int const& j = obj.convert(i);
EXPECT_EQ(&i, &j);
EXPECT_EQ(i, j);
BOOST_CHECK_EQUAL(&i, &j);
BOOST_CHECK_EQUAL(i, j);
}
#if MSGPACK_DEFAULT_API_VERSION == 1 && !defined(MSGPACK_DISABLE_LEGACY_CONVERT)
TEST(convert, return_value_ptr)
BOOST_AUTO_TEST_CASE(return_value_ptr)
{
msgpack::zone z;
msgpack::object obj(1, z);
@@ -107,28 +99,28 @@ TEST(convert, return_value_ptr)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
EXPECT_EQ(obj.convert(&i), &i);
BOOST_CHECK_EQUAL(obj.convert(&i), &i);
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
#pragma GCC diagnostic pop
#endif // defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
EXPECT_EQ(1, i);
BOOST_CHECK_EQUAL(1, i);
}
#endif // MSGPACK_DEFAULT_API_VERSION == 1 && !defined(MSGPACK_DISABLE_LEGACY_CONVERT)
TEST(convert, if_not_nil_nil)
BOOST_AUTO_TEST_CASE(if_not_nil_nil)
{
msgpack::object obj;
int i;
EXPECT_FALSE(obj.convert_if_not_nil(i));
BOOST_CHECK(!obj.convert_if_not_nil(i));
}
TEST(convert, if_not_nil_not_nil)
BOOST_AUTO_TEST_CASE(if_not_nil_not_nil)
{
msgpack::zone z;
msgpack::object obj(1, z);
int i;
EXPECT_TRUE(obj.convert_if_not_nil(i));
EXPECT_EQ(i, 1);
BOOST_CHECK(obj.convert_if_not_nil(i));
BOOST_CHECK_EQUAL(i, 1);
}