grntest 1.0.2 → 1.0.3

data/lib/grntest/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/grntest/worker.rb

@@ -0,0 +1,164 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "grntest/base-result"
+require "grntest/test-runner"
+
+module Grntest
+  class WorkerResult < BaseResult
+    attr_reader :n_tests, :n_passed_tests, :n_leaked_tests
+    attr_reader :n_omitted_tests, :n_not_checked_tests
+    attr_reader :failed_tests
+    def initialize
+      super
+      @n_tests = 0
+      @n_passed_tests = 0
+      @n_leaked_tests = 0
+      @n_omitted_tests = 0
+      @n_not_checked_tests = 0
+      @failed_tests = []
+    end
+
+    def n_failed_tests
+      @failed_tests.size
+    end
+
+    def on_test_finish
+      @n_tests += 1
+    end
+
+    def on_test_success
+      @n_passed_tests += 1
+    end
+
+    def on_test_failure(name)
+      @failed_tests << name
+    end
+
+    def on_test_leak(name)
+      @n_leaked_tests += 1
+    end
+
+    def on_test_omission
+      @n_omitted_tests += 1
+    end
+
+    def on_test_no_check
+      @n_not_checked_tests += 1
+    end
+  end
+
+  class Worker
+    attr_reader :id, :tester, :test_suites_rusult, :reporter
+    attr_reader :suite_name, :test_script_path, :test_name, :status, :result
+    def initialize(id, tester, test_suites_result, reporter)
+      @id = id
+      @tester = tester
+      @test_suites_result = test_suites_result
+      @reporter = reporter
+      @suite_name = nil
+      @test_script_path = nil
+      @test_name = nil
+      @interruptted = false
+      @status = "not running"
+      @result = WorkerResult.new
+    end
+
+    def interrupt
+      @interruptted = true
+    end
+
+    def interruptted?
+      @interruptted
+    end
+
+    def run(queue)
+      succeeded = true
+
+      @result.measure do
+        @reporter.on_worker_start(self)
+        catch do |tag|
+          loop do
+            suite_name, test_script_path, test_name = queue.pop
+            break if test_script_path.nil?
+
+            unless @suite_name == suite_name
+              @reporter.on_suite_finish(self) if @suite_name
+              @suite_name = suite_name
+              @reporter.on_suite_start(self)
+            end
+            @test_script_path = test_script_path
+            @test_name = test_name
+            runner = TestRunner.new(@tester, self)
+            succeeded = false unless runner.run
+
+            break if interruptted?
+          end
+          @status = "finished"
+          @reporter.on_suite_finish(@suite_name) if @suite_name
+          @suite_name = nil
+        end
+      end
+      @reporter.on_worker_finish(self)
+
+      succeeded
+    end
+
+    def on_test_start
+      @status = "running"
+      @test_result = nil
+      @reporter.on_test_start(self)
+    end
+
+    def on_test_success(result)
+      @status = "passed"
+      @result.on_test_success
+      @reporter.on_test_success(self, result)
+    end
+
+    def on_test_failure(result)
+      @status = "failed"
+      @result.on_test_failure(test_name)
+      @reporter.on_test_failure(self, result)
+    end
+
+    def on_test_leak(result)
+      @status = "leaked(#{result.n_leaked_objects})"
+      @result.on_test_leak(test_name)
+      @reporter.on_test_leak(self, result)
+    end
+
+    def on_test_omission(result)
+      @status = "omitted"
+      @result.on_test_omission
+      @reporter.on_test_omission(self, result)
+    end
+
+    def on_test_no_check(result)
+      @status = "not checked"
+      @result.on_test_no_check
+      @reporter.on_test_no_check(self, result)
+    end
+
+    def on_test_finish(result)
+      @result.on_test_finish
+      @reporter.on_test_finish(self, result)
+      @test_script_path = nil
+      @test_name = nil
+    end
+  end
+end

data/test/executors/test-base-executor.rb

@@ -0,0 +1,42 @@
+# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "grntest/executors/base-executor"
+
+class TestBaseExecutor < Test::Unit::TestCase
+  def setup
+    @executor = Grntest::Executors::BaseExecutor.new
+    @context = @executor.context
+  end
+
+  class TestErrorLog < self
+    data("emergency" => "E",
+         "alert"     => "A",
+         "critical"  => "C",
+         "error"     => "e",
+         "warning"   => "w")
+    def test_important_log_level(level)
+      assert_true(@executor.send(:important_log_level?, level))
+    end
+
+    data("notice"  => "n",
+         "info"    => "i",
+         "debug"   => "d",
+         "dump"    => "-")
+    def test_not_important_log_level(level)
+      assert_false(@executor.send(:important_log_level?, level))
+    end
+  end
+end

