Organize test names (#186)

- Rename operations - Remove Integration from names of UI tests - Move SBS mock resources into MockData, move MockServer into Tests folder - Organize mock data for autofill and geocoding tests - Remove old references in testplan - Group resources by API type (corresponding to instances of MockResponse) <img width="218" alt="Screenshot 2024-03-01 at 14 17 07" src="https://github.com/mapbox/mapbox-search-ios/assets/384288/7e0441d6-eca6-42ea-bcd3-8854ae9c64e4"> - Update UI tests folder and classes to have distinct UI name <img width="316" alt="Screenshot 2024-03-01 at 14 17 14" src="https://github.com/mapbox/mapbox-search-ios/assets/384288/41a2d942-c7ae-4f79-aa12-95dae99d9bee"> - [x] Update `CHANGELOG` Conflicts: MapboxSearch.xcodeproj/project.pbxproj Tests/Demo.xctestplan Tests/MapboxSearchUITests/Tests/CategorySuggestionsNavigationUITestCase.swift Tests/MapboxSearchUITests/Tests/CategorySuggestionsUITestCase.swift Tests/MapboxSearchUITests/Tests/FavoritesUITestCase.swift Tests/MapboxSearchUITests/Tests/FeedbackUITestCase.swift Tests/MapboxSearchUITests/Tests/SearchUITestCase.swift Tests/MapboxSearchUITests/Tests/VisibilityUITestCase.swift Tests/MockData/sbs/category-hotel-search-along-route-jp.json
mapbox · Apr 5, 2024 · d794556 · d794556
1 parent 91e3125
commit d794556
Show file tree

Hide file tree

Showing 29 changed files with 244 additions and 210 deletions.
diff --git a/CHANGELOG.md b/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)
 
 - [License] Update license to reflect 2024 usage

diff --git a/MapboxSearch.xcodeproj/project.pbxproj b/MapboxSearch.xcodeproj/project.pbxproj
diff --git a/...stionsNavigationIntegrationTestCase.swift → ...gorySuggestionsNavigationUITestCase.swift b/...stionsNavigationIntegrationTestCase.swift → ...gorySuggestionsNavigationUITestCase.swift
@@ -1,6 +1,6 @@
 import XCTest
 
