Merge pull request #87 from ARUP-CAS/version/v2.2.0

Vydání verze 2.2.0: sjednocené popisky filtrů, váha prvku u komponent, ověření přihlášení před stahováním, zapamatované filtry s resetem a aktualizované README.

tests/check_version_bump.py

@@ -0,0 +1,188 @@
+# -*- coding: utf-8 -*-
+"""
+Guards the release PR (version/vX.Y.Z -> main).
+
+Checks that the version actually moved forward and that the three places
+that name it agree, because plugins.qgis.org and Zenodo both read from
+files a human has to remember to touch by hand:
+
+* amcr_viewer/metadata.txt: version= must be higher than on main, and the
+  first changelog entry must be for that exact version
+* CITATION.cff: version must match metadata.txt, and date-released must
+  not be left pointing at the old release
+* the branch name (version/vX.Y.Z) must match metadata.txt, so a stray
+  push to the wrong release branch is caught before merge
+
+Run from the repository root:
+
+    python3 tests/check_version_bump.py <base_sha> <head_ref>
+"""
+
+import datetime
+import re
+import subprocess
+import sys
+
+METADATA = "amcr_viewer/metadata.txt"
+CITATION = "CITATION.cff"
+
+VERZE_METADATA = re.compile(r"^version=(.+)$", re.MULTILINE)
+VERZE_CITATION = re.compile(r"^version:\s*'?([^'\n]+)'?\s*$", re.MULTILINE)
+DATUM_CITATION = re.compile(r"^date-released:\s*'?([^'\n]+)'?\s*$",
+                             re.MULTILINE)
+# Přeskočí úvodní řádek "Plný seznam změn ... /vX.Y.Z" a najde první
+# skutečnou položku changelogu.
+POLOZKA_CHANGELOGU = re.compile(r"^\s+v([0-9][^\s(]*)\s*\(", re.MULTILINE)
+BRANCH_VERZE = re.compile(r"^version/v(.+)$")
+
+nalezy = []
+
+
+def nacti_na_base(base_sha, cesta):
+    vysledek = subprocess.run(
+        ["git", "show", f"{base_sha}:{cesta}"],
+        capture_output=True, text=True,
+    )
+    if vysledek.returncode != 0:
+        nalezy.append(f"{cesta}: na cílové větvi nejde přečíst "
+                       f"(git show {base_sha}:{cesta} selhalo)")
+        return None
+    return vysledek.stdout
+
+
+def nacti(cesta):
+    with open(cesta, encoding="utf-8") as f:
+        return f.read()
+
+
+def hledej(vzor, text, cesta, popis):
+    shoda = vzor.search(text)
+    if not shoda:
+        nalezy.append(f"{cesta}: {popis} nenalezeno")
+        return None
+    return shoda.group(1).strip()
+
+
+def verze_tuple(verze):
+    jadro = verze.split("-", 1)[0]
+    try:
+        return tuple(int(c) for c in jadro.split("."))
+    except ValueError:
+        return None
+
+
+def je_bump(stara, nova):
+    if stara == nova:
+        return False
+    stara_t, nova_t = verze_tuple(stara), verze_tuple(nova)
+    if stara_t is None or nova_t is None:
+        # Nestandardní formát verze – nejde spolehlivě porovnat čísly,
+        # stačí tedy, že se řetězec liší.
+        return True
+    if nova_t != stara_t:
+        return nova_t > stara_t
+    # Stejné jádro (např. "-alpha" přípona): bump platí, pokud se text
+    # liší a nejde o couvnutí z release na prerelease.
+    return "-" in stara or "-" not in nova
+
+
+def datum(text):
+    try:
+        return datetime.date.fromisoformat(text)
+    except ValueError:
+        return None
+
+
+def main():
+    if len(sys.argv) != 3:
+        print("použití: check_version_bump.py <base_sha> <head_ref>")
+        return 2
+    base_sha, head_ref = sys.argv[1], sys.argv[2]
+
+    base_metadata = nacti_na_base(base_sha, METADATA)
+    base_citation = nacti_na_base(base_sha, CITATION)
+    head_metadata = nacti(METADATA)
+    head_citation = nacti(CITATION)
+
+    if base_metadata is None or base_citation is None:
+        # Bez base souborů nejde nic dalšího smysluplně ověřit.
+        print("Nálezy:")
+        for nalez in nalezy:
+            print(f"  {nalez}")
+        return 1
+
+    stara_verze = hledej(VERZE_METADATA, base_metadata, METADATA,
+                          "verze na cílové větvi (version=)")
+    nova_verze = hledej(VERZE_METADATA, head_metadata, METADATA,
+                         "verze (version=)")
+    stara_citation_verze = hledej(VERZE_CITATION, base_citation, CITATION,
+                                   "verze na cílové větvi (version:)")
+    nova_citation_verze = hledej(VERZE_CITATION, head_citation, CITATION,
+                                  "verze (version:)")
+    stare_datum = hledej(DATUM_CITATION, base_citation, CITATION,
+                          "date-released na cílové větvi")
+    nove_datum = hledej(DATUM_CITATION, head_citation, CITATION,
+                         "date-released")
+
+    if None in (stara_verze, nova_verze, stara_citation_verze,
+                nova_citation_verze, stare_datum, nove_datum):
+        print("Nálezy:")
+        for nalez in nalezy:
+            print(f"  {nalez}")
+        return 1
+
+    # 1. metadata.txt: verze musí jít dopředu.
+    if not je_bump(stara_verze, nova_verze):
+        nalezy.append(
+            f"{METADATA}: verze nepovýšena ({stara_verze} -> {nova_verze})")
+
+    # 2. metadata.txt: první položka changelogu musí patřit nové verzi.
+    prvni_polozka = POLOZKA_CHANGELOGU.search(head_metadata)
+    if not prvni_polozka:
+        nalezy.append(f"{METADATA}: v changelog= nenalezena žádná položka "
+                       f"'vX.Y.Z (...)'")
+    elif prvni_polozka.group(1) != nova_verze:
+        nalezy.append(
+            f"{METADATA}: první položka changelogu je pro "
+            f"v{prvni_polozka.group(1)}, ale version={nova_verze}")
+
+    # 3. CITATION.cff: verze musí souhlasit s metadata.txt.
+    if nova_citation_verze != nova_verze:
+        nalezy.append(
+            f"{CITATION}: version: {nova_citation_verze} neodpovídá "
+            f"{METADATA} version={nova_verze}")
+
+    # 4. CITATION.cff: date-released se musí posunout, a ne dozadu.
+    stary_datum_obj, novy_datum_obj = datum(stare_datum), datum(nove_datum)
+    if stary_datum_obj is None or novy_datum_obj is None:
+        nalezy.append(f"{CITATION}: date-released není platné datum "
+                       f"ISO 8601 ({stare_datum!r} -> {nove_datum!r})")
+    elif novy_datum_obj < stary_datum_obj:
+        nalezy.append(
+            f"{CITATION}: date-released couvlo ({stare_datum} -> "
+            f"{nove_datum})")
+    elif (nove_datum == stare_datum
+          and stara_citation_verze != nova_citation_verze):
+        nalezy.append(
+            f"{CITATION}: version se změnila, ale date-released zůstalo "
+            f"na {stare_datum}")
+
+    # 5. Název release větve musí odpovídat verzi, kterou nese.
+    shoda_branch = BRANCH_VERZE.match(head_ref)
+    if shoda_branch and shoda_branch.group(1) != nova_verze:
+        nalezy.append(
+            f"větev {head_ref!r} neodpovídá {METADATA} "
+            f"version={nova_verze}")
+
+    if nalezy:
+        print("Nálezy:")
+        for nalez in nalezy:
+            print(f"  {nalez}")
+        return 1
+    print(f"Kontrola verze a changelogu: v{stara_verze} -> v{nova_verze}, "
+          f"bez nálezů")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

