[Rubyeclipse-commit] org.rubypeople.rdt.testunit/ruby RemoteTestRunner.rb,1.10,1.11

[Christopher W. <caw...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/ruby
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1489/ruby

Modified Files:
	RemoteTestRunner.rb 
Log Message:
apply david corbin's patches

Index: RemoteTestRunner.rb
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/ruby/RemoteTestRunner.rb,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RemoteTestRunner.rb	2 Mar 2005 00:54:40 -0000	1.10
--- RemoteTestRunner.rb	28 Mar 2005 23:23:24 -0000	1.11
***************
*** 71,76 ****
            def getTestId(test)
              @tests << test
!             return test.object_id if test.respond_to? :object_id
!             return test.id
            end
           
--- 71,75 ----
            def getTestId(test)
              @tests << test
!             return test.respond_to?(:object_id) ? test.object_id : test.id
            end
           
***************
*** 166,174 ****
            def test_started(name)
              test = get_test(name)
!             if test.respond_to? :object_id
!               @last_test_id = test.object_id
!             else
!               @last_test_id = test.id
!             end            
              @last_test_name = name
              output_single("%TESTS  #{@last_test_id},#{name}\n")
--- 165,169 ----
            def test_started(name)
              test = get_test(name)
!             @last_test_id = test.respond_to?(:object_id) ? test.object_id : test.id       
              @last_test_name = name
              output_single("%TESTS  #{@last_test_id},#{name}\n")
***************
*** 196,199 ****
--- 191,212 ----
        end
      end
+         
+     module RDT
+       def self.buildSuite name
+           suite = TestSuite.new(name)
+           sub_suites = []
+           
+           ::ObjectSpace.each_object(Class) do |klass|
+             if(Test::Unit::TestCase > klass)
+               sub_suites << klass.suite
+             end
+           end
+           
+           sub_suites.sort! {|a,b| a.name <=> b.name }
+           sub_suites.each  {|s| suite << s}
+           
+           suite
+       end
+     end
    end
  end
***************
*** 230,246 ****
    # 2. port
    # 3. keepAlive
!   # 4. test class name
!   # 5. test name (optional, unused right now)
    #
    
    filename = ARGV[0].slice(0, ARGV[0].rindex('.'))
-   require filename.gsub(/.+::/, '')
    port = ARGV[1].to_i
    keepAliveString = ARGV[2]
    testClass = ARGV[3]
!   #testMethod = ARGV[4]
   
    session = createTcpSession('127.0.0.1', port)
-   testSuite = eval(testClass)
    remoteTestRunner = Test::Unit::UI::Eclipse::TestRunner.new(testSuite, session)
    remoteTestRunner.start
--- 243,267 ----
    # 2. port
    # 3. keepAlive
!   # 4. test class name (optional)
!   # 5. test name (optional)
    #
    
    filename = ARGV[0].slice(0, ARGV[0].rindex('.'))
    port = ARGV[1].to_i
    keepAliveString = ARGV[2]
    testClass = ARGV[3]
!   testMethod = ARGV[4]
!  
!   require filename.gsub(/.+::/, '')
!   
!   if (testMethod)
!     testSuite = eval(testClass).new(testMethod)
!   elsif testClass  
!     testSuite = eval(testClass)
!   else
!     testSuite = Test::Unit::RDT.buildSuite filename
!   end
   
    session = createTcpSession('127.0.0.1', port)
    remoteTestRunner = Test::Unit::UI::Eclipse::TestRunner.new(testSuite, session)
    remoteTestRunner.start
***************
*** 248,250 ****
    exit
  end
- 
--- 269,270 ----