groonga 0.0.5 → 0.0.6

data/test-unit/lib/test/unit/testcase.rb

@@ -1,7 +1,9 @@
 #--
 #
 # Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# Copyright::
+#   * Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+#   * Copyright (c) 2008-2009 Kouhei Sutou <tt><kou@clear-code.com></tt>
 # License:: Ruby license.
 
 require 'test/unit/attribute'
@@ -60,14 +62,14 @@ module Test
     #   end
     #
     # Here is a call order:
-    #  * startup
-    #  * setup
-    #  * test_my_method1
-    #  * teardown
-    #  * setup
-    #  * test_my_method2
-    #  * teardown
-    #  * shutdown
+    # * startup
+    # * setup
+    # * test_my_method1
+    # * teardown
+    # * setup
+    # * test_my_method2
+    # * teardown
+    # * shutdown
     class TestCase
       include Attribute
       include Fixture
@@ -81,24 +83,29 @@ module Test
       include Assertions
       include Util::BacktraceFilter
 
-      STARTED = name + "::STARTED"
-      FINISHED = name + "::FINISHED"
+      STARTED = name + "::STARTED" # :nodoc:
+      FINISHED = name + "::FINISHED" # :nodoc:
 
-      DESCENDANTS = []
+      DESCENDANTS = [] # :nodoc:
+      AVAILABLE_ORDERS = [:alphabetic, :random, :defined] # :nodoc:
 
       class << self
-        def inherited(sub_class)
+        def inherited(sub_class) # :nodoc:
           DESCENDANTS << sub_class
         end
 
+        @@added_methods = []
+        def method_added(name) # :nodoc:
+          super
+          @@added_methods << name.to_s
+        end
+
         # Rolls up all of the test* methods in the fixture into
         # one suite, creating a new instance of the fixture for
         # each method.
         def suite
-          method_names = public_instance_methods(true).collect {|name| name.to_s}
-          tests = method_names.delete_if {|method_name| method_name !~ /^test./}
           suite = TestSuite.new(name, self)
-          tests.sort.each do |test|
+          collect_test_names.each do |test|
             catch(:invalid_test) do
               suite << new(test)
             end
@@ -137,11 +144,11 @@ module Test
         #   end
         #
         # Here is a call order:
-        #   * startup
-        #   * setup
-        #   * test_my_class1 (or test_my_class2)
-        #   * setup
-        #   * test_my_class2 (or test_my_class1)
+        # * startup
+        # * setup
+        # * test_my_class1 (or test_my_class2)
+        # * setup
+        # * test_my_class2 (or test_my_class1)
         #
         # Note that you should not assume test order. Tests
         # should be worked in any order.
@@ -173,16 +180,74 @@ module Test
         #   end
         #
         # Here is a call order:
-        #   * test_my_class1 (or test_my_class2)
-        #   * teardown
-        #   * test_my_class2 (or test_my_class1)
-        #   * teardown
-        #   * shutdown
+        # * test_my_class1 (or test_my_class2)
+        # * teardown
+        # * test_my_class2 (or test_my_class1)
+        # * teardown
+        # * shutdown
         #
         # Note that you should not assume test order. Tests
         # should be worked in any order.
         def shutdown
         end
+
+        @@test_order = AVAILABLE_ORDERS.first
+
+        # Returns the current test order. This returns
+        # +:alphabetic+ by default.
+        def test_order
+          @@test_order
+        end
+
+        # Sets the current test order.
+        #
+        # Here are the available _order_:
+        # [:alphabetic]
+        #   Default. Tests are sorted in alphabetic order.
+        # [:random]
+        #   Tests are sorted in random order.
+        # [:defined]
+        #   Tests are sorted in defined order.
+        def test_order=(order)
+          @@test_order = order
+        end
+
+        # :stopdoc:
+        private
+        def collect_test_names
+          method_names = public_instance_methods(true).collect do |name|
+            name.to_s
+          end
+          test_names = method_names.find_all do |method_name|
+            method_name =~ /^test./
+          end
+          send("sort_test_names_in_#{test_order}_order", test_names)
+        end
+
+        def sort_test_names_in_alphabetic_order(test_names)
+          test_names.sort
+        end
+
+        def sort_test_names_in_random_order(test_names)
+          test_names.sort_by {rand(test_names.size)}
+        end
+
+        def sort_test_names_in_defined_order(test_names)
+          test_names.sort do |test1, test2|
+            test1_defined_order = @@added_methods.index(test1)
+            test2_defined_order = @@added_methods.index(test2)
+            if test1_defined_order and test2_defined_order
+              test1_defined_order <=> test2_defined_order
+            elsif test1_defined_order
+              1
+            elsif test2_defined_order
+              -1
+            else
+              test1 <=> test2
+            end
+          end
+        end
+        # :startdoc:
       end
 
       attr_reader :method_name
