Skip to content

Declare ArgValues arrays in type position #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sidepelican merged 1 commit into from
Sep 8, 2026
Merged

Declare ArgValues arrays in type position #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ This will generate:
```swift
public class FooMock: Foo {
var fooFuncCallCount = 0
var fooFuncArgValues = [Int]() // arguments captor
var fooFuncArgValues: [Int] = [] // arguments captor
var fooFuncHandler: ((Int) -> ())?
func fooFunc(val: Int) {
fooFuncCallCount += 1
Expand All @@ -346,11 +346,11 @@ public class FooMock: Foo {
}

...
var barFuncArgValues = [(a: String, Float)]() // tuple is also supported.
var barFuncArgValues: [(a: String, Float)] = [] // tuple is also supported.
...

...
var bazFuncArgValues = [(Int, String)]()
var bazFuncArgValues: [(val1: Int, val2: String)] = []
...
}
```
Expand Down
2 changes: 1 addition & 1 deletion Sources/MockoloFramework/Templates/MethodTemplate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ extension MethodModel {
let capturedValueType = argsHistory.capturedValueType.typeName

if !requiresConcurrencySafeAccess {
return "\(1.tab)\(declModifiers)var \(argsHistoryVarName) = [\(capturedValueType)]()"
return "\(1.tab)\(declModifiers)var \(argsHistoryVarName): [\(capturedValueType)] = []"
} else {
return """
\(1.tab)\(nonisolatedSpace)\(declModifiers)var \(argsHistoryVarName): [\(capturedValueType)] {
Expand Down
6 changes: 6 additions & 0 deletions Tests/TestArgumentsHistory/ArgumentsHistoryTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,10 @@ class ArgumentsHistoryTests: MockoloTestCase {
dstContent: argumentsHistoryLabels.expected._source,
enableFuncArgsHistory: true)
}

func testArgumentsHistoryMemberShadowsTypeName() {
verify(srcContent: argumentsHistoryMemberShadowsTypeName._source,
dstContent: argumentsHistoryMemberShadowsTypeName.expected._source,
enableFuncArgsHistory: true)
}
}
92 changes: 69 additions & 23 deletions Tests/TestArgumentsHistory/FixtureArgumentsHistory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


private(set) var fooFuncCallCount = 0
var fooFuncArgValues = [Int]()
var fooFuncArgValues: [Int] = []
var fooFuncHandler: ((Int) -> ())?
func fooFunc(val: Int) {
fooFuncCallCount += 1
Expand All @@ -23,7 +23,7 @@
}

private(set) var barFuncCallCount = 0
var barFuncArgValues = [[Int]]()
var barFuncArgValues: [[Int]] = []
var barFuncHandler: (([Int]) -> ())?
func barFunc(for: [Int]) {
barFuncCallCount += 1
Expand All @@ -34,7 +34,7 @@
}

private(set) var bazFuncCallCount = 0
var bazFuncArgValues = [(arg: String, default: Float)]()
var bazFuncArgValues: [(arg: String, default: Float)] = []
var bazFuncHandler: ((String, Float) -> ())?
func bazFunc(arg: String, default: Float) {
bazFuncCallCount += 1
Expand All @@ -61,7 +61,7 @@


private(set) var fooFuncCallCount = 0
var fooFuncArgValues = [Int]()
var fooFuncArgValues: [Int] = []
var fooFuncHandler: ((Int) -> ())?
func fooFunc(val: Int) {
fooFuncCallCount += 1
Expand All @@ -83,7 +83,7 @@
}

private(set) var bazFuncCallCount = 0
var bazFuncArgValues = [(arg: String, default: Float)]()
var bazFuncArgValues: [(arg: String, default: Float)] = []
var bazFuncHandler: ((String, Float) -> ())?
func bazFunc(arg: String, default: Float) {
bazFuncCallCount += 1
Expand Down Expand Up @@ -122,7 +122,7 @@
}

private(set) var barFuncCallCount = 0
var barFuncArgValues = [Int]()
var barFuncArgValues: [Int] = []
var barFuncHandler: ((Int) -> ())?
func barFunc(val: Int) {
barFuncCallCount += 1
Expand All @@ -134,7 +134,7 @@
}

private(set) var bazFuncCallCount = 0
var bazFuncArgValues = [Int]()
var bazFuncArgValues: [Int] = []
var bazFuncHandler: ((Int) -> ())?
func bazFunc(_ val: Int) {
bazFuncCallCount += 1
Expand All @@ -146,7 +146,7 @@
}

private(set) var quxFuncCallCount = 0
var quxFuncArgValues = [Int]()
var quxFuncArgValues: [Int] = []
var quxFuncHandler: ((Int) -> String)?
func quxFunc(val: Int) -> String {
quxFuncCallCount += 1
Expand All @@ -159,7 +159,7 @@
}

private(set) var quuxFuncCallCount = 0
var quuxFuncArgValues = [(val1: String, val2: Float)]()
var quuxFuncArgValues: [(val1: String, val2: Float)] = []
var quuxFuncHandler: ((String, Float) -> ())?
func quuxFunc(val1: String, val2: Float) {
quuxFuncCallCount += 1
Expand All @@ -185,7 +185,7 @@
init() { }

private(set) var fooFuncCallCount = 0
var fooFuncArgValues = [(Int, String)]()
var fooFuncArgValues: [(Int, String)] = []
var fooFuncHandler: (((Int, String)) -> ())?
func fooFunc(val: (Int, String)) {
fooFuncCallCount += 1
Expand All @@ -197,7 +197,7 @@
}

private(set) var barFuncCallCount = 0
var barFuncArgValues = [(val1: (bar1: Int, String), val2: (bar3: Int, bar4: String))]()
var barFuncArgValues: [(val1: (bar1: Int, String), val2: (bar3: Int, bar4: String))] = []
var barFuncHandler: (((bar1: Int, String), (bar3: Int, bar4: String)) -> ())?
func barFunc(val1: (bar1: Int, String), val2: (bar3: Int, bar4: String)) {
barFuncCallCount += 1
Expand Down Expand Up @@ -235,7 +235,7 @@
}

private(set) var fooFuncVal1CallCount = 0
var fooFuncVal1ArgValues = [Int]()
var fooFuncVal1ArgValues: [Int] = []
var fooFuncVal1Handler: ((Int) -> ())?
func fooFunc(val1: Int) {
fooFuncVal1CallCount += 1
Expand All @@ -248,7 +248,7 @@
}

private(set) var fooFuncVal1StringCallCount = 0
var fooFuncVal1StringArgValues = [String]()
var fooFuncVal1StringArgValues: [String] = []
var fooFuncVal1StringHandler: ((String) -> ())?
func fooFunc(val1: String) {
fooFuncVal1StringCallCount += 1
Expand All @@ -260,7 +260,7 @@
}

private(set) var fooFuncVal2CallCount = 0
var fooFuncVal2ArgValues = [Int]()
var fooFuncVal2ArgValues: [Int] = []
var fooFuncVal2Handler: ((Int) -> ())?
func fooFunc(val2: Int) {
fooFuncVal2CallCount += 1
Expand All @@ -286,7 +286,7 @@
init() { }

private(set) var fooFuncCallCount = 0
var fooFuncArgValues = [(val1: Any, val2: Any?)]()
var fooFuncArgValues: [(val1: Any, val2: Any?)] = []
var fooFuncHandler: ((Any, Any?) -> ())?
func fooFunc<T: StringProtocol>(val1: T, val2: T?) {
fooFuncCallCount += 1
Expand All @@ -298,7 +298,7 @@
}

private(set) var barFuncCallCount = 0
var barFuncArgValues = [Any]()
var barFuncArgValues: [Any] = []
var barFuncHandler: ((Any) -> Any)?
func barFunc<T: Sequence, U: Collection>(val: T) -> U {
barFuncCallCount += 1
Expand Down Expand Up @@ -326,7 +326,7 @@


private(set) var fooFuncCallCount = 0
var fooFuncArgValues = [Int]()
var fooFuncArgValues: [Int] = []
var fooFuncHandler: ((inout Int) -> ())?
func fooFunc(val: inout Int) {
fooFuncCallCount += 1
Expand All @@ -338,7 +338,7 @@
}

private(set) var barFuncCallCount = 0
var barFuncArgValues = [Int]()
var barFuncArgValues: [Int] = []
var barFuncHandler: ((inout Int) -> ())?
func barFunc(into val: inout Int) {
barFuncCallCount += 1
Expand Down Expand Up @@ -374,7 +374,7 @@
}

private(set) var barFuncCallCount = 0
var barFuncArgValues = [Int]()
var barFuncArgValues: [Int] = []
var barFuncHandler: ((Int, (String) -> Void) -> ())?
func barFunc(val: Int, handler: (String) -> Void) {
barFuncCallCount += 1
Expand Down Expand Up @@ -413,7 +413,7 @@
}

private(set) var barFuncCallCount = 0
var barFuncArgValues = [Int]()
var barFuncArgValues: [Int] = []
var barFuncHandler: ((Int, @escaping BarHandler) -> ())?
func barFunc(val: Int, handler: @escaping BarHandler) {
barFuncCallCount += 1
Expand Down Expand Up @@ -461,7 +461,7 @@
init() { }

static private(set) var fooFuncCallCount = 0
static var fooFuncArgValues = [Int]()
static var fooFuncArgValues: [Int] = []
static var fooFuncHandler: ((Int) -> ())?
static func fooFunc(val: Int) {
fooFuncCallCount += 1
Expand All @@ -487,7 +487,7 @@
init() { }

private(set) var fooCallCount = 0
var fooArgValues = [(arg0: Int, arg1: Double, throws: String)]()
var fooArgValues: [(arg0: Int, arg1: Double, throws: String)] = []
var fooHandler: ((Int, Double, String) -> ())?
func foo(arg0: Int, _ arg1: Double, first throws: String) {
fooCallCount += 1
Expand All @@ -499,7 +499,7 @@
}

private(set) var barCallCount = 0
var barArgValues = [(_0: Int, _1: Void, _2: Void)]()
var barArgValues: [(_0: Int, _1: Void, _2: Void)] = []
var barHandler: ((Int, Void, Void) -> ())?
func bar(_ _0: Int, _ _1: Void, _ _2: Void) {
barCallCount += 1
Expand All @@ -512,3 +512,49 @@
}
}
}

@Fixture enum argumentsHistoryMemberShadowsTypeName {
struct Config {}

/// @mockable
protocol Foo {
var Config: Int { get }
func apply(config: Config?, force: Bool)
func log(event: (), verbose: Bool)
}

@Fixture enum expected {
class FooMock: Foo {
init() { }
init(Config: Int = 0) {
self.Config = Config
}

var Config: Int = 0

private(set) var applyCallCount = 0
var applyArgValues: [(config: Config?, force: Bool)] = []
var applyHandler: ((Config?, Bool) -> ())?
func apply(config: Config?, force: Bool) {
applyCallCount += 1
applyArgValues.append((config, force))
if let applyHandler = applyHandler {
applyHandler(config, force)
}

}

private(set) var logCallCount = 0
var logArgValues: [(event: (), verbose: Bool)] = []
var logHandler: (((), Bool) -> ())?
func log(event: (), verbose: Bool) {
logCallCount += 1
logArgValues.append((event, verbose))
if let logHandler = logHandler {
logHandler(event, verbose)
}

}
}
}
}