Kouhei Sutou
null+****@clear*****
Mon Aug 12 12:24:48 JST 2013
Kouhei Sutou 2013-08-12 12:24:48 +0900 (Mon, 12 Aug 2013) New Revision: 1fe5f0a00f366702e81ed8f3c64b1ae188e701ec https://github.com/groonga/grntest/commit/1fe5f0a00f366702e81ed8f3c64b1ae188e701ec Message: Move TestResult to the file that defines TestRunner Modified files: lib/grntest/test-runner.rb lib/grntest/tester.rb Modified: lib/grntest/test-runner.rb (+51 -1) =================================================================== --- lib/grntest/test-runner.rb 2013-08-12 12:23:13 +0900 (829cabb) +++ lib/grntest/test-runner.rb 2013-08-12 12:24:48 +0900 (937d980) @@ -23,8 +23,58 @@ require "json" require "grntest/error" require "grntest/executors" +require "grntest/base-result" module Grntest + class TestResult < BaseResult + attr_accessor :worker_id, :test_name + attr_accessor :expected, :actual, :n_leaked_objects + attr_writer :omitted + def initialize(worker) + super() + @worker_id = worker.id + @test_name = worker.test_name + @actual = nil + @expected = nil + @n_leaked_objects = 0 + @omitted = false + end + + def status + return :omitted if omitted? + + if @expected + if @actual == @expected + if leaked? + :leaked + else + :success + end + else + :failure + end + else + if leaked? + :leaked + else + :not_checked + end + end + end + + def omitted? + @omitted + end + + def leaked? + not @n_leaked_objects.zero? + end + + def checked? + not****@expec*****? + end + end + class TestRunner MAX_N_COLUMNS = 79 @@ -39,7 +89,7 @@ module Grntest succeeded = true @worker.on_test_start - result = Tester::TestResult.new(@worker) + result = TestResult.new(@worker) result.measure do execute_groonga_script(result) end Modified: lib/grntest/tester.rb (+0 -49) =================================================================== --- lib/grntest/tester.rb 2013-08-12 12:23:13 +0900 (25492ae) +++ lib/grntest/tester.rb 2013-08-12 12:24:48 +0900 (82c5f09) @@ -626,54 +626,5 @@ module Grntest Grntest::Reporters.create_repoter(@tester) end end - - class TestResult < BaseResult - attr_accessor :worker_id, :test_name - attr_accessor :expected, :actual, :n_leaked_objects - attr_writer :omitted - def initialize(worker) - super() - @worker_id = worker.id - @test_name = worker.test_name - @actual = nil - @expected = nil - @n_leaked_objects = 0 - @omitted = false - end - - def status - return :omitted if omitted? - - if @expected - if @actual == @expected - if leaked? - :leaked - else - :success - end - else - :failure - end - else - if leaked? - :leaked - else - :not_checked - end - end - end - - def omitted? - @omitted - end - - def leaked? - not @n_leaked_objects.zero? - end - - def checked? - not****@expec*****? - end - end end end -------------- next part -------------- HTML����������������������������...Download