drntest 1.1.2 → 1.1.3

data/lib/drntest/configuration.rb

@@ -18,6 +18,7 @@ module Drntest
     attr_accessor :port, :host, :tag
     attr_accessor :base_path, :engine_config
     attr_accessor :fluentd, :fluentd_options
+    attr_accessor :catalog_version
 
     def initialize
       @port            = 24224
@@ -27,6 +28,7 @@ module Drntest
       @engine_config   = "default"
       @fluentd         = "fluentd"
       @fluentd_options = []
+      @catalog_version = "2"
     end
 
     def suite_path

data/lib/drntest/directive.rb

@@ -15,16 +15,44 @@
 
 module Drntest
   class Directive
-    attr_reader :type, :value
+  end
+
+  class UnknownDirective < Directive
+    attr_reader :type, :options
+
+    def initialize(type, options)
+      @type = type
+      @options = options
+    end
+  end
+
+  class IncludeDirective < Directive
+    attr_reader :path
+
+    def initialize(path)
+      @path = path
+    end
+  end
+
+  class EnableLoggingDirective < Directive
+  end
+
+  class DisableLoggingDirective < Directive
+  end
+
+  class OmitDirective < Directive
+    attr_reader :message
 
-    def initialize(type, value)
-      @type = normalize_type(type)
-      @value = value
+    def initialize(message)
+      @message = message
     end
+  end
+
+  class RequireCatalogVersionDirective < Directive
+    attr_reader :version
 
-    private
-    def normalize_type(type)
-      type.gsub("-", "_").to_sym
+    def initialize(version)
+      @version = version
     end
   end
 end

data/lib/drntest/engine.rb

@@ -24,9 +24,8 @@ module Drntest
       @config = config
     end
 
-    def start
-      prepare
-      setup
+    def start(target_path)
+      setup(target_path)
     end
 
     def stop
@@ -42,45 +41,78 @@ module Drntest
     end
 
     private
-    def prepare
-      return unless catalog_file.exist?
-
+    def load_catalog_json(target_path)
       catalog_json = JSON.parse(catalog_file.read)
-      case catalog_json["version"]
+      @config.catalog_version = catalog_json["version"]
+      case @config.catalog_version
       when 1
-        zone = catalog_json["zones"].first
-        /\A([^:]+):(\d+)\/(.+)\z/ =~ zone
-        @config.host = "localhost" # $1
-        @config.port = $2.to_i
-        @config.tag  = $3
+        extract_connection_info_catalog_v1(catalog_json)
       when 2
-        catch do |tag|
-          datasets = catalog_json["datasets"]
-          datasets.each do |name, dataset|
-            dataset["replicas"].each do |replica|
-              replica["slices"].each do |slice|
-                if /\A([^:]+):(\d+)\/([^.]+)/ =~ slice["volume"]["address"]
-                  @config.host = "localhost" # $1
-                  @config.port = $2.to_i
-                  @config.tag  = $3
-                  throw(tag)
-                end
-              end
+        custom_catalog_json_file = target_path.sub_ext(".catalog.json")
+        if custom_catalog_json_file.exist?
+          custom_catalog_json = JSON.parse(custom_catalog_json_file.read)
+          merge_catalog_v2!(catalog_json, custom_catalog_json)
+        end
+        extract_connection_info_catalog_v2(catalog_json)
+      end
+      catalog_json
+    end
+
+    def extract_connection_info_catalog_v1(catalog_json)
+      zone = catalog_json["zones"].first
+      /\A([^:]+):(\d+)\/(.+)\z/ =~ zone
+      @config.host = "localhost" # $1
+      @config.port = $2.to_i
+      @config.tag  = $3
+    end
+
+    def merge_catalog_v2!(catalog_json, custom_catalog_json)
+      base_datasets = catalog_json["datasets"]
+      custom_catalog_json["datasets"].each do |name, dataset|
+        base_dataset = base_datasets[name]
+        if base_dataset
+          base_dataset["fact"] = dataset["fact"] || base_dataset["fact"]
+          base_dataset["schema"] = dataset["schema"] || base_dataset["schema"]
+          replicas = dataset["replicas"] || []
+          base_replicas = base_dataset["replicas"]
+          replicas.each_with_index do |replica, i|
+            base_replicas[i].merge!(replica)
+          end
+        else
+          base_datasets[name] = dataset
+        end
+      end
+    end
+
+    def extract_connection_info_catalog_v2(catalog_json)
+      datasets = catalog_json["datasets"]
+      datasets.each do |name, dataset|
+        dataset["replicas"].each do |replica|
+          replica["slices"].each do |slice|
+            if /\A([^:]+):(\d+)\/([^.]+)/ =~ slice["volume"]["address"]
+              @config.host = "localhost" # $1
+              @config.port = $2.to_i
+              @config.tag  = $3
+              return
             end
           end
         end
       end
     end
 
