forked from kay/RouterOS
M9: Einrichten-Wizard bekommt einen Einfach/Experte-Modusschalter (ModeStepView). Einfach überspringt VLAN, erlaubt nur ein LAN-Netzwerk ohne Isolation, Firewall-Grundschutz fest an. M10: neuer "Experte"-Tab mit generischem Motor (RouterOSMenuItem, RouterOSCommand.remove, ConnectionService.fetchMenuItems, freies "eigener Menüpfad"-Feld) plus kuratierten Formularen mit Tooltips (RouterOSSchemaCatalog) für Firewall/NAT/Mangle/Raw/Adress-Listen, Interfaces, IP, VPN, WLAN, Queues, System, Werkzeuge. Live gegen einen hEX-Testrouter verifiziert (erst per SSH, dann vom Nutzer selbst in der App), dabei 7 reale Bugs gefunden und gefixt — der wichtigste: RouterOS' SSH-CLI gibt bei fehlgeschlagenen Befehlen Exit-Code 0 zurück, wodurch apply() app-weit Fehler verschluckte statt sie zu melden. Danach ergänzt: Bestätigungsdialog vor Anlegen/Ändern + Auto-Backup vor dem ersten Experte-Tab-Schreibvorgang je Sitzung (Angleichung an den Wizard), sowie ein Dauer-Editor (Tage/Std/Min/Sek) für Lease-/Ablaufzeit-Felder statt Freitext. Details zu allen Bugs/Fixes: HANDOFF.md, CHATLOG.md. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EW3r6rW1xCf6UT5jNvt6rn
82 lines
3.0 KiB
Swift
82 lines
3.0 KiB
Swift
import XCTest
|
|
@testable import RouterOSAssistant
|
|
|
|
private final class MockTransport: RouterOSTransport {
|
|
let kind: RouterOSTransportKind
|
|
var connectError: Error?
|
|
var deviceInfo = RouterDeviceInfo(boardName: "Mock", routerOSVersion: "7.0", architecture: "arm64", uptime: "1h")
|
|
|
|
init(kind: RouterOSTransportKind, connectError: Error? = nil) {
|
|
self.kind = kind
|
|
self.connectError = connectError
|
|
}
|
|
|
|
func connect() async throws {
|
|
if let connectError { throw connectError }
|
|
}
|
|
|
|
func fetchDeviceInfo() async throws -> RouterDeviceInfo { deviceInfo }
|
|
func fetchInterfaces() async throws -> [NetworkInterface] { [] }
|
|
func fetchFirewallRuleCounts() async throws -> FirewallRuleCounts { FirewallRuleCounts(filterRuleCount: 0, natRuleCount: 0) }
|
|
func fetchMenuItems(menuPath: String, restPath: String) async throws -> [RouterOSMenuItem] { [] }
|
|
func apply(_ command: RouterOSCommand) async throws {}
|
|
func disconnect() async {}
|
|
}
|
|
|
|
@MainActor
|
|
final class ConnectionServiceTests: XCTestCase {
|
|
private let credentials = RouterOSCredentials(host: "192.168.88.1", username: "admin", password: "")
|
|
|
|
func testFallsBackToSSHWhenRestFails() async {
|
|
let service = ConnectionService()
|
|
let sshTransport = MockTransport(kind: .ssh)
|
|
|
|
await service.connect(
|
|
with: credentials,
|
|
makeRestTransport: { MockTransport(kind: .rest, connectError: RouterOSError.transportUnavailable("kein REST")) },
|
|
makeSSHTransport: { sshTransport }
|
|
)
|
|
|
|
XCTAssertEqual(service.state, .connected(kind: .ssh))
|
|
}
|
|
|
|
func testUsesRestWhenAvailable() async {
|
|
let service = ConnectionService()
|
|
|
|
await service.connect(
|
|
with: credentials,
|
|
makeRestTransport: { MockTransport(kind: .rest) },
|
|
makeSSHTransport: { MockTransport(kind: .ssh) }
|
|
)
|
|
|
|
XCTAssertEqual(service.state, .connected(kind: .rest))
|
|
}
|
|
|
|
func testUntrustedCertificateAsksForConfirmationInsteadOfFallingBackToSSH() async {
|
|
let service = ConnectionService()
|
|
|
|
await service.connect(
|
|
with: credentials,
|
|
makeRestTransport: { MockTransport(kind: .rest, connectError: RouterOSError.untrustedCertificate(fingerprint: "AA:BB")) },
|
|
makeSSHTransport: { MockTransport(kind: .ssh) }
|
|
)
|
|
|
|
XCTAssertEqual(service.state, .needsCertificateConfirmation(fingerprint: "AA:BB"))
|
|
}
|
|
|
|
func testFailsWhenBothTransportsFail() async {
|
|
let service = ConnectionService()
|
|
|
|
await service.connect(
|
|
with: credentials,
|
|
makeRestTransport: { MockTransport(kind: .rest, connectError: RouterOSError.transportUnavailable("kein REST")) },
|
|
makeSSHTransport: { MockTransport(kind: .ssh, connectError: RouterOSError.transportUnavailable("kein SSH")) }
|
|
)
|
|
|
|
guard case .failed = service.state else {
|
|
XCTFail("Erwarteter Zustand .failed, war \(service.state)")
|
|
return
|
|
}
|
|
}
|
|
}
|