From af99b5c398bddbc70136e123135a912a3a342741 Mon Sep 17 00:00:00 2001 From: Kevin Clark Date: Wed, 4 Mar 2009 21:42:46 +0000 Subject: [PATCH] THRIFT-352. rb: Implicit enums should be valid values Author: Gary Tsang git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@750171 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/generate/t_rb_generator.cc | 6 ++---- test/rb/generation/test_enum.rb | 9 +++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 test/rb/generation/test_enum.rb diff --git a/compiler/cpp/src/generate/t_rb_generator.cc b/compiler/cpp/src/generate/t_rb_generator.cc index da9544f3..169b807d 100644 --- a/compiler/cpp/src/generate/t_rb_generator.cc +++ b/compiler/cpp/src/generate/t_rb_generator.cc @@ -303,10 +303,8 @@ void t_rb_generator::generate_enum(t_enum* tenum) { bool first = true; for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) { // Populate the set - if ((*c_iter)->has_value()){ - first ? first = false: f_types_ << ", "; - f_types_ << capitalize((*c_iter)->get_name()); - } + first ? first = false: f_types_ << ", "; + f_types_ << capitalize((*c_iter)->get_name()); } f_types_ << "]).freeze" << endl; diff --git a/test/rb/generation/test_enum.rb b/test/rb/generation/test_enum.rb new file mode 100644 index 00000000..75ed42bc --- /dev/null +++ b/test/rb/generation/test_enum.rb @@ -0,0 +1,9 @@ +require File.join(File.dirname(__FILE__), '../test_helper') +require 'ThriftTest' + +class TestEnumGeneration < Test::Unit::TestCase + include Thrift::Test + def test_enum_valid_values + assert_equal(Numberz::VALID_VALUES, Set.new([Numberz::ONE, Numberz::TWO, Numberz::THREE, Numberz::FIVE, Numberz::SIX, Numberz::EIGHT])) + end +end \ No newline at end of file -- 2.17.1