Remove Matcher methods moved to MatchData

Update spec for EqualityMatcher to reflect this.
This commit is contained in:
Michael Miller 2019-02-28 13:47:50 -07:00
parent b4502711cd
commit e6ce54202d
2 changed files with 131 additions and 132 deletions

View file

@ -1,133 +1,150 @@
require "../spec_helper" require "../spec_helper"
describe Spectator::Matchers::EqualityMatcher do describe Spectator::Matchers::EqualityMatcher 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::EqualityMatcher.new(42)
matcher = Spectator::Matchers::EqualityMatcher.new(42) matcher.match(partial)
matcher.match?(partial).should be_true spy.eq_call_count.should be > 0
spy.eq_call_count.should be > 0 end
end
context "with identical values" do describe "#match" do
it "is true" do context "returned MatchData" do
value = 42 describe "#matched?" do
partial = new_partial(value) context "with identical values" do
matcher = Spectator::Matchers::EqualityMatcher.new(value) it "is true" do
matcher.match?(partial).should be_true value = 42
end partial = new_partial(value)
end matcher = Spectator::Matchers::EqualityMatcher.new(value)
match_data = matcher.match(partial)
match_data.matched?.should be_true
end
end
context "with different values" do context "with different values" do
it "is false" do it "is false" do
value1 = 42 value1 = 42
value2 = 777 value2 = 777
partial = new_partial(value1) partial = new_partial(value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2) matcher = Spectator::Matchers::EqualityMatcher.new(value2)
matcher.match?(partial).should be_false match_data = matcher.match(partial)
end match_data.matched?.should be_false
end end
end
context "with the same instance" do context "with the same instance" do
it "is true" do it "is true" do
# Box is used because it is a reference type and doesn't override the == method. # Box is used because it is a reference type and doesn't override the == method.
ref = Box.new([] of Int32) ref = Box.new([] of Int32)
partial = new_partial(ref) partial = new_partial(ref)
matcher = Spectator::Matchers::EqualityMatcher.new(ref) matcher = Spectator::Matchers::EqualityMatcher.new(ref)
matcher.match?(partial).should be_true match_data = matcher.match(partial)
end match_data.matched?.should be_true
end end
end
context "with different instances" do context "with different instances" do
context "with same contents" do context "with same contents" do
it "is true" do it "is true" do
array1 = [1, 2, 3] array1 = [1, 2, 3]
array2 = [1, 2, 3] array2 = [1, 2, 3]
partial = new_partial(array1) partial = new_partial(array1)
matcher = Spectator::Matchers::EqualityMatcher.new(array2) matcher = Spectator::Matchers::EqualityMatcher.new(array2)
matcher.match?(partial).should be_true match_data = matcher.match(partial)
match_data.matched?.should be_true
end
end
context "with different contents" do
it "is false" do
array1 = [1, 2, 3]
array2 = [4, 5, 6]
partial = new_partial(array1)
matcher = Spectator::Matchers::EqualityMatcher.new(array2)
match_data = matcher.match(partial)
match_data.matched?.should be_false
end
end
end end
end end
context "with different contents" do describe "#message" do
it "is false" do it "mentions ==" do
array1 = [1, 2, 3] value = 42
array2 = [4, 5, 6] partial = new_partial(value)
partial = new_partial(array1) matcher = Spectator::Matchers::EqualityMatcher.new(value)
matcher = Spectator::Matchers::EqualityMatcher.new(array2) match_data = matcher.match(partial)
matcher.match?(partial).should be_false match_data.message.should contain("==")
end
it "contains the actual label" do
value = 42
label = "everything"
partial = new_partial(value, label)
matcher = Spectator::Matchers::EqualityMatcher.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::EqualityMatcher.new(label, value)
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::EqualityMatcher.new(value2)
match_data = matcher.match(partial)
match_data.message.should contain(value2.to_s)
end
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::EqualityMatcher.new(value) matcher = Spectator::Matchers::EqualityMatcher.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::EqualityMatcher.new(value) matcher = Spectator::Matchers::EqualityMatcher.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::EqualityMatcher.new(label, value) matcher = Spectator::Matchers::EqualityMatcher.new(label, value)
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::EqualityMatcher.new(value2) matcher = Spectator::Matchers::EqualityMatcher.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::EqualityMatcher.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::EqualityMatcher.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::EqualityMatcher.new(label, value)
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::EqualityMatcher.new(value2)
matcher.negated_message(partial).should contain(value2.to_s)
end end
end end
end end

View file

@ -4,12 +4,6 @@ module Spectator::Matchers
# Common matcher that tests whether two values equal each other. # Common matcher that tests whether two values equal each other.
# The values are compared with the == operator. # The values are compared with the == operator.
struct EqualityMatcher(ExpectedType) < ValueMatcher(ExpectedType) struct EqualityMatcher(ExpectedType) < ValueMatcher(ExpectedType)
# Determines whether the matcher is satisfied with the value given to it.
# True is returned if the match was successful, false otherwise.
def match?(partial)
partial.actual == expected
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) : MatchData
@ -18,18 +12,6 @@ module Spectator::Matchers
MatchData.new(matched, expected, actual, partial.label, label) MatchData.new(matched, expected, actual, partial.label, label)
end end
# Describes the condition that satisfies the matcher.
# This is informational and displayed to the end-user.
def message(partial)
"Expected #{partial.label} to equal #{label} (using ==)"
end
# Describes the condition that won't satsify the matcher.
# This is informational and displayed to the end-user.
def negated_message(partial)
"Expected #{partial.label} to not equal #{label} (using ==)"
end
# Match data specific to this matcher. # Match data specific to this matcher.
private struct MatchData(ExpectedType, ActualType) < MatchData private struct MatchData(ExpectedType, ActualType) < MatchData
# Creates the match data. # Creates the match data.