Add test for filter

Author: mojganii

ios/MullvadMockData/MullvadREST/MockRelayCache.swift

@@ -0,0 +1,28 @@
+//
+//  MockRelayCache.swift
+//  MullvadVPN
+//
+//  Created by Mojgan on 2025-03-10.
+//  Copyright © 2025 Mullvad VPN AB. All rights reserved.
+//
+import Foundation
+@testable import MullvadREST
+
+public struct MockRelayCache: RelayCacheProtocol {
+    public init() {}
+
+    public func read() throws -> MullvadREST.StoredRelays {
+        try .init(
+            cachedRelays: CachedRelays(
+                relays: ServerRelaysResponseStubs.sampleRelays,
+                updatedAt: Date()
+            )
+        )
+    }
+
+    public func readPrebundledRelays() throws -> MullvadREST.StoredRelays {
+        try self.read()
+    }
+
+    public func write(record: MullvadREST.StoredRelays) throws {}
+}

ios/MullvadMockData/MullvadREST/RelaySelectorStub.swift

@@ -13,13 +13,17 @@ import WireGuardKitTypes
 
 /// Relay selector stub that accepts a block that can be used to provide custom implementation.
 public final class RelaySelectorStub: RelaySelectorProtocol {
+    public let relayCache: any RelayCacheProtocol
+
     var selectedRelaysResult: (UInt) throws -> SelectedRelays
     var candidatesResult: (() throws -> RelayCandidates)?
 
     init(
+        relayCache: RelayCacheProtocol = MockRelayCache(),
         selectedRelaysResult: @escaping (UInt) throws -> SelectedRelays,
         candidatesResult: (() throws -> RelayCandidates)? = nil
     ) {
+        self.relayCache = relayCache
         self.selectedRelaysResult = selectedRelaysResult
         self.candidatesResult = candidatesResult
     }

ios/MullvadVPNTests/MullvadREST/ApiHandlers/ServerRelaysResponse+Stubs.swift ios/MullvadMockData/MullvadREST/ServerRelaysResponse+Stubs.swift

@@ -10,11 +10,11 @@ import Foundation
 @testable import MullvadREST
 import WireGuardKitTypes
 
-enum ServerRelaysResponseStubs {
-    static let wireguardPortRanges: [[UInt16]] = [[4000, 4001], [5000, 5001]]
-    static let shadowsocksPortRanges: [[UInt16]] = [[51900, 51949]]
+public enum ServerRelaysResponseStubs {
+    public static let wireguardPortRanges: [[UInt16]] = [[4000, 4001], [5000, 5001]]
+    public static let shadowsocksPortRanges: [[UInt16]] = [[51900, 51949]]
 
-    static let sampleRelays = REST.ServerRelaysResponse(
+    public static let sampleRelays = REST.ServerRelaysResponse(
         locations: [
             "es-mad": REST.ServerLocation(
                 country: "Spain",
@@ -79,9 +79,9 @@ enum ServerRelaysResponseStubs {
                 REST.ServerRelay(
                     hostname: "es1-wireguard",
                     active: true,
-                    owned: true,
+                    owned: false,
                     location: "es-mad",
-                    provider: "",
+                    provider: "100TB",
                     weight: 500,
                     ipv4AddrIn: .loopback,
                     ipv6AddrIn: .loopback,
@@ -95,7 +95,7 @@ enum ServerRelaysResponseStubs {
                     active: true,
                     owned: true,
                     location: "se-got",
-                    provider: "",
+                    provider: "Blix",
                     weight: 1000,
                     ipv4AddrIn: .loopback,
                     ipv6AddrIn: .loopback,
@@ -109,7 +109,7 @@ enum ServerRelaysResponseStubs {
                     active: true,
                     owned: true,
                     location: "se-sto",
-                    provider: "",
+                    provider: "DataPacket",
                     weight: 50,
                     ipv4AddrIn: .loopback,
                     ipv6AddrIn: .loopback,
@@ -137,7 +137,7 @@ enum ServerRelaysResponseStubs {
                     active: true,
                     owned: true,
                     location: "us-dal",
-                    provider: "",
+                    provider: "M247",
                     weight: 100,
                     ipv4AddrIn: .loopback,
                     ipv6AddrIn: .loopback,
@@ -149,9 +149,9 @@ enum ServerRelaysResponseStubs {
                 REST.ServerRelay(
                     hostname: "us-nyc-wg-301",
                     active: true,
-                    owned: true,
+                    owned: false,
                     location: "us-nyc",
-                    provider: "",
+                    provider: "xtom",
                     weight: 100,
                     ipv4AddrIn: .loopback,
                     ipv6AddrIn: .loopback,
@@ -165,7 +165,7 @@ enum ServerRelaysResponseStubs {
                     active: false,
                     owned: true,
                     location: "us-nyc",
-                    provider: "",
+                    provider: "Qnax",
                     weight: 100,
                     ipv4AddrIn: .loopback,
                     ipv6AddrIn: .loopback,

ios/MullvadREST/Relay/RelayCandidates.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2025 Mullvad VPN AB. All rights reserved.
 //
 
-public struct RelayCandidates: Equatable {
+public struct RelayCandidates: Equatable, Sendable {
     public let entryRelays: [RelayWithLocation<REST.ServerRelay>]?
     public let exitRelays: [RelayWithLocation<REST.ServerRelay>]
     public init(

ios/MullvadREST/Relay/RelaySelectorProtocol.swift

@@ -12,6 +12,7 @@ import MullvadTypes
 
 /// Protocol describing a type that can select a relay.
 public protocol RelaySelectorProtocol {
+    var relayCache: RelayCacheProtocol { get }
     func selectRelays(
         tunnelSettings: LatestTunnelSettings,
         connectionAttemptCount: UInt

ios/MullvadREST/Relay/RelayWithLocation.swift

@@ -9,7 +9,7 @@
 import Foundation
 import MullvadTypes
 
-public struct RelayWithLocation<T: AnyRelay> {
+public struct RelayWithLocation<T: AnyRelay & Sendable>: Sendable {
     public let relay: T
     public let serverLocation: Location