Fix tests for example app

ra1028 · ra1028 · commit 654f6d3953ab · 2022-04-18T00:15:21.000+09:00
diff --git a/Examples/Examples.xcodeproj/project.pbxproj b/Examples/Examples.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -27,6 +27,7 @@
 		8E4174CA12184B89C04932C3 /* APIRequestPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C56139636BCE9E6B7A5A1CF0 /* APIRequestPage.swift */; };
 		9A21001120896DD74A77368A /* TodoPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A01793F321BFB68D18E27818 /* TodoPage.swift */; };
 		A9E31B44F7E151BD8F7A3CD8 /* Hooks in Frameworks */ = {isa = PBXBuildFile; productRef = FD40812DAB4C1F5B720757F7 /* Hooks */; };
+		B34A8EAE280C5B7B00E83967 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34A8EAD280C5B7B00E83967 /* Utilities.swift */; };
 		C078F002FB29736B800B3774 /* CounterPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D8757F265C5526C297EFDB /* CounterPage.swift */; };
 		DCDC2A61345B88907286B20C /* SimpleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B06DA75E791F7A1E0B6542 /* SimpleUITests.swift */; };
 		E404ADC8590A7823470D6488 /* UseMovieImageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A76A9D3B40580BCF4FEE209 /* UseMovieImageTests.swift */; };
@@ -77,6 +78,7 @@
 		A01793F321BFB68D18E27818 /* TodoPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodoPage.swift; sourceTree = "<group>"; };
 		A233EB4C5891C4899B737ACF /* TopRatedMoviesPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopRatedMoviesPage.swift; sourceTree = "<group>"; };
 		A80807CB4E7902470EE2CF4E /* Todo.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Todo.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		B34A8EAD280C5B7B00E83967 /* Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = "<group>"; };
 		B5CDB321485B19447B2E5863 /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = "<group>"; };
 		C56139636BCE9E6B7A5A1CF0 /* APIRequestPage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIRequestPage.swift; sourceTree = "<group>"; };
 		C9F47469489E2AC56001C720 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
@@ -206,6 +208,7 @@
 				895CD000DCB5854C20C39119 /* MovieDBServiceMock.swift */,
 				5A76A9D3B40580BCF4FEE209 /* UseMovieImageTests.swift */,
 				20A38A9D88C5F0D2B9CCAC13 /* UseTopRatedMoviesViewModelTests.swift */,
+				B34A8EAD280C5B7B00E83967 /* Utilities.swift */,
 			);
 			path = "TheMovieDB-MVVM-Tests";
 			sourceTree = "<group>";
