Kouhei Sutou
null+****@clear*****
Sat Aug 11 19:15:43 JST 2012
Kouhei Sutou 2012-08-11 19:15:43 +0900 (Sat, 11 Aug 2012) New Revision: 49c1be58261a6a27427a55ce57320c9ec85b7c24 https://github.com/groonga/grntest/commit/49c1be58261a6a27427a55ce57320c9ec85b7c24 Log: Colorize summary Modified files: lib/groonga/tester.rb Modified: lib/groonga/tester.rb (+26 -23) =================================================================== --- lib/groonga/tester.rb 2012-08-11 19:12:04 +0900 (4652fac) +++ lib/groonga/tester.rb 2012-08-11 19:15:43 +0900 (69e9a72) @@ -1328,10 +1328,11 @@ EOF private def report_summary(result) - puts(statistics(result)) + puts(colorize(statistics(result), result)) pass_ratio = result.pass_ratio elapsed_time = result.elapsed_time - puts("%.4g%% passed in %.4fs." % [pass_ratio, elapsed_time]) + summary = "%.4g%% passed in %.4fs." % [pass_ratio, elapsed_time] + puts(colorize(summary, result)) end def statistics(result) @@ -1354,19 +1355,19 @@ EOF end def report_failure(result) - report_marker(result.status) + report_marker(result) report_diff(result.expected, result.actual) - report_marker(result.status) + report_marker(result) end def report_actual(result) - report_marker(result.status) + report_marker(result) puts(result.actual) - report_marker(result.status) + report_marker(result) end - def report_marker(situation) - puts(colorize("=" * @term_width, situation)) + def report_marker(result) + puts(colorize("=" * @term_width, result)) end def report_diff(expected, actual) @@ -1391,8 +1392,7 @@ EOF end def test_result_message(result, label) - situation = result.status - " %7.4fs [%s]" % [result.elapsed_time, colorize(label, situation)] + " %7.4fs [%s]" % [result.elapsed_time, colorize(label, result)] end def justify(message, width) @@ -1437,18 +1437,22 @@ EOF end def result_status(result) - if result.n_failed_tests > 0 - :failure - elsif result.n_not_checked_tests > 0 - :no_check + if result.respond_to?(:status) + result.status else - :success + if result.n_failed_tests > 0 + :failure + elsif result.n_not_checked_tests > 0 + :no_check + else + :success + end end end - def colorize(message, situation) + def colorize(message, result) return message unles****@teste*****_color? - case situation + case result_status(result) when :success "%s%s%s" % [success_color, message, reset_color] when :failure @@ -1670,7 +1674,7 @@ EOF private def report_test(worker, result) - report_marker(result.status) + report_marker(result) puts("[#{worker.id}] #{worker.suite_name}") print(" #{worker.test_name}") report_test_result(result, worker.status) @@ -1686,8 +1690,7 @@ EOF def draw_status_line(worker) clear_line - situation = result_status(worker.result) - left = "[#{colorize(worker.id, situation)}] " + left = "[#{colorize(worker.id, worker.result)}] " right = " [#{worker.status}]" rest_width = @term_width - @current_column center_width = rest_width - string_width(left) - string_width(right) @@ -1719,16 +1722,16 @@ EOF progress_width -= finish_mark.bytesize progress_width -= statistics.bytesize finished_mark = "-" - situation = result_status(@test_suites_result) if n_done_tests == n_total_tests - progress = colorize(finished_mark * progress_width, situation) + progress = colorize(finished_mark * progress_width, + @test_suites_result) else current_mark = ">" finished_marks_width = (progress_width * finished_test_ratio).ceil finished_marks_width -= current_mark.bytesize finished_marks_width = [0, finished_marks_width].max progress = finished_mark * finished_marks_width + current_mark - progress = colorize(progress, situation) + progress = colorize(progress, @test_suites_result) progress << " " * (progress_width - string_width(progress)) end puts("#{start_mark}#{progress}#{finish_mark}#{statistics}") -------------- next part -------------- HTML����������������������������...Download
