Prefix test in-front of UI test methods.

RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Test/UI/LiveLocationSharingViewerUITests.swift

@@ -17,9 +17,6 @@
 import XCTest
 import RiotSwiftUI
 
-class LiveLocationSharingViewerUITests: MockScreenTest {
-
-    override class var screenType: MockScreenState.Type {
-        return MockLiveLocationSharingViewerScreenState.self
-    }
+class LiveLocationSharingViewerUITests: MockScreenTestCase {
+    // Tests to be implemented.
 }

RiotSwiftUI/Modules/Room/LocationSharing/Test/UI/LocationSharingUITests.swift

@@ -17,17 +17,7 @@
 import XCTest
 import RiotSwiftUI
 
-class LocationSharingUITests: XCTestCase {
-    
-    private var app: XCUIApplication!
-    
-    override func setUp() {
-        continueAfterFailure = false
-                
-        app = XCUIApplication()
-        app.launch()
-    }
-    
+class LocationSharingUITests: MockScreenTestCase {
     func testInitialUserLocation() {
         goToScreenWithIdentifier(MockLocationSharingScreenState.shareUserLocation.title)
         

RiotSwiftUI/Modules/Room/PollEditForm/Test/UI/PollEditFormUITests.swift

@@ -17,19 +17,9 @@
 import XCTest
 import RiotSwiftUI
 
-class PollEditFormUITests: XCTestCase {
-    
-    private var app: XCUIApplication!
-    
-    override func setUp() {
-        continueAfterFailure = false
-                
-        app = XCUIApplication()
-        app.launch()
-        app.goToScreenWithIdentifier(MockPollEditFormScreenState.standard.title)
-    }
-    
+class PollEditFormUITests: MockScreenTestCase {
     func testInitialStateComponents() {
+        app.goToScreenWithIdentifier(MockPollEditFormScreenState.standard.title)
         
         XCTAssert(app.scrollViews.firstMatch.exists)
         
@@ -58,6 +48,7 @@ class PollEditFormUITests: XCTestCase {
     }
     
     func testRemoveAddAnswerOptions() {
+        app.goToScreenWithIdentifier(MockPollEditFormScreenState.standard.title)
         
         let deleteAnswerOptionButton = app.buttons["Delete answer option"].firstMatch
         

RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Test/UI/RoomAccessTypeChooserUITests.swift

@@ -17,6 +17,6 @@
 import XCTest
 import RiotSwiftUI
 
-class RoomAccessTypeChooserUITests: MockScreenTest {
+class RoomAccessTypeChooserUITests: MockScreenTestCase {
     // Tests to be implemented.
 }

RiotSwiftUI/Modules/Room/RoomUpgrade/Test/UI/RoomUpgradeUITests.swift

@@ -17,6 +17,6 @@
 import XCTest
 import RiotSwiftUI
 
-class RoomUpgradeUITests: MockScreenTest {
+class RoomUpgradeUITests: MockScreenTestCase {
     // Tests to be implemented.
 }

RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Test/UI/StaticLocationViewingUITests.swift

@@ -17,28 +17,6 @@
 import XCTest
 import RiotSwiftUI
 
-class StaticLocationViewingUITests: MockScreenTest {
-    
-    override class var screenType: MockScreenState.Type {
-        return MockStaticLocationViewingScreenState.self
-    }
-
-    override class func createTest() -> MockScreenTest {
-        return StaticLocationViewingUITests(selector: #selector(verifyStaticLocationViewingScreen))
-    }
-
-    func verifyStaticLocationViewingScreen() {
-        guard let screenState = screenState as? MockStaticLocationViewingScreenState else { fatalError("no screen") }
-        
-        switch screenState {
-        case .showUserLocation:
-            verifyInitialExistingLocation()
-        case .showPinLocation:
-            verifyInitialExistingLocation()
-        }
-    }
-    
-    func verifyInitialExistingLocation() {
-        // This test has issues running consistently on CI. Removed for now until the issue has been fixed.
-    }
+class StaticLocationViewingUITests: MockScreenTestCase {
+    // This test has issues running consistently on CI. Removed for now until the issue has been fixed.
 }

RiotSwiftUI/Modules/Room/TimelinePoll/Test/UI/TimelinePollUITests.swift

@@ -17,17 +17,7 @@
 import XCTest
 import RiotSwiftUI
 
-class TimelinePollUITests: XCTestCase {
-    
-    private var app: XCUIApplication!
-    
-    override func setUp() {
-        continueAfterFailure = false
-                
-        app = XCUIApplication()
-        app.launch()
-    }
-    
+class TimelinePollUITests: MockScreenTestCase {
     func testOpenDisclosedPoll() {
         app.goToScreenWithIdentifier(MockTimelinePollScreenState.openDisclosed.title)
         

RiotSwiftUI/Modules/Room/UserSuggestion/Test/UI/UserSuggestionUITests.swift

@@ -17,18 +17,11 @@
 import XCTest
 import RiotSwiftUI
 
-class UserSuggestionUITests: MockScreenTest {
-    
-    override class var screenType: MockScreenState.Type {
-        return MockUserSuggestionScreenState.self
-    }
-
-    override class func createTest() -> MockScreenTest {
-        return UserSuggestionUITests(selector: #selector(verifyUserSuggestionScreen))
-    }
-    
-    func verifyUserSuggestionScreen() throws {
-        XCTAssert(app.tables.firstMatch.exists)
+class UserSuggestionUITests: MockScreenTestCase {
+    func testUserSuggestionScreen() throws {
+        app.goToScreenWithIdentifier(MockUserSuggestionScreenState.multipleResults.title)
+        
+        XCTAssert(app.tables.firstMatch.waitForExistence(timeout: 1))
         
         let firstButton = app.tables.firstMatch.buttons.firstMatch
         _ = firstButton.waitForExistence(timeout: 10)