dao 5.6.1 → 7.0.0

data/test/errors_test.rb

@@ -1,7 +1,22 @@
 # -*- encoding : utf-8 -*-
-Testing Dao::Errors do
+require_relative 'test_helper'
+class DaoErrorsTest < Dao::TestCase
 
-  testing 'that conducer-less error objects scopes keys in a generic fashion' do
+  test 'that errors have #to_html' do
+    e = Dao::Errors.new
+
+    e.add 'is fucked'
+    e.add 'foo is fucked'
+
+    actual = e.to_html
+
+    expected = <<-__
+    __
+
+    assert compress(actual) == compress(expected)
+  end
+
+  test 'that conducer-less error objects scopes keys in a generic fashion' do
     e = Dao::Errors.new
 
     e.add 'is fucked'
@@ -19,7 +34,7 @@ Testing Dao::Errors do
     assert compress(actual) == compress(expected)
   end
 
-  testing 'that conducer-based error objects scope keys in a model_name based fashion' do
+  test 'that conducer-based error objects scope keys in a model_name based fashion' do
     c = new_foo_conducer
 
     e = c.errors 
@@ -29,7 +44,7 @@ Testing Dao::Errors do
     e.add :first_name, 'is fucked'
     e.add :last_name, 'is fucked'
 
-    actual = e.to_text 
+    actual = e.to_text
 
     expected = <<-__
       ---
@@ -46,7 +61,7 @@ Testing Dao::Errors do
   end
 
 =begin
-  testing 'that `nested` errors `nest`' do
+  test 'that `nested` errors `nest`' do
     e = Dao::Errors.new
 
     e.relay 'foo.bar' => 'is fucked'
@@ -80,12 +95,3 @@ protected
   end
   alias_method :new_conducer, :new_foo_conducer
 end
-
-BEGIN {
-  testdir = File.dirname(File.expand_path(__FILE__))
-  rootdir = File.dirname(testdir)
-  libdir = File.join(rootdir, 'lib')
-  require File.join(libdir, 'dao')
-  require File.join(testdir, 'testing')
-  require 'stringio'
-}

data/test/form_test.rb

@@ -1,25 +1,26 @@
 # -*- encoding : utf-8 -*-
-Testing Dao::Form do
-  testing '.new' do
+require_relative 'test_helper'
+class DaoFormTest < ::Dao::TestCase
+  test '.new' do
     form = new_form() 
     form = new_named_form() 
   end
 
-  testing 'name_for' do
+  test 'name_for' do
     assert{ Dao::Form.name_for(:foo, :a, :b) == 'dao[foo][a.b]' }
     assert{ new_form.name_for(:a, :b) == 'dao[form][a.b]' }
     assert{ new_named_form.name_for(:a, :b) == 'dao[name][a.b]' }
     assert{ new_named_form(:foo).name_for(:a, :b) == 'dao[foo][a.b]' }
   end
 
-  testing 'scope_for' do
+  test 'scope_for' do
     form = new_form() 
 
     assert do
       html = form.input(:bar)
       scmp(
         html,
-        '<input type="text" name="dao[form][bar]" class="dao" id="form_bar"/>'
+        '<input type="text" name="dao[form][bar]" class="dao" id="form--bar"/>'
       )
     end
 
@@ -28,7 +29,7 @@ Testing Dao::Form do
         html = form.input(:bar)
         scmp(
           html,
-          '<input type="text" name="dao[form][foo.bar]" class="dao" id="form_foo-bar"/>'
+          '<input type="text" name="dao[form][foo.bar]" class="dao" id="form--foo-bar"/>'
         )
       end
     end
@@ -37,12 +38,12 @@ Testing Dao::Form do
       html = form.input(:bar)
       scmp(
         html,
-        '<input type="text" name="dao[form][bar]" class="dao" id="form_bar"/>'
+        '<input type="text" name="dao[form][bar]" class="dao" id="form--bar"/>'
       )
     end
   end
 
-  testing 'Form#select' do
+  test 'Form#select' do
   #
     form = new_form() 
     form.attributes.set :key => 42 
@@ -52,7 +53,7 @@ Testing Dao::Form do
     assert do
       scmp(
         html,
-        '<select name="dao[form][key]" class="dao" id="form_key"> </select>'
+        '<select name="dao[form][key]" class="dao" id="form--key"> </select>'
       )
     end
 
