Remove unecessary #to_s calls

This commit is contained in:
Michael Miller 2018-10-19 11:01:22 -06:00
parent 7f4690b042
commit 15ac60b17b
3 changed files with 56 additions and 46 deletions

View file

@ -2,6 +2,7 @@ require "../spec_helper"
describe Spectator::Expectations::ValueExpectationPartial do
describe "#actual" do
context "with a label" do
it "contains the value passed to the constructor" do
actual = 777
partial = Spectator::Expectations::ValueExpectationPartial.new(actual.to_s, actual)
@ -9,6 +10,15 @@ describe Spectator::Expectations::ValueExpectationPartial do
end
end
context "without a label" do
it "contains the value passed to the constructor" do
actual = 777
partial = Spectator::Expectations::ValueExpectationPartial.new(actual)
partial.actual.should eq(actual)
end
end
end
describe "#label" do
context "when provided" do
it "contains the value passed to the constructor" do

View file

@ -5,8 +5,8 @@ describe Spectator::Expectations::ValueExpectation do
context "with a successful match" do
it "returns a successful result" do
value = 42
partial = Spectator::Expectations::ValueExpectationPartial.new(value.to_s, value)
matcher = Spectator::Matchers::EqualityMatcher.new(value.to_s, value)
partial = Spectator::Expectations::ValueExpectationPartial.new(value)
matcher = Spectator::Matchers::EqualityMatcher.new(value)
expectation = Spectator::Expectations::ValueExpectation.new(partial, matcher)
matcher.match?(partial).should be_true # Sanity check.
expectation.eval.successful?.should be_true
@ -14,8 +14,8 @@ describe Spectator::Expectations::ValueExpectation do
it "reports a successful actual message" do
value = 42
partial = Spectator::Expectations::ValueExpectationPartial.new(value.to_s, value)
matcher = Spectator::Matchers::EqualityMatcher.new(value.to_s, value)
partial = Spectator::Expectations::ValueExpectationPartial.new(value)
matcher = Spectator::Matchers::EqualityMatcher.new(value)
expectation = Spectator::Expectations::ValueExpectation.new(partial, matcher)
matcher.match?(partial).should be_true # Sanity check.
expectation.eval.actual_message.should eq(expectation.message)
@ -26,8 +26,8 @@ describe Spectator::Expectations::ValueExpectation do
it "returns an unsuccessful result" do
value1 = 42
value2 = 777
partial = Spectator::Expectations::ValueExpectationPartial.new(value1.to_s, value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2.to_s, value2)
partial = Spectator::Expectations::ValueExpectationPartial.new(value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2)
expectation = Spectator::Expectations::ValueExpectation.new(partial, matcher)
matcher.match?(partial).should be_false # Sanity check.
expectation.eval.successful?.should be_false
@ -36,8 +36,8 @@ describe Spectator::Expectations::ValueExpectation do
it "reports an unsuccessful actual message" do
value1 = 42
value2 = 777
partial = Spectator::Expectations::ValueExpectationPartial.new(value1.to_s, value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2.to_s, value2)
partial = Spectator::Expectations::ValueExpectationPartial.new(value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2)
expectation = Spectator::Expectations::ValueExpectation.new(partial, matcher)
matcher.match?(partial).should be_false # Sanity check.
expectation.eval.actual_message.should eq(expectation.negated_message)
@ -46,8 +46,8 @@ describe Spectator::Expectations::ValueExpectation do
it "reports a non-negated expected message" do
value = 42
partial = Spectator::Expectations::ValueExpectationPartial.new(value.to_s, value)
matcher = Spectator::Matchers::EqualityMatcher.new(value.to_s, value)
partial = Spectator::Expectations::ValueExpectationPartial.new(value)
matcher = Spectator::Matchers::EqualityMatcher.new(value)
expectation = Spectator::Expectations::ValueExpectation.new(partial, matcher)
expectation.eval.expected_message.should eq(expectation.message)
end
@ -56,8 +56,8 @@ describe Spectator::Expectations::ValueExpectation do
context "with a successful match" do
it "returns an unsuccessful result" do
value = 42
partial = Spectator::Expectations::ValueExpectationPartial.new(value.to_s, value)
matcher = Spectator::Matchers::EqualityMatcher.new(value.to_s, value)
partial = Spectator::Expectations::ValueExpectationPartial.new(value)
matcher = Spectator::Matchers::EqualityMatcher.new(value)
expectation = Spectator::Expectations::ValueExpectation.new(partial, matcher)
matcher.match?(partial).should be_true # Sanity check.
expectation.eval(true).successful?.should be_false
@ -65,8 +65,8 @@ describe Spectator::Expectations::ValueExpectation do
it "reports an unsuccessful actual message" do
value = 42
partial = Spectator::Expectations::ValueExpectationPartial.new(value.to_s, value)
matcher = Spectator::Matchers::EqualityMatcher.new(value.to_s, value)
partial = Spectator::Expectations::ValueExpectationPartial.new(value)
matcher = Spectator::Matchers::EqualityMatcher.new(value)
expectation = Spectator::Expectations::ValueExpectation.new(partial, matcher)
matcher.match?(partial).should be_true # Sanity check.
expectation.eval(true).actual_message.should eq(expectation.negated_message)
@ -77,8 +77,8 @@ describe Spectator::Expectations::ValueExpectation do
it "returns a successful result" do
value1 = 42
value2 = 777
partial = Spectator::Expectations::ValueExpectationPartial.new(value1.to_s, value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2.to_s, value2)
partial = Spectator::Expectations::ValueExpectationPartial.new(value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2)
expectation = Spectator::Expectations::ValueExpectation.new(partial, matcher)
matcher.match?(partial).should be_false # Sanity check.
expectation.eval(true).successful?.should be_true
@ -87,8 +87,8 @@ describe Spectator::Expectations::ValueExpectation do
it "reports a successful actual message" do
value1 = 42
value2 = 777
partial = Spectator::Expectations::ValueExpectationPartial.new(value1.to_s, value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2.to_s, value2)
partial = Spectator::Expectations::ValueExpectationPartial.new(value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2)
expectation = Spectator::Expectations::ValueExpectation.new(partial, matcher)
matcher.match?(partial).should be_false # Sanity check.
expectation.eval(true).actual_message.should eq(expectation.message)
@ -97,8 +97,8 @@ describe Spectator::Expectations::ValueExpectation do
it "reports a negated expected message" do
value = 42
partial = Spectator::Expectations::ValueExpectationPartial.new(value.to_s, value)
matcher = Spectator::Matchers::EqualityMatcher.new(value.to_s, value)
partial = Spectator::Expectations::ValueExpectationPartial.new(value)
matcher = Spectator::Matchers::EqualityMatcher.new(value)
expectation = Spectator::Expectations::ValueExpectation.new(partial, matcher)
expectation.eval(true).expected_message.should eq(expectation.negated_message)
end

