Update GreaterThanMatcher to use MatchData

This commit is contained in:
Michael Miller 2019-03-05 16:28:29 -07:00
parent 83d398465f
commit 36d3bd0a70
2 changed files with 196 additions and 103 deletions

View file

@ -1,111 +1,183 @@
require "../spec_helper" require "../spec_helper"
describe Spectator::Matchers::GreaterThanMatcher do describe Spectator::Matchers::GreaterThanMatcher do
describe "#match?" do describe "#match" do
it "compares using #>" do it "compares using #>" do
spy = SpySUT.new spy = SpySUT.new
partial = new_partial(spy) partial = new_partial(spy)
matcher = Spectator::Matchers::GreaterThanMatcher.new(42) matcher = Spectator::Matchers::GreaterThanMatcher.new(42)
matcher.match?(partial).should be_true matcher.match(partial)
spy.gt_call_count.should be > 0 spy.gt_call_count.should be > 0
end end
context "with a larger value" do context "returned MatchData" do
it "is false" do describe "#matched?" do
actual = 42 context "with a larger value" do
expected = 777 it "is false" do
partial = new_partial(actual) actual = 42
matcher = Spectator::Matchers::GreaterThanMatcher.new(expected) expected = 777
matcher.match?(partial).should be_false partial = new_partial(actual)
matcher = Spectator::Matchers::GreaterThanMatcher.new(expected)
match_data = matcher.match(partial)
match_data.matched?.should be_false
end
end
context "with a smaller value" do
it "is true" do
actual = 777
expected = 42
partial = new_partial(actual)
matcher = Spectator::Matchers::GreaterThanMatcher.new(expected)
match_data = matcher.match(partial)
match_data.matched?.should be_true
end
end
context "with an equal value" do
it "is false" do
value = 42
partial = new_partial(value)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value)
match_data = matcher.match(partial)
match_data.matched?.should be_false
end
end
end end
end
context "with a smaller value" do describe "#values" do
it "is true" do context "expected" do
actual = 777 it "is the expected value" do
expected = 42 actual = 777
partial = new_partial(actual) expected = 42
matcher = Spectator::Matchers::GreaterThanMatcher.new(expected) partial = new_partial(actual)
matcher.match?(partial).should be_true matcher = Spectator::Matchers::GreaterThanMatcher.new(expected)
match_data = matcher.match(partial)
match_data.values[:expected].value.should eq(expected)
end
it "is prefixed with >" do
actual = 777
expected = 42
partial = new_partial(actual)
matcher = Spectator::Matchers::GreaterThanMatcher.new(expected)
match_data = matcher.match(partial)
match_data.values[:expected].to_s.should start_with(">")
end
end
context "actual" do
it "is the actual value" do
actual = 777
expected = 42
partial = new_partial(actual)
matcher = Spectator::Matchers::GreaterThanMatcher.new(expected)
match_data = matcher.match(partial)
match_data.values[:actual].value.should eq(actual)
end
context "when #matched? is true" do
it "is prefixed with >" do
actual = 777
expected = 42
partial = new_partial(actual)
matcher = Spectator::Matchers::GreaterThanMatcher.new(expected)
match_data = matcher.match(partial)
match_data.matched?.should be_true # Sanity check.
match_data.values[:actual].to_s.should start_with(">")
end
end
context "when #matched? is false" do
it "is prefixed with <=" do
actual = 42
expected = 777
partial = new_partial(actual)
matcher = Spectator::Matchers::GreaterThanMatcher.new(expected)
match_data = matcher.match(partial)
match_data.matched?.should be_false # Sanity check.
match_data.values[:actual].to_s.should start_with("<=")
end
end
end
end end
end
context "with an equal value" do describe "#message" do
it "is false" do it "mentions >" do
value = 42 value = 42
partial = new_partial(value) partial = new_partial(value)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value) matcher = Spectator::Matchers::GreaterThanMatcher.new(value)
matcher.match?(partial).should be_false match_data = matcher.match(partial)
match_data.message.should contain(">")
end
it "contains the actual label" do
value = 42
label = "everything"
partial = new_partial(value, label)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value)
match_data = matcher.match(partial)
match_data.message.should contain(label)
end
it "contains the expected label" do
value = 42
label = "everything"
partial = new_partial(value)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value, label)
match_data = matcher.match(partial)
match_data.message.should contain(label)
end
context "when expected label is omitted" do
it "contains stringified form of expected value" do
value1 = 42
value2 = 777
partial = new_partial(value1)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value2)
match_data = matcher.match(partial)
match_data.message.should contain(value2.to_s)
end
end
end end
end
end
describe "#message" do describe "#negated_message" do
it "mentions >" do it "mentions >" do
value = 42 value = 42
partial = new_partial(value) partial = new_partial(value)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value) matcher = Spectator::Matchers::GreaterThanMatcher.new(value)
matcher.message(partial).should contain(">") match_data = matcher.match(partial)
end match_data.negated_message.should contain(">")
end
it "contains the actual label" do it "contains the actual label" do
value = 42 value = 42
label = "everything" label = "everything"
partial = new_partial(value, label) partial = new_partial(value, label)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value) matcher = Spectator::Matchers::GreaterThanMatcher.new(value)
matcher.message(partial).should contain(label) match_data = matcher.match(partial)
end match_data.negated_message.should contain(label)
end
it "contains the expected label" do it "contains the expected label" do
value = 42 value = 42
label = "everything" label = "everything"
partial = new_partial(value) partial = new_partial(value)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value, label) matcher = Spectator::Matchers::GreaterThanMatcher.new(value, label)
matcher.message(partial).should contain(label) match_data = matcher.match(partial)
end match_data.negated_message.should contain(label)
end
context "when expected label is omitted" do context "when expected label is omitted" do
it "contains stringified form of expected value" do it "contains stringified form of expected value" do
value1 = 42 value1 = 42
value2 = 777 value2 = 777
partial = new_partial(value1) partial = new_partial(value1)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value2) matcher = Spectator::Matchers::GreaterThanMatcher.new(value2)
matcher.message(partial).should contain(value2.to_s) match_data = matcher.match(partial)
end match_data.negated_message.should contain(value2.to_s)
end end
end end
describe "#negated_message" do
it "mentions >" do
value = 42
partial = new_partial(value)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value)
matcher.negated_message(partial).should contain(">")
end
it "contains the actual label" do
value = 42
label = "everything"
partial = new_partial(value, label)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value)
matcher.negated_message(partial).should contain(label)
end
it "contains the expected label" do
value = 42
label = "everything"
partial = new_partial(value)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value, label)
matcher.negated_message(partial).should contain(label)
end
context "when expected label is omitted" do
it "contains stringified form of expected value" do
value1 = 42
value2 = 777
partial = new_partial(value1)
matcher = Spectator::Matchers::GreaterThanMatcher.new(value2)
matcher.negated_message(partial).should contain(value2.to_s)
end end
end end
end end

