Rename Actual types to be more "human" sounding

This commit is contained in:
Michael Miller 2019-08-01 15:22:18 -06:00
parent 79a095bb31
commit 28680fa849
4 changed files with 9 additions and 9 deletions

View file

@ -19,7 +19,7 @@ module Spectator::DSL
# Where the actual value is returned by the system-under-test,
# and the expected value is what the actual value should be to satisfy the condition.
macro expect(actual, _source_file = __FILE__, _source_line = __LINE__)
value_actual = ::Spectator::Expectations::ValueActual.new({{actual.stringify}}, {{actual}})
value_actual = ::Spectator::Expectations::ActualValue.new({{actual.stringify}}, {{actual}})
source = ::Spectator::Source.new({{_source_file}}, {{_source_line}})
::Spectator::Expectations::ExpectationPartial.new(value_actual, source)
end
@ -70,11 +70,11 @@ module Spectator::DSL
# The raw block can't be used because it's not clear to the user.
{% method_name = block.body.id.split('.')[1..-1].join('.') %}
%partial = %proc.partial(subject)
block_actual = ::Spectator::Expectations::ValueActual.new({{"#" + method_name}}, %partial)
block_actual = ::Spectator::Expectations::ActualValue.new({{"#" + method_name}}, %partial)
{% else %}
# In this case, it looks like the short-hand method syntax wasn't used.
# Just drop in the proc as-is.
block_actual = ::Spectator::Expectations::ValueActual.new({{"`" + block.body.stringify + "`"}}, %proc)
block_actual = ::Spectator::Expectations::ActualValue.new({{"`" + block.body.stringify + "`"}}, %proc)
{% end %}
source = ::Spectator::Source.new({{_source_file}}, {{_source_line}})

View file

@ -2,7 +2,7 @@ require "./actual"
module Spectator::Expectations
# Captures an actual block and its label.
struct BlockActual(ReturnType) < Actual
struct ActualBlock(ReturnType) < Actual
# Calls the block and retrieves the value.
def value : ReturnType
@proc.call

View file

@ -2,7 +2,7 @@ require "./actual"
module Spectator::Expectations
# Captures an actual value and its label.
struct ValueActual(T) < Actual
struct ActualValue(T) < Actual
# Actual value.
getter value : T

View file

@ -21,7 +21,7 @@ class Object
# However, since this isn't a macro and we can't "look behind" this method call
# to see what it was invoked on, the argument is an empty string.
# Additionally, the source file and line can't be obtained.
actual = ::Spectator::Expectations::ValueActual.new(self)
actual = ::Spectator::Expectations::ActualValue.new(self)
source = ::Spectator::Source.new(__FILE__, __LINE__)
::Spectator::Expectations::ExpectationPartial.new(actual, source).to(matcher)
end
@ -29,7 +29,7 @@ class Object
# Works the same as `#should` except the condition is inverted.
# When `#should` succeeds, this method will fail, and vice-versa.
def should_not(matcher : ::Spectator::Matchers::Matcher)
actual = ::Spectator::Expectations::ValueActual.new(self)
actual = ::Spectator::Expectations::ActualValue.new(self)
source = ::Spectator::Source.new(__FILE__, __LINE__)
::Spectator::Expectations::ExpectationPartial.new(actual, source).to_not(matcher)
end
@ -39,7 +39,7 @@ struct Proc(*T, R)
# Extension method to create an expectation for a block of code (proc).
# Depending on the matcher, the proc may be executed multiple times.
def should(matcher : ::Spectator::Matchers::Matcher)
actual = ::Spectator::Expectations::BlockActual.new(self)
actual = ::Spectator::Expectations::ActualBlock.new(self)
source = ::Spectator::Source.new(__FILE__, __LINE__)
::Spectator::Expectations::ExpectationPartial.new(actual, source).to(matcher)
end
@ -47,7 +47,7 @@ struct Proc(*T, R)
# Works the same as `#should` except the condition is inverted.
# When `#should` succeeds, this method will fail, and vice-versa.
def should_not(matcher : ::Spectator::Matchers::Matcher)
actual = ::Spectator::Expectations::BlockActual.new(self)
actual = ::Spectator::Expectations::ActualBlock.new(self)
source = ::Spectator::Source.new(__FILE__, __LINE__)
::Spectator::Expectations::BlockExpectationPartial.new(actual, source).to_not(matcher)
end