Organize test names

CHANGELOG.md

@@ -8,6 +8,8 @@ Guide: https://keepachangelog.com/en/1.0.0/
 
 <!-- Add changes for active work here -->
 
+- [Tests] Reorganize tests based on API type
+
 - [Privacy] Add Search history collected data for the purpose of product personalization (used for displaying the search history)
 
 - [Discover, Category] Rename Discover to Category and update tests.

Tests/Demo.xctestplan

@@ -56,10 +56,10 @@
     {
       "skippedTests" : [
         "BaseTestCase",
-        "FavoritesIntegrationTestCase\/testAddEditLocationRemoveFavorite()",
-        "FavoritesIntegrationTestCase\/testAddRemoveFavorite()",
-        "FavoritesIntegrationTestCase\/testAddRenameCancelRemoveFavorite()",
-        "FavoritesIntegrationTestCase\/testAddRenameRemoveFavorite()",
+        "FavoritesUITestCase\/testAddEditLocationRemoveFavorite()",
+        "FavoritesUITestCase\/testAddRemoveFavorite()",
+        "FavoritesUITestCase\/testAddRenameCancelRemoveFavorite()",
+        "FavoritesUITestCase\/testAddRenameRemoveFavorite()",
         "MockServerUITestCase"
       ],
       "target" : {

Tests/MapboxSearchUITests/Integration/CategorySuggestionsNavigationIntegrationTestCase.swift → Tests/MapboxSearchUITests/Tests/CategorySuggestionsNavigationUITestCase.swift

@@ -1,7 +1,6 @@
 import XCTest
 
-// Rename to UITestCase
-class CategorySuggestionsNavigationIntegrationTestCase: MockSearchBoxUITestCase {
+class CategorySuggestionsNavigationUITestCase: MockSearchBoxUITestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         app.launch()

Tests/MapboxSearchUITests/Integration/CategorySuggestionsIntegrationTestCase.swift → Tests/MapboxSearchUITests/Tests/CategorySuggestionsUITestCase.swift

@@ -1,7 +1,6 @@
 import XCTest
 
-// Rename to UITestCase
-class CategorySuggestionsIntegrationTestCase: MockSearchBoxUITestCase {
+class CategorySuggestionsUITestCase: MockSearchBoxUITestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         app.launch()

Tests/MapboxSearchUITests/Integration/FavoritesIntegrationTestCase.swift → Tests/MapboxSearchUITests/Tests/FavoritesUITestCase.swift

@@ -1,7 +1,6 @@
 import XCTest
 
-// Rename to UITestCase
-class FavoritesIntegrationTestCase: MockSearchBoxUITestCase {
+class FavoritesUITestCase: MockSearchBoxUITestCase {
     func testAddRemoveFavorite() throws {
         try server.setResponse(.suggestMinsk)
         try server.setResponse(.retrieveMinsk)
@@ -233,7 +232,7 @@ class FavoritesIntegrationTestCase: MockSearchBoxUITestCase {
     }
 }
 
-extension FavoritesIntegrationTestCase {
+extension FavoritesUITestCase {
     func removeDefaultFavorite(element: XCUIElement) {
         element.buttons["moreButton"].tap()
         let removeLocation = app.buttons["Remove location"]

Tests/MapboxSearchUITests/Integration/FeedbackIntegrationTestCase.swift → Tests/MapboxSearchUITests/Tests/FeedbackUITestCase.swift

@@ -2,8 +2,7 @@ import XCTest
 
 // TODO: Analytics
 
-// Rename to UITestCase
-class FeedbackIntegrationTestCase: MockSearchBoxUITestCase {
+class FeedbackUITestCase: MockSearchBoxUITestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
 

Tests/MapboxSearchUITests/Integration/SearchIntegrationTestCase.swift → Tests/MapboxSearchUITests/Tests/SearchUITestCase.swift

@@ -1,7 +1,6 @@
 import XCTest
 
-// Rename to UITestCase
-class SearchIntegrationTestCase: MockSearchBoxUITestCase {
+class SearchUITestCase: MockSearchBoxUITestCase {
     func testRecentSearchRemove() throws {
         try server.setResponse(.suggestSanFrancisco)
         try server.setResponse(.retrieveSanFrancisco)

Tests/MapboxSearchUITests/VisibilityTestCase.swift → Tests/MapboxSearchUITests/Tests/VisibilityUITestCase.swift

@@ -1,7 +1,6 @@
 import XCTest
 
-// Rename to UITestCase
-class VisibilityTestCase: MockSearchBoxUITestCase {
+class VisibilityUITestCase: MockSearchBoxUITestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         app.launch()