script_core 0.1.1 → 0.2.4

data/ext/enterprise_script_service/msgpack/test/msgpack_tuple.cpp

@@ -1,6 +1,12 @@
 #include <msgpack.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
 
+#pragma GCC diagnostic pop
+
 
 TEST(msgpack_tuple, member_get)
 {

data/ext/enterprise_script_service/msgpack/test/msgpack_vref.cpp

@@ -9,8 +9,13 @@
 #include <list>
 #include <limits>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
 
+#pragma GCC diagnostic pop
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

data/ext/enterprise_script_service/msgpack/test/msgpack_x3_parse.cpp

@@ -4,8 +4,13 @@
 #include <limits>
 #include <cmath>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
 
+#pragma GCC diagnostic pop
+
 // To avoid link error
 TEST(MSGPACK_X3_PARSE, dummy)
 {
@@ -169,7 +174,7 @@ TEST(MSGPACK_X3_PARSE, uint64_2)
 
 TEST(MSGPACK_X3_PARSE, int8_1)
 {
-    int8_t v = 0b11011111;
+    int8_t v = static_cast<int8_t>(0b11011111);
     std::stringstream ss;
     msgpack::pack(ss, v);
 
@@ -179,7 +184,7 @@ TEST(MSGPACK_X3_PARSE, int8_1)
 
 TEST(MSGPACK_X3_PARSE, int8_2)
 {
-    int8_t v = 0b10000000;
+    int8_t v = static_cast<int8_t>(0b10000000);
     std::stringstream ss;
     msgpack::pack(ss, v);
 
@@ -189,7 +194,7 @@ TEST(MSGPACK_X3_PARSE, int8_2)
 
 TEST(MSGPACK_X3_PARSE, int16_1)
 {
-    int16_t v = 0xff00;
+    int16_t v = static_cast<int16_t>(0xff00);
     std::stringstream ss;
     msgpack::pack(ss, v);
 
@@ -199,7 +204,7 @@ TEST(MSGPACK_X3_PARSE, int16_1)
 
 TEST(MSGPACK_X3_PARSE, int16_2)
 {
-    int16_t v = 0x8000;
+    int16_t v = static_cast<int16_t>(0x8000);
     std::stringstream ss;
     msgpack::pack(ss, v);
 
@@ -209,7 +214,7 @@ TEST(MSGPACK_X3_PARSE, int16_2)
 
 TEST(MSGPACK_X3_PARSE, int32_1)
 {
-    int32_t v = 0xff000000L;
+    int32_t v = static_cast<int32_t>(0xff000000L);
     std::stringstream ss;
     msgpack::pack(ss, v);
 
@@ -219,7 +224,7 @@ TEST(MSGPACK_X3_PARSE, int32_1)
 
 TEST(MSGPACK_X3_PARSE, int32_2)
 {
-    int32_t v = 0x80000000L;
+    int32_t v = static_cast<int32_t>(0x80000000L);
     std::stringstream ss;
     msgpack::pack(ss, v);
 
@@ -229,7 +234,7 @@ TEST(MSGPACK_X3_PARSE, int32_2)
 
 TEST(MSGPACK_X3_PARSE, int64_1)
 {
-    int64_t v = 0xff00000000000000LL;
+    int64_t v = static_cast<int64_t>(0xff00000000000000LL);
     std::stringstream ss;
     msgpack::pack(ss, v);
 
@@ -239,7 +244,7 @@ TEST(MSGPACK_X3_PARSE, int64_1)
 
 TEST(MSGPACK_X3_PARSE, int64_2)
 {
-    int64_t v = 0x8000000000000000LL;
+    int64_t v = static_cast<int64_t>(0x8000000000000000LL);
     std::stringstream ss;
     msgpack::pack(ss, v);
 
@@ -445,7 +450,7 @@ TEST(MSGPACK_X3_PARSE, string_2)
 {
     std::string v;
 
-    for (uint64_t i = 0; i != 0x1fU; ++i) v.push_back('0'+(i%10));
+    for (uint64_t i = 0; i != 0x1fU; ++i) v.push_back(static_cast<char>('0'+(i%10)));
 
     std::stringstream ss;
     msgpack::pack(ss, v);
@@ -458,7 +463,7 @@ TEST(MSGPACK_X3_PARSE, string_3)
 {
     std::string v;
 
-    for (uint64_t i = 0; i != 0xffU; ++i) v.push_back('0'+(i%10));
+    for (uint64_t i = 0; i != 0xffU; ++i) v.push_back(static_cast<char>('0'+(i%10)));
 
     std::stringstream ss;
     msgpack::pack(ss, v);
@@ -471,7 +476,7 @@ TEST(MSGPACK_X3_PARSE, string_4)
 {
     std::string v;
 
-    for (uint64_t i = 0; i != 0xffU+1U; ++i) v.push_back('0'+(i%10));
+    for (uint64_t i = 0; i != 0xffU+1U; ++i) v.push_back(static_cast<char>('0'+(i%10)));
 
     std::stringstream ss;
     msgpack::pack(ss, v);
@@ -484,7 +489,7 @@ TEST(MSGPACK_X3_PARSE, string_5)
 {
     std::string v;
 
-    for (uint64_t i = 0; i != 0xffffU; ++i) v.push_back('0'+(i%10));
+    for (uint64_t i = 0; i != 0xffffU; ++i) v.push_back(static_cast<char>('0'+(i%10)));
 
     std::stringstream ss;
     msgpack::pack(ss, v);
@@ -497,7 +502,7 @@ TEST(MSGPACK_X3_PARSE, string_6)
 {
     std::string v;
 
-    for (uint64_t i = 0; i != 0xffffUL + 1UL; ++i) v.push_back('0'+(i%10));
+    for (uint64_t i = 0; i != 0xffffUL + 1UL; ++i) v.push_back(static_cast<char>('0'+(i%10)));
 
     std::stringstream ss;
     msgpack::pack(ss, v);
@@ -520,7 +525,7 @@ TEST(MSGPACK_X3_PARSE, bin_2)
 {
     std::vector<char> v;
 
-    for (uint64_t i = 0; i != 0x1fU; ++i) v.push_back(i%0xff);
+    for (uint64_t i = 0; i != 0x1fU; ++i) v.push_back(static_cast<char>(i%0xff));
 
     std::stringstream ss;
     msgpack::pack(ss, v);
@@ -533,7 +538,7 @@ TEST(MSGPACK_X3_PARSE, bin_3)
 {
     std::vector<char> v;
 
-    for (uint64_t i = 0; i != 0xffU; ++i) v.push_back(i%0xff);
+    for (uint64_t i = 0; i != 0xffU; ++i) v.push_back(static_cast<char>(i%0xff));
 
     std::stringstream ss;
     msgpack::pack(ss, v);
@@ -546,7 +551,7 @@ TEST(MSGPACK_X3_PARSE, bin_4)
 {
     std::vector<char> v;
 
-    for (uint64_t i = 0; i != 0xffU+1U; ++i) v.push_back(i%0xff);
+    for (uint64_t i = 0; i != 0xffU+1U; ++i) v.push_back(static_cast<char>(i%0xff));
 
     std::stringstream ss;
     msgpack::pack(ss, v);
@@ -559,7 +564,7 @@ TEST(MSGPACK_X3_PARSE, bin_5)
 {
     std::vector<char> v;
 
-    for (uint64_t i = 0; i != 0xffffU; ++i) v.push_back(i%0xff);
+    for (uint64_t i = 0; i != 0xffffU; ++i) v.push_back(static_cast<char>(i%0xff));
 
     std::stringstream ss;
     msgpack::pack(ss, v);
@@ -572,7 +577,7 @@ TEST(MSGPACK_X3_PARSE, bin_6)
 {
     std::vector<char> v;
 
-    for (uint64_t i = 0; i != 0xffffUL + 1UL; ++i) v.push_back(i%0xff);
+    for (uint64_t i = 0; i != 0xffffUL + 1UL; ++i) v.push_back(static_cast<char>(i%0xff));
 
     std::stringstream ss;
     msgpack::pack(ss, v);

data/ext/enterprise_script_service/msgpack/test/object.cpp

@@ -1,6 +1,12 @@
 #include <msgpack.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
 
+#pragma GCC diagnostic pop
+
 
 enum enum_test {
     elem
@@ -361,67 +367,93 @@ TEST(object, clone_int)
 
 TEST(object, clone_str)
 {
-    msgpack::zone z;
+    msgpack::object_handle oh;
     std::string v = "123456789";
-    msgpack::object obj(v, z);
-    std::size_t sz1 = msgpack::aligned_zone_size(obj);
-    msgpack::object_handle h = msgpack::clone(obj);
-    EXPECT_EQ(h.get(), obj);
-    EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
-    h = msgpack::clone(obj);
-    EXPECT_EQ(h.get(), obj);
-    EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
+    {
+        msgpack::zone z;
+        msgpack::object obj(v, z);
+        std::size_t sz1 = msgpack::aligned_zone_size(obj);
+        msgpack::object_handle h = msgpack::clone(obj);
+        EXPECT_EQ(h.get(), obj);
+        EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
+        h = msgpack::clone(obj);
+        EXPECT_EQ(h.get(), obj);
+        EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
+        oh = msgpack::move(h);
+    }
+    EXPECT_EQ(v, oh.get().as<std::string>());
 }
 
 TEST(object, clone_bin)
 {
-    msgpack::zone z;
+    msgpack::object_handle oh;
     std::vector<char> v;
-    v.push_back('A');
-    v.push_back('B');
-    v.push_back('C');
-    msgpack::object obj(v, z);
-    std::size_t sz1 = msgpack::aligned_zone_size(obj);
-    msgpack::object_handle h = msgpack::clone(obj);
-    EXPECT_EQ(h.get(), obj);
-    EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
-    h = msgpack::clone(obj);
-    EXPECT_EQ(h.get(), obj);
-    EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
+    {
+        msgpack::zone z;
+        v.push_back('A');
+        v.push_back('B');
+        v.push_back('C');
+        msgpack::object obj(v, z);
+        std::size_t sz1 = msgpack::aligned_zone_size(obj);
+        msgpack::object_handle h = msgpack::clone(obj);
+        EXPECT_EQ(h.get(), obj);
+        EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
+        h = msgpack::clone(obj);
+        EXPECT_EQ(h.get(), obj);
+        EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
+        oh = msgpack::move(h);
+    }
+    std::vector<char> v2 = oh.get().as<std::vector<char> >();
+    EXPECT_EQ(v.size(), v2.size());
+    EXPECT_TRUE(equal(v.begin(), v.end(), v2.begin()));
 }
 
 TEST(object, clone_array)
 {
-    msgpack::zone z;
+    msgpack::object_handle oh;
     std::vector<int> v;
-    v.push_back(1);
-    v.push_back(2);
-    v.push_back(3);
-    msgpack::object obj(v, z);
-    std::size_t sz1 = msgpack::aligned_zone_size(obj);
-    msgpack::object_handle h = msgpack::clone(obj);
-    EXPECT_EQ(h.get(), obj);
-    EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
-    h = msgpack::clone(obj);
-    EXPECT_EQ(h.get(), obj);
-    EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
+    {
+        msgpack::zone z;
+        v.push_back(1);
+        v.push_back(2);
+        v.push_back(3);
+        msgpack::object obj(v, z);
+        std::size_t sz1 = msgpack::aligned_zone_size(obj);
+        msgpack::object_handle h = msgpack::clone(obj);
+        EXPECT_EQ(h.get(), obj);
+        EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
+        h = msgpack::clone(obj);
+        EXPECT_EQ(h.get(), obj);
+        EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
+        oh = msgpack::move(h);
+    }
+    std::vector<int> v2 = oh.get().as<std::vector<int> >();
+    EXPECT_EQ(v.size(), v2.size());
+    EXPECT_TRUE(equal(v.begin(), v.end(), v2.begin()));
 }
 
 TEST(object, clone_map)
 {
-    msgpack::zone z;
+    msgpack::object_handle oh;
     std::map<int, std::string> v;
-    v.insert(std::map<int, std::string>::value_type(1, "ABC"));
-    v.insert(std::map<int, std::string>::value_type(2, "DEF"));
-    v.insert(std::map<int, std::string>::value_type(3, "GHI"));
-    msgpack::object obj(v, z);
-    std::size_t sz1 = msgpack::aligned_zone_size(obj);
-    msgpack::object_handle h = msgpack::clone(obj);
-    EXPECT_EQ(h.get(), obj);
-    EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
-    h = msgpack::clone(obj);
-    EXPECT_EQ(h.get(), obj);
-    EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
+    {
+        msgpack::zone z;
+        v.insert(std::map<int, std::string>::value_type(1, "ABC"));
+        v.insert(std::map<int, std::string>::value_type(2, "DEF"));
+        v.insert(std::map<int, std::string>::value_type(3, "GHI"));
+        msgpack::object obj(v, z);
+        std::size_t sz1 = msgpack::aligned_zone_size(obj);
+        msgpack::object_handle h = msgpack::clone(obj);
+        EXPECT_EQ(h.get(), obj);
+        EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
+        h = msgpack::clone(obj);
+        EXPECT_EQ(h.get(), obj);
+        EXPECT_EQ(sz1, msgpack::aligned_zone_size(h.get()));
+        oh = msgpack::move(h);
+    }
+    std::map<int, std::string> v2 = oh.get().as<std::map<int, std::string> >();
+    EXPECT_EQ(v.size(), v2.size());
+    EXPECT_TRUE(equal(v.begin(), v.end(), v2.begin()));
 }
 
 TEST(object, pack_float)

data/ext/enterprise_script_service/msgpack/test/object_with_zone.cpp

@@ -1,5 +1,12 @@
 #include <msgpack.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <gtest/gtest.h>
+
+#pragma GCC diagnostic pop
+
 #include <cmath>
 
 #ifdef HAVE_CONFIG_H
@@ -202,7 +209,7 @@ TEST(object_with_zone, vector)
         vector<int> v1;
         v1.push_back(1);
         for (unsigned int i = 1; i < kElements; i++)
-            v1.push_back(i);
+            v1.push_back(static_cast<int>(i));
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<vector<int> >() == v1);
@@ -282,7 +289,7 @@ TEST(object_with_zone, list)
         list<int> v1;
         v1.push_back(1);
         for (unsigned int i = 1; i < kElements; i++)
-            v1.push_back(i);
+            v1.push_back(static_cast<int>(i));
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<list<int> >() == v1);
@@ -298,7 +305,7 @@ TEST(object_with_zone, deque)
         deque<int> v1;
         v1.push_back(1);
         for (unsigned int i = 1; i < kElements; i++)
-            v1.push_back(i);
+            v1.push_back(static_cast<int>(i));
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<deque<int> >() == v1);
@@ -332,6 +339,17 @@ TEST(object_without_zone, string)
 
 #endif // MSGPACK_DEFAULT_API_VERSION == 1
 
+// wstring
+TEST(object_with_zone, wstring)
+{
+    wstring v = L"abc";
+    msgpack::zone z;
+    msgpack::object obj(v, z);
+    EXPECT_EQ(obj.as<wstring>(), v);
+    v[0] = 'd';
+    EXPECT_EQ(obj.as<wstring>()[0], L'a');
+}
+
 // char*
 TEST(object_with_zone, char_ptr)
 {
@@ -401,7 +419,7 @@ TEST(object_with_zone, set)
     for (unsigned int k = 0; k < kLoop; k++) {
         set<int> v1;
         for (unsigned int i = 0; i < kElements; i++)
-            v1.insert(i);
+            v1.insert(static_cast<int>(i));
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<set<int> >() == v1);
@@ -861,7 +879,7 @@ TEST(object_with_zone, array_char)
         test_t v1;
         v1[0] = 1;
         for (unsigned int i = 1; i < kElements; i++)
-            v1[i] = rand();
+            v1[i] = static_cast<char>(rand());
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<test_t>() == v1);
@@ -877,7 +895,7 @@ TEST(object_without_zone, array_char)
         test_t v1;
         v1[0] = 1;
         for (unsigned int i = 1; i < kElements; i++)
-            v1[i] = rand();
+            v1[i] = static_cast<char>(rand());
         msgpack::object obj(v1);
         EXPECT_TRUE(obj.as<test_t>() == v1);
         v1.front() = 42;
@@ -894,7 +912,7 @@ TEST(object_with_zone, array_unsigned_char)
         test_t v1;
         v1[0] = 1;
         for (unsigned int i = 1; i < kElements; i++)
-            v1[i] = rand();
+            v1[i] = static_cast<unsigned char>(rand());
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<test_t>() == v1);
@@ -911,7 +929,7 @@ TEST(object_without_zone, array_unsigned_char)
         test_t v1;
         v1[0] = 1;
         for (unsigned int i = 1; i < kElements; i++)
-            v1[i] = rand();
+            v1[i] = static_cast<unsigned char>(rand());
         msgpack::object obj(v1);
         EXPECT_TRUE(obj.as<test_t>() == v1);
         v1.front() = 42;
@@ -926,7 +944,7 @@ TEST(object_with_zone, forward_list)
     for (unsigned int k = 0; k < kLoop; k++) {
         forward_list<int> v1;
         for (unsigned int i = 0; i < kElements; i++)
-            v1.push_front(i);
+            v1.push_front(static_cast<int>(i));
         msgpack::zone z;
         msgpack::object obj(v1, z);
         EXPECT_TRUE(obj.as<forward_list<int> >() == v1);
@@ -1031,7 +1049,7 @@ TEST(object_with_zone, ext_empty)
 TEST(object_with_zone, ext)
 {
     msgpack::type::ext v(42, 10);
-    for (int i = 0; i < 10; ++i) v.data()[i] = i;
+    for (int i = 0; i < 10; ++i) v.data()[i] = static_cast<char>(i);
     msgpack::zone z;
     msgpack::object obj(v, z);
     EXPECT_TRUE(obj.as<msgpack::type::ext>() == v);