data/test/executors/test-standard-io-executor.rb

@@ -0,0 +1,61 @@
+# Copyright (C) 2012-2013  Kouhei Sutou <kou@clear-code.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "stringio"
+require "tempfile"
+require "grntest/executors/standard-io-executor"
+
+class TestStandardIOExecutor < Test::Unit::TestCase
+  def setup
+    input = StringIO.new
+    output = StringIO.new
+    @executor = Grntest::Executors::StandardIOExecutor.new(input, output)
+    @context = @executor.context
+    @script = Tempfile.new("test-executor")
+  end
+
+  private
+  def execute(command)
+    @script.puts(command)
+    @script.close
+    @executor.execute(Pathname(@script.path))
+  end
+
+  class TestComment < self
+    def test_disable_logging
+      assert_predicate(@context, :logging?)
+      execute("\#@disable-logging")
+      assert_not_predicate(@context, :logging?)
+    end
+
+    def test_enable_logging
+      @context.logging = false
+      assert_not_predicate(@context, :logging?)
+      execute("\#@enable-logging")
+      assert_predicate(@context, :logging?)
+    end
+
+    def test_suggest_create_dataset
+      mock(@executor).execute_suggest_create_dataset("shop")
+      execute("\#@suggest-create-dataset shop")
+    end
+
+    def test_enable_ignore_feature_on_error
+      assert_not_equal(:omit, @context.on_error)
+      execute("\#@on-error omit")
+      assert_equal(:omit, @context.on_error)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -170,12 +170,29 @@ files:
 - Gemfile
 - grntest.gemspec
 - .yardopts
+- lib/grntest/test-runner.rb
 - lib/grntest/tester.rb
+- lib/grntest/worker.rb
+- lib/grntest/response-parser.rb
+- lib/grntest/error.rb
+- lib/grntest/base-result.rb
 - lib/grntest/version.rb
+- lib/grntest/test-suites-runner.rb
+- lib/grntest/executors/http-executor.rb
+- lib/grntest/executors/base-executor.rb
+- lib/grntest/executors/standard-io-executor.rb
+- lib/grntest/executors.rb
+- lib/grntest/execution-context.rb
+- lib/grntest/reporters.rb
+- lib/grntest/reporters/inplace-reporter.rb
+- lib/grntest/reporters/stream-reporter.rb
+- lib/grntest/reporters/base-reporter.rb
+- lib/grntest/reporters/mark-reporter.rb
 - doc/text/news.md
 - doc/text/gpl-3.0.txt
 - test/run-test.rb
-- test/test-executor.rb
+- test/executors/test-base-executor.rb
+- test/executors/test-standard-io-executor.rb
 - bin/grntest
 homepage: https://github.com/groonga/grntest
 licenses:
@@ -190,18 +207,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -173336567552475669
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -173336567552475669
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -211,5 +222,6 @@ summary: Grntest is a testing framework for groonga. You can write a test for gr
   by writing groonga commands and expected result.
 test_files:
 - test/run-test.rb
-- test/test-executor.rb
+- test/executors/test-base-executor.rb
+- test/executors/test-standard-io-executor.rb
 has_rdoc: 

data/test/test-executor.rb

