dnrops
/
Cuckoo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for protocol generic parameters in `init`. 

Though support is missing for generic protocol methods.
This commit is contained in:
Matyáš Kříž 2020-08-22 20:11:05 +02:00
parent d85e2dd8e7
commit 8a7362ef17
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Generator/Source/CuckooGeneratorFramework/Templates/MockTemplate.swift
View File

@ -88,7 +88,7 @@ extension Templates {
{% if debug %} {% if debug %}
// {{initializer}} // {{initializer}}
{% endif %} {% endif %}
{{ initializer.accessibility }}{% if container.isImplementation %} override{% endif %}{% if initializer.@type == "ProtocolMethod" %} required{% endif %} init({{initializer.parameterSignature}}) { {{ initializer.accessibility }}{% if container.isImplementation %} override{% endif %}{% if initializer.@type == "ProtocolMethod" %} required{% endif %} init{{ initializer.genericParameters }}({{ initializer.parameterSignature }}) {
{% if container.isImplementation %} {% if container.isImplementation %}
super.init({{initializer.call}}) super.init({{initializer.call}})
{% endif %} {% endif %}

2
Generator/Source/CuckooGeneratorFramework/Templates/NopImplStubTemplate.swift
View File

@ -23,7 +23,7 @@ extension Templates {
{% endfor %} {% endfor %}
{% for initializer in container.initializers %} {% for initializer in container.initializers %}
{{ initializer.accessibility }}{% if container.@type == "ClassDeclaration" %} override{% endif %}{% if initializer.@type == "ProtocolMethod" %} required{%endif%} init({{initializer.parameterSignature}}) { {{ initializer.accessibility }}{% if container.@type == "ClassDeclaration" %} override{% endif %}{% if initializer.@type == "ProtocolMethod" %} required{%endif%} init{{ initializer.genericParameters }}({{ initializer.parameterSignature }}) {
{% if container.@type == "ClassDeclaration" %} {% if container.@type == "ClassDeclaration" %}
super.init({{initializer.call}}) super.init({{initializer.call}})
{% endif %} {% endif %}

2
Generator/Source/CuckooGeneratorFramework/Templates/TypeErasureTemplate.swift
View File

@ -33,7 +33,7 @@ extension Templates {
} }
{% if container.initializers %} {% if container.initializers %}
/// MARK:- ignored required initializers{% endif %} /// MARK:- ignored required initializers{% endif %}
{% for initializer in container.initializers %}{{ container.accessibility }} required init({{ initializer.parameterSignature }}) { {% for initializer in container.initializers %}{{ container.accessibility }} required init{{ initializer.genericParameters }}({{ initializer.parameterSignature }}) {
fatalError("`DefaultImplCaller` class is only used for calling default implementation and can't be initialized on its own.") fatalError("`DefaultImplCaller` class is only used for calling default implementation and can't be initialized on its own.")
} }
{% endfor %} {% endfor %}

12
Tests/Swift/GenericProtocolTest.swift
View File

@ -15,7 +15,7 @@ private class GenericProtocolConformerClass<C: AnyObject, V>: GenericProtocol {
let constant: Int = 0 let constant: Int = 0
var optionalProperty: V? var optionalProperty: V?
required init(theC: C, theV: V) { required init<F>(theC: C, theV: V, f: F) {
readOnlyPropertyC = theC readOnlyPropertyC = theC
readWritePropertyV = theV readWritePropertyV = theV
} }
@ -58,7 +58,7 @@ private struct GenericProtocolConformerStruct<C: AnyObject, V>: GenericProtocol
let constant: Int = 0 let constant: Int = 0
var optionalProperty: V? var optionalProperty: V?
init(theC: C, theV: V) { init<F>(theC: C, theV: V, f: F) {
readOnlyPropertyC = theC readOnlyPropertyC = theC
readWritePropertyV = theV readWritePropertyV = theV
} }
@ -81,7 +81,7 @@ private struct GenericProtocolConformerStruct<C: AnyObject, V>: GenericProtocol
class GenericProtocolTest: XCTestCase { class GenericProtocolTest: XCTestCase {
private func createMock<V>(value: V) -> MockGenericProtocol<MockTestedClass, V> { private func createMock<V>(value: V) -> MockGenericProtocol<MockTestedClass, V> {
let classy = MockTestedClass() let classy = MockTestedClass()
return MockGenericProtocol(theC: classy, theV: value) return MockGenericProtocol(theC: classy, theV: value, f: 0)
} }
func testReadOnlyProperty() { func testReadOnlyProperty() {
@ -144,7 +144,7 @@ class GenericProtocolTest: XCTestCase {
func testModification() { func testModification() {
let mock = createMock(value: ["EXTERMINATE!": "EXTERMINATE!!", "EXTERMINATE!!!": "EXTERMINATE!!!!"]) let mock = createMock(value: ["EXTERMINATE!": "EXTERMINATE!!", "EXTERMINATE!!!": "EXTERMINATE!!!!"])
let original = GenericProtocolConformerClass(theC: MockTestedClass(), theV: ["Sir, may I help you?": "Nope, just lookin' 👀"]) let original = GenericProtocolConformerClass(theC: MockTestedClass(), theV: ["Sir, may I help you?": "Nope, just lookin' 👀"], f: "F")
mock.enableDefaultImplementation(original) mock.enableDefaultImplementation(original)
original.readWritePropertyV["Are you sure?"] = "Yeah, I'm just waiting for my wife." original.readWritePropertyV["Are you sure?"] = "Yeah, I'm just waiting for my wife."
@ -163,7 +163,7 @@ class GenericProtocolTest: XCTestCase {
// using: `enableDefaultImplementation(mutating:)` reflects the original's state at all times // using: `enableDefaultImplementation(mutating:)` reflects the original's state at all times
func testStructModification() { func testStructModification() {
let mock = createMock(value: ["EXTERMINATE!": "EXTERMINATE!!", "EXTERMINATE!!!": "EXTERMINATE!!!!"]) let mock = createMock(value: ["EXTERMINATE!": "EXTERMINATE!!", "EXTERMINATE!!!": "EXTERMINATE!!!!"])
var original = GenericProtocolConformerStruct(theC: MockTestedClass(), theV: ["Sir, may I help you?": "Nope, just lookin' 👀"]) var original = GenericProtocolConformerStruct(theC: MockTestedClass(), theV: ["Sir, may I help you?": "Nope, just lookin' 👀"], f: "F")
mock.enableDefaultImplementation(mutating: &original) mock.enableDefaultImplementation(mutating: &original)
original.readWritePropertyV["Are you sure?"] = "Yeah, I'm just waiting for my wife." original.readWritePropertyV["Are you sure?"] = "Yeah, I'm just waiting for my wife."
@ -181,7 +181,7 @@ class GenericProtocolTest: XCTestCase {
// //
func testStructNonModification() { func testStructNonModification() {
let mock = createMock(value: ["EXTERMINATE!": "EXTERMINATE!!", "EXTERMINATE!!!": "EXTERMINATE!!!!"]) let mock = createMock(value: ["EXTERMINATE!": "EXTERMINATE!!", "EXTERMINATE!!!": "EXTERMINATE!!!!"])
var original = GenericProtocolConformerStruct(theC: MockTestedClass(), theV: ["Sir, may I help you?": "Nope, just lookin' 👀"]) var original = GenericProtocolConformerStruct(theC: MockTestedClass(), theV: ["Sir, may I help you?": "Nope, just lookin' 👀"], f: "F")
mock.enableDefaultImplementation(original) mock.enableDefaultImplementation(original)
original.readWritePropertyV["Are you sure?"] = "Yeah, I'm just waiting for my wife." original.readWritePropertyV["Are you sure?"] = "Yeah, I'm just waiting for my wife."

2
Tests/Swift/Source/GenericProtocol.swift
View File

@ -17,7 +17,7 @@ protocol GenericProtocol {
var constant: Int { get } var constant: Int { get }
var optionalProperty: V? { get set } var optionalProperty: V? { get set }
init(theC: C, theV: V) init<F>(theC: C, theV: V, f: F)
func callSomeC(theC: C) -> Int func callSomeC(theC: C) -> Int
func callSomeV(theV: V) -> Int func callSomeV(theV: V) -> Int