@@ -225,7 +290,7 @@ module Test
           result.add_run
           yield(FINISHED, name)
         ensure
-          @_result = nil
+          # @_result = nil # For test-spec's after_all :<
         end
       end
 
@@ -255,10 +320,10 @@ module Test
       #   end
       #
       # Here is a call order:
-      #   * setup
-      #   * my_setup1
-      #   * my_setup2
-      #   * test_my_class
+      # * setup
+      # * my_setup1
+      # * my_setup2
+      # * test_my_class
       def setup
       end
 
@@ -288,13 +353,13 @@ module Test
       #   end
       #
       # Here is a call order:
-      #   * test_my_class
-      #   * my_teardown2
-      #   * my_teardown1
-      #   * teardown
+      # * test_my_class
+      # * my_teardown2
+      # * my_teardown1
+      # * teardown
       def teardown
       end
-      
+
       def default_test
         flunk("No tests were specified")
       end

data/test-unit/lib/test/unit/ui/console/testrunner.rb

@@ -185,10 +185,13 @@ module Test
 
           def guess_color_availability
             return false unless @output.tty?
-            term = ENV["TERM"]
-            return true if term and (/term\z/ =~ term or term == "screen")
-            return true if ENV["EMACS"] == "t"
-            false
+            case ENV["TERM"]
+            when /term(?:-color)?\z/, "screen"
+              true
+            else
+              return true if ENV["EMACS"] == "t"
+              false
+            end
           end
 
           def guess_progress_row_max

data/test-unit/test/{test_testcase.rb → test-testcase.rb}

@@ -6,7 +6,7 @@ require 'test/unit'
 
 module Test
   module Unit
-    class TC_TestCase < TestCase
+    class TestTestCase < TestCase
       def test_creation
         tc = Class.new(TestCase) do
           def test_with_arguments(arg1, arg2)
@@ -468,11 +468,40 @@ module Test
         end
       end
 
+      def test_defined_order
+        keep_test_order do
+          test_case = Class.new(Test::Unit::TestCase) do
+            def test_z
+            end
+
+            def test_1
+            end
+
+            def test_a
+            end
+          end
+
+          assert_equal(["test_1", "test_a", "test_z"],
+                       test_case.suite.tests.collect {|test| test.method_name})
+
+          test_case.test_order = :defined
+          assert_equal(["test_z", "test_1", "test_a"],
+                       test_case.suite.tests.collect {|test| test.method_name})
+        end
+      end
+
       private
       def check(message, passed)
         add_assertion
         raise AssertionFailedError.new(message) unless passed
       end
+
+      def keep_test_order
+        order = TestCase.test_order
+        yield
+      ensure
+        TestCase.test_order = order
+      end
     end
   end
 end

data/test-unit/test/test_assertions.rb

@@ -428,7 +428,7 @@ EOM
 
         different_error_class = Class.new(StandardError)
         message = <<-EOM
-<\#<Class:0x[a-f\\d]+>\\("Error"\\)> exception expected but was
+<\#<Class:[xa-f\\d]+>\\("Error"\\)> exception expected but was
 Class: <RuntimeError>
 Message: <"Error">
 EOM

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: groonga
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-19 00:00:00 +09:00
+date: 2009-08-01 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -26,11 +26,11 @@ executables: []
 extensions: 
 - extconf.rb
 extra_rdoc_files: 
+- README.ja.rdoc
+- README.rdoc
 - TUTORIAL.ja.rdoc
-- NEWS.ja.rdoc
 - NEWS.rdoc
-- README.rdoc
-- README.ja.rdoc
+- NEWS.ja.rdoc
 files: 
 - AUTHORS
 - NEWS.ja.rdoc
@@ -43,6 +43,9 @@ files:
 - benchmark/read-write-many-small-items.rb
 - benchmark/write-many-small-items.rb
 - example/bookmark.rb
+- example/index-html.rb
+- example/search/config.ru
+- example/search/public/css/groonga.css
 - ext/.gitignore
 - ext/rb-grn-accessor.c
 - ext/rb-grn-array-cursor.c
@@ -165,10 +168,10 @@ files:
 - test-unit/test/test-omission.rb
 - test-unit/test/test-pending.rb
 - test-unit/test/test-priority.rb
+- test-unit/test/test-testcase.rb
 - test-unit/test/test_assertions.rb
 - test-unit/test/test_error.rb
 - test-unit/test/test_failure.rb
-- test-unit/test/test_testcase.rb
 - test-unit/test/test_testresult.rb
 - test-unit/test/test_testsuite.rb
 - test-unit/test/testunit-test-util.rb