iv-org-mirror/shard-spectator
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/shard-spectator.git synced 2024-08-15 00:53:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove GenericMethodCall

Browse source 
This type isn't needed. MethodCall is suitable after moving arguments to
it.
This commit is contained in:
Michael Miller 2019-12-13 19:54:06 -07:00
parent a6aa00eb38
commit a38625f8a7
11 changed files with 22 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/spectator/mocks/anonymous_double.cr
View file

@ -9,7 +9,7 @@ module Spectator::Mocks
macro method_missing(call)
args = ::Spectator::Mocks::GenericArguments.create({{call.args.splat}})
call = ::Spectator::Mocks::GenericMethodCall.new({{call.name.symbolize}}, args)
call = ::Spectator::Mocks::MethodCall.new({{call.name.symbolize}}, args)
::Spectator::Harness.current.mocks.record_call(self, call)
if (stub = ::Spectator::Harness.current.mocks.find_stub(self, call))
stub.call!(args) do

2
src/spectator/mocks/anonymous_null_double.cr
View file

@ -5,7 +5,7 @@ module Spectator::Mocks
macro method_missing(call)
args = ::Spectator::Mocks::GenericArguments.create({{call.args.splat}})
call = ::Spectator::Mocks::GenericMethodCall.new({{call.name.symbolize}}, args)
call = ::Spectator::Mocks::MethodCall.new({{call.name.symbolize}}, args)
::Spectator::Harness.current.mocks.record_call(self, call)
if (stub = ::Spectator::Harness.current.mocks.find_stub(self, call))
stub.call!(args) { @values.fetch({{call.name.symbolize}}) { self } }

10
src/spectator/mocks/double.cr
View file

@ -1,5 +1,5 @@
require "./generic_method_call"
require "./generic_method_stub"
require "./method_call"
require "./unexpected_message_error"
module Spectator::Mocks
@ -36,7 +36,7 @@ module Spectator::Mocks
def {{name}}({{params.splat}}){% if definition.is_a?(TypeDeclaration) %} : {{definition.type}}{% end %}
%args = ::Spectator::Mocks::GenericArguments.create({{args.splat}})
%call = ::Spectator::Mocks::GenericMethodCall.new({{name.symbolize}}, %args)
%call = ::Spectator::Mocks::MethodCall.new({{name.symbolize}}, %args)
::Spectator::Harness.current.mocks.record_call(self, %call)
if (%stub = ::Spectator::Harness.current.mocks.find_stub(self, %call))
%stub.call!(%args) { %method({{args.splat}}) }
@ -47,7 +47,7 @@ module Spectator::Mocks
def {{name}}({{params.splat}}){% if definition.is_a?(TypeDeclaration) %} : {{definition.type}}{% end %}
%args = ::Spectator::Mocks::GenericArguments.create({{args.splat}})
%call = ::Spectator::Mocks::GenericMethodCall.new({{name.symbolize}}, %args)
%call = ::Spectator::Mocks::MethodCall.new({{name.symbolize}}, %args)
::Spectator::Harness.current.mocks.record_call(self, %call)
if (%stub = ::Spectator::Harness.current.mocks.find_stub(self, %call))
%stub.call!(%args) { %method({{args.splat}}) { |*%ya| yield *%ya } }
@ -63,7 +63,7 @@ module Spectator::Mocks
{{body.body}}
{% else %}
%args = ::Spectator::Mocks::GenericArguments.create({{args.splat}})
%call = ::Spectator::Mocks::GenericMethodCall.new({{name.symbolize}}, %args)
%call = ::Spectator::Mocks::MethodCall.new({{name.symbolize}}, %args)
unless ::Spectator::Harness.current.mocks.expected?(self, %call)
raise ::Spectator::Mocks::UnexpectedMessageError.new("#{self} received unexpected message {{name}}")
end
@ -80,7 +80,7 @@ module Spectator::Mocks
macro method_missing(call)
args = ::Spectator::Mocks::GenericArguments.create({{call.args.splat}})
call = ::Spectator::Mocks::GenericMethodCall.new({{call.name.symbolize}}, args)
call = ::Spectator::Mocks::MethodCall.new({{call.name.symbolize}}, args)
::Spectator::Harness.current.mocks.record_call(self, call)
return self if @null

19
src/spectator/mocks/generic_method_call.cr
View file

@ -1,19 +0,0 @@
require "./generic_arguments"
require "./method_call"
module Spectator::Mocks
class GenericMethodCall(T, NT) < MethodCall
getter args
def initialize(name : Symbol, @args : GenericArguments(T, NT))
super(name)
end
def to_s(io)
super
io << '('
io << @args
io << ')'
end
end
end

2
src/spectator/mocks/generic_method_stub.cr
View file

@ -11,7 +11,7 @@ module Spectator::Mocks
super(name, source)
end
def callable?(call : GenericMethodCall(T, NT)) : Bool forall T, NT
def callable?(call : MethodCall) : Bool
super && (!@args || @args === call.args)
end

5
src/spectator/mocks/method_call.cr
View file

@ -1,8 +1,9 @@
module Spectator::Mocks
abstract class MethodCall
class MethodCall
getter name : Symbol
getter args : Arguments
def initialize(@name : Symbol)
def initialize(@name : Symbol, @args : Arguments)
end
def to_s(io)

4
src/spectator/mocks/method_stub.cr
View file

