Reorder tests and add username assertion placeholders

EliahKagan · EliahKagan · commit 6cbe65d3f25c · 2024-04-11T21:51:37.000Z
diff --git a/gix-url/tests/access/mod.rs b/gix-url/tests/access/mod.rs
@@ -30,6 +30,17 @@ mod canonicalized {
     }
 }
 
+#[test]
+fn user() -> crate::Result {
+    let mut url = gix_url::parse("https://user:password@host/path".into())?;
+
+    assert_eq!(url.user(), Some("user"));
+    assert_eq!(url.set_user(Some("new-user".into())), Some("user".into()));
+    assert_eq!(url.user(), Some("new-user"));
+
+    Ok(())
+}
+
 #[test]
 fn password() -> crate::Result {
     let mut url = gix_url::parse("https://user:password@host/path".into())?;
@@ -42,33 +53,47 @@ fn password() -> crate::Result {
 }
 
 #[test]
-fn user() -> crate::Result {
-    let mut url = gix_url::parse("https://user:password@host/path".into())?;
+fn user_argument_safe() -> crate::Result {
+    let url = gix_url::parse("ssh://-Fconfigfile@foo/bar".into())?;
 
-    assert_eq!(url.user(), Some("user"));
-    assert_eq!(url.set_user(Some("new-user".into())), Some("user".into()));
-    assert_eq!(url.user(), Some("new-user"));
+    // FIXME: Add the critical assertions for the user argument here.
+
+    assert_eq!(url.host(), Some("foo"));
+    assert_eq!(url.host_argument_safe(), Some("foo"));
+
+    assert_eq!(url.path, "/bar");
+    assert_eq!(url.path_argument_safe(), Some("/bar".into()));
 
     Ok(())
 }
 
 #[test]
 fn host_argument_safe() -> crate::Result {
     let url = gix_url::parse("ssh://-oProxyCommand=open$IFS-aCalculator/foo".into())?;
+
+    // FIXME: Add assertions for the user argument here.
+
     assert_eq!(url.host(), Some("-oProxyCommand=open$IFS-aCalculator"));
     assert_eq!(url.host_argument_safe(), None);
+
     assert_eq!(url.path, "/foo");
     assert_eq!(url.path_argument_safe(), Some("/foo".into()));
+
     Ok(())
 }
 
 #[test]
 fn path_argument_safe() -> crate::Result {
     let url = gix_url::parse("ssh://foo/-oProxyCommand=open$IFS-aCalculator".into())?;
+
+    // FIXME: Add assertions for the user argument here.
+
     assert_eq!(url.host(), Some("foo"));
     assert_eq!(url.host_argument_safe(), Some("foo"));
+
     assert_eq!(url.path, "/-oProxyCommand=open$IFS-aCalculator");
     assert_eq!(url.path_argument_safe(), None);
+
     Ok(())
 }
 
