Merge branch 'THRIFT-143'
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@714070 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/rb/spec/struct_spec.rb b/lib/rb/spec/struct_spec.rb
index 7c52d16..4dc8714 100644
--- a/lib/rb/spec/struct_spec.rb
+++ b/lib/rb/spec/struct_spec.rb
@@ -5,15 +5,6 @@
include Thrift
include SpecNamespace
- class Xception < Thrift::Exception
- include Thrift::Struct
- attr_accessor :message, :code
- FIELDS = {
- 1 => {:type => Thrift::Types::STRING, :name => 'message'},
- 2 => {:type => Thrift::Types::I32, :name => 'code', :default => 1}
- }
- end
-
describe Struct do
it "should iterate over all fields properly" do
fields = {}
@@ -209,7 +200,7 @@
e.code.should == 1
# ensure it gets serialized properly, this is the really important part
prot = mock("Protocol")
- prot.should_receive(:write_struct_begin).with("ThriftStructSpec::Xception")
+ prot.should_receive(:write_struct_begin).with("SpecNamespace::Xception")
prot.should_receive(:write_struct_end)
prot.should_receive(:write_field).with('message', Types::STRING, 1, "something happened")
prot.should_receive(:write_field).with('code', Types::I32, 2, 1)
@@ -226,7 +217,7 @@
e.message.should == "something happened"
e.code.should == 5
prot = mock("Protocol")
- prot.should_receive(:write_struct_begin).with("ThriftStructSpec::Xception")
+ prot.should_receive(:write_struct_begin).with("SpecNamespace::Xception")
prot.should_receive(:write_struct_end)
prot.should_receive(:write_field).with('message', Types::STRING, 1, "something happened")
prot.should_receive(:write_field).with('code', Types::I32, 2, 5)