From f7eacb6a65b75adeff064d190f4f9bd0df27c6c4 Mon Sep 17 00:00:00 2001
From: Sergio Benitez <sb@sergio.bz>
Date: Thu, 10 Sep 2020 02:15:29 -0700
Subject: [PATCH] Tidy 'form_value_from_encoded_str' test.

---
 .../form_value_from_encoded_str-issue-1425.rs | 58 ++++++++-----------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/core/lib/tests/form_value_from_encoded_str-issue-1425.rs b/core/lib/tests/form_value_from_encoded_str-issue-1425.rs
index d1fae2de..bb6e29a5 100644
--- a/core/lib/tests/form_value_from_encoded_str-issue-1425.rs
+++ b/core/lib/tests/form_value_from_encoded_str-issue-1425.rs
@@ -1,38 +1,28 @@
-extern crate rocket;
-
-use rocket::http::RawStr;
-use rocket::request::FromFormValue;
-use std::fmt::Debug;
 use std::net::{Ipv4Addr, Ipv6Addr, SocketAddrV4, SocketAddrV6};
 
-mod tests {
-    use super::*;
+use rocket::request::FromFormValue;
 
-    fn check_from_form_value_encoded<'a, T>(encoded_str: &'static str, expected: T)
-        where <T as FromFormValue<'a>>::Error: Debug,
-              T: FromFormValue<'a> + PartialEq + Debug,
-    {
-        let value = T::from_form_value(RawStr::from_str(encoded_str));
-
-        assert!(value.is_ok());
-        assert_eq!(value.unwrap(), expected);
-    }
-
-    #[test]
-    fn test_from_form_value_encoded() {
-        check_from_form_value_encoded(
-            "127.0.0.1%3A80",
-            SocketAddrV4::new(Ipv4Addr::new(127, 0, 0, 1), 80),
-        );
-
-        check_from_form_value_encoded(
-            "2001%3A0db8%3A85a3%3A0000%3A0000%3A8a2e%3A0370%3A7334",
-            Ipv6Addr::new(0x2001, 0x0db8, 0x85a3, 0, 0, 0x8a2e, 0x0370, 0x7334),
-        );
-
-        check_from_form_value_encoded(
-            "%5B2001%3Adb8%3A%3A1%5D%3A8080",
-            SocketAddrV6::new(Ipv6Addr::new(0x2001, 0xdb8, 0, 0, 0, 0, 0, 1), 8080, 0, 0),
-        );
-    }
+macro_rules! assert_from_form_value_eq {
+    ($string:literal as $T:ty, $expected:expr) => (
+        let value: $T = FromFormValue::from_form_value($string.into()).unwrap();
+        assert_eq!(value, $expected);
+    )
+}
+
+#[test]
+fn test_from_form_value_encoded() {
+    assert_from_form_value_eq!(
+        "127.0.0.1%3A80" as SocketAddrV4,
+        SocketAddrV4::new(Ipv4Addr::new(127, 0, 0, 1), 80)
+    );
+
+    assert_from_form_value_eq!(
+        "2001%3A0db8%3A85a3%3A0000%3A0000%3A8a2e%3A0370%3A7334" as Ipv6Addr,
+        Ipv6Addr::new(0x2001, 0x0db8, 0x85a3, 0, 0, 0x8a2e, 0x0370, 0x7334)
+    );
+
+    assert_from_form_value_eq!(
+        "%5B2001%3Adb8%3A%3A1%5D%3A8080" as SocketAddrV6,
+        SocketAddrV6::new(Ipv6Addr::new(0x2001, 0xdb8, 0, 0, 0, 0, 0, 1), 8080, 0, 0)
+    );
 }