Yoji Shidara
null+****@clear*****
Thu Sep 19 14:35:20 JST 2013
Yoji Shidara 2013-09-19 14:35:20 +0900 (Thu, 19 Sep 2013) New Revision: 9eb1daae0fc9204f81aafe22a9962fe5e2d4b49b https://github.com/droonga/drntest/commit/9eb1daae0fc9204f81aafe22a9962fe5e2d4b49b Message: Extract TestResult Added files: lib/drntest/test-result.rb Modified files: lib/drntest/test-runner.rb Added: lib/drntest/test-result.rb (+26 -0) 100644 =================================================================== --- /dev/null +++ lib/drntest/test-result.rb 2013-09-19 14:35:20 +0900 (65771a5) @@ -0,0 +1,26 @@ +module Drntest + class TestResult + attr_accessor :expected, :actual + + def initialize + @expected = nil + @actual = nil + end + + def status + if @actual + if @expected + if @actual == @expected + :success + else + :failure + end + else + :not_checked + end + else + :no_response + end + end + end +end Modified: lib/drntest/test-runner.rb (+20 -13) =================================================================== --- lib/drntest/test-runner.rb 2013-09-19 13:43:13 +0900 (0dff44d) +++ lib/drntest/test-runner.rb 2013-09-19 14:35:20 +0900 (8ab60f2) @@ -2,6 +2,7 @@ require "json" require "droonga/client" require "tempfile" require "pp" +require "drntest/test-result" module Drntest class TestRunner @@ -14,28 +15,34 @@ module Drntest def run client = Droonga::Client.new(tag: tester.tag, port: tester.port) + result = TestResult.new print "#{target_path}: " request_envelope = load_request_envelope actual = client.connection.send_receive(request_envelope) - unless actual - puts "No response received" - return + if actual + actual = normalize_result(actual) + result.actual = actual end - actual = normalize_result(actual) if expected_exist? - expected = load_expected - if expected == actual - puts "PASS" - else - puts "FAIL" - show_diff(expected, actual) - output_reject_file(actual) - end - else + result.expected = load_expected + end + + case result.status + when :success + puts "PASS" + when :no_response + puts "NO RESPONSE" + when :failure + puts "FAIL" + output_reject_file(actual) + show_diff(expected, actual) + when :not_checked output_actual_file(actual) end + + result end def load_request_envelope -------------- next part -------------- HTML����������������������������...Download