-    def setup
+    def setup(target_path)
       return unless temporary?
 
       setup_temporary_dir
 
       temporary_config = temporary_dir + "fluentd.conf"
       FileUtils.cp(config_file, temporary_config)
+
+      catalog_json = load_catalog_json(target_path)
       temporary_catalog = temporary_dir + "catalog.json"
-      FileUtils.cp(catalog_file, temporary_catalog)
+      temporary_catalog.open("w") do |output|
+        output.puts(JSON.pretty_generate(catalog_json))
+      end
 
       command = [
         @config.fluentd,

data/lib/drntest/input-error.rb

@@ -0,0 +1,26 @@
+# Copyright (C) 2014  Droonga Project
+#
+# 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/>.
+
+module Drntest
+  class InputError < StandardError
+    attr_reader :file, :line_number, :content
+    def initialize(file, line_number, content, message)
+      @file = file
+      @line_number = line_number
+      @content = content
+      super("#{message}: #{@file}:#{@line_number}: #{@content}")
+    end
+  end
+end

data/lib/drntest/response-normalizer.rb

@@ -41,8 +41,11 @@ module Drntest
     end
 
     def normalize_droonga_message_body!(body)
-      return unless groonga_command?
-      normalize_groonga_command_response!(body)
+      if groonga_command?
+        normalize_groonga_command_response!(body)
+      elsif search_command?
+        normalize_search_command_response!(body)
+      end
     end
 
     GROONGA_COMMANDS = [
@@ -55,6 +58,10 @@ module Drntest
       GROONGA_COMMANDS.include?(@request["type"])
     end
 
+    def search_command?
+      @request["type"] == "search"
+    end
+
     def normalize_droonga_message_envelope!(message)
       normalized_in_reply_to = "request-id"
       in_reply_to = message["inReplyTo"]
@@ -77,14 +84,28 @@ module Drntest
       normalize_groonga_command_header!(response[0])
     end
 
+    def normalized_start_time
+      0.0
+    end
+
+    def normalized_elapsed
+      0.0
+    end
+
     def normalize_groonga_command_header!(header)
       return unless header.is_a?(Array)
-      normalized_start_time = 0.0
-      normalized_elapsed = 0.0
       header[1] = normalized_start_time if valid_start_time?(header[1])
       header[2] = normalized_elapsed if valid_elapsed?(header[2])
     end
 
+    def normalize_search_command_response!(response)
+      response.each do |query_name, result|
+        if valid_elapsed?(result["elapsedTime"])
+          result["elapsedTime"] = normalized_elapsed
+        end
+      end
+    end
+
     def valid_start_time?(start_time)
       start_time.is_a?(Float) and start_time > 0
     end

data/lib/drntest/test-executor.rb

@@ -20,19 +20,25 @@ require "drntest/response-normalizer"
 
 module Drntest
   class TestExecutor
-    def initialize(config, test_path)
+    def initialize(config, test_path, results)
       @config = config
       @test_path = test_path
+      @results = results
     end
 
     def execute
-      Droonga::Client.open(tag: @config.tag, port: @config.port) do |client|
-        context = Context.new(client)
-        operations.each do |operation|
-          context.execute(operation)
+      catch do |abort_tag|
+        begin
+          Droonga::Client.open(tag: @config.tag, port: @config.port) do |client|
+            context = Context.new(client, @config, @results, abort_tag)
+            operations.each do |operation|
+              context.execute(operation)
+            end
+            context.finish
+          end
+        rescue
+          @results.errors << $!
         end
-        context.finish
-        context.responses
       end
     end
 
@@ -43,10 +49,11 @@ module Drntest
     end
 
     class Context
-      attr_reader :responses
-
-      def initialize(client)
+      def initialize(client, config, results, abort_tag)
         @client = client
+        @config = config
+        @results = results
+        @abort_tag = abort_tag
         @requests = []
         @responses = []
         @logging = true
@@ -63,16 +70,28 @@ module Drntest
 
       def finish
         consume_requests
+        @results.actuals = @responses
       end
 
       private
       def execute_directive(directive)
-        case directive.type
-        when :enable_logging
+        case directive
+        when EnableLoggingDirective
           @logging = true
           consume_requests
-        when :disable_logging
+        when DisableLoggingDirective
           @logging = false
+        when OmitDirective
+          @results.omit(directive.message)
+          abort_execution
+        when RequireCatalogVersionDirective
+          if @config.catalog_version < directive.version
+            message =
+              "require catalog version #{directive.version} or later: " +
+              "<#{@config.catalog_version}>"
+            @results.omit(message)
+            abort_execution
+          end
         end
       end
 
@@ -110,6 +129,10 @@ module Drntest
         normalizer = ResponseNormalizer.new(request, response)
         normalizer.normalize
       end
+
+      def abort_execution
+        throw(@abort_tag)
+      end
     end
   end
 end

data/lib/drntest/test-loader.rb

@@ -13,8 +13,12 @@
 # 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 "English"
+require "shellwords"
+
 require "drntest/json-loader"
 require "drntest/directive"
+require "drntest/input-error"
 
 module Drntest
   class TestLoader
@@ -41,32 +45,59 @@ module Drntest
         operations << operation
       end
       data = ""
-      Pathname(path).read.each_line do |line|
-        data << line
-        case line.chomp
-        when /\A\#\@([^\s]+)(?:\s+(.+))?\z/
-          type = $1
-          value = $2
-          directive = Directive.new(type, value)
-          if directive.type == :include
-            included = resolve_relative_path(directive.value)
-            included_operations = load_test_file(included)
-            operations += included_operations
+      Pathname(path).open do |input|
+        input.each_line do |line|
+          data << line
+          case line.chomp
+          when /\A\#\@([^\s]+)/
+            type = $1
+            options = Shellwords.split($POSTMATCH.strip)
+            directive = parse_directive(type, options)
+            case directive
+            when UnknownDirective
+              raise InputError.new(path, input.lineno, line,
+                                   "unknown directive: <#{directive.type}>")
+            when IncludeDirective
+              included = resolve_relative_path(directive.path)
+              included_operations = load_test_file(included)
+              operations += included_operations
+            else
+              operations << directive
+            end
+          when /\A\#/
+            # comment
           else
-            operations << directive
-          end
-        when /\A\#/
-          # comment
-        else
-          begin
-            parser << line
-          rescue Yajl::ParseError => error
-            JSONLoader.report_error(path, data, error)
-            raise error
+            begin
+              parser << line
+            rescue Yajl::ParseError => error
+              JSONLoader.report_error(path, data, error)
+              raise error
+            end
           end
         end
       end
       operations
     end
+
+    def parse_directive(type, options)
+      case normalize_directive_type(type)
+      when :include
+        IncludeDirective.new(options.first)
+      when :enable_logging
+        EnableLoggingDirective.new
+      when :disable_logging
+        DisableLoggingDirective.new
+      when :omit
+        OmitDirective.new(options.first)
+      when :require_catalog_version
+        RequireCatalogVersionDirective.new(Integer(options.first))
+      else
+        UnknownDirective.new(type, options)
+      end
+    end
+
+    def normalize_directive_type(type)
+      type.gsub("-", "_").to_sym
+    end
   end
 end

data/lib/drntest/test-results.rb

@@ -16,15 +16,19 @@
 module Drntest
   class TestResults
     attr_accessor :name, :actuals, :expecteds, :errors
+    attr_reader :omit_message
 
     def initialize(name)
       @name = name
       @actuals = []
       @expecteds = []
       @errors = []
+      @omitted = false
+      @omit_message = nil
     end
 
     def status
+      return :omitted if @omitted
       return :error unless @errors.empty?
       return :no_response if @actuals.empty?
       return :not_checked if @expecteds.empty?
@@ -35,5 +39,10 @@ module Drntest
         :failure
       end
     end
+
+    def omit(message)
+      @omitted = true
+      @omit_message = message
+    end
   end
 end

data/lib/drntest/test-runner.rb

@@ -23,6 +23,7 @@ require "drntest/test-results"
 require "drntest/test-executor"
 require "drntest/json-loader"
 require "drntest/engine"
+require "drntest/input-error"
 
 module Drntest
   class TestRunner
@@ -34,7 +35,7 @@ module Drntest
 
     def run
       print "#{@target_path}: "
-      @engine.start
+      @engine.start(@target_path)
       begin
         results = process_requests
       ensure
@@ -47,12 +48,8 @@ module Drntest
     def process_requests
       results = TestResults.new(@target_path)
 
-      executor = TestExecutor.new(@config, @target_path)
-      begin
-        results.actuals = executor.execute
-      rescue
-        results.errors << $!
-      end
+      executor = TestExecutor.new(@config, @target_path, results)
+      executor.execute
       if expected_exist?
         results.expecteds = load_expected_responses
       end
@@ -65,14 +62,17 @@ module Drntest
         puts "NO RESPONSE"
       when :failure
         puts "FAILURE"
-        output_reject_file(results.actuals)
+        save_reject_file(results.actuals)
         show_diff(results.expecteds, results.actuals)
       when :not_checked
         puts "NOT CHECKED"
-        output_actual_file(results.actuals)
+        save_actual_file(results.actuals)
+        output_results(results.actuals, $stdout)
       when :error
         puts "ERROR"
         output_errors(results.errors)
+      when :omitted
+        puts "OMITTED: #{results.omit_message}"
       end
 
       results
@@ -107,20 +107,24 @@ module Drntest
       FileUtils.rm_rf(reject_path, :secure => true)
     end
 
-    def output_reject_file(results)
-      output_results(results, reject_path)
+    def save_reject_file(results)
+      save_results(results, reject_path)
     end
 
-    def output_actual_file(results)
-      output_results(results, actual_path)
+    def save_actual_file(results)
+      save_results(results, actual_path)
     end
 
-    def output_results(results, output_path)
+    def save_results(results, output_path)
       puts "Saving received results as #{output_path}"
       File.open(output_path, "w") do |file|
-        results.each do |result|
-          file.puts(format_result(result))
-        end
+        output_results(results, file)
+      end
+    end
+
+    def output_results(results, output)
+      results.each do |result|
+        output.puts(format_result(result))
       end
     end
 
@@ -172,8 +176,12 @@ module Drntest
       errors.each_with_index do |error, i|
         puts(mark)
         formatted_nth = "%*d)" % [n_digits, i + 1]
-        puts("#{formatted_nth} #{error.message} (#{error.class})")
-        puts(error.backtrace)
+        if error.is_a?(InputError)
+          puts("#{formatted_nth} #{error.message}")
+        else
+          puts("#{formatted_nth} #{error.message} (#{error.class})")
+          puts(error.backtrace)
+        end
         puts(mark)
       end
     end

data/lib/drntest/version.rb

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

metadata

@@ -1,113 +1,93 @@
 --- !ruby/object:Gem::Specification
 name: drntest
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
+  prerelease: 
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &87655010 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *87655010
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &87654800 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *87654800
 - !ruby/object:Gem::Dependency
   name: droonga-client
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &87654550 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+  version_requirements: *87654550
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &87654340 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *87654340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &87654110 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *87654110
 - !ruby/object:Gem::Dependency
   name: packnga
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &87653900 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *87653900
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &87653690 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *87653690
 description: ''
 email:
 - droonga@groonga.org
@@ -120,42 +100,44 @@ files:
 - Rakefile
 - Gemfile
 - drntest.gemspec
+- lib/drntest/test-loader.rb
+- lib/drntest/engine.rb
+- lib/drntest/test-executor.rb
+- lib/drntest/test-suites-result.rb
 - lib/drntest/test-runner.rb
+- lib/drntest/input-error.rb
 - lib/drntest/tester.rb
-- lib/drntest/directive.rb
 - lib/drntest/version.rb
-- lib/drntest/test-results.rb
-- lib/drntest/test-loader.rb
-- lib/drntest/configuration.rb
+- lib/drntest/directive.rb
 - lib/drntest/json-loader.rb
-- lib/drntest/test-suites-result.rb
-- lib/drntest/test-executor.rb
+- lib/drntest/test-results.rb
 - lib/drntest/response-normalizer.rb
-- lib/drntest/engine.rb
+- lib/drntest/configuration.rb
 - bin/drntest
 homepage: https://github.com/droonga/drntest
 licenses:
 - GPLv3 or later
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Drntest is a testing framework for Droonga. You can write a test for Droonga
   by writing Droonga commands and expected result.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 6f726abaf99e69946e00326d0c793453418bab22
-  data.tar.gz: 06482427d09d7a13fc941195c563dcb53b1f0e72
-SHA512:
-  metadata.gz: 275fd9a91d5049eee3c5b3c7008b7a81e12dd1f9cb7336dc10dc991ecb262e43782c43aefb3daf5e9a2bf5c7d2ac29180a159b2fc4bbcd3e4f88f2cb72940f0f
-  data.tar.gz: 54f655562fb16f1ecfad673864ab9c04dc833664100dee4e12d9825c4dbcc1741ab318ed4db1a7c0c26852e468a2e27fb0400e45b40f1f77d554305e5f98dbf1