diff options
author | Bryan Duxbury <bryanduxbury@apache.org> | 2009-04-07 04:37:28 +0000 |
---|---|---|
committer | Bryan Duxbury <bryanduxbury@apache.org> | 2009-04-07 04:37:28 +0000 |
commit | 07f38ff531c44148a5ca66838d3a22f91fb0f7bc (patch) | |
tree | dc045c3e0490e989c42a630dce1238636ec0d97c /test/rb | |
parent | 65043d6fbdbe9bb8a101e440d59567acefd7a70c (diff) | |
download | thrift-07f38ff531c44148a5ca66838d3a22f91fb0f7bc.tar.gz |
THRIFT-430. rb: ruby tutorials and ruby tests require deprecated files and class names
This patch cleans all this up.
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@762618 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/rb')
-rw-r--r-- | test/rb/benchmarks/protocol_benchmark.rb | 3 | ||||
-rw-r--r-- | test/rb/core/test_backwards_compatability.rb | 1 | ||||
-rw-r--r-- | test/rb/core/transport/test_transport.rb | 6 | ||||
-rw-r--r-- | test/rb/integration/accelerated_buffered_client.rb | 1 | ||||
-rw-r--r-- | test/rb/integration/accelerated_buffered_server.rb | 1 | ||||
-rw-r--r-- | test/rb/integration/buffered_client.rb | 1 | ||||
-rw-r--r-- | test/rb/integration/simple_client.rb | 1 | ||||
-rw-r--r-- | test/rb/integration/simple_server.rb | 1 | ||||
-rw-r--r-- | test/rb/integration/test_simple_handler.rb | 1 |
9 files changed, 3 insertions, 13 deletions
diff --git a/test/rb/benchmarks/protocol_benchmark.rb b/test/rb/benchmarks/protocol_benchmark.rb index b9fde17a6..05a8ee534 100644 --- a/test/rb/benchmarks/protocol_benchmark.rb +++ b/test/rb/benchmarks/protocol_benchmark.rb @@ -21,9 +21,6 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. .. .. lib rb lib]) $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' diff --git a/test/rb/core/test_backwards_compatability.rb b/test/rb/core/test_backwards_compatability.rb index 692aaf11b..0577515d3 100644 --- a/test/rb/core/test_backwards_compatability.rb +++ b/test/rb/core/test_backwards_compatability.rb @@ -26,6 +26,5 @@ class TestThriftException < Test::Unit::TestCase msg = "hi there thrift" assert_equal msg, Thrift::Exception.new(msg).message end - end diff --git a/test/rb/core/transport/test_transport.rb b/test/rb/core/transport/test_transport.rb index eb6e03dde..52755c1da 100644 --- a/test/rb/core/transport/test_transport.rb +++ b/test/rb/core/transport/test_transport.rb @@ -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 @@ end # 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? diff --git a/test/rb/integration/accelerated_buffered_client.rb b/test/rb/integration/accelerated_buffered_client.rb index 5a66cb8ef..7cec1df51 100644 --- a/test/rb/integration/accelerated_buffered_client.rb +++ b/test/rb/integration/accelerated_buffered_client.rb @@ -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 diff --git a/test/rb/integration/accelerated_buffered_server.rb b/test/rb/integration/accelerated_buffered_server.rb index 11e09df41..1ca66e543 100644 --- a/test/rb/integration/accelerated_buffered_server.rb +++ b/test/rb/integration/accelerated_buffered_server.rb @@ -22,7 +22,6 @@ $:.push File.join(File.dirname(__FILE__), '../../../lib/rb/lib') $:.push File.join(File.dirname(__FILE__), '../../../lib/rb/ext') require 'thrift' -require 'thrift/protocol/binaryprotocolaccelerated' require 'ThriftTest' class SimpleHandler diff --git a/test/rb/integration/buffered_client.rb b/test/rb/integration/buffered_client.rb index 50dac3051..1a925ccf4 100644 --- a/test/rb/integration/buffered_client.rb +++ b/test/rb/integration/buffered_client.rb @@ -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 diff --git a/test/rb/integration/simple_client.rb b/test/rb/integration/simple_client.rb index 591cd45dd..1064822ac 100644 --- a/test/rb/integration/simple_client.rb +++ b/test/rb/integration/simple_client.rb @@ -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 diff --git a/test/rb/integration/simple_server.rb b/test/rb/integration/simple_server.rb index 450704b29..3518d2e14 100644 --- a/test/rb/integration/simple_server.rb +++ b/test/rb/integration/simple_server.rb @@ -21,7 +21,6 @@ $:.push File.dirname(__FILE__) + '/../gen-rb' $:.push File.join(File.dirname(__FILE__), '../../../lib/rb/lib') require 'thrift' -require 'thrift/protocol/binaryprotocol' require 'ThriftTest' class SimpleHandler diff --git a/test/rb/integration/test_simple_handler.rb b/test/rb/integration/test_simple_handler.rb index 389457664..c34aa7e51 100644 --- a/test/rb/integration/test_simple_handler.rb +++ b/test/rb/integration/test_simple_handler.rb @@ -20,7 +20,6 @@ require File.join(File.dirname(__FILE__), '../test_helper') require 'thrift' -require 'thrift/protocol/binaryprotocol' require 'ThriftTest' class TestHandler |