View file

@ -5,27 +5,48 @@ module Spectator::Matchers
# The values are compared with the > operator. # The values are compared with the > operator.
struct GreaterThanMatcher(ExpectedType) < ValueMatcher(ExpectedType) struct GreaterThanMatcher(ExpectedType) < ValueMatcher(ExpectedType)
# Determines whether the matcher is satisfied with the value given to it. # Determines whether the matcher is satisfied with the value given to it.
# True is returned if the match was successful, false otherwise. private def match?(actual)
def match?(partial) actual > expected
partial.actual > expected
end end
# Determines whether the matcher is satisfied with the partial given to it. # Determines whether the matcher is satisfied with the partial given to it.
# `MatchData` is returned that contains information about the match. # `MatchData` is returned that contains information about the match.
def match(partial) : MatchData def match(partial)
raise NotImplementedError.new("#match") values = ExpectedActual.new(partial, self)
MatchData.new(match?(values.actual), values)
end end
# Describes the condition that satisfies the matcher. # Match data specific to this matcher.
# This is informational and displayed to the end-user. private struct MatchData(ExpectedType, ActualType) < MatchData
def message(partial) # Creates the match data.
"Expected #{partial.label} to be greater than #{label} (using >)" def initialize(matched, @values : ExpectedActual(ExpectedType, ActualType))
end super(matched)
end
# Describes the condition that won't satsify the matcher. # Information about the match.
# This is informational and displayed to the end-user. def values
def negated_message(partial) {
"Expected #{partial.label} to not be greater than #{label} (using >)" expected: PrefixedValue.new(">", @values.expected),
actual: PrefixedValue.new(actual_operator, @values.actual),
}
end
# Textual operator for the actual value.
private def actual_operator
matched? ? ">" : "<="
end
# Describes the condition that satisfies the matcher.
# This is informational and displayed to the end-user.
def message
"#{@values.actual_label} is greater than #{@values.expected_label} (using >)"
end
# Describes the condition that won't satsify the matcher.
# This is informational and displayed to the end-user.
def negated_message
"#{@values.actual_label} is less than or equal to #{@values.expected_label} (using >)"
end
end end
end end
end end