@ -1,5 +1,5 @@
require "../source"
require "./generic_method_call"
require "./method_call"
module Spectator::Mocks
abstract class MethodStub
@ -10,7 +10,7 @@ module Spectator::Mocks
def initialize(@name, @source)
end
def callable?(call : GenericMethodCall(T, NT)) : Bool forall T, NT
def callable?(call : MethodCall) : Bool
@name == call.name
end

4
src/spectator/mocks/registry.cr
View file

@ -47,7 +47,7 @@ module Spectator::Mocks
fetch_type(object.class).stubs.any? { |stub| stub.name == method_name }
end
def find_stub(object, call : GenericMethodCall(T, NT)) forall T, NT
def find_stub(object, call : MethodCall)
fetch_instance(object).stubs.find(&.callable?(call)) ||
fetch_type(object.class).stubs.find(&.callable?(call))
end
@ -65,7 +65,7 @@ module Spectator::Mocks
fetch_type(type).calls.select { |call| call.name == method_name }
end
def expected?(object, call : GenericMethodCall(T, NT)) : Bool forall T, NT
def expected?(object, call : MethodCall) : Bool
fetch_instance(object).expected.any?(&.callable?(call)) ||
fetch_type(object.class).expected.any?(&.callable?(call))
end

4
src/spectator/mocks/stubs.cr
View file

@ -53,7 +53,7 @@ module Spectator::Mocks
def {{receiver}}{{name}}({{params.splat}}){% if definition.is_a?(TypeDeclaration) %} : {{definition.type}}{% end %}
if (%harness = ::Spectator::Harness.current?)
%args = ::Spectator::Mocks::GenericArguments.create({{args.splat}})
%call = ::Spectator::Mocks::GenericMethodCall.new({{name.symbolize}}, %args)
%call = ::Spectator::Mocks::MethodCall.new({{name.symbolize}}, %args)
%harness.mocks.record_call(self, %call)
if (%stub = %harness.mocks.find_stub(self, %call))
return %stub.call!(%args) { {{original}}({{args.splat}}) }
@ -65,7 +65,7 @@ module Spectator::Mocks
def {{receiver}}{{name}}({{params.splat}}){% if definition.is_a?(TypeDeclaration) %} : {{definition.type}}{% end %}
if (%harness = ::Spectator::Harness.current?)
%args = ::Spectator::Mocks::GenericArguments.create({{args.splat}})
%call = ::Spectator::Mocks::GenericMethodCall.new({{name.symbolize}}, %args)
%call = ::Spectator::Mocks::MethodCall.new({{name.symbolize}}, %args)
%harness.mocks.record_call(self, %call)
if (%stub = %harness.mocks.find_stub(self, %call))
return %stub.call!(%args) { {{original}}({{args.splat}}) { |*%ya| yield *%ya } }

2
src/spectator/mocks/type_registry.cr
View file

@ -16,7 +16,7 @@ module Spectator::Mocks
list << NilMethodStub.new(method_name, source, args)
end
def exists?(type_name : String, call : GenericMethodCall(T, NT)) : Bool forall T, NT
def exists?(type_name : String, call : MethodCall) : Bool
key = {type_name, call.name}
list = @@entries.fetch(key) { return false }
list.any?(&.callable?(call))

8
src/spectator/mocks/verifying_double.cr
View file

@ -32,7 +32,7 @@ module Spectator::Mocks
def {{name}}({{params.splat}}){% if definition.is_a?(TypeDeclaration) %} : {{definition.type}}{% end %}
%args = ::Spectator::Mocks::GenericArguments.create({{args.splat}})
%call = ::Spectator::Mocks::GenericMethodCall.new({{name.symbolize}}, %args)
%call = ::Spectator::Mocks::MethodCall.new({{name.symbolize}}, %args)
::Spectator::Harness.current.mocks.record_call(self, %call)
unless ::Spectator::Mocks::TypeRegistry.exists?(T.to_s, %call)
@ -48,7 +48,7 @@ module Spectator::Mocks
def {{name}}({{params.splat}}){% if definition.is_a?(TypeDeclaration) %} : {{definition.type}}{% end %}
%args = ::Spectator::Mocks::GenericArguments.create({{args.splat}})
%call = ::Spectator::Mocks::GenericMethodCall.new({{name.symbolize}}, %args)
%call = ::Spectator::Mocks::MethodCall.new({{name.symbolize}}, %args)
::Spectator::Harness.current.mocks.record_call(self, %call)
unless ::Spectator::Mocks::TypeRegistry.exists?(T.to_s, %call)
@ -69,7 +69,7 @@ module Spectator::Mocks
{{body.body}}
{% else %}
%args = ::Spectator::Mocks::GenericArguments.create({{args.splat}})
%call = ::Spectator::Mocks::GenericMethodCall.new({{name.symbolize}}, %args)
%call = ::Spectator::Mocks::MethodCall.new({{name.symbolize}}, %args)
unless ::Spectator::Harness.current.mocks.expected?(self, %call)
raise ::Spectator::Mocks::UnexpectedMessageError.new("#{self} received unexpected message {{name}}")
end
@ -86,7 +86,7 @@ module Spectator::Mocks
macro method_missing(call)
args = ::Spectator::Mocks::GenericArguments.create({{call.args.splat}})
call = ::Spectator::Mocks::GenericMethodCall.new({{call.name.symbolize}}, args)
call = ::Spectator::Mocks::MethodCall.new({{call.name.symbolize}}, args)
::Spectator::Harness.current.mocks.record_call(self, call)
unless ::Spectator::Mocks::TypeRegistry.exists?(T.to_s, call)