@@ -386,6 +389,7 @@
 			files = (
 				22B1EFFA1478D324171D5E75 /* MovieDBServiceMock.swift in Sources */,
 				E404ADC8590A7823470D6488 /* UseMovieImageTests.swift in Sources */,
+				B34A8EAE280C5B7B00E83967 /* Utilities.swift in Sources */,
 				5B2A5E7A0AA463A0BF685F71 /* UseTopRatedMoviesViewModelTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Examples/TheMovieDB-MVVM-Tests/MovieDBServiceMock.swift b/Examples/TheMovieDB-MVVM-Tests/MovieDBServiceMock.swift
@@ -4,23 +4,19 @@ import UIKit
 @testable import TheMovieDB_MVVM
 
 final class MovieDBServiceMock: MovieDBServiceProtocol {
-    let imageSubject = PassthroughSubject<UIImage?, URLError>()
-    let moviesSubject = PassthroughSubject<[Movie], URLError>()
+    var imageResult: Result<UIImage?, URLError>?
+    var moviesResult: Result<[Movie], URLError>?
     var totalPages = 100
 
-    func getImage(path: String?, size: NetworkImageSize) -> AnyPublisher<UIImage?, URLError> {
-        imageSubject.eraseToAnyPublisher()
+    func getImage(path: String?, size: NetworkImageSize) async throws -> UIImage? {
+        try imageResult?.get()
     }
 
-    func getTopRated(page: Int) -> AnyPublisher<PagedResponse<Movie>, URLError> {
-        moviesSubject
-            .map { [totalPages] movies in
-                PagedResponse(
-                    page: page,
-                    totalPages: totalPages,
-                    results: movies
-                )
-            }
-            .eraseToAnyPublisher()
+    func getTopRated(page: Int) async throws -> PagedResponse<Movie> {
+        try PagedResponse(
+            page: page,
+            totalPages: totalPages,
+            results: moviesResult?.get() ?? []
+        )
     }
 }
diff --git a/Examples/TheMovieDB-MVVM-Tests/UseMovieImageTests.swift b/Examples/TheMovieDB-MVVM-Tests/UseMovieImageTests.swift
@@ -5,57 +5,60 @@ import XCTest
 
 final class UseMovieImageTests: XCTestCase {
     func testSuccess() {
+        let image1 = UIImage()
+        let image2 = UIImage()
+        let image3 = UIImage()
         let service = MovieDBServiceMock()
         let tester = HookTester(("path1", .medium)) { path, size in
             useMovieImage(for: path, size: size)
         } environment: {
             $0[Context<Dependency>.self] = Dependency(service: service)
         }
 
-        let image1 = UIImage()
-        let image2 = UIImage()
-        let image3 = UIImage()
-
         XCTAssertNil(tester.value)
 
-        service.imageSubject.send(image1)
+        service.imageResult = .success(image1)
+        wait(timeout: 0.1)
 
         XCTAssertTrue(tester.value === image1)
 
         tester.update()
+        wait(timeout: 0.1)
 
         XCTAssertTrue(tester.value === image1)
 
         tester.update(with: ("path1", .original))
 
         XCTAssertNil(tester.value)
 
-        service.imageSubject.send(image2)
+        service.imageResult = .success(image2)
+        wait(timeout: 0.1)
 
         XCTAssertTrue(tester.value === image2)
 
         tester.update(with: ("path2", .original))
 
         XCTAssertNil(tester.value)
 
-        service.imageSubject.send(image3)
+        service.imageResult = .success(image3)
+        wait(timeout: 0.1)
 
         XCTAssertTrue(tester.value === image3)
     }
 
     func testFailure() {
+        let error = URLError(.badURL)
         let service = MovieDBServiceMock()
         let tester = HookTester(("path1", .medium)) { path, size in
             useMovieImage(for: path, size: size)
         } environment: {
             $0[Context<Dependency>.self] = Dependency(service: service)
         }
 
-        let error = URLError(.badURL)
-
         XCTAssertNil(tester.value)
 
-        service.imageSubject.send(completion: .failure(error))
+        service.imageResult = .failure(error)
+        wait(timeout: 0.1)
 
         XCTAssertNil(tester.value)
     }
diff --git a/Examples/TheMovieDB-MVVM-Tests/UseTopRatedMoviesViewModelTests.swift b/Examples/TheMovieDB-MVVM-Tests/UseTopRatedMoviesViewModelTests.swift
@@ -3,6 +3,7 @@ import XCTest
 
 @testable import TheMovieDB_MVVM
 
+@MainActor
 final class UseTopRatedMoviesViewModelTests: XCTestCase {
     func testSelectedMovie() {
         let tester = HookTester {
@@ -20,7 +21,7 @@ final class UseTopRatedMoviesViewModelTests: XCTestCase {
         XCTAssertEqual(tester.value.selectedMovie.wrappedValue, .stub)
     }
 
-    func testLoad() {
+    func testLoad() async {
         let service = MovieDBServiceMock()
         let tester = HookTester {
             useTopRatedMoviesViewModel()
@@ -30,26 +31,15 @@ final class UseTopRatedMoviesViewModelTests: XCTestCase {
 
         let movies = Array(repeating: Movie.stub, count: 3)
 
-        XCTAssertEqual(tester.value.loadPhase, .pending)
+        XCTAssertTrue(tester.value.loadPhase.isPending)
 
-        tester.value.load()
+        service.moviesResult = .success(movies)
+        await tester.value.load()
 
-        XCTAssertEqual(tester.value.loadPhase, .running)
-
-        service.moviesSubject.send(movies)
-
-        XCTAssertEqual(tester.value.loadPhase, .success(movies))
-
-        tester.value.load()
-
-        XCTAssertEqual(tester.value.loadPhase, .running)
-
-        service.moviesSubject.send(movies)
-
-        XCTAssertEqual(tester.value.loadPhase, .success(movies))
+        XCTAssertEqual(tester.value.loadPhase.value, movies)
     }
 
-    func testLoadNext() {
+    func testLoadNext() async {
         let service = MovieDBServiceMock()
         let tester = HookTester {
             useTopRatedMoviesViewModel()
@@ -58,28 +48,24 @@ final class UseTopRatedMoviesViewModelTests: XCTestCase {
         }
 
         let movies = Array(repeating: Movie.stub, count: 3)
+        service.moviesResult = .success(movies)
 
-        XCTAssertEqual(tester.value.loadPhase, .pending)
-
-        tester.value.loadNext()
+        XCTAssertTrue(tester.value.loadPhase.isPending)
 
-        XCTAssertEqual(tester.value.loadPhase, .pending)
+        await tester.value.loadNext()
 
-        tester.value.load()
-        service.moviesSubject.send(movies)
+        XCTAssertTrue(tester.value.loadPhase.isPending)
 
-        XCTAssertEqual(tester.value.loadPhase, .success(movies))
+        await tester.value.load()
 
-        tester.value.loadNext()
+        XCTAssertEqual(tester.value.loadPhase.value, movies)
 
-        XCTAssertEqual(tester.value.loadPhase, .success(movies))
+        await tester.value.loadNext()
 
-        service.moviesSubject.send(movies)
-
-        XCTAssertEqual(tester.value.loadPhase, .success(movies + movies))
+        XCTAssertEqual(tester.value.loadPhase.value, movies + movies)
     }
 
-    func testHasNext() {
+    func testHasNext() async {
         let service = MovieDBServiceMock()
         let tester = HookTester {
             useTopRatedMoviesViewModel()
@@ -89,15 +75,13 @@ final class UseTopRatedMoviesViewModelTests: XCTestCase {
 
         XCTAssertFalse(tester.value.hasNextPage)
 
-        tester.value.load()
-        service.moviesSubject.send([])
+        service.moviesResult = .success([])
+        await tester.value.load()
 
         XCTAssertTrue(tester.value.hasNextPage)
 
         service.totalPages = 0
-
-        tester.value.load()
-        service.moviesSubject.send([])
+        await tester.value.load()
 
         XCTAssertFalse(tester.value.hasNextPage)
     }
diff --git a/Examples/TheMovieDB-MVVM-Tests/Utilities.swift b/Examples/TheMovieDB-MVVM-Tests/Utilities.swift
@@ -0,0 +1,9 @@
+import XCTest
+
+extension XCTestCase {
+    func wait(timeout seconds: TimeInterval) {
+        let expectation = expectation(description: #function)
+        expectation.isInverted = true
+        wait(for: [expectation], timeout: seconds)
+    }
+}