View file

@ -4,8 +4,8 @@ describe Spectator::Matchers::EqualityMatcher do
describe "#match?" do
it "compares using #==" do
spy = SpySUT.new
partial = Spectator::Expectations::ValueExpectationPartial.new("", spy)
matcher = Spectator::Matchers::EqualityMatcher.new("", 42)
partial = Spectator::Expectations::ValueExpectationPartial.new(spy)
matcher = Spectator::Matchers::EqualityMatcher.new(42)
matcher.match?(partial).should be_true
spy.eq_call_count.should be > 0
end
@ -13,8 +13,8 @@ describe Spectator::Matchers::EqualityMatcher do
context "with identical values" do
it "is true" do
value = 42
partial = Spectator::Expectations::ValueExpectationPartial.new(value.to_s, value)
matcher = Spectator::Matchers::EqualityMatcher.new(value.to_s, value)
partial = Spectator::Expectations::ValueExpectationPartial.new(value)
matcher = Spectator::Matchers::EqualityMatcher.new(value)
matcher.match?(partial).should be_true
end
end
@ -23,8 +23,8 @@ describe Spectator::Matchers::EqualityMatcher do
it "is false" do
value1 = 42
value2 = 777
partial = Spectator::Expectations::ValueExpectationPartial.new(value1.to_s, value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2.to_s, value2)
partial = Spectator::Expectations::ValueExpectationPartial.new(value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2)
matcher.match?(partial).should be_false
end
end
@ -33,8 +33,8 @@ describe Spectator::Matchers::EqualityMatcher do
it "is true" do
# Box is used because it is a reference type and doesn't override the == method.
ref = Box.new([] of Int32)
partial = Spectator::Expectations::ValueExpectationPartial.new(ref.to_s, ref)
matcher = Spectator::Matchers::EqualityMatcher.new(ref.to_s, ref)
partial = Spectator::Expectations::ValueExpectationPartial.new(ref)
matcher = Spectator::Matchers::EqualityMatcher.new(ref)
matcher.match?(partial).should be_true
end
end
@ -44,8 +44,8 @@ describe Spectator::Matchers::EqualityMatcher do
it "is true" do
array1 = [1, 2, 3]
array2 = [1, 2, 3]
partial = Spectator::Expectations::ValueExpectationPartial.new(array1.to_s, array1)
matcher = Spectator::Matchers::EqualityMatcher.new(array2.to_s, array2)
partial = Spectator::Expectations::ValueExpectationPartial.new(array1)
matcher = Spectator::Matchers::EqualityMatcher.new(array2)
matcher.match?(partial).should be_true
end
end
@ -54,8 +54,8 @@ describe Spectator::Matchers::EqualityMatcher do
it "is false" do
array1 = [1, 2, 3]
array2 = [4, 5, 6]
partial = Spectator::Expectations::ValueExpectationPartial.new(array1.to_s, array1)
matcher = Spectator::Matchers::EqualityMatcher.new(array2.to_s, array2)
partial = Spectator::Expectations::ValueExpectationPartial.new(array1)
matcher = Spectator::Matchers::EqualityMatcher.new(array2)
matcher.match?(partial).should be_false
end
end
@ -65,8 +65,8 @@ describe Spectator::Matchers::EqualityMatcher do
describe "#message" do
it "mentions ==" do
value = 42
partial = Spectator::Expectations::ValueExpectationPartial.new(value.to_s, value)
matcher = Spectator::Matchers::EqualityMatcher.new(value.to_s, value)
partial = Spectator::Expectations::ValueExpectationPartial.new(value)
matcher = Spectator::Matchers::EqualityMatcher.new(value)
matcher.message(partial).should contain("==")
end
@ -74,14 +74,14 @@ describe Spectator::Matchers::EqualityMatcher do
value = 42
label = "everything"
partial = Spectator::Expectations::ValueExpectationPartial.new(label, value)
matcher = Spectator::Matchers::EqualityMatcher.new(value.to_s, value)
matcher = Spectator::Matchers::EqualityMatcher.new(value)
matcher.message(partial).should contain(label)
end
it "contains the expected label" do
value = 42
label = "everything"
partial = Spectator::Expectations::ValueExpectationPartial.new(value.to_s, value)
partial = Spectator::Expectations::ValueExpectationPartial.new(value)
matcher = Spectator::Matchers::EqualityMatcher.new(label, value)
matcher.message(partial).should contain(label)
end
@ -90,7 +90,7 @@ describe Spectator::Matchers::EqualityMatcher do
it "contains stringified form of expected value" do
value1 = 42
value2 = 777
partial = Spectator::Expectations::ValueExpectationPartial.new(value1.to_s, value1)
partial = Spectator::Expectations::ValueExpectationPartial.new(value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2)
matcher.message(partial).should contain(value2.to_s)
end
@ -100,8 +100,8 @@ describe Spectator::Matchers::EqualityMatcher do
describe "#negated_message" do
it "mentions ==" do
value = 42
partial = Spectator::Expectations::ValueExpectationPartial.new(value.to_s, value)
matcher = Spectator::Matchers::EqualityMatcher.new(value.to_s, value)
partial = Spectator::Expectations::ValueExpectationPartial.new(value)
matcher = Spectator::Matchers::EqualityMatcher.new(value)
matcher.negated_message(partial).should contain("==")
end
@ -109,14 +109,14 @@ describe Spectator::Matchers::EqualityMatcher do
value = 42
label = "everything"
partial = Spectator::Expectations::ValueExpectationPartial.new(label, value)
matcher = Spectator::Matchers::EqualityMatcher.new(value.to_s, value)
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 = Spectator::Expectations::ValueExpectationPartial.new(value.to_s, value)
partial = Spectator::Expectations::ValueExpectationPartial.new(value)
matcher = Spectator::Matchers::EqualityMatcher.new(label, value)
matcher.negated_message(partial).should contain(label)
end
@ -125,7 +125,7 @@ describe Spectator::Matchers::EqualityMatcher do
it "contains stringified form of expected value" do
value1 = 42
value2 = 777
partial = Spectator::Expectations::ValueExpectationPartial.new(value1.to_s, value1)
partial = Spectator::Expectations::ValueExpectationPartial.new(value1)
matcher = Spectator::Matchers::EqualityMatcher.new(value2)
matcher.negated_message(partial).should contain(value2.to_s)
end