rcodetools 0.5.0.0 → 0.7.0.0

data/test/test_run.rb

@@ -7,6 +7,9 @@ require 'rcodetools/options'
 require 'stringio'
 
 class TestRun < Test::Unit::TestCase
+  include Rcodetools
+  DIR = File.expand_path(File.dirname(__FILE__))
+
   tests = {
     :simple_annotation => {:klass => XMPFilter},
     :unit_test         => {:klass => XMPTestUnitFilter},
@@ -20,6 +23,8 @@ class TestRun < Test::Unit::TestCase
     :completion       => {:klass => XMPCompletionFilter,      :lineno => 1},
     :completion_emacs => {:klass => XMPCompletionEmacsFilter, :lineno => 1},
     :completion_emacs_icicles => {:klass => XMPCompletionEmacsIciclesFilter, :lineno => 1},
+    :completion_class_info => {:klass => XMPCompletionClassInfoFilter, :lineno => 1},
+    :completion_class_info_no_candidates => {:klass => XMPCompletionClassInfoFilter, :lineno => 1},
     
     :doc      => {:klass => XMPDocFilter,     :lineno => 1},
     :refe     => {:klass => XMPReFeFilter,    :lineno => 1},
@@ -30,9 +35,8 @@ class TestRun < Test::Unit::TestCase
   }
   tests.each_pair do |test, opts|
     define_method("test_#{test}") do
-      dir = File.expand_path(File.dirname(__FILE__))
-      inputfile = "#{dir}/data/#{test}-input.rb"
-      outputfile = "#{dir}/data/#{test}-output.rb"
+      inputfile = "#{DIR}/data/#{test}-input.rb"
+      outputfile = "#{DIR}/data/#{test}-output.rb"
       sio = StringIO.new
       sio.puts opts[:klass].run(File.read(inputfile), DEFAULT_OPTIONS.merge(opts))
       assert_equal(File.read(outputfile), sio.string)

data/test/test_xmpfilter.rb

@@ -1,12 +1,14 @@
 
 require 'test/unit'
-$: << ".." << "../lib[s]"
+$: << ".." << "../lib"
 require "rcodetools/xmpfilter"
 
 class TestXMPFilter < Test::Unit::TestCase
+  include Rcodetools
   def setup
     @xmp = XMPFilter.new
     @marker = XMPFilter::MARKER
+    @testdir = File.dirname(__FILE__)
   end
 
   def test_extract_data
@@ -25,12 +27,137 @@ class TestXMPFilter < Test::Unit::TestCase
     assert_equal([[2, ["some exception"]]], data.exceptions.sort)
     assert_equal([[1, ["var", "var2"]], [4, ["var3"]]], data.bindings.sort)
   end
-end
 
-class TestXMPAddMarkers < Test::Unit::TestCase
-  
+  def test_interpreter_command
+    xmp = XMPFilter.new(:interpreter=>"ruby", :detect_rct_fork => false)
+    assert_equal(%w[ruby -w], xmp.interpreter_command)
+  end
+
+  def test_interpreter_command_detect_rct_fork
+    begin
+      def Fork::run?() true end
+      xmp = XMPFilter.new(:interpreter=>"ruby", :detect_rct_fork => true)
+      assert_equal(%w[ruby -S rct-fork-client], xmp.interpreter_command)
+    ensure
+      def Fork::run?() false end
+    end
+  end
+
+  def test_interpreter_command_use_rbtest
+    xmp = XMPFilter.new(:interpreter=>"ruby", :use_rbtest => true)
+    assert_equal(%w[ruby -S rbtest], xmp.interpreter_command)
+  end
+
+  def test_initialize__test_script_1
+    @xmp = XMPFilter.new(:test_script=>"/path/to/test/test_ruby_toggle_file.rb",
+                         :test_method=>"test_implementation_file_file_exist",
+                         :filename=>"/path/to/lib/ruby_toggle_file.rb")
+
+    evals_expected = [
+      %q!$LOADED_FEATURES << "ruby_toggle_file.rb"!,
+      %q!require 'test/unit'!,
+      %q!load "/path/to/test/test_ruby_toggle_file.rb"!,
+      %q!Test::Unit::AutoRunner.run(false, nil, ["-n", "test_implementation_file_file_exist"])!
+    ]
+    assert_equal evals_expected, @xmp.instance_variable_get(:@evals)
+  end
+
+  def test_initialize__test_script_2
+    @xmp = XMPFilter.new(:test_script=>"/path/to/test_ruby_toggle_file.rb",
+                         :test_method=>"test_implementation_file_file_exist",
+                         :filename=>"/path/to/ruby_toggle_file.rb")
+
+    evals_expected = [
+      %q!$LOADED_FEATURES << "ruby_toggle_file.rb"!,
+      %q!require 'test/unit'!,
+      %q!load "/path/to/test_ruby_toggle_file.rb"!,
+      %q!Test::Unit::AutoRunner.run(false, nil, ["-n", "test_implementation_file_file_exist"])!
+    ]
+    assert_equal evals_expected, @xmp.instance_variable_get(:@evals)
+  end
+
+  def test_initialize__test_script_3
+    test_script = File.join(@testdir, "data/sample_test_script.rb")
+    filename = File.join(@testdir, "data/sample.rb")
+    @xmp = XMPFilter.new(:test_script=>test_script, :test_method=>"4", :filename=>filename)
+
+    evals_expected = [
+      %q!$LOADED_FEATURES << "sample.rb"!,
+      %q!require 'test/unit'!,
+      %Q!load #{test_script.dump}!,
+      %q!Test::Unit::AutoRunner.run(false, nil, ["-n", "test_sample0"])!
+    ]
+    assert_equal evals_expected, @xmp.instance_variable_get(:@evals)
+  end
 
-  def test_
+  def test_initialize__test_script__filename_eq_test_script
+    test_script = File.join(@testdir, "data/sample_test_script.rb")
+    filename = test_script
+    @xmp = XMPFilter.new(:test_script=>test_script, :test_method=>"4", :filename=>filename)
 
+    evals_expected = [
+      %q!Test::Unit::AutoRunner.run(false, nil, ["-n", "test_sample0"])!
+    ]
+    assert_equal evals_expected, @xmp.instance_variable_get(:@evals)
   end
+
+  def test_get_test_method_from_lineno
+    file = File.join(@testdir, "data/sample_test_script.rb")
+    assert_equal("test_sample0", @xmp.get_test_method_from_lineno(file, 4))
+    assert_equal("test_sample1", @xmp.get_test_method_from_lineno(file, 7))
+    assert_equal("test_sample1", @xmp.get_test_method_from_lineno(file, 8))
+    assert_equal(nil, @xmp.get_test_method_from_lineno(file, 1))
+  end
+
+  def test_s_detect_rbtest
+    # Use variable to avoid confusing syntax highlighting
+    beg = "=begin"
+    ed  = "=end"
+
+    rbtest_script_1 = <<XXX
+#{beg} test_0
+assert f(10)
+#{ed}
+def f(x) x*100 end
+XXX
+
+    opts = {:detect_rbtest => true}
+    assert_equal true, XMPFilter.detect_rbtest(rbtest_script_1, opts)
+    assert_equal true, opts[:use_rbtest]
+    opts = {:detect_rbtest => false}
+    assert_equal false, XMPFilter.detect_rbtest(rbtest_script_1, opts)
+    assert_equal false, opts[:use_rbtest]
+    opts = {:detect_rbtest => false, :use_rbtest => true}
+    assert_equal true, XMPFilter.detect_rbtest(rbtest_script_1, opts)
+    assert_equal true, opts[:use_rbtest]
+
+
+
+    rbtest_script_2 = <<XXX
+def f(x) x*100 end
+#{beg} test_0
+assert f(10)
+#{ed}
+XXX
+    opts = {:detect_rbtest => true}
+    assert_equal true, XMPFilter.detect_rbtest(rbtest_script_2, opts)
+    assert_equal true, opts[:use_rbtest]
+    opts = {:detect_rbtest => false}
+    assert_equal false, XMPFilter.detect_rbtest(rbtest_script_2, opts)
+    assert_equal false, opts[:use_rbtest]
+
+
+    no_rbtest_script = <<XXX
+def f(x) x*100 end
+XXX
+
+    opts = {:detect_rbtest => true}
+    assert_equal false, XMPFilter.detect_rbtest(no_rbtest_script, opts)
+    assert_equal false, opts[:use_rbtest]
+    opts = {:detect_rbtest => false}
+    assert_equal false, XMPFilter.detect_rbtest(no_rbtest_script, opts)
+    assert_equal false, opts[:use_rbtest]
+  end
+
 end
+

data/test/test_xmptestunitfilter.rb

@@ -4,6 +4,7 @@ $: << ".." << "../lib"
 require "rcodetools/xmptestunitfilter"
 
 class TestXMPTestUnitFilter < Test::Unit::TestCase
+  include Rcodetools
   def setup
     @xmp = XMPTestUnitFilter.new
   end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.1
 specification_version: 1
 name: rcodetools
 version: !ruby/object:Gem::Version 
-  version: 0.5.0.0
-date: 2007-01-28 00:00:00 +01:00
+  version: 0.7.0.0
+date: 2007-06-22 00:00:00 +02:00
 summary: rcodetools is a collection of Ruby code manipulation tools
 require_paths: 
 - lib
@@ -50,18 +50,23 @@ files:
 - bin/xmpfilter
 - bin/rct-meth-args
 - lib/method_analyzer.rb
-- lib/rcodetools/completion.rb
-- lib/rcodetools/doc.rb
+- lib/ruby_toggle_file.rb
+- lib/rcodetools/xmpfilter.rb
+- lib/rcodetools/fork.rb
 - lib/rcodetools/options.rb
+- lib/rcodetools/doc.rb
+- lib/rcodetools/completion.rb
+- lib/rcodetools/fork_config.rb
 - lib/rcodetools/xmptestunitfilter.rb
-- lib/rcodetools/xmpfilter.rb
 - CHANGES
-- rcodetools.vim
 - rcodetools.el
+- rcodetools.vim
 - icicles-rcodetools.el
 - README
+- README.ja
 - README.emacs
 - README.vim
+- README.TDC
 - README.xmpfilter
 - README.method_analysis
 - THANKS
@@ -69,58 +74,86 @@ files:
 - Rakefile.method_analysis
 - setup.rb
 - test/test_functional.rb
-- test/test_xmpfilter.rb
-- test/test_xmptestunitfilter.rb
+- test/test_options.rb
 - test/test_doc.rb
+- test/test_run.rb
+- test/test_method_analyzer.rb
 - test/test_completion.rb
 - test/test_method_args.rb
-- test/test_method_analyzer.rb
-- test/test_run.rb
-- test/test_options.rb
-- test/data/simple_annotation-input.rb
+- test/test_xmptestunitfilter.rb
+- test/test_xmpfilter.rb
+- test/test_ruby_toggle_file.rb
+- test/data/completion_class_info-output.rb
+- test/data/completion_in_method-test.rb
+- test/data/bindings-output.rb
+- test/data/completion_rbtest-output.rb
+- test/data/ri_vim-output.rb
+- test/data/method_args.data.rb
+- test/data/doc_rbtest-output.rb
+- test/data/method_analyzer-data.rb
+- test/data/ri_vim-input.rb
+- test/data/completion_in_method-output.rb
+- test/data/rspec-output.rb
 - test/data/unit_test-input.rb
-- test/data/rspec-input.rb
+- test/data/bindings-input.rb
+- test/data/doc_detect_rbtest2-input.rb
 - test/data/simple_annotation-output.rb
-- test/data/unit_test-output.rb
+- test/data/doc_detect_rbtest-input.rb
+- test/data/ri-input.rb
+- test/data/rspec_poetry-output.rb
+- test/data/ri_emacs-input.rb
+- test/data/ri-output.rb
+- test/data/refe-input.rb
+- test/data/rspec-input.rb
+- test/data/unit_test_poetry-output.rb
+- test/data/unit_test_detect_rbtest2-output.rb
+- test/data/doc_detect_rbtest-output.rb
+- test/data/doc-input.rb
+- test/data/completion-input.rb
+- test/data/unit_test_detect_rbtest-input.rb
+- test/data/unit_test_detect_rbtest-output.rb
+- test/data/completion_class_info_no_candidates-input.rb
+- test/data/completion_detect_rbtest2-output.rb
 - test/data/no_warnings-input.rb
+- test/data/completion-output.rb
 - test/data/no_warnings-output.rb
-- test/data/rspec-output.rb
-- test/data/bindings-input.rb
-- test/data/bindings-output.rb
-- test/data/method_analyzer-data.rb
-- test/data/add_markers-input.rb
+- test/data/completion_emacs_icicles-input.rb
+- test/data/completion_in_method-input.rb
 - test/data/add_markers-output.rb
-- test/data/completion-input.rb
-- test/data/completion-output.rb
-- test/data/completion_emacs-input.rb
+- test/data/completion_detect_rbtest-output.rb
+- test/data/completion_class_info-input.rb
+- test/data/unit_test_poetry-input.rb
+- test/data/doc_detect_rbtest2-output.rb
+- test/data/completion_detect_rbtest-input.rb
+- test/data/unit_test_rbtest-input.rb
+- test/data/rspec_poetry-input.rb
 - test/data/completion_emacs-output.rb
-- test/data/doc-input.rb
-- test/data/doc-output.rb
-- test/data/refe-input.rb
+- test/data/completion_rbtest-input.rb
+- test/data/completion_class_info_no_candidates-output.rb
+- test/data/unit_test_rbtest-output.rb
 - test/data/refe-output.rb
-- test/data/ri-input.rb
-- test/data/ri-output.rb
-- test/data/ri_emacs-input.rb
-- test/data/ri_emacs-output.rb
-- test/data/ri_vim-input.rb
-- test/data/ri_vim-output.rb
-- test/data/rspec_poetry-input.rb
-- test/data/rspec_poetry-output.rb
-- test/data/unit_test_poetry-input.rb
-- test/data/unit_test_poetry-output.rb
-- test/data/method_args.data.rb
-- test/data/completion_emacs_icicles-input.rb
+- test/data/sample_test_script.rb
+- test/data/unit_test-output.rb
+- test/data/completion_detect_rbtest2-input.rb
+- test/data/simple_annotation-input.rb
+- test/data/completion_emacs-input.rb
+- test/data/unit_test_detect_rbtest2-input.rb
+- test/data/doc_rbtest-input.rb
 - test/data/completion_emacs_icicles-output.rb
+- test/data/ri_emacs-output.rb
+- test/data/doc-output.rb
+- test/data/add_markers-input.rb
 test_files: 
 - test/test_functional.rb
-- test/test_xmpfilter.rb
-- test/test_xmptestunitfilter.rb
+- test/test_options.rb
 - test/test_doc.rb
+- test/test_run.rb
+- test/test_method_analyzer.rb
 - test/test_completion.rb
 - test/test_method_args.rb
-- test/test_method_analyzer.rb
-- test/test_run.rb
-- test/test_options.rb
+- test/test_xmptestunitfilter.rb
+- test/test_xmpfilter.rb
+- test/test_ruby_toggle_file.rb
 rdoc_options: 
 - --main
 - README