mirror of
https://github.com/msgpack/msgpack-c.git
synced 2025-10-14 06:55:50 +02:00
Modernize codebase
- 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:
@@ -2,23 +2,14 @@
|
||||
#include <sstream>
|
||||
#include <iterator>
|
||||
|
||||
#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 MSGPACK_BOOST
|
||||
#include <boost/test/unit_test.hpp>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
TEST(MSGPACK_BOOST, pack_convert_nil)
|
||||
BOOST_AUTO_TEST_CASE(pack_convert_nil)
|
||||
{
|
||||
std::stringstream ss;
|
||||
boost::optional<int> val1;
|
||||
@@ -27,10 +18,10 @@ TEST(MSGPACK_BOOST, pack_convert_nil)
|
||||
msgpack::object_handle oh =
|
||||
msgpack::unpack(str.data(), str.size());
|
||||
boost::optional<int> val2 = oh.get().as<boost::optional<int> >();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
TEST(MSGPACK_BOOST, pack_convert_int)
|
||||
BOOST_AUTO_TEST_CASE(pack_convert_int)
|
||||
{
|
||||
std::stringstream ss;
|
||||
boost::optional<int> val1 = 1;
|
||||
@@ -39,10 +30,10 @@ TEST(MSGPACK_BOOST, pack_convert_int)
|
||||
msgpack::object_handle oh =
|
||||
msgpack::unpack(str.data(), str.size());
|
||||
boost::optional<int> val2 = oh.get().as<boost::optional<int> >();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
TEST(MSGPACK_BOOST, pack_convert_vector)
|
||||
BOOST_AUTO_TEST_CASE(pack_convert_vector)
|
||||
{
|
||||
typedef boost::optional<std::vector<int> > ovi_t;
|
||||
std::stringstream ss;
|
||||
@@ -57,10 +48,10 @@ TEST(MSGPACK_BOOST, pack_convert_vector)
|
||||
msgpack::object_handle oh =
|
||||
msgpack::unpack(str.data(), str.size());
|
||||
ovi_t val2 = oh.get().as<ovi_t>();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
TEST(MSGPACK_BOOST, pack_convert_vector_optional)
|
||||
BOOST_AUTO_TEST_CASE(pack_convert_vector_optional)
|
||||
{
|
||||
typedef std::vector<boost::optional<int> > voi_t;
|
||||
std::stringstream ss;
|
||||
@@ -73,28 +64,28 @@ TEST(MSGPACK_BOOST, pack_convert_vector_optional)
|
||||
msgpack::object_handle oh =
|
||||
msgpack::unpack(str.data(), str.size());
|
||||
voi_t val2 = oh.get().as<voi_t>();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
TEST(MSGPACK_BOOST, object_nil)
|
||||
BOOST_AUTO_TEST_CASE(object_nil)
|
||||
{
|
||||
boost::optional<int> val1;
|
||||
msgpack::object obj(val1);
|
||||
boost::optional<int> val2 = obj.as<boost::optional<int> >();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
TEST(MSGPACK_BOOST, object_int)
|
||||
BOOST_AUTO_TEST_CASE(object_int)
|
||||
{
|
||||
boost::optional<int> val1 = 1;
|
||||
msgpack::object obj(val1);
|
||||
boost::optional<int> val2 = obj.as<boost::optional<int> >();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
// Compile error as expected
|
||||
/*
|
||||
TEST(MSGPACK_BOOST, object_vector)
|
||||
BOOST_AUTO_TEST_CASE(object_vector)
|
||||
{
|
||||
typedef boost::optional<std::vector<int> > ovi_t;
|
||||
ovi_t val1;
|
||||
@@ -105,29 +96,29 @@ TEST(MSGPACK_BOOST, object_int)
|
||||
val1 = v;
|
||||
msgpack::object obj(val1);
|
||||
ovi_t val2 = obj.as<ovi_t>();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
*/
|
||||
|
||||
TEST(MSGPACK_BOOST, object_with_zone_nil)
|
||||
BOOST_AUTO_TEST_CASE(object_with_zone_nil)
|
||||
{
|
||||
msgpack::zone z;
|
||||
boost::optional<int> val1;
|
||||
msgpack::object obj(val1, z);
|
||||
boost::optional<int> val2 = obj.as<boost::optional<int> >();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
TEST(MSGPACK_BOOST, object_with_zone_int)
|
||||
BOOST_AUTO_TEST_CASE(object_with_zone_int)
|
||||
{
|
||||
msgpack::zone z;
|
||||
boost::optional<int> val1 = 1;
|
||||
msgpack::object obj(val1, z);
|
||||
boost::optional<int> val2 = obj.as<boost::optional<int> >();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
TEST(MSGPACK_BOOST, object_with_zone_vector_optional)
|
||||
BOOST_AUTO_TEST_CASE(object_with_zone_vector_optional)
|
||||
{
|
||||
typedef std::vector<boost::optional<int> > voi_t;
|
||||
msgpack::zone z;
|
||||
@@ -137,7 +128,7 @@ TEST(MSGPACK_BOOST, object_with_zone_vector_optional)
|
||||
val1[2] = 3;
|
||||
msgpack::object obj(val1, z);
|
||||
voi_t val2 = obj.as<voi_t>();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
#if !defined(MSGPACK_USE_CPP03)
|
||||
@@ -172,7 +163,7 @@ MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS) {
|
||||
} // MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS)
|
||||
} // msgpack
|
||||
|
||||
TEST(MSGPACK_BOOST, pack_convert_no_def_con)
|
||||
BOOST_AUTO_TEST_CASE(pack_convert_no_def_con)
|
||||
{
|
||||
std::stringstream ss;
|
||||
boost::optional<no_def_con> val1 = no_def_con(1);
|
||||
@@ -181,7 +172,7 @@ TEST(MSGPACK_BOOST, pack_convert_no_def_con)
|
||||
msgpack::object_handle oh =
|
||||
msgpack::unpack(str.data(), str.size());
|
||||
boost::optional<no_def_con> val2 = oh.get().as<boost::optional<no_def_con>>();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
#endif // !defined(MSGPACK_USE_CPP03
|
||||
|
Reference in New Issue
Block a user