Skip to content

Updated unit tests to Swift 3 #4

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

Open
jengelsma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated unit tests to Swift 3 #4

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
14 changes: 7 additions & 7 deletions MVVM-CTests/MVVMCAuthenticateViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ class MVVMCAuthenticateViewModelTests: XCTestCase
let vm = MVVMCAuthenticateViewModel()
vm.viewDelegate = self

currentExpectaion = expectationWithDescription("estErrorMessageDidChange")
currentExpectaion = expectation(description: "estErrorMessageDidChange")
expectedErrorMessage = "Incomplete or Invalid Data";

// Call submit with no model set on the viewModel should produce an error message
vm.submit()

waitForExpectationsWithTimeout(1) { error in
waitForExpectations(timeout: 1) { error in
vm.viewDelegate = nil
}
}
Expand All @@ -80,29 +80,29 @@ class MVVMCAuthenticateViewModelTests: XCTestCase
vm.model = MVVMCAuthenticateModel()

vm.coordinatorDelegate = self
currentExpectaion = expectationWithDescription("testCoordinatorDelegate")
currentExpectaion = expectation(description: "testCoordinatorDelegate")

vm.email = "scotty@example.com"
vm.password = "password"

vm.submit()

waitForExpectationsWithTimeout(1) { error in
waitForExpectations(timeout: 1) { error in
vm.coordinatorDelegate = nil
}
}
}

extension MVVMCAuthenticateViewModelTests: AuthenticateViewModelViewDelegate
{
func canSubmitStatusDidChange(viewModel: AuthenticateViewModel, status: Bool)
func canSubmitStatusDidChange(_ viewModel: AuthenticateViewModel, status: Bool)
{
XCTAssertEqual(expectedCanSubmit, status)
XCTAssertEqual(expectedCanSubmit, viewModel.canSubmit)
currentExpectaion?.fulfill()
}

func errorMessageDidChange(viewModel: AuthenticateViewModel, message: String)
func errorMessageDidChange(_ viewModel: AuthenticateViewModel, message: String)
{
XCTAssertEqual(expectedErrorMessage, message)
XCTAssertEqual(expectedErrorMessage, viewModel.errorMessage)
Expand All @@ -112,7 +112,7 @@ extension MVVMCAuthenticateViewModelTests: AuthenticateViewModelViewDelegate

extension MVVMCAuthenticateViewModelTests: AuthenticateViewModelCoordinatorDelegate
{
func authenticateViewModelDidLogin(viewModel viewModel: AuthenticateViewModel) {
func authenticateViewModelDidLogin(viewModel: AuthenticateViewModel) {
currentExpectaion?.fulfill()
}
}
6 changes: 3 additions & 3 deletions MVVM-CTests/MVVMCListViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ class MVVMCListViewModelTests: XCTestCase
// In normal testing we would create a ListModel implementation with fixed test data to use,
vm.model = MVVMCListModel()
vm.coordinatorDelegate = self
currentExpectaion = expectationWithDescription("testUseItemAtIndex")
currentExpectaion = expectation(description: "testUseItemAtIndex")
vm.useItemAtIndex(6)

waitForExpectationsWithTimeout(1) { error in
waitForExpectations(timeout: 1) { error in
vm.coordinatorDelegate = nil
}
}
Expand All @@ -105,7 +105,7 @@ class MVVMCListViewModelTests: XCTestCase

extension MVVMCListViewModelTests: ListViewModelCoordinatorDelegate
{
func listViewModelDidSelectData(viewModel: ListViewModel, data: DataItem) {
func listViewModelDidSelectData(_ viewModel: ListViewModel, data: DataItem) {
XCTAssertEqual("Pavel Chekov", data.name)
XCTAssertEqual("Ensign", data.role)
currentExpectaion?.fulfill()
Expand Down
12 changes: 6 additions & 6 deletions MVVM-CTests/MVVMDetailViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ class MVVMDetailViewModelTests: XCTestCase
expectedItem = MVVMCDataItem(name: "Test Name", role: "Test Role")
let model = MVVMCDetailModel(detailItem: expectedItem!)
vm.viewDelegate = self
currentExpectaion = expectationWithDescription("testDetailDidChange")
currentExpectaion = expectation(description: "testDetailDidChange")
vm.model = model

waitForExpectationsWithTimeout(1) { error in
waitForExpectations(timeout: 1) { error in
vm.viewDelegate = nil
}
}
Expand All @@ -56,17 +56,17 @@ class MVVMDetailViewModelTests: XCTestCase
{
let vm = MVVMCDetailViewModel()
vm.coordinatorDelegate = self
currentExpectaion = expectationWithDescription("testDetailDidChange")
currentExpectaion = expectation(description: "testDetailDidChange")
vm.done()
waitForExpectationsWithTimeout(1) { error in
waitForExpectations(timeout: 1) { error in
vm.viewDelegate = nil
}
}
}

extension MVVMDetailViewModelTests: DetailViewModelViewDelegate
{
func detailDidChange(viewModel viewModel: DetailViewModel) {
func detailDidChange(viewModel: DetailViewModel) {
XCTAssertNotNil(viewModel.detail)
XCTAssertEqual(expectedItem?.name, viewModel.detail?.name)
XCTAssertEqual(expectedItem?.role, viewModel.detail?.role)
Expand All @@ -76,7 +76,7 @@ extension MVVMDetailViewModelTests: DetailViewModelViewDelegate

extension MVVMDetailViewModelTests: DetailViewModelCoordinatorDelegate
{
func detailViewModelDidEnd(viewModel: DetailViewModel) {
func detailViewModelDidEnd(_ viewModel: DetailViewModel) {
currentExpectaion?.fulfill()
}
}