Update InequalityMatcher to use MatchData

This commit is contained in:
Michael Miller 2019-03-05 19:00:49 -07:00
parent d35a739e60
commit 95b4a349da
2 changed files with 180 additions and 117 deletions

View file

@ -1,133 +1,180 @@
require "../spec_helper" require "../spec_helper"
describe Spectator::Matchers::InequalityMatcher do describe Spectator::Matchers::InequalityMatcher 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::InequalityMatcher.new(42) matcher = Spectator::Matchers::InequalityMatcher.new(42)
matcher.match?(partial).should be_true matcher.match(partial)
spy.ne_call_count.should be > 0 spy.ne_call_count.should be > 0
end end
context "with identical values" do context "returned MatchData" do
it "is false" do describe "#matched?" do
value = 42 context "with identical values" do
partial = new_partial(value) it "is false" do
matcher = Spectator::Matchers::InequalityMatcher.new(value) value = 42
matcher.match?(partial).should be_false partial = new_partial(value)
end matcher = Spectator::Matchers::InequalityMatcher.new(value)
end match_data = matcher.match(partial)
match_data.matched?.should be_false
end
end
context "with different values" do context "with different values" do
it "is true" do it "is true" do
value1 = 42 value1 = 42
value2 = 777 value2 = 777
partial = new_partial(value1) partial = new_partial(value1)
matcher = Spectator::Matchers::InequalityMatcher.new(value2) matcher = Spectator::Matchers::InequalityMatcher.new(value2)
matcher.match?(partial).should be_true match_data = matcher.match(partial)
end match_data.matched?.should be_true
end end
end
context "with the same instance" do context "with the same instance" do
it "is false" do it "is false" 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::InequalityMatcher.new(ref) matcher = Spectator::Matchers::InequalityMatcher.new(ref)
matcher.match?(partial).should be_false match_data = matcher.match(partial)
end match_data.matched?.should be_false
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 false" do it "is false" 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::InequalityMatcher.new(array2) matcher = Spectator::Matchers::InequalityMatcher.new(array2)
matcher.match?(partial).should be_false match_data = matcher.match(partial)
match_data.matched?.should be_false
end
end
context "with different contents" do
it "is true" do
array1 = [1, 2, 3]
array2 = [4, 5, 6]
partial = new_partial(array1)
matcher = Spectator::Matchers::InequalityMatcher.new(array2)
match_data = matcher.match(partial)
match_data.matched?.should be_true
end
end
end end
end end
context "with different contents" do describe "#values" do
it "is true" do context "expected" do
array1 = [1, 2, 3] it "is the expected value" do
array2 = [4, 5, 6] expected, actual = 42, 777
partial = new_partial(array1) partial = new_partial(actual)
matcher = Spectator::Matchers::InequalityMatcher.new(array2) matcher = Spectator::Matchers::InequalityMatcher.new(expected)
matcher.match?(partial).should be_true match_data = matcher.match(partial)
match_data.values[:expected].value.should eq(expected)
end
it "is prefixed with 'Not'" do
expected, actual = 42, 777
partial = new_partial(actual)
matcher = Spectator::Matchers::InequalityMatcher.new(expected)
match_data = matcher.match(partial)
match_data.values[:expected].to_s.should start_with("Not")
end
end
context "actual" do
it "is the actual value" do
expected, actual = 42, 777
partial = new_partial(actual)
matcher = Spectator::Matchers::InequalityMatcher.new(expected)
match_data = matcher.match(partial)
match_data.values[:actual].should eq(actual)
end
end end
end end
end
end
describe "#message" do describe "#message" do
it "mentions !=" do it "mentions !=" do
value = 42 value = 42
partial = new_partial(value) partial = new_partial(value)
matcher = Spectator::Matchers::InequalityMatcher.new(value) matcher = Spectator::Matchers::InequalityMatcher.new(value)
matcher.message(partial).should contain("!=") match_data = matcher.match(partial)
end match_data.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::InequalityMatcher.new(value) matcher = Spectator::Matchers::InequalityMatcher.new(value)
matcher.message(partial).should contain(label) match_data = matcher.match(partial)
end match_data.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::InequalityMatcher.new(value, label) matcher = Spectator::Matchers::InequalityMatcher.new(value, label)
matcher.message(partial).should contain(label) match_data = matcher.match(partial)
end match_data.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::InequalityMatcher.new(value2) matcher = Spectator::Matchers::InequalityMatcher.new(value2)
matcher.message(partial).should contain(value2.to_s) match_data = matcher.match(partial)
match_data.message.should contain(value2.to_s)
end
end
end end
end
end
describe "#negated_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::InequalityMatcher.new(value) matcher = Spectator::Matchers::InequalityMatcher.new(value)
matcher.negated_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::InequalityMatcher.new(value) matcher = Spectator::Matchers::InequalityMatcher.new(value)
matcher.negated_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::InequalityMatcher.new(value, label) matcher = Spectator::Matchers::InequalityMatcher.new(value, label)
matcher.negated_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::InequalityMatcher.new(value2) matcher = Spectator::Matchers::InequalityMatcher.new(value2)
matcher.negated_message(partial).should contain(value2.to_s) match_data = matcher.match(partial)
match_data.negated_message.should contain(value2.to_s)
end
end
end end
end end
end end

View file

@ -5,27 +5,43 @@ module Spectator::Matchers
# The values are compared with the != operator. # The values are compared with the != operator.
struct InequalityMatcher(ExpectedType) < ValueMatcher(ExpectedType) struct InequalityMatcher(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 not equal #{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 equal #{label} (using !=)" expected: PrefixedValue.new("Not", @values.expected),
actual: @values.actual,
}
end
# Describes the condition that satisfies the matcher.
# This is informational and displayed to the end-user.
def message
"#{@values.actual_label} is not #{@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 #{@values.expected_label} (using !=)"
end
end end
end end
end end