@@ -1,207 +0,0 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-require "stringio"
-require "cgi/util"
-require "grntest/tester"
-
-class TestExecutor < Test::Unit::TestCase
-  def setup
-    input = StringIO.new
-    output = StringIO.new
-    @executor = Grntest::Tester::StandardIOExecutor.new(input, output)
-    @context = @executor.context
-    @script = Tempfile.new("test-executor")
-  end
-
-  private
-  def execute(command)
-    @script.puts(command)
-    @script.close
-    @executor.execute(Pathname(@script.path))
-  end
-
-  class TestComment < self
-    def test_disable_logging
-      assert_predicate(@context, :logging?)
-      execute("\#@disable-logging")
-      assert_not_predicate(@context, :logging?)
-    end
-
-    def test_enable_logging
-      @context.logging = false
-      assert_not_predicate(@context, :logging?)
-      execute("\#@enable-logging")
-      assert_predicate(@context, :logging?)
-    end
-
-    def test_suggest_create_dataset
-      mock(@executor).execute_suggest_create_dataset("shop")
-      execute("\#@suggest-create-dataset shop")
-    end
-
-    def test_enable_ignore_feature_on_error
-      assert_not_equal(:omit, @context.on_error)
-      execute("\#@on-error omit")
-      assert_equal(:omit, @context.on_error)
-    end
-  end
-
-  class TestCommandFormatConveter < self
-    def test_without_argument_name
-      command = "table_create Site TABLE_HASH_KEY ShortText"
-      arguments = {
-        "name" => "Site",
-        "flags" => "TABLE_HASH_KEY",
-        "key_type" => "ShortText",
-      }
-      actual_url = convert(command)
-      expected_url = build_url("table_create", arguments)
-
-      assert_equal(expected_url, actual_url)
-    end
-
-    def test_with_argument_name
-      command = "select --table Sites"
-      actual_url = convert(command)
-      expected_url = build_url("select", "table" => "Sites")
-
-      assert_equal(expected_url, actual_url)
-    end
-
-    def test_non_named_argument_after_named_arguement
-      command = "table_create --flags TABLE_HASH_KEY --key_type ShortText Site"
-      arguments = {
-        "flags" => "TABLE_HASH_KEY",
-        "key_type" => "ShortText",
-        "name" => "Site",
-      }
-      actual_url = convert(command)
-      expected_url = build_url("table_create", arguments)
-
-      assert_equal(expected_url, actual_url)
-    end
-
-    def test_without_arguments
-      command = "dump"
-      actual_url = convert(command)
-      expected_url = build_url(command, {})
-
-      assert_equal(expected_url, actual_url)
-    end
-
-    def test_load_json_array
-      load_command = "load --table Sites"
-      load_values = <<EOF
-[
-["_key","uri"],
-["groonga","http://groonga.org/"],
-["razil","http://razil.jp/"]
-]
-EOF
-      command = "#{load_command}\n#{load_values}"
-      actual_url = convert(command)
-
-      load_values_without_columns =
-        '[["groonga","http://groonga.org/"],["razil","http://razil.jp/"]]'
-      arguments = {
-        "table" => "Sites",
-        "columns" => "_key,uri",
-        "values" => load_values_without_columns
-      }
-      expected_url = build_url("load", arguments)
-
-      assert_equal(expected_url, actual_url)
-    end
-
-    def test_load_json_object
-      load_command = "load --table Sites"
-      load_values = <<EOF
-[
-{"_key": "ruby", "uri": "http://ruby-lang.org/"}
-]
-EOF
-      command = "#{load_command}\n#{load_values}"
-      actual_url = convert(command)
-
-      arguments = {
-        "table" => "Sites",
-        "values" => '[{"_key":"ruby","uri":"http://ruby-lang.org/"}]'
-      }
-      expected_url = build_url("load", arguments)
-
-      assert_equal(expected_url, actual_url)
-    end
-
-    def test_value_single_quote
-      command = "select Sites --output_columns '_key, uri'"
-      arguments = {
-        "table" => "Sites",
-        "output_columns" => "_key, uri",
-      }
-      actual_url = convert(command)
-      expected_url = build_url("select", arguments)
-
-      assert_equal(expected_url, actual_url)
-    end
-
-    def test_value_double_quote_in_single_quote
-      command = "select Sites --filter 'uri @ \"ruby\"'"
-      arguments = {
-        "table" => "Sites",
-        "filter" => "uri @ \"ruby\"",
-      }
-      actual_url = convert(command)
-      expected_url = build_url("select", arguments)
-
-      assert_equal(expected_url, actual_url)
-    end
-
-    def test_value_double_quote
-      command = "select Sites --output_columns \"_key, uri\""
-      arguments = {
-        "table" => "Sites",
-        "output_columns" => "_key, uri",
-      }
-      actual_url = convert(command)
-      expected_url = build_url("select", arguments)
-
-      assert_equal(expected_url, actual_url)
-    end
-
-    private
-    def convert(command)
-      converter = Grntest::Tester::CommandFormatConverter.new(command)
-      converter.to_url
-    end
-
-    def build_url(command, named_arguments)
-      url = "/d/#{command}"
-      query_parameters = []
-
-      sorted_arguments = named_arguments.sort_by do |name, _|
-        name
-      end
-      sorted_arguments.each do |name, argument|
-        query_parameters << "#{CGI.escape(name)}=#{CGI.escape(argument)}"
-      end
-      unless query_parameters.empty?
-        url << "?"
-        url << query_parameters.join("&")
-      end
-      url
-    end
-  end
-end