tests/smoke_test.py

@@ -19,6 +19,8 @@ import os
 import sys
 import traceback
 
+import requests
+
 # Offscreen, otherwise the dialogs need an X server
 os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
 
@@ -117,10 +119,545 @@ def filtr_datumu():
     return hodnota
 
 
+class FalesnaSession:
+    """Offline stand-in for requests.Session: returns canned JSON
+    bodies for GET /api/user/islogged and counts the requests."""
+
+    def __init__(self, tela):
+        # tela: a list of (body, exception) pairs – one per GET call,
+        # consumed in order; None body means raise the exception
+        self.tela = list(tela)
+        self.get_volani = 0
+
+    def get(self, url, timeout=0):
+        self.get_volani += 1
+        polozka = self.tela.pop(0)
+        # A bare dict is a plain body; (None, exception) means raise
+        if isinstance(polozka, tuple):
+            tela, vyjimka = polozka
+        else:
+            tela, vyjimka = polozka, None
+        if tela is None and vyjimka is not None:
+            raise vyjimka
+
+        class Odpoved:
+            def __init__(self, tela):
+                self.telo = tela
+                self.text = str(tela)
+
+            def json(self):
+                if isinstance(self.telo, Exception):
+                    raise self.telo
+                return self.telo
+
+        return Odpoved(tela)
+
+
+def prihlasovaci_stav():
+    """
+    _ensure_logged_in with a fake session and monkeypatched login /
+    credentials / _get_session – everything stays offline.
+
+    Each case: (name, expected status, islogged bodies of the current
+    session, islogged bodies after re-login, fake login result,
+    stored credentials, expected number of islogged GETs).
+    """
+    pripady = [
+        # Valid session – no re-login, no extra request
+        ("platná session", "logged_in",
+         [{"remaining": 3500}], [], None, ("", ""), 1),
+        # nologged + successful re-login, verified again
+        ("expired + re-login", "relogged",
+         [{"error": "nologged"}], [{"remaining": 1800}],
+         "session", ("uzivatel", "heslo"), 1),
+        # nologged + failed re-login
+        ("expired + selhaný re-login", "fallback",
+         [{"error": "nologged"}], [], None, ("uzivatel", "heslo"), 1),
+        # nologged + no stored credentials
+        ("expired bez údajů", "fallback",
+         [{"error": "nologged"}], [], None, ("", ""), 1),
+        # No session and no credentials – no request at all
+        ("anonym bez údajů", "anonymous",
+         [], [], None, ("", ""), 0),
+        # Network error during the check
+        ("chyba sítě", "unknown",
+         [(None, requests.exceptions.ConnectionError("probe"))],
+         [], None, ("", ""), 1),
+        # 200 but invalid JSON
+        ("neplatný JSON", "unknown",
+         [(None, ValueError("Invalid JSON"))],
+         [], None, ("", ""), 1),
+    ]
+
+    tools = amcr_viewer.amcr_tools
+    puvodni = (tools.login_to_api, tools._get_session,
+               dialog.LoginDialog.__dict__["get_credentials"])
+    try:
+        return _prihlasovaci_stav(pripady, tools)
+    finally:
+        # Leave the modules as they were found, even when a case fails
+        (tools.login_to_api, tools._get_session,
+         dialog.LoginDialog.get_credentials) = puvodni
+        tools.AMCR_SESSION = None
+
+
+def _prihlasovaci_stav(pripady, tools):
+    """Runs the cases of prihlasovaci_stav()."""
+    vysledky = []
+    for (nazev, ocekavano, tela, tela_po_loginu, login_vysledek,
+         kredity, get_volani) in pripady:
+
+        # The current session (None = _get_session returns None);
+        # a successful fake re-login produces a new fake session
+        session = FalesnaSession(tela) if tela else None
+        login_hodnota = FalesnaSession(tela_po_loginu) \
+            if login_vysledek else None
+
+        tools.AMCR_SESSION = session
+
+        def fake_login(hodnota):
+            # Like the real login_to_api: stores the session globally
+            def login(uzivatel, heslo):
+                if hodnota is not None:
+                    tools.AMCR_SESSION = hodnota
+                return hodnota
+            return login
+
+        tools.login_to_api = fake_login(login_hodnota)
+        tools._get_session = (lambda s: lambda: s)(session) \
+            if session else (lambda: None)
+        dialog.LoginDialog.get_credentials = staticmethod(
+            (lambda k: lambda: k)(kredity)
+        )
+
+        stav = tools._ensure_logged_in()
+        assert stav == ocekavano, f"{nazev}: {stav} != {ocekavano}"
+
+        # The old session object must have been used for the checks
+        if session is not None:
+            assert session.get_volani == get_volani, \
+                f"{nazev}: {session.get_volani} != {get_volani}"
+
+        # The returned fake login session must become the global one
+        # and its login state must have been verified as well
+        if ocekavano == "relogged":
+            assert login_hodnota is not None
+            assert tools.AMCR_SESSION is login_hodnota
+            assert login_hodnota.get_volani == 1, \
+                f"{nazev}: nová session nebyla ověřena"
+
+        vysledky.append(f"{nazev} → {stav}")
+
+    return ", ".join(vysledky)
+
+
+def odhlaseni():
+    """logout_from_api with a fake session – offline."""
+    tools = amcr_viewer.amcr_tools
+    puvodni = tools.AMCR_SESSION
+    try:
+        # Logged-in session: one GET to /logout, session dropped
+        session = FalesnaSession([{"msg": "logged out"}])
+        session_get = session.get
+        urls = []
+
+        def get(url, timeout=0):
+            urls.append(url)
+            odpoved = session_get(url, timeout)
+            odpoved.raise_for_status = lambda: None
+            return odpoved
+
+        session.get = get
+        tools.AMCR_SESSION = session
+        assert tools.logout_from_api() is True
+        assert tools.AMCR_SESSION is None
+        assert urls and urls[0].endswith("/api/user/logout"), urls
+
+        # Network error: session still dropped locally
+        chyba = FalesnaSession(
+            [(None, requests.exceptions.ConnectionError("probe"))]
+        )
+        tools.AMCR_SESSION = chyba
+        assert tools.logout_from_api() is False
+        assert tools.AMCR_SESSION is None
+        assert chyba.get_volani == 1
+
+        # No session: nothing to do, no request
+        assert tools.logout_from_api() is True
+    finally:
+        tools.AMCR_SESSION = puvodni
+    return "odhlášení, chyba sítě → zahozeno lokálně, bez session → nic"
+
+
+def vaha_komponent():
+    """
+    _component_entries: the weight is 1/n of the components that pass
+    the predicate, so the weights of one documentation unit sum to 1
+    even with a period/area filter active.
+
+    The cases come from the spec of the fix (issue #55); the sums are
+    compared with a tolerance because 1/3 weights add up to 0.999…
+    """
+    tools = amcr_viewer.amcr_tools
+
+    def komponenta(ident, areal=None, obdobi=None):
+        return {
+            "ident_cely": ident,
+            "komponenta_areal": ({"id": areal} if areal else None),
+            "komponenta_obdobi": ({"id": obdobi} if obdobi else None),
+        }
+
+    dj_meta = {"dj_id": "X-M-000001"}
+
+    # 4 components, no filter: 4 features, each 0.25
+    komps = [komponenta(f"K{i}") for i in range(4)]
+    zaznamy = tools._component_entries(dj_meta, komps, lambda k: True)
+    assert len(zaznamy) == 4, len(zaznamy)
+    assert all(z["vaha"] == 0.25 for z in zaznamy), \
+        [z["vaha"] for z in zaznamy]
+
+    # Period filter keeps 1 of 4: single feature with weight 1
+    komps = [
+        komponenta("K0", obdobi="neolit"),
+        komponenta("K1"), komponenta("K2"), komponenta("K3"),
+    ]
+    zaznamy = tools._component_entries(
+        dj_meta, komps, lambda k: k["komponenta_obdobi"] is not None
+    )
+    assert len(zaznamy) == 1, len(zaznamy)
+    assert zaznamy[0]["vaha"] == 1.0, zaznamy[0]["vaha"]
+
+    # Filter keeps 2 of 3: 2 features, each 0.5, sum 1 within tolerance
+    komps = [
+        komponenta("K0", obdobi="neolit"), komponenta("K1", obdobi="bronz"),
+        komponenta("K2"),
+    ]
+    zaznamy = tools._component_entries(
+        dj_meta, komps, lambda k: k["komponenta_obdobi"] is not None
+    )
+    assert len(zaznamy) == 2, len(zaznamy)
+    assert all(z["vaha"] == 0.5 for z in zaznamy), \
+        [z["vaha"] for z in zaznamy]
+    assert abs(sum(z["vaha"] for z in zaznamy) - 1) < 1e-9
+
+    # Sum with tolerance also for an indivisible split (1/3)
+    komps = [komponenta(f"K{i}") for i in range(3)]
+    zaznamy = tools._component_entries(dj_meta, komps, lambda k: True)
+    assert abs(sum(z["vaha"] for z in zaznamy) - 1) < 1e-9
+
+    # No components: one entry with empty component fields, weight 1
+    zaznamy = tools._component_entries(dj_meta, [], lambda k: True)
+    assert len(zaznamy) == 1, zaznamy
+    assert zaznamy[0]["vaha"] == 1, zaznamy[0]["vaha"]
+    assert zaznamy[0]["komponenta_id"] == ""
+
+    # The shared DJ metadata and component fields travel along
+    komps = [komponenta("K0", areal="sidelni", obdobi="neolit")]
+    zaznamy = tools._component_entries(dj_meta, komps, lambda k: True)
+    assert zaznamy[0]["dj_id"] == "X-M-000001"
+    assert zaznamy[0]["komponenta_id"] == "K0"
+
+    return "4×0.25; 1/4 → 1.0; 2/3 → 2×0.5; prázdné → 1"
+
+
+def vychozi_filtry():
+    """
+    A fresh dialog starts from the defaults: the map-extent restriction
+    checked, PIAN – přesnost pre-selected for akce and lokalita, and
+    nothing (not even PIAN) sent for samostatny_nalez.
+    """
+    _stubuj_varovani()
+    try:
+        pian = ["HES-000861", "HES-000862", "HES-000863"]
+        for typ, ma_pian in (("akce", True), ("lokalita", True),
+                             ("samostatny_nalez", False)):
+            okno = dialog.AmcrFilterDialog(typ)
+            assert okno.get_bbox() == "true", typ
+            assert okno.get_komponenty() == "false", typ
+            if ma_pian:
+                assert okno.selection_cache["pian_presnost"] == pian, typ
+                assert okno.get_filters()["f_pian_presnost"] == pian, typ
+            else:
+                assert "f_pian_presnost" not in okno.get_filters(), typ
+            okno.close()
+        return ("PIAN 861/862/863 u akcí a lokalit, u nálezů bez "
+                "omezení, bbox zapnutý")
+    finally:
+        dialog._REMEMBERED_STATE.clear()
+
+
+def _stubuj_varovani():
+    # A modal warning would block the offscreen run forever
+    dialog.QMessageBox.warning = staticmethod(lambda *a, **k: None)
+
+
+def _kody(codelist, n=1):
+    """First n real codes of a codelist (label -> code dict)."""
+    return [code for code in codelist.values() if code][:n]
+
+
+def _napln(okno, typ):
+    """Fills a dialog with a non-default state for round-trip tests."""
+    okno._set_picker("kraj", _kody(dialog.KRAJE))
+    okno._set_picker("obdobi", _kody(dialog.OBDOBI, 2))
+    okno.chk_bbox.setChecked(False)
+    if typ == "akce":
+        okno.chk_posevidence.setChecked(True)
+        okno.chk_proj_akce.setChecked(True)
+        okno._set_picker("typ_akce", _kody(dialog.TYP_AKCE))
+        okno.date_ranges[0][2].setDate(QDate(2016, 1, 1))
+        okno.date_ranges[0][3].setDate(QDate(2017, 12, 31))
+    if typ == "lokalita":
+        okno.chk_komponenty.setChecked(True)
+        okno._set_picker("typ_lokality", _kody(dialog.TYP_LOKALITY))
+    if typ == "samostatny_nalez":
+        okno._set_picker("druh_nalezu", _kody(dialog.DRUH_NALEZU))
+        okno.date_ranges[0][3].setDate(QDate(2020, 6, 30))
+
+
+def pamet_snapshotu():
+    """
+    Snapshot -> apply on a fresh dialog keeps get_filters(),
+    get_bbox() and get_komponenty() identical; a code unknown to the
+    current codelist is dropped on the way.
+    """
+    _stubuj_varovani()
+    try:
+        for typ in ("akce", "lokalita", "samostatny_nalez"):
+            okno = dialog.AmcrFilterDialog(typ)
+            _napln(okno, typ)
+            stav = okno.get_filters()
+            snapshot = okno._snapshot()
+            okno.close()
+
+            obnovene = dialog.AmcrFilterDialog(typ)
+            obnovene._apply_state(snapshot)
+            assert obnovene._snapshot() == snapshot, typ
+            assert obnovene.get_filters() == stav, typ
+            assert obnovene.get_bbox() == okno.get_bbox(), typ
+            assert obnovene.get_komponenty() == okno.get_komponenty(), typ
+            obnovene.close()
+
+        # Unknown code: dropped, not sent
+        okno = dialog.AmcrFilterDialog("akce")
+        kraj = _kody(dialog.KRAJE)
+        okno._set_picker("kraj", kraj + ["XX-NEEXISTUJE"])
+        assert okno.selection_cache["kraj"] == kraj
+        assert okno.get_filters()["f_kraj"] == kraj
+        okno.close()
+
+        # The same through a remembered state, as after a codelist
+        # update removed the code: dropped on opening, the picker text
+        # is the current codelist label
+        stitek = next(k for k, v in dialog.KRAJE.items() if v == kraj[0])
+        stav = dialog.AmcrFilterDialog("akce")._snapshot()
+        stav["codes"]["kraj"] = kraj + ["XX-NEEXISTUJE"]
+        dialog._REMEMBERED_STATE["akce"] = stav
+        okno = dialog.AmcrFilterDialog("akce")
+        assert okno.get_filters()["f_kraj"] == kraj
+        assert okno.pickers["kraj"][1].text() == stitek
+        okno.close()
+        return "round-trip všech tří typů, neznámý kód zahozen"
+    finally:
+        dialog._REMEMBERED_STATE.clear()
+
+
+def pamet_potvrzeni():
+    """
+    OK remembers the form state for the next opening of the same data
+    type; Cancel and a refused reversed date range do not; another
+    data type starts from the defaults.
+    """
+    _stubuj_varovani()
+    try:
+        okno = dialog.AmcrFilterDialog("akce")
+        _napln(okno, "akce")
+        potvrzene = okno.get_filters()
+        okno.accept()
+        okno.close()
+
+        # OK -> reopen restores the same filters
+        znovu = dialog.AmcrFilterDialog("akce")
+        assert znovu.get_filters() == potvrzene
+        assert znovu.get_bbox() == "false"
+
+        # Another data type starts from the defaults
+        lokalita = dialog.AmcrFilterDialog("lokalita")
+        assert "f_kraj" not in lokalita.get_filters()
+        assert lokalita.get_bbox() == "true"
+        lokalita.close()
+
+        # Cancel keeps the remembered state
+        znovu._set_picker("kraj", [])
+        znovu.chk_bbox.setChecked(True)
+        znovu.reject()
+        znovu.close()
+        po_zruseni = dialog.AmcrFilterDialog("akce")
+        assert po_zruseni.get_filters() == potvrzene
+
+        # A reversed range is refused and the state stays unchanged
+        zapamatovano = dialog._REMEMBERED_STATE["akce"]
+        po_zruseni.date_ranges[0][2].setDate(QDate(2018, 1, 1))
+        po_zruseni.date_ranges[0][3].setDate(QDate(2017, 1, 1))
+        po_zruseni.accept()
+        assert po_zruseni.result() == 0, "obrácené rozmezí přijato"
+        assert dialog._REMEMBERED_STATE["akce"] == zapamatovano
+        po_zruseni.close()
+        return ("OK obnoví, Cancel i obrácené rozmezí ne, jiný typ "
+                "od výchozích")
+    finally:
+        dialog._REMEMBERED_STATE.clear()
+
+
+def obnoveni_vychozich():
+    """
+    Obnovit výchozí resets the form only: reset + OK behaves like a
+    fresh dialog, reset + Cancel keeps the remembered state.
+    """
+    _stubuj_varovani()
+    try:
+        # Default output, captured before anything is remembered
+        okno = dialog.AmcrFilterDialog("akce")
+        vychozi = okno.get_filters()
+        vychozi_bbox = okno.get_bbox()
+        vychozi_komponenty = okno.get_komponenty()
+        okno.close()
+
+        # A remembered non-default state
+        okno = dialog.AmcrFilterDialog("akce")
+        _napln(okno, "akce")
+        potvrzene = okno.get_filters()
+        okno.accept()
+        okno.close()
+
+        # Reset + Cancel: reopening shows the remembered state
+        okno = dialog.AmcrFilterDialog("akce")
+        okno.action_reset()
+        assert okno.get_filters() == vychozi
+        okno.reject()
+        okno.close()
+        okno = dialog.AmcrFilterDialog("akce")
+        assert okno.get_filters() == potvrzene
+        okno.close()
+
+        # Reset + OK: the sent filters and the next opening are default
+        okno = dialog.AmcrFilterDialog("akce")
+        okno.action_reset()
+        assert okno.get_filters() == vychozi
+        assert okno.get_bbox() == vychozi_bbox
+        assert okno.get_komponenty() == vychozi_komponenty
+        okno.accept()
+        okno.close()
+        okno = dialog.AmcrFilterDialog("akce")
+        assert okno.get_filters() == vychozi
+        okno.close()
+        return "reset + OK = čerstvý dialog, reset + Cancel zachová"
+    finally:
+        dialog._REMEMBERED_STATE.clear()
+
+
+def vymazani_vyberu():
+    """
+    The ✕ button returns only its own filter to its default (empty,
+    or the three pre-selected levels for PIAN – přesnost) and is
+    disabled while the filter already is at that default.
+    """
+    _stubuj_varovani()
+    try:
+        okno = dialog.AmcrFilterDialog("lokalita")
+        okno._set_picker("kraj", _kody(dialog.KRAJE))
+        okno._set_picker("obdobi", _kody(dialog.OBDOBI, 2))
+        pred = okno.get_filters()
+        assert "f_kraj" in pred and "f_obdobi" in pred
+
+        okno.pickers["kraj"][2].click()
+        assert okno.selection_cache["kraj"] == []
+        po = okno.get_filters()
+        assert "f_kraj" not in po
+        assert po["f_obdobi"] == pred["f_obdobi"]
+        assert not okno.pickers["kraj"][2].isEnabled()
+        okno.close()
+
+        okno = dialog.AmcrFilterDialog("akce")
+        assert "f_pian_presnost" in okno.get_filters()
+        # A fresh dialog is at the default, so ✕ is disabled
+        assert not okno.pickers["pian_presnost"][2].isEnabled()
+
+        # A reordered default list still counts as the default
+        vychozi = dialog.DEFAULT_CODES["pian_presnost"]
+        okno._set_picker("pian_presnost", list(reversed(vychozi)))
+        assert not okno.pickers["pian_presnost"][2].isEnabled()
+        assert "f_pian_presnost" in okno.get_filters()
+
+        # Emptied PIAN means no restriction and enables ✕
+        okno._set_picker("pian_presnost", [])
+        assert "f_pian_presnost" not in okno.get_filters()
+        assert okno.pickers["pian_presnost"][2].isEnabled()
+
+        # ✕ restores the three default levels and disables itself
+        okno.pickers["pian_presnost"][2].click()
+        assert sorted(okno.get_filters()["f_pian_presnost"]) == sorted(
+            vychozi
+        )
+        assert not okno.pickers["pian_presnost"][2].isEnabled()
+        okno.close()
+        return ("✕ vrací filtr na výchozí hodnotu, PIAN na tři "
+                "úrovně, jinak prázdné")
+    finally:
+        dialog._REMEMBERED_STATE.clear()
+
+
+def upozorneni_obnovy():
+    """
+    The notice is hidden for a fresh dialog and for a remembered
+    default state; with two filters set it is shown with the count 2
+    and hidden again by Obnovit výchozí.
+    """
+    _stubuj_varovani()
+    try:
+        okno = dialog.AmcrFilterDialog("akce")
+        assert okno.lbl_notice.isHidden()
+        okno.close()
+
+        # A remembered default state is not worth a notice
+        okno = dialog.AmcrFilterDialog("akce")
+        okno.accept()
+        okno.close()
+        okno = dialog.AmcrFilterDialog("akce")
+        assert okno.lbl_notice.isHidden()
+        okno.close()
+
+        # Two non-default filters -> a notice with the count 2
+        okno = dialog.AmcrFilterDialog("akce")
+        okno._set_picker("kraj", _kody(dialog.KRAJE))
+        okno._set_picker("obdobi", _kody(dialog.OBDOBI))
+        okno.accept()
+        okno.close()
+        okno = dialog.AmcrFilterDialog("akce")
+        assert not okno.lbl_notice.isHidden()
+        assert okno.lbl_notice.text().startswith("Načteny filtry")
+        assert "aktivní filtry: 2" in okno.lbl_notice.text()
+        okno.action_reset()
+        assert okno.lbl_notice.isHidden()
+        okno.close()
+        return "skryté pro výchozí, viditelné s počtem 2, reset skryje"
+    finally:
+        dialog._REMEMBERED_STATE.clear()
+
+
 zkouska("scoped enumy", enumy)
 zkouska("UpdateCodelistsTask", uloha)
 zkouska("filtrační dialogy", dialogy)
 zkouska("filtr podle data", filtr_datumu)
+zkouska("výchozí filtry", vychozi_filtry)
+zkouska("paměť snapshotu", pamet_snapshotu)
+zkouska("paměť potvrzení", pamet_potvrzeni)
+zkouska("obnovení výchozích", obnoveni_vychozich)
+zkouska("vymazání výběru", vymazani_vyberu)
+zkouska("upozornění obnovy", upozorneni_obnovy)
+zkouska("stav přihlášení", prihlasovaci_stav)
+zkouska("odhlášení", odhlaseni)
+zkouska("váha komponent", vaha_komponent)
 
 qgs.exitQgis()