@@ -61,7 +62,7 @@ Testing Dao::Form do
     assert do
       scmp(
         html,
-        '<select name="dao[form][key]" class="dao" id="form_key"><option value="a">a</option><option value="b">b</option><option value="c">c</option></select>'
+        '<select name="dao[form][key]" class="dao" id="form--key"><option value="a">a</option><option value="b">b</option><option value="c">c</option></select>'
       )
    end
 
@@ -70,7 +71,7 @@ Testing Dao::Form do
     assert do
       scmp(
         html,
-        '<select name="dao[form][key]" class="dao" id="form_key"><option value="1">A</option><option value="2">B</option><option value="3">C</option></select>'
+        '<select name="dao[form][key]" class="dao" id="form--key"><option value="1">A</option><option value="2">B</option><option value="3">C</option></select>'
       )
    end
 
@@ -79,7 +80,7 @@ Testing Dao::Form do
     assert do
       scmp(
         html,
-        '<select name="dao[form][key]" class="dao" id="form_key"><option></option><option value="a">a</option><option value="b">b</option><option value="c">c</option></select>'
+        '<select name="dao[form][key]" class="dao" id="form--key"><option></option><option value="a">a</option><option value="b">b</option><option value="c">c</option></select>'
       )
    end
 
@@ -88,7 +89,7 @@ Testing Dao::Form do
     assert do
       scmp(
         html,
-        '<select name="dao[form][key]" class="dao" id="form_key"><option></option><option value="a">a</option><option value="b">b</option><option value="c">c</option></select>'
+        '<select name="dao[form][key]" class="dao" id="form--key"><option></option><option value="a">a</option><option value="b">b</option><option value="c">c</option></select>'
       )
    end
 
@@ -97,7 +98,7 @@ Testing Dao::Form do
     assert do
       scmp(
         html,
-        '<select name="dao[form][key]" class="dao" id="form_key"><option value="">42</option><option value="a">a</option><option value="b">b</option><option value="c">c</option></select>'
+        '<select name="dao[form][key]" class="dao" id="form--key"><option value="">42</option><option value="a">a</option><option value="b">b</option><option value="c">c</option></select>'
       )
    end
 
@@ -106,7 +107,7 @@ Testing Dao::Form do
     assert do
       scmp(
         html,
-        '<select name="dao[form][key]" class="dao" id="form_key"><option value="a">a</option><option value="b">b</option><option value="c">c</option></select>'
+        '<select name="dao[form][key]" class="dao" id="form--key"><option value="a">a</option><option value="b">b</option><option value="c">c</option></select>'
       )
    end
 
@@ -115,7 +116,7 @@ Testing Dao::Form do
     assert do
       scmp(
         html,
-        '<select name="dao[form][key]" class="dao" id="form_key"><option value="a">a</option><option value="b" selected>b</option><option value="c">c</option></select>'
+        '<select name="dao[form][key]" class="dao" id="form--key"><option value="a">a</option><option value="b" selected>b</option><option value="c">c</option></select>'
       )
     end
 
@@ -130,7 +131,7 @@ Testing Dao::Form do
     assert do
       scmp(
         html,
-        '<select name="dao[form][key]" class="dao" id="form_key"><option value="41">41</option><option value="42" selected>42</option><option value="43">43</option></select>'
+        '<select name="dao[form][key]" class="dao" id="form--key"><option value="41">41</option><option value="42" selected>42</option><option value="43">43</option></select>'
       )
     end
 
@@ -145,7 +146,7 @@ Testing Dao::Form do
     assert do
       scmp(
         html,
-        '<select name="dao[form][key]" class="dao" id="form_key"><option value="41">41</option><option value="42" selected>42</option><option value="43">43</option></select>'
+        '<select name="dao[form][key]" class="dao" id="form--key"><option value="41">41</option><option value="42" selected>42</option><option value="43">43</option></select>'
       )
     end
 
@@ -160,14 +161,15 @@ Testing Dao::Form do
     assert do
       scmp(
         html,
-        '<select name="dao[form][key]" class="dao" id="form_key"><option value="41">41</option><option value="42" selected>42</option><option value="43">43</option></select>'
+        '<select name="dao[form][key]" class="dao" id="form--key"><option value="41">41</option><option value="42" selected>42</option><option value="43">43</option></select>'
       )
     end
   end
 
 protected
   def new_form
-    assert{ Dao::Form.new }
+    #assert{ Dao::Form.new }
+    Dao::Form.new
   end
 
   def new_named_form(name = 'name')
@@ -182,15 +184,3 @@ protected
     assert{ Dao::Form.new(object) }
   end
 end
