diff options
Diffstat (limited to 'test/rb')
-rwxr-xr-x[-rw-r--r--] | test/rb/integration/accelerated_buffered_client.rb | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | test/rb/integration/accelerated_buffered_server.rb | 7 | ||||
-rwxr-xr-x[-rw-r--r--] | test/rb/integration/buffered_client.rb | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | test/rb/integration/simple_client.rb | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | test/rb/integration/simple_server.rb | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | test/rb/integration/test_simple_handler.rb | 5 |
6 files changed, 18 insertions, 15 deletions
diff --git a/test/rb/integration/accelerated_buffered_client.rb b/test/rb/integration/accelerated_buffered_client.rb index 7cec1df51..f2403c5f4 100644..100755 --- a/test/rb/integration/accelerated_buffered_client.rb +++ b/test/rb/integration/accelerated_buffered_client.rb @@ -17,10 +17,11 @@ # under the License. # -require File.join(File.dirname(__FILE__), '../test_helper') +$:.push File.dirname(__FILE__) + '/..' +require 'test_helper' require 'thrift' -require 'ThriftTest' +require 'thrift_test' class AcceleratedBufferedClientTest < Test::Unit::TestCase def setup diff --git a/test/rb/integration/accelerated_buffered_server.rb b/test/rb/integration/accelerated_buffered_server.rb index 1ca66e543..af5e6019b 100644..100755 --- a/test/rb/integration/accelerated_buffered_server.rb +++ b/test/rb/integration/accelerated_buffered_server.rb @@ -17,12 +17,11 @@ # under the License. # -$:.push File.dirname(__FILE__) + '/../gen-rb' -$:.push File.join(File.dirname(__FILE__), '../../../lib/rb/lib') -$:.push File.join(File.dirname(__FILE__), '../../../lib/rb/ext') +$:.push File.dirname(__FILE__) + '/..' +require 'test_helper' require 'thrift' -require 'ThriftTest' +require 'thrift_test' class SimpleHandler [:testString, :testByte, :testI32, :testI64, :testDouble, diff --git a/test/rb/integration/buffered_client.rb b/test/rb/integration/buffered_client.rb index 1a925ccf4..16f6d4e9c 100644..100755 --- a/test/rb/integration/buffered_client.rb +++ b/test/rb/integration/buffered_client.rb @@ -17,10 +17,11 @@ # under the License. # -require File.join(File.dirname(__FILE__), '../test_helper') +$:.push File.dirname(__FILE__) + '/..' +require 'test_helper' require 'thrift' -require 'ThriftTest' +require 'thrift_test' class BufferedClientTest < Test::Unit::TestCase def setup diff --git a/test/rb/integration/simple_client.rb b/test/rb/integration/simple_client.rb index 1064822ac..f7516fc6b 100644..100755 --- a/test/rb/integration/simple_client.rb +++ b/test/rb/integration/simple_client.rb @@ -17,10 +17,11 @@ # under the License. # -require File.join(File.dirname(__FILE__), '../test_helper') +$:.push File.dirname(__FILE__) + '/..' +require 'test_helper' require 'thrift' -require 'ThriftTest' +require 'thrift_test' class SimpleClientTest < Test::Unit::TestCase def setup diff --git a/test/rb/integration/simple_server.rb b/test/rb/integration/simple_server.rb index 3518d2e14..e543b70c6 100644..100755 --- a/test/rb/integration/simple_server.rb +++ b/test/rb/integration/simple_server.rb @@ -17,11 +17,11 @@ # under the License. # -$:.push File.dirname(__FILE__) + '/../gen-rb' -$:.push File.join(File.dirname(__FILE__), '../../../lib/rb/lib') +$:.push File.dirname(__FILE__) + '/..' +require 'test_helper' require 'thrift' -require 'ThriftTest' +require 'thrift_test' class SimpleHandler [:testString, :testByte, :testI32, :testI64, :testDouble, diff --git a/test/rb/integration/test_simple_handler.rb b/test/rb/integration/test_simple_handler.rb index c34aa7e51..c0561391d 100644..100755 --- a/test/rb/integration/test_simple_handler.rb +++ b/test/rb/integration/test_simple_handler.rb @@ -17,10 +17,11 @@ # under the License. # -require File.join(File.dirname(__FILE__), '../test_helper') +$:.push File.dirname(__FILE__) + '/..' +require 'test_helper' require 'thrift' -require 'ThriftTest' +require 'thrift_test' class TestHandler [:testString, :testByte, :testI32, :testI64, :testDouble, |