commit b3e5ebe1e4fdbbc34df5d4dabcdd15f25a7ee2fd
author name <email> Fri Sep 12 11:15:24 2014 +0200
committer name <email> Fri Sep 12 11:15:24 2014 +0200
tree e321d71c0d14068c286969896202bd8919a9e465
parent 2de7e198998adeabbc7a31ecf2c1f06fc0304834

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.

lib/cpp/test/EnumTest.cpp

diff --git a/lib/cpp/test/EnumTest.cpp b/lib/cpp/test/EnumTest.cpp
index d523ff6..72f98bb 100644
--- a/lib/cpp/test/EnumTest.cpp
+++ b/lib/cpp/test/EnumTest.cpp
@@ -24,29 +24,29 @@
 
 BOOST_AUTO_TEST_CASE( test_enum ) {
   // Check that all the enum values match what we expect
-  BOOST_CHECK_EQUAL(ME1_0, 0);
-  BOOST_CHECK_EQUAL(ME1_1, 1);
-  BOOST_CHECK_EQUAL(ME1_2, 2);
-  BOOST_CHECK_EQUAL(ME1_3, 3);
-  BOOST_CHECK_EQUAL(ME1_5, 5);
-  BOOST_CHECK_EQUAL(ME1_6, 6);
+  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);
 
-  BOOST_CHECK_EQUAL(ME2_0, 0);
-  BOOST_CHECK_EQUAL(ME2_1, 1);
-  BOOST_CHECK_EQUAL(ME2_2, 2);
+  BOOST_CHECK_EQUAL(MyEnum2::ME2_0, 0);
+  BOOST_CHECK_EQUAL(MyEnum2::ME2_1, 1);
+  BOOST_CHECK_EQUAL(MyEnum2::ME2_2, 2);
 
-  BOOST_CHECK_EQUAL(ME3_0, 0);
-  BOOST_CHECK_EQUAL(ME3_1, 1);
-  BOOST_CHECK_EQUAL(ME3_N2, -2);
-  BOOST_CHECK_EQUAL(ME3_N1, -1);
-  BOOST_CHECK_EQUAL(ME3_D0, 0);
-  BOOST_CHECK_EQUAL(ME3_D1, 1);
-  BOOST_CHECK_EQUAL(ME3_9, 9);
-  BOOST_CHECK_EQUAL(ME3_10, 10);
+  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);
 
-  BOOST_CHECK_EQUAL(ME4_A, 0x7ffffffd);
-  BOOST_CHECK_EQUAL(ME4_B, 0x7ffffffe);
-  BOOST_CHECK_EQUAL(ME4_C, 0x7fffffff);
+  BOOST_CHECK_EQUAL(MyEnum4::ME4_A, 0x7ffffffd);
+  BOOST_CHECK_EQUAL(MyEnum4::ME4_B, 0x7ffffffe);
+  BOOST_CHECK_EQUAL(MyEnum4::ME4_C, 0x7fffffff);
 }
 
 BOOST_AUTO_TEST_CASE( test_enum_constant ) {

lib/cpp/test/Makefile.am

diff --git a/lib/cpp/test/Makefile.am b/lib/cpp/test/Makefile.am
index 9c9b8d8..ba32cb8 100755
--- a/lib/cpp/test/Makefile.am
+++ b/lib/cpp/test/Makefile.am
@@ -246,7 +246,7 @@
 	$(THRIFT) --gen cpp:dense $<
 
 gen-cpp/EnumTest_types.cpp gen-cpp/EnumTest_types.h: $(top_srcdir)/test/EnumTest.thrift
-	$(THRIFT) --gen cpp:pure_enums $<
+	$(THRIFT) --gen cpp $<
 
 gen-cpp/TypedefTest_types.cpp gen-cpp/TypedefTest_types.h: $(top_srcdir)/test/TypedefTest.thrift
 	$(THRIFT) --gen cpp $<