From efd0ab089d693e8d261772c468fecf3d21b1cfb3 Mon Sep 17 00:00:00 2001 From: Michael Miller Date: Fri, 9 Aug 2019 16:58:35 -0600 Subject: [PATCH] Define type annotations for match methods Hopefully this speeds up some compilation. --- src/spectator/matchers/array_matcher.cr | 4 ++-- src/spectator/matchers/attributes_matcher.cr | 4 ++-- src/spectator/matchers/end_with_matcher.cr | 4 ++-- src/spectator/matchers/exception_matcher.cr | 4 ++-- src/spectator/matchers/have_predicate_matcher.cr | 4 ++-- src/spectator/matchers/matcher.cr | 4 ++-- src/spectator/matchers/predicate_matcher.cr | 4 ++-- src/spectator/matchers/respond_matcher.cr | 4 ++-- src/spectator/matchers/standard_matcher.cr | 4 ++-- src/spectator/matchers/start_with_matcher.cr | 4 ++-- src/spectator/matchers/unordered_array_matcher.cr | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/spectator/matchers/array_matcher.cr b/src/spectator/matchers/array_matcher.cr index 28080ea..e03f584 100644 --- a/src/spectator/matchers/array_matcher.cr +++ b/src/spectator/matchers/array_matcher.cr @@ -16,7 +16,7 @@ module Spectator::Matchers "contains exactly #{expected.label}" end - def match(actual) + def match(actual : TestExpression(T)) : MatchData forall T actual_elements = actual.value.to_a expected_elements = expected.value.to_a index = compare_arrays(expected_elements, actual_elements) @@ -31,7 +31,7 @@ module Spectator::Matchers end end - def negated_match(actual) + def negated_match(actual : TestExpression(T)) : MatchData forall T actual_elements = actual.value.to_a expected_elements = expected.value.to_a diff --git a/src/spectator/matchers/attributes_matcher.cr b/src/spectator/matchers/attributes_matcher.cr index be5cbbc..437b80f 100644 --- a/src/spectator/matchers/attributes_matcher.cr +++ b/src/spectator/matchers/attributes_matcher.cr @@ -19,7 +19,7 @@ module Spectator::Matchers "has attributes #{expected.label}" end - def match(actual) + def match(actual : TestExpression(T)) : MatchData forall T snapshot = snapshot_values(actual.value) if match?(snapshot) SuccessfulMatchData.new @@ -28,7 +28,7 @@ module Spectator::Matchers end end - def negated_match(actual) + def negated_match(actual : TestExpression(T)) : MatchData forall T snapshot = snapshot_values(actual.value) if match?(snapshot) FailedMatchData.new("#{actual.label} has attributes #{expected.label}", **values(snapshot)) diff --git a/src/spectator/matchers/end_with_matcher.cr b/src/spectator/matchers/end_with_matcher.cr index 516e411..3dbd9e6 100644 --- a/src/spectator/matchers/end_with_matcher.cr +++ b/src/spectator/matchers/end_with_matcher.cr @@ -16,7 +16,7 @@ module Spectator::Matchers "ends with #{expected.label}" end - def match(actual) + def match(actual : TestExpression(T)) : MatchData forall T if (value = actual.value).responds_to?(:ends_with?) match_ends_with(value, actual.label) else @@ -50,7 +50,7 @@ module Spectator::Matchers end end - def negated_match(actual) + def negated_match(actual : TestExpression(T)) : MatchData forall T if actual.value.responds_to?(:ends_with?) negated_match_ends_with(actual) else diff --git a/src/spectator/matchers/exception_matcher.cr b/src/spectator/matchers/exception_matcher.cr index b39ceb9..3641c15 100644 --- a/src/spectator/matchers/exception_matcher.cr +++ b/src/spectator/matchers/exception_matcher.cr @@ -23,7 +23,7 @@ module Spectator::Matchers end end - def match(actual) + def match(actual : TestExpression(T)) : MatchData forall T exception = capture_exception { actual.value } if exception.nil? FailedMatchData.new("#{actual.label} did not raise", expected: ExceptionType.inspect) @@ -52,7 +52,7 @@ module Spectator::Matchers end end - def negated_match(actual) + def negated_match(actual : TestExpression(T)) : MatchData forall T exception = capture_exception { actual.value } if exception.nil? SuccessfulMatchData.new diff --git a/src/spectator/matchers/have_predicate_matcher.cr b/src/spectator/matchers/have_predicate_matcher.cr index 3bb881a..525f157 100644 --- a/src/spectator/matchers/have_predicate_matcher.cr +++ b/src/spectator/matchers/have_predicate_matcher.cr @@ -16,7 +16,7 @@ module Spectator::Matchers "has #{expected.label}" end - def match(actual) + def match(actual : TestExpression(T)) : MatchData forall T snapshot = snapshot_values(actual.value) if match?(snapshot) SuccessfulMatchData.new @@ -25,7 +25,7 @@ module Spectator::Matchers end end - def negated_match(actual) + def negated_match(actual : TestExpression(T)) : MatchData forall T snapshot = snapshot_values(actual.value) if match?(snapshot) FailedMatchData.new("#{actual.label} has #{expected.label}", **values(snapshot)) diff --git a/src/spectator/matchers/matcher.cr b/src/spectator/matchers/matcher.cr index 9120909..7845700 100644 --- a/src/spectator/matchers/matcher.cr +++ b/src/spectator/matchers/matcher.cr @@ -14,8 +14,8 @@ module Spectator::Matchers # The phrasing should be such that it reads "it ___." abstract def description : String - abstract def match(actual) : MatchData + abstract def match(actual : TestExpression(T)) : MatchData forall T - abstract def negated_match(actual) : MatchData + abstract def negated_match(actual : TestExpression(T)) : MatchData forall T end end diff --git a/src/spectator/matchers/predicate_matcher.cr b/src/spectator/matchers/predicate_matcher.cr index f8cb737..5ab5582 100644 --- a/src/spectator/matchers/predicate_matcher.cr +++ b/src/spectator/matchers/predicate_matcher.cr @@ -15,7 +15,7 @@ module Spectator::Matchers "is #{expected.label}" end - def match(actual) + def match(actual : TestExpression(T)) : MatchData forall T snapshot = snapshot_values(actual.value) if match?(snapshot) SuccessfulMatchData.new @@ -24,7 +24,7 @@ module Spectator::Matchers end end - def negated_match(actual) + def negated_match(actual : TestExpression(T)) : MatchData forall T snapshot = snapshot_values(actual.value) if match?(snapshot) FailedMatchData.new("#{actual.label} is #{expected.label}", **values(snapshot)) diff --git a/src/spectator/matchers/respond_matcher.cr b/src/spectator/matchers/respond_matcher.cr index 99a728f..dbecaa0 100644 --- a/src/spectator/matchers/respond_matcher.cr +++ b/src/spectator/matchers/respond_matcher.cr @@ -15,7 +15,7 @@ module Spectator::Matchers {{ExpectedType.keys.map { |e| "##{e}".id }.splat.stringify}} end - def match(actual) + def match(actual : TestExpression(T)) : MatchData forall T snapshot = snapshot_values(actual.value) if match?(snapshot) SuccessfulMatchData.new @@ -24,7 +24,7 @@ module Spectator::Matchers end end - def negated_match(actual) + def negated_match(actual : TestExpression(T)) : MatchData forall T snapshot = snapshot_values(actual.value) if match?(snapshot) FailedMatchData.new("#{actual.label} responds to #{label}", **snapshot) diff --git a/src/spectator/matchers/standard_matcher.cr b/src/spectator/matchers/standard_matcher.cr index 0e99e38..3c1d109 100644 --- a/src/spectator/matchers/standard_matcher.cr +++ b/src/spectator/matchers/standard_matcher.cr @@ -40,7 +40,7 @@ module Spectator::Matchers values(actual) end - def match(actual) + def match(actual : TestExpression(T)) : MatchData forall T if match?(actual) SuccessfulMatchData.new else @@ -48,7 +48,7 @@ module Spectator::Matchers end end - def negated_match(actual) + def negated_match(actual : TestExpression(T)) : MatchData forall T if does_not_match?(actual) SuccessfulMatchData.new else diff --git a/src/spectator/matchers/start_with_matcher.cr b/src/spectator/matchers/start_with_matcher.cr index 539c73d..2e7961f 100644 --- a/src/spectator/matchers/start_with_matcher.cr +++ b/src/spectator/matchers/start_with_matcher.cr @@ -14,7 +14,7 @@ module Spectator::Matchers "starts with #{expected.label}" end - def match(actual) + def match(actual : TestExpression(T)) : MatchData forall T if (value = actual.value).responds_to?(:starts_with?) match_starts_with(value, actual.label) else @@ -48,7 +48,7 @@ module Spectator::Matchers end end - def negated_match(actual) + def negated_match(actual : TestExpression(T)) : MatchData forall T if (value = actual.value).responds_to?(:starts_with?) negated_match_starts_with(value, actual.label) else diff --git a/src/spectator/matchers/unordered_array_matcher.cr b/src/spectator/matchers/unordered_array_matcher.cr index 9014aa1..acef92f 100644 --- a/src/spectator/matchers/unordered_array_matcher.cr +++ b/src/spectator/matchers/unordered_array_matcher.cr @@ -13,7 +13,7 @@ module Spectator::Matchers "contains #{expected.label} in any order" end - def match(actual) + def match(actual : TestExpression(T)) : MatchData forall T actual_elements = actual.value.to_a expected_elements = expected.value.to_a missing, extra = array_diff(expected_elements, actual_elements) @@ -30,7 +30,7 @@ module Spectator::Matchers end end - def negated_match(actual) + def negated_match(actual : TestExpression(T)) : MatchData forall T actual_elements = actual.value.to_a expected_elements = expected.value.to_a missing, extra = array_diff(expected_elements, actual_elements)