feat: Kür-Hub in der App anbinden
- Hub-Adresse und API-Token in den Sync-Einstellungen verbinden - Verbindungstest über /api/v1/me, Token getrennt unter user://hub.cfg - Datei → Kür-Hub… nur bei geprüfter Verbindung - Alle veröffentlichten Küren durchsuchen, laden, veröffentlichen, verstecken - Kollisionen: nummerierte Kopie mit Musik-Umbenennung oder Überschreiben - HubSettings/HubClient/HubJob mit Worker-Thread und SHA-256-Prüfung - Tests für Einstellungen, Fehler, Menü, Download und Kollisionen
This commit is contained in:
parent
055a2919c3
commit
ab88a84d5d
15 changed files with 1960 additions and 9 deletions
403
rinkplanner/tests/run_hub_tests.gd
Normal file
403
rinkplanner/tests/run_hub_tests.gd
Normal file
|
|
@ -0,0 +1,403 @@
|
|||
extends SceneTree
|
||||
|
||||
## Headless tests for the Kür-Hub client: settings/token handling, URL
|
||||
## normalization, collision names, API error mapping and the settings/menu
|
||||
## wiring. No network access is required.
|
||||
|
||||
const WhiteboardScene := preload("res://scenes/whiteboard/whiteboard.tscn")
|
||||
const TEST_DIR := "user://hub-test"
|
||||
|
||||
var _assertions: int = 0
|
||||
var _failures: PackedStringArray = PackedStringArray()
|
||||
|
||||
|
||||
func _init() -> void:
|
||||
_run.call_deferred()
|
||||
|
||||
|
||||
func _run() -> void:
|
||||
_test_settings()
|
||||
_test_url_normalization()
|
||||
_test_numbered_names()
|
||||
_test_error_messages()
|
||||
await _test_controller_wiring()
|
||||
HubSettings.clear_settings()
|
||||
_remove_test_dir()
|
||||
_finish()
|
||||
|
||||
|
||||
func _test_settings() -> void:
|
||||
HubSettings.clear_settings()
|
||||
var defaults := HubSettings.load_settings()
|
||||
_check(
|
||||
not HubSettings.is_linked(defaults),
|
||||
"ohne Token ist der Hub nicht verbunden"
|
||||
)
|
||||
_check(
|
||||
str(defaults.get("base_url", "")).begins_with("https://"),
|
||||
"die Standard-Hub-Adresse nutzt HTTPS"
|
||||
)
|
||||
|
||||
var token := "rhub_" + "a".repeat(64)
|
||||
_check(HubSettings.is_token_valid(token), "ein rhub_-Token gilt als gültig")
|
||||
_check(
|
||||
not HubSettings.is_token_valid("rhub_kurz"),
|
||||
"zu kurze Tokens werden abgelehnt"
|
||||
)
|
||||
_check(
|
||||
not HubSettings.is_token_valid("bearer " + token),
|
||||
"Tokens ohne rhub_-Präfix werden abgelehnt"
|
||||
)
|
||||
|
||||
var settings := {
|
||||
"base_url": "https://rinkplanner-hub.programmschmiede.de",
|
||||
"token": token,
|
||||
"username": "tester",
|
||||
"role": "user",
|
||||
"verified": true,
|
||||
}
|
||||
HubSettings.save_settings(settings)
|
||||
var loaded := HubSettings.load_settings()
|
||||
_check(HubSettings.is_linked(loaded), "gespeicherte Verbindung gilt als verbunden")
|
||||
_check(loaded.get("username") == "tester", "der Kontoname wird gespeichert")
|
||||
_check(loaded.get("token") == token, "der Token wird gespeichert")
|
||||
|
||||
var unverified := HubSettings.mark_unverified(loaded)
|
||||
_check(
|
||||
not HubSettings.is_linked(unverified),
|
||||
"ein widerrufener Token trennt den Hub"
|
||||
)
|
||||
_check(
|
||||
unverified.get("token") == token,
|
||||
"beim Trennen bleibt der Token zum erneuten Prüfen erhalten"
|
||||
)
|
||||
var forgotten := HubSettings.forget_token(unverified)
|
||||
_check(
|
||||
str(forgotten.get("token", "")).is_empty(),
|
||||
"Trennen entfernt den Token"
|
||||
)
|
||||
_check(
|
||||
not HubSettings.is_linked(forgotten),
|
||||
"nach dem Trennen ist der Hub nicht verbunden"
|
||||
)
|
||||
HubSettings.clear_settings()
|
||||
|
||||
|
||||
func _test_url_normalization() -> void:
|
||||
_check(
|
||||
HubSettings.normalize_url("rinkplanner-hub.example.org/")
|
||||
== "https://rinkplanner-hub.example.org",
|
||||
"Adressen bekommen HTTPS und verlieren den Schrägstrich"
|
||||
)
|
||||
_check(
|
||||
HubSettings.normalize_url("https://hub.example.org/api/v1")
|
||||
== "https://hub.example.org",
|
||||
"ein eingefügter API-Pfad wird entfernt"
|
||||
)
|
||||
_check(
|
||||
HubSettings.normalize_url("")
|
||||
== HubSettings.DEFAULT_URL,
|
||||
"eine leere Adresse fällt auf den Standard zurück"
|
||||
)
|
||||
|
||||
|
||||
func _test_numbered_names() -> void:
|
||||
_remove_test_dir()
|
||||
DirAccess.make_dir_recursive_absolute(TEST_DIR)
|
||||
_write_text(TEST_DIR.path_join("kuer.json"), "{}")
|
||||
_write_text(TEST_DIR.path_join("musik.mp3"), "audio")
|
||||
var names := HubClient.numbered_names(TEST_DIR, "kuer.json", "musik.mp3")
|
||||
_check(
|
||||
names.get("routine") == "kuer (Hub 2).json",
|
||||
"die Kür bekommt eine nummerierte Kopie"
|
||||
)
|
||||
_check(
|
||||
names.get("audio") == "musik (Hub 2).mp3",
|
||||
"die Musik bekommt dieselbe Nummer"
|
||||
)
|
||||
_write_text(TEST_DIR.path_join("kuer (Hub 2).json"), "{}")
|
||||
_write_text(TEST_DIR.path_join("musik (Hub 2).mp3"), "audio")
|
||||
var next := HubClient.numbered_names(TEST_DIR, "kuer.json", "musik.mp3")
|
||||
_check(
|
||||
next.get("routine") == "kuer (Hub 3).json",
|
||||
"belegte Nummern werden übersprungen"
|
||||
)
|
||||
_remove_test_dir()
|
||||
|
||||
|
||||
func _test_error_messages() -> void:
|
||||
_check(
|
||||
HubClient.error_message({}, 401).contains("abgelaufen"),
|
||||
"401 erklärt die abgelaufene Verbindung"
|
||||
)
|
||||
var validation := {
|
||||
"error": {"code": "validation_failed", "message": "Ungültig."},
|
||||
"errors": ["Kür fehlt", "Musik fehlt"],
|
||||
}
|
||||
var message := HubClient.error_message(validation, 422)
|
||||
_check(
|
||||
message.contains("Ungültig.") and message.contains("Kür fehlt"),
|
||||
"422 zeigt Detailfehler"
|
||||
)
|
||||
_check(
|
||||
HubClient.error_message(
|
||||
{"error": {"code": "duplicate", "message": "Schon da."}},
|
||||
409
|
||||
) == "Schon da.",
|
||||
"409 übernimmt die Servermeldung"
|
||||
)
|
||||
_check(
|
||||
HubClient.error_message({}, 429).contains("Anfragen"),
|
||||
"429 erklärt das Limit"
|
||||
)
|
||||
|
||||
|
||||
func _test_controller_wiring() -> void:
|
||||
HubSettings.clear_settings()
|
||||
var scene := WhiteboardScene.instantiate()
|
||||
var controller := scene as WhiteboardController
|
||||
controller.restore_autosave = false
|
||||
controller.autosave_enabled = false
|
||||
root.add_child(scene)
|
||||
await process_frame
|
||||
if controller == null:
|
||||
return
|
||||
|
||||
controller._refresh_hub_menu()
|
||||
_check(
|
||||
_find_menu_item(controller, "Kür-Hub…") < 0,
|
||||
"ohne Hub-Verbindung fehlt der Menüpunkt"
|
||||
)
|
||||
|
||||
var token := "rhub_" + "b".repeat(64)
|
||||
HubSettings.save_settings({
|
||||
"base_url": "https://rinkplanner-hub.example.org",
|
||||
"token": token,
|
||||
"username": "tester",
|
||||
"role": "user",
|
||||
"verified": true,
|
||||
})
|
||||
controller._refresh_hub_menu()
|
||||
_check(
|
||||
_find_menu_item(controller, "Kür-Hub…") >= 0,
|
||||
"mit Verbindung erscheint der Hub im Dateimenü"
|
||||
)
|
||||
|
||||
controller._open_sync_settings_dialog()
|
||||
_check(
|
||||
controller.hub_url_edit.text == "https://rinkplanner-hub.example.org",
|
||||
"die Sync-Einstellungen zeigen die Hub-Adresse"
|
||||
)
|
||||
_check(
|
||||
controller.hub_token_edit.text == token,
|
||||
"die Sync-Einstellungen zeigen den Token"
|
||||
)
|
||||
_check(
|
||||
controller.hub_account_value.text.contains("tester"),
|
||||
"die Sync-Einstellungen zeigen das Hub-Konto"
|
||||
)
|
||||
_check(
|
||||
controller.hub_connect_button.text == "Trennen",
|
||||
"ein verbundenes Konto bietet Trennen an"
|
||||
)
|
||||
controller.sync_settings_dialog.hide()
|
||||
|
||||
var items: Array[Dictionary] = [
|
||||
{
|
||||
"id": 7,
|
||||
"title": "Testkür",
|
||||
"skater_name": "Läuferin",
|
||||
"revision": 2,
|
||||
"routine_bytes": 2048,
|
||||
"audio_bytes": 4096,
|
||||
"owner": {"username": "andere", "display_name": "Andere"},
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"title": "Eigene Kür",
|
||||
"skater_name": "Ich",
|
||||
"revision": 1,
|
||||
"routine_bytes": 1024,
|
||||
"audio_bytes": null,
|
||||
"owner": {"username": "tester", "display_name": "Tester"},
|
||||
},
|
||||
]
|
||||
controller._hub_items = items
|
||||
controller._populate_hub_tree()
|
||||
var tree := controller.hub_tree
|
||||
_check(
|
||||
tree.get_root() != null and tree.get_root().get_child_count() == 2,
|
||||
"der Hub-Dialog listet beide Küren"
|
||||
)
|
||||
var first := tree.get_root().get_child(0)
|
||||
first.select(0)
|
||||
controller._on_hub_tree_selected()
|
||||
_check(
|
||||
not controller.hub_download_button.disabled,
|
||||
"eine fremde Kür lässt sich herunterladen"
|
||||
)
|
||||
_check(
|
||||
controller.hub_hide_button.disabled,
|
||||
"fremde Küren lassen sich nicht aus dem Hub nehmen"
|
||||
)
|
||||
_check(
|
||||
controller.hub_detail_label.text.contains("Testkür")
|
||||
and controller.hub_detail_label.text.contains("andere"),
|
||||
"die Detailzeile nennt Kür und Eigentümer"
|
||||
)
|
||||
var second := tree.get_root().get_child(1)
|
||||
second.select(0)
|
||||
controller._on_hub_tree_selected()
|
||||
_check(
|
||||
not controller.hub_hide_button.disabled,
|
||||
"eigene Küren lassen sich aus dem Hub nehmen"
|
||||
)
|
||||
_check(
|
||||
controller._hub_size_label(items[0]) == "6 KB",
|
||||
"die Größe wird aus Kür und Musik summiert"
|
||||
)
|
||||
_test_download_integration(controller)
|
||||
|
||||
HubSettings.clear_settings()
|
||||
controller._refresh_hub_menu()
|
||||
_check(
|
||||
_find_menu_item(controller, "Kür-Hub…") < 0,
|
||||
"nach dem Trennen verschwindet der Menüpunkt wieder"
|
||||
)
|
||||
scene.queue_free()
|
||||
await process_frame
|
||||
|
||||
|
||||
func _test_download_integration(controller: WhiteboardController) -> void:
|
||||
var routines := RoutineSync.LOCAL_DIR
|
||||
DirAccess.make_dir_recursive_absolute(routines)
|
||||
_remove_routine_test_files(routines)
|
||||
var pending := "user://hub-pending-test"
|
||||
_remove_test_dir_at(pending)
|
||||
DirAccess.make_dir_recursive_absolute(pending)
|
||||
|
||||
_write_text(routines.path_join("kuer.json"), _routine_json("Bestehend", "musik.mp3"))
|
||||
_write_text(routines.path_join("musik.mp3"), "lokal")
|
||||
_write_text(pending.path_join("kuer.json"), _routine_json("Vom Hub", "musik.mp3"))
|
||||
_write_text(pending.path_join("musik.mp3"), "hub-audio")
|
||||
controller._hub_pending_download = {
|
||||
"folder": pending,
|
||||
"routine_name": "kuer.json",
|
||||
"audio_name": "musik.mp3",
|
||||
"routine_path": pending.path_join("kuer.json"),
|
||||
"audio_path": pending.path_join("musik.mp3"),
|
||||
}
|
||||
controller._apply_hub_download(false)
|
||||
controller.message_dialog.hide()
|
||||
var numbered := routines.path_join("kuer (Hub 2).json")
|
||||
var numbered_audio := routines.path_join("musik (Hub 2).mp3")
|
||||
_check(FileAccess.file_exists(numbered), "Kollisionen erzeugen eine nummerierte Kür")
|
||||
_check(FileAccess.file_exists(numbered_audio), "die Musik wird mitnummeriert")
|
||||
var rewritten: Variant = JSON.parse_string(FileAccess.get_file_as_string(numbered))
|
||||
_check(
|
||||
rewritten is Dictionary
|
||||
and str((rewritten as Dictionary).get("music_file", "")) == "musik (Hub 2).mp3",
|
||||
"die Kür verweist nach dem Umbenennen auf die neue Musik"
|
||||
)
|
||||
_check(
|
||||
FileAccess.get_file_as_string(routines.path_join("kuer.json")).contains("Bestehend"),
|
||||
"die vorhandene Kür bleibt beim nummerierten Kopieren unverändert"
|
||||
)
|
||||
|
||||
var overwrite_pending := "user://hub-pending-overwrite"
|
||||
_remove_test_dir_at(overwrite_pending)
|
||||
DirAccess.make_dir_recursive_absolute(overwrite_pending)
|
||||
_write_text(overwrite_pending.path_join("kuer.json"), _routine_json("Überschrieben", "musik.mp3"))
|
||||
_write_text(overwrite_pending.path_join("musik.mp3"), "neu")
|
||||
controller._hub_pending_download = {
|
||||
"folder": overwrite_pending,
|
||||
"routine_name": "kuer.json",
|
||||
"audio_name": "musik.mp3",
|
||||
"routine_path": overwrite_pending.path_join("kuer.json"),
|
||||
"audio_path": overwrite_pending.path_join("musik.mp3"),
|
||||
}
|
||||
controller._apply_hub_download(true)
|
||||
controller.message_dialog.hide()
|
||||
_check(
|
||||
FileAccess.get_file_as_string(routines.path_join("kuer.json")).contains("Überschrieben"),
|
||||
"Überschreiben ersetzt die vorhandene Kür"
|
||||
)
|
||||
_check(
|
||||
FileAccess.get_file_as_string(routines.path_join("musik.mp3")) == "neu",
|
||||
"Überschreiben ersetzt die vorhandene Musik"
|
||||
)
|
||||
_remove_routine_test_files(routines)
|
||||
_remove_test_dir_at(pending)
|
||||
_remove_test_dir_at(overwrite_pending)
|
||||
|
||||
|
||||
func _routine_json(title: String, music: String) -> String:
|
||||
return JSON.stringify({
|
||||
"format": "rinkplanner.routine",
|
||||
"format_version": 1,
|
||||
"schema_version": 1,
|
||||
"routine_id": "hub-test",
|
||||
"title": title,
|
||||
"music_file": music,
|
||||
"sections": [],
|
||||
}, "\t", false, true)
|
||||
|
||||
|
||||
func _remove_routine_test_files(routines: String) -> void:
|
||||
for name: String in [
|
||||
"kuer.json", "kuer (Hub 2).json", "kuer (Hub 3).json",
|
||||
"musik.mp3", "musik (Hub 2).mp3", "musik (Hub 3).mp3",
|
||||
]:
|
||||
var path := routines.path_join(name)
|
||||
if FileAccess.file_exists(path):
|
||||
DirAccess.remove_absolute(ProjectSettings.globalize_path(path))
|
||||
|
||||
|
||||
func _remove_test_dir_at(path: String) -> void:
|
||||
var folder := ProjectSettings.globalize_path(path)
|
||||
if not DirAccess.dir_exists_absolute(folder):
|
||||
return
|
||||
for file: String in DirAccess.get_files_at(folder):
|
||||
DirAccess.remove_absolute(folder.path_join(file))
|
||||
DirAccess.remove_absolute(folder)
|
||||
|
||||
|
||||
func _find_menu_item(controller: WhiteboardController, text: String) -> int:
|
||||
var popup := controller.file_menu_button.get_popup()
|
||||
for index: int in range(popup.item_count):
|
||||
if popup.get_item_text(index) == text:
|
||||
return index
|
||||
return -1
|
||||
|
||||
|
||||
func _write_text(path: String, text: String) -> void:
|
||||
var file := FileAccess.open(path, FileAccess.WRITE)
|
||||
if file != null:
|
||||
file.store_string(text)
|
||||
file.close()
|
||||
|
||||
|
||||
func _remove_test_dir() -> void:
|
||||
var folder := ProjectSettings.globalize_path(TEST_DIR)
|
||||
if not DirAccess.dir_exists_absolute(folder):
|
||||
return
|
||||
for file: String in DirAccess.get_files_at(folder):
|
||||
DirAccess.remove_absolute(folder.path_join(file))
|
||||
DirAccess.remove_absolute(folder)
|
||||
|
||||
|
||||
func _check(condition: bool, message: String) -> void:
|
||||
_assertions += 1
|
||||
if not condition:
|
||||
_failures.append(message)
|
||||
|
||||
|
||||
func _finish() -> void:
|
||||
if _failures.is_empty():
|
||||
print("PASS: %d assertions" % _assertions)
|
||||
quit(0)
|
||||
else:
|
||||
for failure: String in _failures:
|
||||
printerr("FAIL: " + failure)
|
||||
printerr("%d of %d assertions failed" % [_failures.size(), _assertions])
|
||||
quit(1)
|
||||
1
rinkplanner/tests/run_hub_tests.gd.uid
Normal file
1
rinkplanner/tests/run_hub_tests.gd.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://eyveg5lvk1vc
|
||||
Loading…
Add table
Add a link
Reference in a new issue