From 579bc1ef4f9bcf6071c037d0e8bca6daa3438113 Mon Sep 17 00:00:00 2001 From: Daniel Bernal <1156669+afterxleep@users.noreply.github.com> Date: Sat, 29 Apr 2023 11:27:58 +0200 Subject: [PATCH] Update Sample Tests --- .../WireKitSample.xcodeproj/project.pbxproj | 14 +++----------- .../Sample Data/todoItems.json | 0 .../Tests => WireKitSampleTests}/TestHelpers.swift | 0 .../TodoList/TodoListViewModelTests.swift | 8 +++----- .../URLProtocolMock.swift | 0 5 files changed, 6 insertions(+), 16 deletions(-) rename docs/ExampleApp/{WireKitSample/Tests => WireKitSampleTests}/Sample Data/todoItems.json (100%) rename docs/ExampleApp/{WireKitSample/Tests => WireKitSampleTests}/TestHelpers.swift (100%) rename docs/ExampleApp/{WireKitSample/Tests => WireKitSampleTests}/TodoList/TodoListViewModelTests.swift (85%) rename docs/ExampleApp/{WireKitSample/Tests => WireKitSampleTests}/URLProtocolMock.swift (100%) diff --git a/docs/ExampleApp/WireKitSample.xcodeproj/project.pbxproj b/docs/ExampleApp/WireKitSample.xcodeproj/project.pbxproj index f074c23..fcbbcf0 100644 --- a/docs/ExampleApp/WireKitSample.xcodeproj/project.pbxproj +++ b/docs/ExampleApp/WireKitSample.xcodeproj/project.pbxproj @@ -20,8 +20,8 @@ D6E759A329FD0A0D00E058E3 /* WireKitSampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E759A229FD0A0D00E058E3 /* WireKitSampleTests.swift */; }; D6E759A929FD0A1300E058E3 /* TodoListViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E7599A29FD09D800E058E3 /* TodoListViewModelTests.swift */; }; D6E759AD29FD14F800E058E3 /* todoItems.json in Resources */ = {isa = PBXBuildFile; fileRef = D6E759AC29FD14BB00E058E3 /* todoItems.json */; }; - D6E759B329FD158E00E058E3 /* URLProtocolMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E759AA29FD0B4000E058E3 /* URLProtocolMock.swift */; }; D6E759B429FD168800E058E3 /* TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E759B129FD156000E058E3 /* TestHelpers.swift */; }; + D6E759B529FD1A3D00E058E3 /* URLProtocolMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E759AA29FD0B4000E058E3 /* URLProtocolMock.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -102,7 +102,6 @@ D68B255B257DD2560019B48A /* Assets.xcassets */, D68B2560257DD2560019B48A /* Info.plist */, D68B255D257DD2560019B48A /* Preview Content */, - D6E7599929FD09C000E058E3 /* Tests */, ); path = WireKitSample; sourceTree = ""; @@ -125,20 +124,13 @@ path = TodoList; sourceTree = ""; }; - D6E7599929FD09C000E058E3 /* Tests */ = { + D6E759A129FD0A0D00E058E3 /* WireKitSampleTests */ = { isa = PBXGroup; children = ( D6E759B129FD156000E058E3 /* TestHelpers.swift */, D6E759AA29FD0B4000E058E3 /* URLProtocolMock.swift */, D6E759AF29FD151000E058E3 /* TodoList */, D6E759AE29FD14FC00E058E3 /* Sample Data */, - ); - path = Tests; - sourceTree = ""; - }; - D6E759A129FD0A0D00E058E3 /* WireKitSampleTests */ = { - isa = PBXGroup; - children = ( D6E759A229FD0A0D00E058E3 /* WireKitSampleTests.swift */, ); path = WireKitSampleTests; @@ -267,7 +259,6 @@ buildActionMask = 2147483647; files = ( D6B466AF25980F4000695194 /* TodoAddView.swift in Sources */, - D6E759B329FD158E00E058E3 /* URLProtocolMock.swift in Sources */, D68B255A257DD2550019B48A /* TodoListView.swift in Sources */, D68B257A257DD7070019B48A /* TodoAPI.swift in Sources */, D68B2558257DD2550019B48A /* WireKitSampleApp.swift in Sources */, @@ -284,6 +275,7 @@ D6E759A929FD0A1300E058E3 /* TodoListViewModelTests.swift in Sources */, D6E759A329FD0A0D00E058E3 /* WireKitSampleTests.swift in Sources */, D6E759B429FD168800E058E3 /* TestHelpers.swift in Sources */, + D6E759B529FD1A3D00E058E3 /* URLProtocolMock.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/docs/ExampleApp/WireKitSample/Tests/Sample Data/todoItems.json b/docs/ExampleApp/WireKitSampleTests/Sample Data/todoItems.json similarity index 100% rename from docs/ExampleApp/WireKitSample/Tests/Sample Data/todoItems.json rename to docs/ExampleApp/WireKitSampleTests/Sample Data/todoItems.json diff --git a/docs/ExampleApp/WireKitSample/Tests/TestHelpers.swift b/docs/ExampleApp/WireKitSampleTests/TestHelpers.swift similarity index 100% rename from docs/ExampleApp/WireKitSample/Tests/TestHelpers.swift rename to docs/ExampleApp/WireKitSampleTests/TestHelpers.swift diff --git a/docs/ExampleApp/WireKitSample/Tests/TodoList/TodoListViewModelTests.swift b/docs/ExampleApp/WireKitSampleTests/TodoList/TodoListViewModelTests.swift similarity index 85% rename from docs/ExampleApp/WireKitSample/Tests/TodoList/TodoListViewModelTests.swift rename to docs/ExampleApp/WireKitSampleTests/TodoList/TodoListViewModelTests.swift index ec9fce3..36ff986 100644 --- a/docs/ExampleApp/WireKitSample/Tests/TodoList/TodoListViewModelTests.swift +++ b/docs/ExampleApp/WireKitSampleTests/TodoList/TodoListViewModelTests.swift @@ -18,8 +18,7 @@ class TodoListViewModelTests: XCTestCase { func testListModelWorks() { // Note that we're using non SSL urls here as URLProtocol does - // to avoid SSL errors in URLSession - let url = URL(string: "http://jsonplaceholder.typicode.com/todos") + let url = URL(string: "https://jsonplaceholder.typicode.com/todos") // Get some test data from a file do { @@ -37,8 +36,7 @@ class TodoListViewModelTests: XCTestCase { let session = URLSession(configuration: config) // Initialize the APIClient and pass along a custom dispatcher - // Note that we're using non SSL urls here as - let baseURL = "http://jsonplaceholder.typicode.com" + let baseURL = "https://jsonplaceholder.typicode.com" // Then let dispatcher = WKNetworkDispatcher(urlSession: session) @@ -52,7 +50,7 @@ class TodoListViewModelTests: XCTestCase { XCTAssertGreaterThan(todoItems.count, 0, "Todo items should be loaded") expectation.fulfill() } - wait(for: [expectation], timeout: 10) + wait(for: [expectation], timeout: 1) } deinit { diff --git a/docs/ExampleApp/WireKitSample/Tests/URLProtocolMock.swift b/docs/ExampleApp/WireKitSampleTests/URLProtocolMock.swift similarity index 100% rename from docs/ExampleApp/WireKitSample/Tests/URLProtocolMock.swift rename to docs/ExampleApp/WireKitSampleTests/URLProtocolMock.swift