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,16 +2,8 @@
|
||||
#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 UNIQUE_PTR
|
||||
#include <boost/test/unit_test.hpp>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
@@ -19,7 +11,7 @@
|
||||
|
||||
#if !defined(MSGPACK_USE_CPP03)
|
||||
|
||||
TEST(UNIQUE_PTR, pack_convert_nil)
|
||||
BOOST_AUTO_TEST_CASE(pack_convert_nil)
|
||||
{
|
||||
std::stringstream ss;
|
||||
std::unique_ptr<int> val1;
|
||||
@@ -28,10 +20,10 @@ TEST(UNIQUE_PTR, pack_convert_nil)
|
||||
msgpack::object_handle oh =
|
||||
msgpack::unpack(str.data(), str.size());
|
||||
std::unique_ptr<int> val2 = oh.get().as<std::unique_ptr<int>>();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
TEST(UNIQUE_PTR, pack_convert_int)
|
||||
BOOST_AUTO_TEST_CASE(pack_convert_int)
|
||||
{
|
||||
std::stringstream ss;
|
||||
std::unique_ptr<int> val1(new int(1));
|
||||
@@ -40,54 +32,54 @@ TEST(UNIQUE_PTR, pack_convert_int)
|
||||
msgpack::object_handle oh =
|
||||
msgpack::unpack(str.data(), str.size());
|
||||
std::unique_ptr<int> val2 = oh.get().as<std::unique_ptr<int>>();
|
||||
EXPECT_TRUE(*val1 == *val2);
|
||||
BOOST_CHECK(*val1 == *val2);
|
||||
}
|
||||
|
||||
TEST(UNIQUE_PTR, object_nil)
|
||||
BOOST_AUTO_TEST_CASE(object_nil)
|
||||
{
|
||||
std::unique_ptr<int> val1;
|
||||
msgpack::object obj(val1);
|
||||
std::unique_ptr<int> val2 = obj.as<std::unique_ptr<int>>();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
TEST(UNIQUE_PTR, object_int)
|
||||
BOOST_AUTO_TEST_CASE(object_int)
|
||||
{
|
||||
std::unique_ptr<int> val1(new int(1));
|
||||
msgpack::object obj(val1);
|
||||
std::unique_ptr<int> val2 = obj.as<std::unique_ptr<int>>();
|
||||
EXPECT_TRUE(*val1 == *val2);
|
||||
BOOST_CHECK(*val1 == *val2);
|
||||
}
|
||||
|
||||
// Compile error as expected
|
||||
// object::with_zone is required not object
|
||||
/*
|
||||
TEST(UNIQUE_PTR, object_vector)
|
||||
BOOST_AUTO_TEST_CASE(object_vector)
|
||||
{
|
||||
typedef std::unique_ptr<std::vector<int>> ovi_t;
|
||||
ovi_t val1(new std::vector<int>());
|
||||
msgpack::object obj(val1);
|
||||
ovi_t val2 = obj.as<ovi_t>();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
*/
|
||||
|
||||
TEST(UNIQUE_PTR, object_with_zone_nil)
|
||||
BOOST_AUTO_TEST_CASE(object_with_zone_nil)
|
||||
{
|
||||
msgpack::zone z;
|
||||
std::unique_ptr<int> val1;
|
||||
msgpack::object obj(val1, z);
|
||||
std::unique_ptr<int> val2 = obj.as<std::unique_ptr<int>>();
|
||||
EXPECT_TRUE(val1 == val2);
|
||||
BOOST_CHECK(val1 == val2);
|
||||
}
|
||||
|
||||
TEST(UNIQUE_PTR, object_with_zone_int)
|
||||
BOOST_AUTO_TEST_CASE(object_with_zone_int)
|
||||
{
|
||||
msgpack::zone z;
|
||||
std::unique_ptr<int> val1(new int(1));
|
||||
msgpack::object obj(val1, z);
|
||||
std::unique_ptr<int> val2 = obj.as<std::unique_ptr<int>>();
|
||||
EXPECT_TRUE(*val1 == *val2);
|
||||
BOOST_CHECK(*val1 == *val2);
|
||||
}
|
||||
|
||||
struct no_def_con {
|
||||
@@ -120,7 +112,7 @@ struct as<no_def_con> {
|
||||
} // MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS)
|
||||
} // msgpack
|
||||
|
||||
TEST(UNIQUE_PTR, pack_convert_nil_no_def_con)
|
||||
BOOST_AUTO_TEST_CASE(pack_convert_nil_no_def_con)
|
||||
{
|
||||
std::stringstream ss;
|
||||
std::unique_ptr<no_def_con> val1(new no_def_con(1));
|
||||
@@ -129,7 +121,7 @@ TEST(UNIQUE_PTR, pack_convert_nil_no_def_con)
|
||||
msgpack::object_handle oh =
|
||||
msgpack::unpack(str.data(), str.size());
|
||||
std::unique_ptr<no_def_con> val2 = oh.get().as<std::unique_ptr<no_def_con>>();
|
||||
EXPECT_TRUE(*val1 == *val2);
|
||||
BOOST_CHECK(*val1 == *val2);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user