-class CategorySuggestionsNavigationIntegrationTestCase: MockSBSServerUITestCase {
+class CategorySuggestionsNavigationUITestCase: MockSBSServerUITestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         app.launch()

diff --git a/...egorySuggestionsIntegrationTestCase.swift → ...Tests/CategorySuggestionsUITestCase.swift b/...egorySuggestionsIntegrationTestCase.swift → ...Tests/CategorySuggestionsUITestCase.swift
@@ -1,6 +1,6 @@
 import XCTest
 
-class CategorySuggestionsIntegrationTestCase: MockSBSServerUITestCase {
+class CategorySuggestionsUITestCase: MockSBSServerUITestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         app.launch()

diff --git a/...ration/FavoritesIntegrationTestCase.swift → ...chUITests/Tests/FavoritesUITestCase.swift b/...ration/FavoritesIntegrationTestCase.swift → ...chUITests/Tests/FavoritesUITestCase.swift
@@ -1,6 +1,6 @@
 import XCTest
 
-class FavoritesIntegrationTestCase: MockSBSServerUITestCase {
+class FavoritesUITestCase: MockSBSServerUITestCase {
     func testAddRemoveFavorite() throws {
         try server.setResponse(.suggestMinsk)
         try server.setResponse(.retrieveMinsk)
@@ -232,7 +232,7 @@ class FavoritesIntegrationTestCase: MockSBSServerUITestCase {
     }
 }
 
-extension FavoritesIntegrationTestCase {
+extension FavoritesUITestCase {
     func removeDefaultFavorite(element: XCUIElement) {
         element.buttons["moreButton"].tap()
         let removeLocation = app.buttons["Remove location"]

diff --git a/...gration/FeedbackIntegrationTestCase.swift → ...rchUITests/Tests/FeedbackUITestCase.swift b/...gration/FeedbackIntegrationTestCase.swift → ...rchUITests/Tests/FeedbackUITestCase.swift
@@ -1,8 +1,6 @@
 import XCTest
 
-// TODO: Analytics
-
-class FeedbackIntegrationTestCase: MockSBSServerUITestCase {
+class FeedbackUITestCase: MockSBSServerUITestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
 

diff --git a/...tegration/SearchIntegrationTestCase.swift → ...earchUITests/Tests/SearchUITestCase.swift b/...tegration/SearchIntegrationTestCase.swift → ...earchUITests/Tests/SearchUITestCase.swift
@@ -1,6 +1,6 @@
 import XCTest
 
-class SearchIntegrationTestCase: MockSBSServerUITestCase {
+class SearchUITestCase: MockSBSServerUITestCase {
     func testRecentSearchRemove() throws {
         try server.setResponse(.suggestSanFrancisco)
         try server.setResponse(.retrieveSanFrancisco)

diff --git a/...boxSearchUITests/VisibilityTestCase.swift → ...hUITests/Tests/VisibilityUITestCase.swift b/...boxSearchUITests/VisibilityTestCase.swift → ...hUITests/Tests/VisibilityUITestCase.swift
@@ -1,6 +1,6 @@
 import XCTest
 
-class VisibilityTestCase: MockSBSServerUITestCase {
+class VisibilityUITestCase: MockSBSServerUITestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         app.launch()

diff --git a/...erver/address-retrieve-san-francisco.json → ...ofill/address-retrieve-san-francisco.json b/...erver/address-retrieve-san-francisco.json → ...ofill/address-retrieve-san-francisco.json
diff --git a/...er/address-suggestions-san-francisco.json → ...ll/address-suggestions-san-francisco.json b/...er/address-suggestions-san-francisco.json → ...ll/address-suggestions-san-francisco.json
diff --git a/...ebServer/geocoding-reverse-geocoding.json → ...eocoding/geocoding-reverse-geocoding.json b/...ebServer/geocoding-reverse-geocoding.json → ...eocoding/geocoding-reverse-geocoding.json
diff --git a/...ebServer/mapbox.places.san.francisco.json → ...eocoding/mapbox.places.san.francisco.json b/...ebServer/mapbox.places.san.francisco.json → ...eocoding/mapbox.places.san.francisco.json
diff --git a/.../MockWebServer/reverse-geocoding-sbs.json → ...Data/geocoding/reverse-geocoding-sbs.json b/.../MockWebServer/reverse-geocoding-sbs.json → ...Data/geocoding/reverse-geocoding-sbs.json
diff --git a/...hUITests/MockWebServer/category-cafe.json → Tests/MockData/sbs/category-cafe.json b/...hUITests/MockWebServer/category-cafe.json → Tests/MockData/sbs/category-cafe.json
diff --git a/...earchUITests/MockWebServer/recursion.json → Tests/MockData/sbs/recursion.json b/...earchUITests/MockWebServer/recursion.json → Tests/MockData/sbs/recursion.json
diff --git a/...ests/MockWebServer/retrieve-category.json → Tests/MockData/sbs/retrieve-category.json b/...ests/MockWebServer/retrieve-category.json → Tests/MockData/sbs/retrieve-category.json
diff --git a/...UITests/MockWebServer/retrieve-minsk.json → Tests/MockData/sbs/retrieve-minsk.json b/...UITests/MockWebServer/retrieve-minsk.json → Tests/MockData/sbs/retrieve-minsk.json
diff --git a/...UITests/MockWebServer/retrieve-multi.json → Tests/MockData/sbs/retrieve-multi.json b/...UITests/MockWebServer/retrieve-multi.json → Tests/MockData/sbs/retrieve-multi.json
diff --git a/...chUITests/MockWebServer/retrieve-poi.json → Tests/MockData/sbs/retrieve-poi.json b/...chUITests/MockWebServer/retrieve-poi.json → Tests/MockData/sbs/retrieve-poi.json
diff --git a/...MockWebServer/retrieve-san-francisco.json → .../MockData/sbs/retrieve-san-francisco.json b/...MockWebServer/retrieve-san-francisco.json → .../MockData/sbs/retrieve-san-francisco.json
diff --git a/...MockWebServer/suggestions-categories.json → .../MockData/sbs/suggestions-categories.json b/...MockWebServer/suggestions-categories.json → .../MockData/sbs/suggestions-categories.json
diff --git a/...uggestions-category-with-coordinates.json → ...uggestions-category-with-coordinates.json b/...uggestions-category-with-coordinates.json → ...uggestions-category-with-coordinates.json
diff --git a/...ests/MockWebServer/suggestions-empty.json → Tests/MockData/sbs/suggestions-empty.json b/...ests/MockWebServer/suggestions-empty.json → Tests/MockData/sbs/suggestions-empty.json
diff --git a/...ests/MockWebServer/suggestions-minsk.json → Tests/MockData/sbs/suggestions-minsk.json b/...ests/MockWebServer/suggestions-minsk.json → Tests/MockData/sbs/suggestions-minsk.json
diff --git a/...kWebServer/suggestions-san-francisco.json → ...ckData/sbs/suggestions-san-francisco.json b/...kWebServer/suggestions-san-francisco.json → ...ckData/sbs/suggestions-san-francisco.json
diff --git a/...bServer/suggestions-with-coordinates.json → ...ata/sbs/suggestions-with-coordinates.json b/...bServer/suggestions-with-coordinates.json → ...ata/sbs/suggestions-with-coordinates.json
diff --git a/...r/suggestions-with-mixed-coordinates.json → ...s/suggestions-with-mixed-coordinates.json b/...r/suggestions-with-mixed-coordinates.json → ...s/suggestions-with-mixed-coordinates.json
diff --git a/...hUITests/MockWebServer/MockResponse.swift → Tests/MockWebServer/MockResponse.swift b/...hUITests/MockWebServer/MockResponse.swift → Tests/MockWebServer/MockResponse.swift
diff --git a/...UITests/MockWebServer/MockWebServer.swift → Tests/MockWebServer/MockWebServer.swift b/...UITests/MockWebServer/MockWebServer.swift → Tests/MockWebServer/MockWebServer.swift