-
-
-
-BEGIN {
-  testdir = File.dirname(File.expand_path(__FILE__))
-  rootdir = File.dirname(testdir)
-  libdir = File.join(rootdir, 'lib')
-
-  require File.join(libdir, 'dao')
-  require File.join(testdir, 'testing')
-  require File.join(testdir, 'helper')
-}

data/test/rake_rerun_reporter.rb

@@ -0,0 +1,74 @@
+require "minitest/reporters"
+
+module Minitest
+  module Reporters
+    class RakeRerunReporter < Minitest::Reporters::DefaultReporter
+
+      def initialize(options = {})
+        @rerun_user_prefix=options.fetch(:rerun_prefix, "")
+        super
+      end
+
+      def report
+        super
+      
+        puts
+      
+        unless @fast_fail
+          #print rerun commands
+          failed_or_error_tests=(tests.select {|t| t.failure && !t.skipped? })
+
+          unless failed_or_error_tests.empty?
+            puts red("You can rerun failed/error test by commands (you can add rerun prefix with 'rerun_prefix' option):")
+
+            failed_or_error_tests.each do |test|
+              print_rerun_command(test)
+            end
+          end
+        end
+        
+        #summary for all suite again
+        puts
+        print colored_for(suite_result, result_line)
+        puts
+        
+      end  
+
+      private
+
+        def print_rerun_command(test)
+          message = rerun_message_for(test)
+          unless message.nil? || message.strip == ''
+            puts
+            puts colored_for(result(test), message)
+          end
+        end
+
+        def rerun_message_for(test)
+          file_path=location(test.failure).gsub(/(\:\d*)\z/,"")
+          msg="#{@rerun_user_prefix} rake test TEST=#{file_path} TESTOPTS=\"--name=#{test.name} -v\""
+          if test.skipped?
+            "Skipped: \n#{msg}"
+          elsif test.error?
+            "Error:\n#{msg}"
+          else
+            "Failure:\n#{msg}"
+          end
+        end
+        
+        def location(exception)
+          last_before_assertion = ''
+
+          exception.backtrace.reverse_each do |ss|
+            break if ss =~ /in .(assert|refute|flunk|pass|fail|raise|must|wont)/
+            last_before_assertion = ss
+            break if ss=~ /_test.rb\:/
+          end
+
+          last_before_assertion.sub(/:in .*$/, '')
+        end  
+
+    end
+  end
+end
+

data/test/support_test.rb

@@ -1,20 +1,22 @@
 # -*- encoding : utf-8 -*-
-Testing Dao::Conducer do
-  testing 'that dao has a root' do
+require_relative 'test_helper'
+
+class Dao::ModuleTest < Dao::TestCase 
+  test 'that dao has a root' do
     assert{ Dao.respond_to?(:root) }
     assert{ Dao.root }
   end
 
-  testing 'that dao can build a mock controller' do
+  test 'that dao can build a mock controller' do
     controller = assert{ Dao.mock_controller }
     assert{ controller.url_for '/' }
   end
 
-  testing 'that dao can mark the current_controller' do
+  test 'that dao can mark the current_controller' do
     assert{ Dao.current_controller = Dao.mock_controller }
   end
 
