THRIFT-276. rb: Ruby libraries should have one class per file
This monster of a patch moves all the classes into their own files and specs as appropriate. Additionally, it concentrates all the requires into thrift.rb, removing the need to require any other file. (Changes were made to the compiler to reflect this reduced requirement.)
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@761849 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/rb/spec/server_spec.rb b/lib/rb/spec/server_spec.rb
index 7c6ebd4..ffe9bff 100644
--- a/lib/rb/spec/server_spec.rb
+++ b/lib/rb/spec/server_spec.rb
@@ -22,11 +22,11 @@
class ThriftServerSpec < Spec::ExampleGroup
include Thrift
- describe Server do
- it "should default to TransportFactory and BinaryProtocolFactory when not specified" do
- server = Server.new(mock("Processor"), mock("ServerTransport"))
- server.instance_variable_get(:'@transportFactory').should be_an_instance_of(TransportFactory)
- server.instance_variable_get(:'@protocolFactory').should be_an_instance_of(BinaryProtocolFactory)
+ describe BaseServer do
+ it "should default to BaseTransportFactory and BinaryProtocolFactory when not specified" do
+ server = BaseServer.new(mock("Processor"), mock("BaseServerTransport"))
+ server.instance_variable_get(:'@transport_factory').should be_an_instance_of(BaseTransportFactory)
+ server.instance_variable_get(:'@protocol_factory').should be_an_instance_of(BinaryProtocolFactory)
end
# serve is a noop, so can't test that
@@ -36,8 +36,8 @@
before(:each) do
@processor = mock("Processor")
@serverTrans = mock("ServerTransport")
- @trans = mock("Transport")
- @prot = mock("Protocol")
+ @trans = mock("BaseTransport")
+ @prot = mock("BaseProtocol")
@client = mock("Client")
@server = server_type.new(@processor, @serverTrans, @trans, @prot)
end