Unverified Commit 0f96b560 authored by Milo Yip's avatar Milo Yip Committed by GitHub

Merge pull request #1202 from Sumoren/msc_long_part2

Change long/ulong as int/uint on MSC unit tests to be more inline wit…
parents d79533c6 27424d5c
...@@ -443,9 +443,12 @@ TEST(Value, Int) { ...@@ -443,9 +443,12 @@ TEST(Value, Int) {
#ifdef _MSC_VER #ifdef _MSC_VER
// long as int on MSC platforms // long as int on MSC platforms
RAPIDJSON_STATIC_ASSERT(sizeof(long) == sizeof(int)); RAPIDJSON_STATIC_ASSERT(sizeof(long) == sizeof(int));
z.SetInt(1234); z.SetInt(2222);
EXPECT_TRUE(z.Is<long>()); EXPECT_TRUE(z.Is<long>());
EXPECT_EQ(1234l, z.Get<long>()); EXPECT_EQ(2222l, z.Get<long>());
EXPECT_EQ(3333l, z.Set(3333l).Get<long>());
EXPECT_EQ(4444l, z.Set<long>(4444l).Get<long>());
EXPECT_TRUE(z.IsInt());
#endif #endif
} }
...@@ -497,9 +500,12 @@ TEST(Value, Uint) { ...@@ -497,9 +500,12 @@ TEST(Value, Uint) {
#ifdef _MSC_VER #ifdef _MSC_VER
// unsigned long as unsigned on MSC platforms // unsigned long as unsigned on MSC platforms
RAPIDJSON_STATIC_ASSERT(sizeof(unsigned long) == sizeof(unsigned)); RAPIDJSON_STATIC_ASSERT(sizeof(unsigned long) == sizeof(unsigned));
z.SetUint(1234); z.SetUint(2222);
EXPECT_TRUE(z.Is<unsigned long>()); EXPECT_TRUE(z.Is<unsigned long>());
EXPECT_EQ(1234ul, z.Get<unsigned long>()); EXPECT_EQ(2222ul, z.Get<unsigned long>());
EXPECT_EQ(3333ul, z.Set(3333ul).Get<unsigned long>());
EXPECT_EQ(4444ul, z.Set<unsigned long>(4444ul).Get<unsigned long>());
EXPECT_TRUE(x.IsUint());
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment