dohtest 0.1.3 → 0.1.4

data/bin/dohtest

@@ -1,18 +1,20 @@
 #!/usr/bin/env ruby
 require 'doh/options'
+require 'doh/test/configure'
 require 'doh/test/master_runner'
 require 'doh/test/stream_output'
 
 opts = Doh::Options.new(
-{'grep' => [nil, "-g", "--grep <name>", "only execute tests with name that include the given value"] \
-,'glob' => ['*.dt.rb', "-b", "--glob <string>", "glob string to find test files"] \
-,'seed' => [nil, "-v", "--seed <number>", "random seed"] \
+{'grep' => [nil, "-g", "--grep <name>", "only execute tests with name that include the given value."] \
+,'glob' => [nil, "-b", "--glob <string>", "glob string to find test files. defaults to *.dt.rb"] \
+,'seed' => [nil, "-v", "--seed <number>", "use this as the seed to srand"] \
 }, true, 'Files or directories may be specified to run tests on.  Directories will be treated recursively.  Defaults to the current directory.')
 
-config = {}
-config[:grep] = opts.grep if opts.grep
-config[:glob] = opts.glob
-config[:seed] = opts.seed.to_i if opts.seed
-config[:paths] = (if opts.varargs.empty? then ['.'] else opts.varargs end)
+paths = (if opts.varargs.empty? then ['.'] else opts.varargs end)
 
-exit DohTest::MasterRunner.new(DohTest::StreamOutput.new, config).run
+DohTest::configure(paths[0])
+DohTest::config[:grep] = opts.grep if opts.grep
+DohTest::config[:glob] = opts.glob if opts.glob
+DohTest::config[:seed] = opts.seed.to_i if opts.seed
+
+exit DohTest::MasterRunner.new(DohTest::StreamOutput.new, DohTest::config, paths).run

data/lib/doh/test/assertions.rb

@@ -30,7 +30,8 @@ class TestGroup
       yield
       no_exception = true
     rescue Exception => excpt
-      assert(args.include?(excpt.class), msg || "expected: #{args}; actual: #{excpt}")
+      expected_str = if (args.size == 1) then args.first else "one of #{args.join(',')}" end
+      assert(args.include?(excpt.class), msg || "expected: #{expected_str}; actual: #{excpt.class}: #{excpt.message}")
       return
     end
 

data/lib/doh/test/backtrace_parser.rb

@@ -26,7 +26,9 @@ private
       else
         found_start = true
         info = location.rpartition(':in').first
-        retval << info
+        parts = info.partition(':')
+        raise "unexpected backtrace element: #{location}" if parts.first.nil? || parts.last.nil?
+        retval << [parts.first, parts.last]
       end
     end
     retval
@@ -36,15 +38,13 @@ private
     retval = ''
     prev_filename = ''
     prev_simplified = ''
-    relevant_stack.each do |location|
-      parts = location.partition(':')
-      filename = File.basename(parts.first)
-      simplified = "#{filename}:#{parts.last}"
-      raise "unexpected location format: #{location}" unless filename
+    relevant_stack.each do |path, line_number|
+      filename = File.basename(path)
+      simplified = "#{filename}:#{line_number}"
       if simplified == prev_simplified
         # ignore it
       elsif filename == prev_filename
-        retval += ",#{parts.last}"
+        retval += ",#{line_number}"
       elsif retval.empty?
         retval = simplified
       else

data/lib/doh/test/configure.rb

@@ -2,17 +2,34 @@ require 'doh/root'
 
 module DohTest
 
-def self.configure(start_path)
+def self.config
+  @config ||= {}
+end
+
+def self.load_configuration_files(start_path)
   start_directory = File.dirname(start_path)
 
+  local_filename = Doh::findup(start_directory, 'configure_dohtest.rb')
+  if local_filename && File.exist?(local_filename)
+    require(local_filename)
+    return
+  end
+
   root_directory = Doh::find_root(start_directory)
   if root_directory
     root_filename = File.join(root_directory, 'config', 'dohtest.rb')
     require(root_filename) if File.exist?(root_filename)
   end
+end
 
-  local_filename = Doh::findup(start_directory, 'configure_dohtest.rb')
-  require(local_filename) if local_filename && File.exist?(local_filename)
+def self.add_default_config_values
+  DohTest::config[:glob] ||= '*.dt.rb'
+  DohTest::config[:seed] ||= (Time.new.to_f * 1000).to_i
+end
+
+def self.configure(start_path)
+  load_configuration_files(start_path)
+  add_default_config_values
 end
 
 end

data/lib/doh/test/master_runner.rb

@@ -1,31 +1,20 @@
-require 'doh/test/configure'
 require 'doh/test/group_runner'
 require 'doh/test/require_paths'
 
 module DohTest
 
 class MasterRunner
-  def initialize(output, config)
-    @output, @config = output, config
-    add_missing_config
+  def initialize(output, config, paths)
+    @output, @config, @paths = output, config, paths
   end
 
   def run
-    paths = @config[:paths]
-    DohTest::configure(paths[0])
-    DohTest::require_paths(@config[:glob], paths)
+    DohTest::require_paths(@config[:glob], @paths)
     srand(@config[:seed])
     @output.run_begin(@config)
     TestGroup.descendants.each { |group_class| GroupRunner.new(group_class, @output, @config).run }
     @output.run_end
   end
-
-private
-  def add_missing_config
-    @config[:glob] ||= '*.dt.rb'
-    @config[:seed] ||= (Time.new.to_f * 1000).to_i
-    @config[:paths] ||= ['.']
-  end
 end
 
 end

data/lib/doh/test/stream_output.rb

@@ -58,9 +58,16 @@ class StreamOutput
 
 private
   def display_badness(title, group_name, test_name, excpt, display_name)
-    warn "#{title} in #{group_name}.#{test_name} at #{DohTest::backtrace_summary(excpt)}"
+    parser = DohTest::BacktraceParser.new(excpt.backtrace)
+    warn "#{title} in #{group_name}.#{test_name}"
     badname = if display_name then "#{excpt.class}: " else '' end
     warn "=> #{badname}#{excpt}"
+    # main_call = parser.relevant_stack.last
+    # warn "=> #{main_call.first}:#{main_call.last}"
+    # warn "=> #{parser.summary}"
+    parser.relevant_stack.each do |path, line|
+      warn "=> #{path}:#{line}"
+    end
   end
 end
 

data/test/test_backtrace_parser.rb

@@ -17,11 +17,11 @@ class TestBacktraceParser < MiniTest::Unit::TestCase
   end
 
   def test_single_stack
-    location = DohTest::BacktraceParser.new(create_single_stack).summary
-    assert_equal("frog.rb:12", location)
+    parser = DohTest::BacktraceParser.new(create_single_stack)
+    assert_equal("frog.rb:12", parser.summary)
   end
 
-  def create_double_stack
+  def create_raw_double_stack
     retval = []
     retval << "/Users/somebody/dohtest/lib/doh/test/assertions.rb:10:in `assert'"
     retval << "/Users/somebody/tinker/test/frog.rb:5:in `verify_sum'"
@@ -30,9 +30,17 @@ class TestBacktraceParser < MiniTest::Unit::TestCase
     retval
   end
 
+  def create_relevant_double_stack
+    retval = []
+    retval << ['/Users/somebody/tinker/test/frog.rb', '5']
+    retval << ['/Users/somebody/tinker/test/frog.rb', '12']
+    retval
+  end
+
   def test_double_stack
-    location = DohTest::BacktraceParser.new(create_double_stack).summary
-    assert_equal("frog.rb:5,12", location)
+    parser = DohTest::BacktraceParser.new(create_raw_double_stack)
+    assert_equal(create_relevant_double_stack, parser.relevant_stack)
+    assert_equal("frog.rb:5,12", parser.summary)
   end
 
   def create_multifile_stack
@@ -45,8 +53,8 @@ class TestBacktraceParser < MiniTest::Unit::TestCase
   end
 
   def test_multifile_stack
-    location = DohTest::BacktraceParser.new(create_multifile_stack).summary
-    assert_equal("toad.rb:8;frog.rb:11", location)
+    parser = DohTest::BacktraceParser.new(create_multifile_stack)
+    assert_equal("toad.rb:8;frog.rb:11", parser.summary)
   end
 
   def create_duplicate_stack
@@ -58,8 +66,8 @@ class TestBacktraceParser < MiniTest::Unit::TestCase
   end
 
   def test_duplicate_stack
-    location = DohTest::BacktraceParser.new(create_duplicate_stack).summary
-    assert_equal("blee.rb:30", location)
+    parser = DohTest::BacktraceParser.new(create_duplicate_stack)
+    assert_equal("blee.rb:30", parser.summary)
   end
 
   def create_block_stack
@@ -69,8 +77,8 @@ class TestBacktraceParser < MiniTest::Unit::TestCase
   end
 
   def test_block_stack
-    location = DohTest::BacktraceParser.new(create_block_stack).summary
-    assert_equal("kblah.rb:3", location)
+    parser = DohTest::BacktraceParser.new(create_block_stack)
+    assert_equal("kblah.rb:3", parser.summary)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohtest
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,20 +10,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohutil
-  requirement: &70241608038460 !ruby/object:Gem::Requirement
+  requirement: &70165913339980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70241608038460
-description: Minimalist unit test framework, simple to understand and extend.
+  version_requirements: *70165913339980
+description: Minimalist unit test framework, easy to understand and extend.
 email:
 - devinfo@atpsoft.com
 executables:
@@ -64,9 +64,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: minimalist unit test framework
 test_files:
 - test/test_backtrace_parser.rb
+has_rdoc: