svn commit: r780090 - in /incubator/thrift/trunk/lib/rb/spec: binary_protocol_accelerated_spec.rb nonblocking_server_spec.rb serializer_spec.rb spec_helper.rb struct_spec.rb types_spec.rb

[bryanduxbury]

Author: bryanduxbury
Date: Fri May 29 20:11:27 2009
New Revision: 780090

URL: http://svn.apache.org/viewvc?rev=780090&view=rev
Log:
THRIFT-513. rb: spec test files broken, rake searching for misnamed files

This patch causes the right files to be required and cleans up a few odd or 
redundant requires that were in the specs.


Modified:
    incubator/thrift/trunk/lib/rb/spec/binary_protocol_accelerated_spec.rb
    incubator/thrift/trunk/lib/rb/spec/nonblocking_server_spec.rb
    incubator/thrift/trunk/lib/rb/spec/serializer_spec.rb
    incubator/thrift/trunk/lib/rb/spec/spec_helper.rb
    incubator/thrift/trunk/lib/rb/spec/struct_spec.rb
    incubator/thrift/trunk/lib/rb/spec/types_spec.rb

Modified: incubator/thrift/trunk/lib/rb/spec/binary_protocol_accelerated_spec.rb
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/spec/binary_protocol_accelerated_spec.rb?rev=780090&r1=780089&r2=780090&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/spec/binary_protocol_accelerated_spec.rb 
(original)
+++ incubator/thrift/trunk/lib/rb/spec/binary_protocol_accelerated_spec.rb Fri 
May 29 20:11:27 2009
@@ -19,7 +19,6 @@
 
 require File.dirname(__FILE__) + '/spec_helper'
 require File.dirname(__FILE__) + '/binary_protocol_spec_shared'
-require File.dirname(__FILE__) + '/gen-rb/thrift_spec_types'
 
 class ThriftBinaryProtocolAcceleratedSpec < Spec::ExampleGroup
   include Thrift

Modified: incubator/thrift/trunk/lib/rb/spec/nonblocking_server_spec.rb
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/spec/nonblocking_server_spec.rb?rev=780090&r1=780089&r2=780090&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/spec/nonblocking_server_spec.rb (original)
+++ incubator/thrift/trunk/lib/rb/spec/nonblocking_server_spec.rb Fri May 29 
20:11:27 2009
@@ -18,7 +18,6 @@
 #
 
 require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/gen-rb/nonblocking_service'
 
 class ThriftNonblockingServerSpec < Spec::ExampleGroup
   include Thrift

Modified: incubator/thrift/trunk/lib/rb/spec/serializer_spec.rb
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/spec/serializer_spec.rb?rev=780090&r1=780089&r2=780090&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/spec/serializer_spec.rb (original)
+++ incubator/thrift/trunk/lib/rb/spec/serializer_spec.rb Fri May 29 20:11:27 
2009
@@ -18,7 +18,6 @@
 #
 
 require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/gen-rb/thrift_spec_types'
 
 class ThriftSerializerSpec < Spec::ExampleGroup
   include Thrift

Modified: incubator/thrift/trunk/lib/rb/spec/spec_helper.rb
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/spec/spec_helper.rb?rev=780090&r1=780089&r2=780090&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/spec/spec_helper.rb (original)
+++ incubator/thrift/trunk/lib/rb/spec/spec_helper.rb Fri May 29 20:11:27 2009
@@ -44,8 +44,13 @@
   end
 end
 
-require File.dirname(__FILE__) + "/../debug_proto_test/gen-rb/Srv"
-require File.dirname(__FILE__) + 
"/../debug_proto_test/gen-rb/debug_proto_test_constants"
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. debug_proto_test gen-rb])
+require "srv"
+require "debug_proto_test_constants"
+
+$:.unshift File.join(File.dirname(__FILE__), *%w[gen-rb])
+require 'thrift_spec_types'
+require 'nonblocking_service'
 
 module Fixtures
   COMPACT_PROTOCOL_TEST_STRUCT = COMPACT_TEST.dup

Modified: incubator/thrift/trunk/lib/rb/spec/struct_spec.rb
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/spec/struct_spec.rb?rev=780090&r1=780089&r2=780090&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/spec/struct_spec.rb (original)
+++ incubator/thrift/trunk/lib/rb/spec/struct_spec.rb Fri May 29 20:11:27 2009
@@ -18,7 +18,6 @@
 #
 
 require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/gen-rb/thrift_spec_types'
 
 class ThriftStructSpec < Spec::ExampleGroup
   include Thrift

Modified: incubator/thrift/trunk/lib/rb/spec/types_spec.rb
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/spec/types_spec.rb?rev=780090&r1=780089&r2=780090&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/spec/types_spec.rb (original)
+++ incubator/thrift/trunk/lib/rb/spec/types_spec.rb Fri May 29 20:11:27 2009
@@ -18,7 +18,6 @@
 #
 
 require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/gen-rb/thrift_spec_types'
 
 class ThriftTypesSpec < Spec::ExampleGroup
   include Thrift