Test cleanup

src/main.rs

@@ -133,6 +133,30 @@ mod tests {
         }
     }
 
+    fn get_test_register_request() -> icarus_auth::callers::register::request::Request {
+        icarus_auth::callers::register::request::Request {
+            username: String::from("somethingsss"),
+            password: String::from("Raindown!"),
+            email: String::from("dev@null.com"),
+            phone: String::from("1234567890"),
+            firstname: String::from("Bob"),
+            lastname: String::from("Smith"),
+        }
+    }
+
+    fn get_test_register_payload(
+        usr: &icarus_auth::callers::register::request::Request,
+    ) -> serde_json::Value {
+        json!({
+            "username": &usr.username,
+            "password": &usr.password,
+            "email": &usr.email,
+            "phone": &usr.phone,
+            "firstname": &usr.firstname,
+            "lastname": &usr.lastname,
+        })
+    }
+
     #[tokio::test]
     async fn test_hello_world() {
         let app = init::app().await;
@@ -176,23 +200,8 @@ mod tests {
 
         let app = init::routes().await.layer(axum::Extension(pool));
 
-        let usr = icarus_auth::callers::register::request::Request {
+        let usr = get_test_register_request();
-            username: String::from("somethingsss"),
+        let payload = get_test_register_payload(&usr);
-            password: String::from("Raindown!"),
-            email: String::from("dev@null.com"),
-            phone: String::from("1234567890"),
-            firstname: String::from("Bob"),
-            lastname: String::from("Smith"),
-        };
-
-        let payload = json!({
-            "username": &usr.username,
-            "password": &usr.password,
-            "email": &usr.email,
-            "phone": &usr.phone,
-            "firstname": &usr.firstname,
-            "lastname": &usr.lastname,
-        });
 
         let response = app
             .oneshot(
@@ -258,23 +267,8 @@ mod tests {
 
         let app = init::routes().await.layer(axum::Extension(pool));
 
-        let usr = icarus_auth::callers::register::request::Request {
+        let usr = get_test_register_request();
-            username: String::from("somethingsss"),
+        let payload = get_test_register_payload(&usr);
-            password: String::from("Raindown!"),
-            email: String::from("dev@null.com"),
-            phone: String::from("1234567890"),
-            firstname: String::from("Bob"),
-            lastname: String::from("Smith"),
-        };
-
-        let payload = json!({
-            "username": &usr.username,
-            "password": &usr.password,
-            "email": &usr.email,
-            "phone": &usr.phone,
-            "firstname": &usr.firstname,
-            "lastname": &usr.lastname,
-        });
 
         let response = app
             .clone()