improve uri text strategy

cleder · Nov 9, 2024 · 817b3bb · 817b3bb
1 parent f4d4d7c
commit 817b3bb
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/tests/hypothesis/strategies.py b/tests/hypothesis/strategies.py
@@ -30,6 +30,7 @@
 from fastkml.times import KmlDateTime
 
 ID_TEXT: Final = string.ascii_letters + string.digits + ".-_"
+
 nc_name = partial(
     st.from_regex,
     regex=re.compile(r"^[A-Za-z_][\w.-]*$"),
@@ -43,24 +44,26 @@
     alphabet=f"{string.ascii_letters}-{string.digits}",
     fullmatch=True,
 )
+
 media_types = partial(
     st.from_regex,
     regex=re.compile(r"^[a-zA-Z0-9-]+/[a-zA-Z0-9-]+$"),
     alphabet=f"{string.ascii_letters}/-{string.digits}",
     fullmatch=True,
 )
+
 xml_text = partial(
     st.text,
     alphabet=st.characters(min_codepoint=1, blacklist_categories=("Cc", "Cs")),
 )
+
 uri_text = partial(
     st.from_regex,
-    regex=re.compile(r"^[a-zA-Z][a-zA-Z0-9+\-.]*://.+$"),
-    alphabet=f"{string.ascii_letters}{string.digits}+-.:/",
+    regex=re.compile(r"^[a-zA-Z][a-zA-Z0-9+.-]*://([^/?#]*)([^#]*)(#.*)?$"),
+    alphabet=f"{string.ascii_letters}{string.digits}+-._~:/?#[]@!$&'()*+,;=%",
     fullmatch=True,
 )
 
-
 kml_datetimes = partial(
     st.builds,
     KmlDateTime,