Update to correct method calls for new naming style in Swift 3, formatting, AppCode

.gitignore

@@ -62,4 +62,12 @@ Carthage/Build
 fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
-fastlane/test_output
+fastlane/test_output
+
+# JetBrains AppCode user-specific files
+/.idea/atlassian-ide-plugin.xml
+/.idea/codeStyles/
+/.idea/markdown-navigator.xml
+/.idea/markdown-navigator/
+/.idea/misc.xml
+/.idea/workspace.xml

MVVM-CTests/MVVMCAuthenticateViewModelTests.swift

@@ -10,12 +10,12 @@ import XCTest
 
 class MVVMCAuthenticateViewModelTests: XCTestCase
 {
-    
+
     var currentExpectaion: XCTestExpectation?
     var expectedCanSubmit: Bool = false
     var expectedErrorMessage: String = ""
-    
-    
+
+
     func testInitialDefaults() {
         let vm = MVVMCAuthenticateViewModel()
         XCTAssertEqual("", vm.email)
@@ -26,14 +26,14 @@ class MVVMCAuthenticateViewModelTests: XCTestCase
         XCTAssertNil(vm.model)
         XCTAssertNil(vm.coordinatorDelegate)
     }
-    
+
     func testEmail()
     {
         let vm = MVVMCAuthenticateViewModel()
         vm.email = "scotty@example.com"
         XCTAssertEqual("scotty@example.com", vm.email)
     }
-    
+
     func testPassword()
     {
         let vm = MVVMCAuthenticateViewModel()
@@ -44,65 +44,65 @@ class MVVMCAuthenticateViewModelTests: XCTestCase
     func testCanSubmit() {
         let vm = MVVMCAuthenticateViewModel()
         XCTAssertFalse(vm.canSubmit)
-        
+
         vm.email = "scotty@example.com"
         vm.password = ""
         XCTAssertFalse(vm.canSubmit)
-        
+
         vm.email = ""
         vm.password = "password"
         XCTAssertFalse(vm.canSubmit)
-        
+
         vm.email = "scotty@example.com"
         vm.password = "password"
         XCTAssert(vm.canSubmit)
     }
-    
+
     func testErrorMessageDidChange() {
-        
+
         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
         }
     }
-    
+
     func testCoordinatorDelegate()
     {
         let vm = MVVMCAuthenticateViewModel()
         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)
@@ -112,7 +112,7 @@ extension MVVMCAuthenticateViewModelTests: AuthenticateViewModelViewDelegate
 
 extension MVVMCAuthenticateViewModelTests: AuthenticateViewModelCoordinatorDelegate
 {
-    func authenticateViewModelDidLogin(viewModel viewModel: AuthenticateViewModel) {
+    func authenticateViewModelDidLogin(viewModel: AuthenticateViewModel) {
         currentExpectaion?.fulfill()
     }
 }

MVVM-CTests/MVVMCListViewModelTests.swift

@@ -10,9 +10,9 @@ import XCTest
 
 class MVVMCListViewModelTests: XCTestCase
 {
-    
+
     var currentExpectaion: XCTestExpectation?
-    
+
     func testDefaults()
     {
         let vm = MVVMCListViewModel()
@@ -22,81 +22,81 @@ class MVVMCListViewModelTests: XCTestCase
         XCTAssertNil(vm.model)
         XCTAssertNil(vm.coordinatorDelegate)
     }
-    
+
     func testNumberOfItems() {
         let vm = MVVMCListViewModel()
-        
+
         // We can test with the actual app model as it produces hard coded data
         // In normal testing we would create a ListModel implementation with fix test data to use,
         vm.model = MVVMCListModel()
         XCTAssertEqual(7,vm.numberOfItems)
     }
-    
+
     func testItemAtIndex() {
-        
+
         let vm = MVVMCListViewModel()
-        
+
         // We can test with the actual app model as it produces hard coded data
         // In normal testing we would create a ListModel implementation with fix test data to use,
         vm.model = MVVMCListModel()
-        
-        
+
+
         // Test a value from the start , end and middle of list
-        
+
         var dataItem = vm.itemAtIndex(0)
         XCTAssertNotNil(dataItem)
-        
+
         guard let item = dataItem else { return }
-        
+
         XCTAssertEqual("James T Kirk", item.name)
         XCTAssertEqual("Captain", item.role)
-        
-        
+
+
         dataItem = vm.itemAtIndex(6)
         XCTAssertNotNil(dataItem)
-        
+
         guard let item2 = dataItem else { return }
-        
+
         XCTAssertEqual("Pavel Chekov", item2.name)
         XCTAssertEqual("Ensign", item2.role)
-        
-        
+
+
         dataItem = vm.itemAtIndex(3)
         XCTAssertNotNil(dataItem)
-        
+
         guard let item3 = dataItem else { return }
-        
+
         XCTAssertEqual("Montgomery Scott", item3.name)
         XCTAssertEqual("Lieutenant Commander", item3.role)
-        
+
     }
-    
+
     func testItemAtIndexWithInvalidIndex() {
-        
+
         let vm = MVVMCListViewModel()
-        
+
         // We can test with the actual app model as it produces hard coded data
         // In normal testing we would create a ListModel implementation with fixed test data to use,
         vm.model = MVVMCListModel()
-        
+
         // Test a value from beyond the end of the list
         let dataItem = vm.itemAtIndex(vm.numberOfItems + 1)
         XCTAssertNil(dataItem)
     }
-    
+
     func testUseItemAtIndex()
     {
-        
+
         let vm = MVVMCListViewModel()
-        
+
         // We can test with the actual app model as it produces hard coded data
         // 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
         }
     }
@@ -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()

MVVM-CTests/MVVMDetailViewModelTests.swift

@@ -13,60 +13,60 @@ class MVVMDetailViewModelTests: XCTestCase
 
     var currentExpectaion: XCTestExpectation?
     var expectedItem: DataItem?
-    
-    
+
+
     func testInitialDefaults() {
         let vm = MVVMCDetailViewModel()
         XCTAssertNil(vm.detail)
         XCTAssertNil(vm.viewDelegate)
         XCTAssertNil(vm.model)
         XCTAssertNil(vm.coordinatorDelegate)
     }
-    
+
     func testDetail()
     {
         let vm = MVVMCDetailViewModel()
         let item = MVVMCDataItem(name: "Test Name", role: "Test Role")
         let model = MVVMCDetailModel(detailItem: item)
         vm.model = model
         XCTAssertNotNil(vm.detail)
-        
+
         guard let detail = vm.detail else { return }
-        
+
         XCTAssertEqual("Test Name", detail.name)
         XCTAssertEqual("Test Role", detail.role)
     }
-    
-    
+
+
     func testDetailDidChange() {
-        
+
         let vm = MVVMCDetailViewModel()
         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
         }
     }
-    
+
     func testCoordinatorDelegate()
     {
         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)
@@ -76,7 +76,7 @@ extension MVVMDetailViewModelTests: DetailViewModelViewDelegate
 
 extension MVVMDetailViewModelTests: DetailViewModelCoordinatorDelegate
 {
-    func detailViewModelDidEnd(viewModel: DetailViewModel) {
+    func detailViewModelDidEnd(_ viewModel: DetailViewModel) {
         currentExpectaion?.fulfill()
     }
 }