valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-08 03:08:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
90ea4f64c1
thrift/lib/cpp/test/EnumTest.cpp

60 lines
2.0 KiB
C++
Raw Normal View History

THRIFT-2513 clean up enum value assignment Patch: Dave Watson This closes #88 Summary: Clean up how enum values are handled if an integer value is not explicitly specified in the thrift file. For example, the following used to be a compile error, but works now: enum MyEnum { SOMEVALUE } struct MyStruct { 1: MyEnum e = SOMEVALUE } This change also cleans up some of the error handling with out-of-range values. Previously thrift simply issued a warning for enum values that didn't fit in an i32, but serialized them as i32 anyway. Now out-of-range enum values result in a compile failure. Test Plan: Included a new unit test to verify the assignment of enum values. I also verified that g++ makes the same enum value assignments when compiling these enums as C++ code.
2014-09-04 21:04:21 +00:00
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
#define BOOST_TEST_MODULE EnumTest
#include <boost/test/unit_test.hpp>
FIX: wrong include path
2014-09-05 20:31:39 +00:00
#include "gen-cpp/EnumTest_types.h"
THRIFT-2513 clean up enum value assignment Patch: Dave Watson This closes #88 Summary: Clean up how enum values are handled if an integer value is not explicitly specified in the thrift file. For example, the following used to be a compile error, but works now: enum MyEnum { SOMEVALUE } struct MyStruct { 1: MyEnum e = SOMEVALUE } This change also cleans up some of the error handling with out-of-range values. Previously thrift simply issued a warning for enum values that didn't fit in an i32, but serialized them as i32 anyway. Now out-of-range enum values result in a compile failure. Test Plan: Included a new unit test to verify the assignment of enum values. I also verified that g++ makes the same enum value assignments when compiling these enums as C++ code.
2014-09-04 21:04:21 +00:00
THRIFT-2729: C++ - .clang-format created and applied Client: C++ Patch: Konrad Grochowski make style command added
2014-11-13 14:33:38 +00:00
BOOST_AUTO_TEST_SUITE(EnumTest)
THRIFT-2513 clean up enum value assignment Patch: Dave Watson This closes #88 Summary: Clean up how enum values are handled if an integer value is not explicitly specified in the thrift file. For example, the following used to be a compile error, but works now: enum MyEnum { SOMEVALUE } struct MyStruct { 1: MyEnum e = SOMEVALUE } This change also cleans up some of the error handling with out-of-range values. Previously thrift simply issued a warning for enum values that didn't fit in an i32, but serialized them as i32 anyway. Now out-of-range enum values result in a compile failure. Test Plan: Included a new unit test to verify the assignment of enum values. I also verified that g++ makes the same enum value assignments when compiling these enums as C++ code.
2014-09-04 21:04:21 +00:00
THRIFT-2729: C++ - .clang-format created and applied Client: C++ Patch: Konrad Grochowski make style command added
2014-11-13 14:33:38 +00:00
BOOST_AUTO_TEST_CASE(test_enum) {
THRIFT-2513 clean up enum value assignment Patch: Dave Watson This closes #88 Summary: Clean up how enum values are handled if an integer value is not explicitly specified in the thrift file. For example, the following used to be a compile error, but works now: enum MyEnum { SOMEVALUE } struct MyStruct { 1: MyEnum e = SOMEVALUE } This change also cleans up some of the error handling with out-of-range values. Previously thrift simply issued a warning for enum values that didn't fit in an i32, but serialized them as i32 anyway. Now out-of-range enum values result in a compile failure. Test Plan: Included a new unit test to verify the assignment of enum values. I also verified that g++ makes the same enum value assignments when compiling these enums as C++ code.
2014-09-04 21:04:21 +00:00
// Check that all the enum values match what we expect
THRIFT-2513 clean up enum value assignment Client: Compiler (General) Patch: Konrad Grochowski Fixes the failing test with pure_enums. For details, see JIRA ticket.
2014-09-12 09:15:24 +00:00
BOOST_CHECK_EQUAL(MyEnum1::ME1_0, 0);
BOOST_CHECK_EQUAL(MyEnum1::ME1_1, 1);
BOOST_CHECK_EQUAL(MyEnum1::ME1_2, 2);
BOOST_CHECK_EQUAL(MyEnum1::ME1_3, 3);
BOOST_CHECK_EQUAL(MyEnum1::ME1_5, 5);
BOOST_CHECK_EQUAL(MyEnum1::ME1_6, 6);
THRIFT-2513 clean up enum value assignment Patch: Dave Watson This closes #88 Summary: Clean up how enum values are handled if an integer value is not explicitly specified in the thrift file. For example, the following used to be a compile error, but works now: enum MyEnum { SOMEVALUE } struct MyStruct { 1: MyEnum e = SOMEVALUE } This change also cleans up some of the error handling with out-of-range values. Previously thrift simply issued a warning for enum values that didn't fit in an i32, but serialized them as i32 anyway. Now out-of-range enum values result in a compile failure. Test Plan: Included a new unit test to verify the assignment of enum values. I also verified that g++ makes the same enum value assignments when compiling these enums as C++ code.
2014-09-04 21:04:21 +00:00
THRIFT-2513 clean up enum value assignment Client: Compiler (General) Patch: Konrad Grochowski Fixes the failing test with pure_enums. For details, see JIRA ticket.
2014-09-12 09:15:24 +00:00
BOOST_CHECK_EQUAL(MyEnum2::ME2_0, 0);
BOOST_CHECK_EQUAL(MyEnum2::ME2_1, 1);
BOOST_CHECK_EQUAL(MyEnum2::ME2_2, 2);
THRIFT-2513 clean up enum value assignment Patch: Dave Watson This closes #88 Summary: Clean up how enum values are handled if an integer value is not explicitly specified in the thrift file. For example, the following used to be a compile error, but works now: enum MyEnum { SOMEVALUE } struct MyStruct { 1: MyEnum e = SOMEVALUE } This change also cleans up some of the error handling with out-of-range values. Previously thrift simply issued a warning for enum values that didn't fit in an i32, but serialized them as i32 anyway. Now out-of-range enum values result in a compile failure. Test Plan: Included a new unit test to verify the assignment of enum values. I also verified that g++ makes the same enum value assignments when compiling these enums as C++ code.
2014-09-04 21:04:21 +00:00
THRIFT-2513 clean up enum value assignment Client: Compiler (General) Patch: Konrad Grochowski Fixes the failing test with pure_enums. For details, see JIRA ticket.
2014-09-12 09:15:24 +00:00
BOOST_CHECK_EQUAL(MyEnum3::ME3_0, 0);
BOOST_CHECK_EQUAL(MyEnum3::ME3_1, 1);
BOOST_CHECK_EQUAL(MyEnum3::ME3_N2, -2);
BOOST_CHECK_EQUAL(MyEnum3::ME3_N1, -1);
BOOST_CHECK_EQUAL(MyEnum3::ME3_D0, 0);
BOOST_CHECK_EQUAL(MyEnum3::ME3_D1, 1);
BOOST_CHECK_EQUAL(MyEnum3::ME3_9, 9);
BOOST_CHECK_EQUAL(MyEnum3::ME3_10, 10);
THRIFT-2513 clean up enum value assignment Patch: Dave Watson This closes #88 Summary: Clean up how enum values are handled if an integer value is not explicitly specified in the thrift file. For example, the following used to be a compile error, but works now: enum MyEnum { SOMEVALUE } struct MyStruct { 1: MyEnum e = SOMEVALUE } This change also cleans up some of the error handling with out-of-range values. Previously thrift simply issued a warning for enum values that didn't fit in an i32, but serialized them as i32 anyway. Now out-of-range enum values result in a compile failure. Test Plan: Included a new unit test to verify the assignment of enum values. I also verified that g++ makes the same enum value assignments when compiling these enums as C++ code.
2014-09-04 21:04:21 +00:00
THRIFT-2513 clean up enum value assignment Client: Compiler (General) Patch: Konrad Grochowski Fixes the failing test with pure_enums. For details, see JIRA ticket.
2014-09-12 09:15:24 +00:00
BOOST_CHECK_EQUAL(MyEnum4::ME4_A, 0x7ffffffd);
BOOST_CHECK_EQUAL(MyEnum4::ME4_B, 0x7ffffffe);
BOOST_CHECK_EQUAL(MyEnum4::ME4_C, 0x7fffffff);
THRIFT-2513 clean up enum value assignment Patch: Dave Watson This closes #88 Summary: Clean up how enum values are handled if an integer value is not explicitly specified in the thrift file. For example, the following used to be a compile error, but works now: enum MyEnum { SOMEVALUE } struct MyStruct { 1: MyEnum e = SOMEVALUE } This change also cleans up some of the error handling with out-of-range values. Previously thrift simply issued a warning for enum values that didn't fit in an i32, but serialized them as i32 anyway. Now out-of-range enum values result in a compile failure. Test Plan: Included a new unit test to verify the assignment of enum values. I also verified that g++ makes the same enum value assignments when compiling these enums as C++ code.
2014-09-04 21:04:21 +00:00
}
THRIFT-2729: C++ - .clang-format created and applied Client: C++ Patch: Konrad Grochowski make style command added
2014-11-13 14:33:38 +00:00
BOOST_AUTO_TEST_CASE(test_enum_constant) {
THRIFT-2513 clean up enum value assignment Patch: Dave Watson This closes #88 Summary: Clean up how enum values are handled if an integer value is not explicitly specified in the thrift file. For example, the following used to be a compile error, but works now: enum MyEnum { SOMEVALUE } struct MyStruct { 1: MyEnum e = SOMEVALUE } This change also cleans up some of the error handling with out-of-range values. Previously thrift simply issued a warning for enum values that didn't fit in an i32, but serialized them as i32 anyway. Now out-of-range enum values result in a compile failure. Test Plan: Included a new unit test to verify the assignment of enum values. I also verified that g++ makes the same enum value assignments when compiling these enums as C++ code.
2014-09-04 21:04:21 +00:00
MyStruct ms;
BOOST_CHECK_EQUAL(ms.me2_2, 2);
BOOST_CHECK_EQUAL(ms.me3_n2, -2);
BOOST_CHECK_EQUAL(ms.me3_d1, 1);
}
BOOST_AUTO_TEST_SUITE_END()
Reference in New Issue Copy Permalink