-  testing 'that dao can pre-process parameters' do
+  test 'that dao can pre-process parameters' do
     params = Map.new( 
       'dao' => {
         'foos' => {
@@ -45,12 +47,3 @@ Testing Dao::Conducer do
     assert{ params[:bars]['42'] == 'foobar' }
   end
 end
-
-
-BEGIN {
-  testdir = File.dirname(File.expand_path(__FILE__))
-  rootdir = File.dirname(testdir)
-  libdir = File.join(rootdir, 'lib')
-  require File.join(libdir, 'dao')
-  require File.join(testdir, 'testing')
-}

data/test/{testing.rb → test_helper.rb}

@@ -1,45 +1,80 @@
 # -*- encoding : utf-8 -*-
-require 'test/unit'
-
-testdir = File.expand_path(File.dirname(__FILE__))
-rootdir = File.dirname(testdir)
-libdir = File.join(rootdir, 'lib')
-
-STDOUT.sync = true
-
-$:.unshift(testdir) unless $:.include?(testdir)
-$:.unshift(libdir) unless $:.include?(libdir)
-$:.unshift(rootdir) unless $:.include?(rootdir)
-
-class Testing
-  class Slug < ::String
-    def Slug.for(*args)
-      string = args.flatten.compact.join('-')
-      words = string.to_s.scan(%r/\w+/)
-      words.map!{|word| word.gsub %r/[^0-9a-zA-Z_-]/, ''}
-      words.delete_if{|word| word.nil? or word.strip.empty?}
-      new(words.join('-').downcase)
+gem "minitest"
+#require "minitest/autorun"
+#require "minitest/reporters"
+
+#require 'rake_rerun_reporter'
+#reporter_options = { color: true, slow_count: 5, verbose: false, rerun_prefix: "bundle exec" }
+#Minitest::Reporters.use! [Minitest::Reporters::RakeRerunReporter.new(reporter_options)]
+
+require "dao"
+require_relative "util"
+
+class Dao::TestCase < ActiveSupport::TestCase
+  class << self
+    def context(*args, &block)
+      return contexts.last if(args.empty? and block.nil?)
+      block.call
     end
   end
-  
-  class Context
-    attr_accessor :name
 
-    def initialize(name, *args)
-      @name = name
+
+  Missing = Object.new.freeze
+
+  alias_method('__assert__', 'assert')
+
+  def missing
+    Dao::TestCase::Missing
+  end
+
+  def assert(*args, &block)
+    if args.size == 1 and args.first.is_a?(Hash)
+      options = args.first
+      expected = getopt(:expected, options){ missing }
+      actual = getopt(:actual, options){ missing }
+      if expected == missing and actual == missing
+        actual, expected, *_ = options.to_a.flatten
+      end
+      expected = expected.call() if expected.respond_to?(:call)
+      actual = actual.call() if actual.respond_to?(:call)
+      assert_equal(expected, actual)
     end
 
-    def to_s
-      Slug.for(name)
+    if block
+      label = "assert(#{ args.join(' ') })"
+      result = nil
+      result = block.call
+      __assert__(result, label)
+      result
+    else
+      result = args.shift
+      label = "assert(#{ args.join(' ') })"
+      __assert__(result, label)
+      result
     end
   end
+
+  def getopt(opt, hash, options = nil, &block)
+    [opt.to_s, opt.to_s.to_sym].each do |key|
+      return hash[key] if hash.has_key?(key)
+    end
+    default =
+      if block
+        block.call
+      else
+        options.is_a?(Hash) ? options[:default] : nil
+      end
+    return default
+  end
+
 end
 
+__END__
 def Testing(*args, &block)
-  Class.new(::Test::Unit::TestCase) do
+  Class.new(::MiniTest::Test) do
 
-  ## class methods
-  #
+    ## class methods
+    #
     class << self
       def contexts
         @contexts ||= []
@@ -104,8 +139,8 @@ def Testing(*args, &block)
       end
     end
 
-  ## configure the subclass!
-  #
+    ## configure the subclass!
+    #
     const_set(:Testno, '0')
     slug = slug_for(*args).gsub(%r/-/,'_')
     name = ['TESTING', '%03d' % const_get(:Testno), slug].delete_if{|part| part.empty?}.join('_')
@@ -113,8 +148,8 @@ def Testing(*args, &block)
     const_set(:Name, name)
     const_set(:Missing, Object.new.freeze)
 
-  ## instance methods
-  #
+    ## instance methods
+    #
     alias_method('__assert__', 'assert')
 
     def assert(*args, &block)
@@ -123,7 +158,7 @@ def Testing(*args, &block)
         expected = getopt(:expected, options){ missing }
         actual = getopt(:actual, options){ missing }
         if expected == missing and actual == missing
-          actual, expected, *ignored = options.to_a.flatten
+          actual, expected, *_ = options.to_a.flatten
         end
         expected = expected.call() if expected.respond_to?(:call)
         actual = actual.call() if actual.respond_to?(:call)
@@ -133,7 +168,7 @@ def Testing(*args, &block)
       if block
         label = "assert(#{ args.join(' ') })"
         result = nil
-        assert_nothing_raised{ result = block.call }
+        result = block.call
         __assert__(result, label)
         result
       else
@@ -168,8 +203,8 @@ def Testing(*args, &block)
       exception
     end
 
-  ##
-  #
+    ##
+    #
     module_eval(&block)
 
     self.setup()
@@ -183,14 +218,3 @@ def Testing(*args, &block)
     self
   end
 end
-
-
-if $0 == __FILE__
-
-  Testing 'Testing' do
-    testing('foo'){ assert true }
-    test{ assert true }
-    p instance_methods.grep(/test/)
-  end
-
-end