Skip to content

Commit

Permalink
Shorter factory method name for RingtoneSoundNameSaveInteractor
Browse files Browse the repository at this point in the history
Issue #161
  • Loading branch information
eofster committed Mar 15, 2016
1 parent 7cdabac commit 42dbd55
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Telephone/DefaultInteractorFactory.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ extension DefaultInteractorFactory: InteractorFactory {
return UserDefaultsSoundIOSaveInteractor(soundIO: soundIO, userDefaults: userDefaults)
}

func createUserDefaultsRingtoneSoundNameSaveInteractor(name name: String) -> Interactor {
func createRingtoneSoundNameSaveInteractor(name name: String) -> Interactor {
return UserDefaultsRingtoneSoundNameSaveInteractor(soundName: name, userDefaults: userDefaults)
}
}
2 changes: 1 addition & 1 deletion Telephone/SoundPreferencesViewEventHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ extension SoundPreferencesViewEventHandler: SoundPreferencesViewObserver {
}

func viewDidChangeRingtoneName(name: String) {
interactorFactory.createUserDefaultsRingtoneSoundNameSaveInteractor(name: name).execute()
interactorFactory.createRingtoneSoundNameSaveInteractor(name: name).execute()
playRingtoneSoundOrLogError()
}

Expand Down
4 changes: 2 additions & 2 deletions TelephoneTests/DefaultInteractorFactoryTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ class DefaultInteractorFactoryTests: XCTestCase {
XCTAssertTrue(result.userDefaults === userDefaults)
}

func testCanCreateUserDefaultsRingtoneSoundNameSaveInteractor() {
let result = sut.createUserDefaultsRingtoneSoundNameSaveInteractor(name: "sound-name") as! UserDefaultsRingtoneSoundNameSaveInteractor
func testCanCreateRingtoneSoundNameSaveInteractor() {
let result = sut.createRingtoneSoundNameSaveInteractor(name: "sound-name") as! UserDefaultsRingtoneSoundNameSaveInteractor

XCTAssertNotNil(result)
XCTAssertEqual(result.soundName, "sound-name")
Expand Down
6 changes: 3 additions & 3 deletions TelephoneTests/SoundPreferencesViewEventHandlerTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ class SoundPreferencesViewEventHandlerTests: XCTestCase {
XCTAssertTrue(ringtoneOutputUpdateInteractorSpy.didCallExecute)
}

func testExecutesUserDefaultsRingtoneSoundNameSaveInteractorWithExpectedArgumentsOnRingtoneNameChange() {
func testExecutesRingtoneSoundNameSaveInteractorWithExpectedArgumentsOnRingtoneNameChange() {
let interactorSpy = InteractorSpy()
interactorFactorySpy.stubWithUserDefaultsRingtoneSoundNameSaveInteractor(interactorSpy)
interactorFactorySpy.stubWithRingtoneSoundNameSaveInteractor(interactorSpy)

sut.viewDidChangeRingtoneName("sound-name")

Expand All @@ -91,7 +91,7 @@ class SoundPreferencesViewEventHandlerTests: XCTestCase {
}

func testPlaysRingtoneSoundOnRingtoneNameChange() {
interactorFactorySpy.stubWithUserDefaultsRingtoneSoundNameSaveInteractor(InteractorSpy())
interactorFactorySpy.stubWithRingtoneSoundNameSaveInteractor(InteractorSpy())

sut.viewDidChangeRingtoneName("any-name")

Expand Down
2 changes: 1 addition & 1 deletion UseCases/InteractorFactory.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ public protocol InteractorFactory {
func createUserAgentSoundIOSelectionInteractor(userAgent userAgent: UserAgent) -> ThrowingInteractor
func createUserDefaultsSoundIOLoadInteractor(output output: UserDefaultsSoundIOLoadInteractorOutput) -> ThrowingInteractor
func createUserDefaultsSoundIOSaveInteractor(soundIO soundIO: SoundIO) -> Interactor
func createUserDefaultsRingtoneSoundNameSaveInteractor(name name: String) -> Interactor
func createRingtoneSoundNameSaveInteractor(name name: String) -> Interactor
}
10 changes: 5 additions & 5 deletions UseCasesTestDoubles/InteractorFactorySpy.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class InteractorFactorySpy {
public private(set) var userAgentSoundIOSelectionInteractor: ThrowingInteractor!
public private(set) var userDefaultsSoundIOLoadInteractor: ThrowingInteractor!
public private(set) var userDefaultsSoundIOSaveInteractor: Interactor!
public private(set) var userDefaultsRingtoneSoundNameSaveInteractor: Interactor!
public private(set) var ringtoneSoundNameSaveInteractor: Interactor!

public private(set) var invokedSoundIO = SoundIO(soundInput: "", soundOutput: "", ringtoneOutput: "")
public private(set) var invokedRingtoneSoundName = ""
Expand All @@ -40,8 +40,8 @@ public class InteractorFactorySpy {
userDefaultsSoundIOSaveInteractor = interactor
}

public func stubWithUserDefaultsRingtoneSoundNameSaveInteractor(interactor: Interactor) {
userDefaultsRingtoneSoundNameSaveInteractor = interactor
public func stubWithRingtoneSoundNameSaveInteractor(interactor: Interactor) {
ringtoneSoundNameSaveInteractor = interactor
}
}

Expand All @@ -59,8 +59,8 @@ extension InteractorFactorySpy: InteractorFactory {
return userDefaultsSoundIOSaveInteractor
}

public func createUserDefaultsRingtoneSoundNameSaveInteractor(name name: String) -> Interactor {
public func createRingtoneSoundNameSaveInteractor(name name: String) -> Interactor {
invokedRingtoneSoundName = name
return userDefaultsRingtoneSoundNameSaveInteractor
return ringtoneSoundNameSaveInteractor
}
}

0 comments on commit 42dbd55

Please sign in to comment.