From 27e3f00d707732499746ad946b95c38cb3bf1fd1 Mon Sep 17 00:00:00 2001 From: Michael Miller Date: Fri, 7 Sep 2018 15:06:57 -0600 Subject: [PATCH] Remove RunOrder Examples will be sorted by using the decorator pattern.The collection of examples will be wrapped when a custom run order isused. --- src/spectator/defined_run_order.cr | 9 --------- src/spectator/run_order.cr | 5 ----- src/spectator/runner.cr | 7 +------ 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 src/spectator/defined_run_order.cr delete mode 100644 src/spectator/run_order.cr diff --git a/src/spectator/defined_run_order.cr b/src/spectator/defined_run_order.cr deleted file mode 100644 index 409ae2a..0000000 --- a/src/spectator/defined_run_order.cr +++ /dev/null @@ -1,9 +0,0 @@ -require "./run_order" - -module Spectator - private class DefinedRunOrder < RunOrder - def sort(a : Example, b : Example) : Int32 - 0 - end - end -end diff --git a/src/spectator/run_order.cr b/src/spectator/run_order.cr deleted file mode 100644 index 96ca03b..0000000 --- a/src/spectator/run_order.cr +++ /dev/null @@ -1,5 +0,0 @@ -module Spectator - private abstract class RunOrder - abstract def sort(a : Example, b : Example) : Int32 - end -end diff --git a/src/spectator/runner.cr b/src/spectator/runner.cr index d16d2b9..8ef23de 100644 --- a/src/spectator/runner.cr +++ b/src/spectator/runner.cr @@ -4,7 +4,6 @@ require "./successful_example_result" module Spectator class Runner def initialize(@examples : Enumerable(Example), - @run_order : RunOrder = DefinedRunOrder.new, @reporter : Reporters::Reporter = Reporters::StandardReporter.new) end @@ -12,7 +11,7 @@ module Spectator results = [] of ExampleResult elapsed = Time.measure do @reporter.start_suite - results = sorted_examples.map do |example| + results = @examples.map do |example| @reporter.start_example(example) run_example(example).tap do |result| @reporter.end_example(result) @@ -23,10 +22,6 @@ module Spectator @reporter.end_suite(report) end - private def sorted_examples - @examples.to_a.sort { |a, b| @run_order.sort(a, b) } - end - private def run_example(example) error = nil elapsed = Time.measure do