Author: bryanduxbury
Date: Tue Apr 7 04:37:28 2009
New Revision: 762618
URL: http://svn.apache.org/viewvc?rev=762618&view=rev
Log:
THRIFT-430. rb: ruby tutorials and ruby tests require deprecated files and
class names
This patch cleans all this up.
Modified:
incubator/thrift/trunk/test/rb/benchmarks/protocol_benchmark.rb
incubator/thrift/trunk/test/rb/core/test_backwards_compatability.rb
incubator/thrift/trunk/test/rb/core/transport/test_transport.rb
incubator/thrift/trunk/test/rb/integration/accelerated_buffered_client.rb
incubator/thrift/trunk/test/rb/integration/accelerated_buffered_server.rb
incubator/thrift/trunk/test/rb/integration/buffered_client.rb
incubator/thrift/trunk/test/rb/integration/simple_client.rb
incubator/thrift/trunk/test/rb/integration/simple_server.rb
incubator/thrift/trunk/test/rb/integration/test_simple_handler.rb
incubator/thrift/trunk/tutorial/rb/RubyClient.rb
incubator/thrift/trunk/tutorial/rb/RubyServer.rb
Modified: incubator/thrift/trunk/test/rb/benchmarks/protocol_benchmark.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/rb/benchmarks/protocol_benchmark.rb?rev=762618&r1=762617&r2=762618&view=diff
==============================================================================
--- incubator/thrift/trunk/test/rb/benchmarks/protocol_benchmark.rb (original)
+++ incubator/thrift/trunk/test/rb/benchmarks/protocol_benchmark.rb Tue Apr 7
04:37:28 2009
@@ -21,9 +21,6 @@
$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. .. .. lib rb ext])
require 'thrift'
-require 'thrift/transport'
-require 'thrift/protocol/binaryprotocol'
-require 'thrift/protocol/binaryprotocolaccelerated'
require 'benchmark'
require 'rubygems'
Modified: incubator/thrift/trunk/test/rb/core/test_backwards_compatability.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/rb/core/test_backwards_compatability.rb?rev=762618&r1=762617&r2=762618&view=diff
==============================================================================
--- incubator/thrift/trunk/test/rb/core/test_backwards_compatability.rb
(original)
+++ incubator/thrift/trunk/test/rb/core/test_backwards_compatability.rb Tue Apr
7 04:37:28 2009
@@ -26,6 +26,5 @@
msg = "hi there thrift"
assert_equal msg, Thrift::Exception.new(msg).message
end
-
end
Modified: incubator/thrift/trunk/test/rb/core/transport/test_transport.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/rb/core/transport/test_transport.rb?rev=762618&r1=762617&r2=762618&view=diff
==============================================================================
--- incubator/thrift/trunk/test/rb/core/transport/test_transport.rb (original)
+++ incubator/thrift/trunk/test/rb/core/transport/test_transport.rb Tue Apr 7
04:37:28 2009
@@ -19,9 +19,9 @@
require File.join(File.dirname(__FILE__), '../../test_helper')
-require 'thrift/transport'
+require 'thrift'
-class DummyTransport < Thrift::Transport
+class DummyTransport < Thrift::BaseTransport
def initialize(data)
@data = data
end
@@ -34,7 +34,7 @@
# TTransport is basically an abstract class, but isn't raising
NotImplementedError
class TestThriftTransport < Test::Unit::TestCase
def setup
- @trans = Thrift::Transport.new
+ @trans = Thrift::BaseTransport.new
end
def test_open?
Modified:
incubator/thrift/trunk/test/rb/integration/accelerated_buffered_client.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/rb/integration/accelerated_buffered_client.rb?rev=762618&r1=762617&r2=762618&view=diff
==============================================================================
--- incubator/thrift/trunk/test/rb/integration/accelerated_buffered_client.rb
(original)
+++ incubator/thrift/trunk/test/rb/integration/accelerated_buffered_client.rb
Tue Apr 7 04:37:28 2009
@@ -20,7 +20,6 @@
require File.join(File.dirname(__FILE__), '../test_helper')
require 'thrift'
-require 'thrift/protocol/binaryprotocolaccelerated'
require 'ThriftTest'
class AcceleratedBufferedClientTest < Test::Unit::TestCase
Modified:
incubator/thrift/trunk/test/rb/integration/accelerated_buffered_server.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/rb/integration/accelerated_buffered_server.rb?rev=762618&r1=762617&r2=762618&view=diff
==============================================================================
--- incubator/thrift/trunk/test/rb/integration/accelerated_buffered_server.rb
(original)
+++ incubator/thrift/trunk/test/rb/integration/accelerated_buffered_server.rb
Tue Apr 7 04:37:28 2009
@@ -22,7 +22,6 @@
$:.push File.join(File.dirname(__FILE__), '../../../lib/rb/ext')
require 'thrift'
-require 'thrift/protocol/binaryprotocolaccelerated'
require 'ThriftTest'
class SimpleHandler
Modified: incubator/thrift/trunk/test/rb/integration/buffered_client.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/rb/integration/buffered_client.rb?rev=762618&r1=762617&r2=762618&view=diff
==============================================================================
--- incubator/thrift/trunk/test/rb/integration/buffered_client.rb (original)
+++ incubator/thrift/trunk/test/rb/integration/buffered_client.rb Tue Apr 7
04:37:28 2009
@@ -20,7 +20,6 @@
require File.join(File.dirname(__FILE__), '../test_helper')
require 'thrift'
-require 'thrift/protocol/binaryprotocol'
require 'ThriftTest'
class BufferedClientTest < Test::Unit::TestCase
Modified: incubator/thrift/trunk/test/rb/integration/simple_client.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/rb/integration/simple_client.rb?rev=762618&r1=762617&r2=762618&view=diff
==============================================================================
--- incubator/thrift/trunk/test/rb/integration/simple_client.rb (original)
+++ incubator/thrift/trunk/test/rb/integration/simple_client.rb Tue Apr 7
04:37:28 2009
@@ -20,7 +20,6 @@
require File.join(File.dirname(__FILE__), '../test_helper')
require 'thrift'
-require 'thrift/protocol/binaryprotocol'
require 'ThriftTest'
class SimpleClientTest < Test::Unit::TestCase
Modified: incubator/thrift/trunk/test/rb/integration/simple_server.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/rb/integration/simple_server.rb?rev=762618&r1=762617&r2=762618&view=diff
==============================================================================
--- incubator/thrift/trunk/test/rb/integration/simple_server.rb (original)
+++ incubator/thrift/trunk/test/rb/integration/simple_server.rb Tue Apr 7
04:37:28 2009
@@ -21,7 +21,6 @@
$:.push File.join(File.dirname(__FILE__), '../../../lib/rb/lib')
require 'thrift'
-require 'thrift/protocol/binaryprotocol'
require 'ThriftTest'
class SimpleHandler
Modified: incubator/thrift/trunk/test/rb/integration/test_simple_handler.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/test/rb/integration/test_simple_handler.rb?rev=762618&r1=762617&r2=762618&view=diff
==============================================================================
--- incubator/thrift/trunk/test/rb/integration/test_simple_handler.rb (original)
+++ incubator/thrift/trunk/test/rb/integration/test_simple_handler.rb Tue Apr
7 04:37:28 2009
@@ -20,7 +20,6 @@
require File.join(File.dirname(__FILE__), '../test_helper')
require 'thrift'
-require 'thrift/protocol/binaryprotocol'
require 'ThriftTest'
class TestHandler
Modified: incubator/thrift/trunk/tutorial/rb/RubyClient.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/rb/RubyClient.rb?rev=762618&r1=762617&r2=762618&view=diff
==============================================================================
--- incubator/thrift/trunk/tutorial/rb/RubyClient.rb (original)
+++ incubator/thrift/trunk/tutorial/rb/RubyClient.rb Tue Apr 7 04:37:28 2009
@@ -23,7 +23,6 @@
$:.unshift '../../lib/rb/lib'
require 'thrift'
-require 'thrift/protocol/binaryprotocol'
require 'Calculator'
Modified: incubator/thrift/trunk/tutorial/rb/RubyServer.rb
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/rb/RubyServer.rb?rev=762618&r1=762617&r2=762618&view=diff
==============================================================================
--- incubator/thrift/trunk/tutorial/rb/RubyServer.rb (original)
+++ incubator/thrift/trunk/tutorial/rb/RubyServer.rb Tue Apr 7 04:37:28 2009
@@ -23,8 +23,6 @@
$:.unshift '../../lib/rb/lib'
require 'thrift'
-require 'thrift/protocol/binaryprotocol'
-require 'thrift/server/tserver'
require 'Calculator'
require 'shared_types'
