phoenix/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

More refactoring

Browse Source
This commit is contained in:
kdeng00
2025-04-26 16:50:31 -04:00
parent 773b0780f6
commit 70da022a92
1 changed files with 7 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.rs
+7 -64
View File
@@ -224,16 +224,13 @@ mod tests {
} }
pub async fn get_resp_data<Data>(response: axum::response::Response) -> Data pub async fn get_resp_data<Data>(response: axum::response::Response) -> Data
where where
Data: for<'a>serde::Deserialize<'a> Data: for<'a>serde::Deserialize<'a>
{ {
let body = axum::body::to_bytes(response.into_body(), usize::MAX) let body = axum::body::to_bytes(response.into_body(), usize::MAX)
.await .await
.unwrap(); .unwrap();
let resp: Data = serde_json::from_slice(&body).unwrap()
serde_json::from_slice(&body).unwrap();
resp
} }
#[tokio::test] #[tokio::test]
@@ -258,14 +255,6 @@ mod tests {
// Send request // Send request
match song_queue_req(&app).await { match song_queue_req(&app).await {
Ok(response) => { Ok(response) => {
/*
let body = axum::body::to_bytes(response.into_body(), usize::MAX)
.await
.unwrap();
println!("Body: {:?}", body);
let resp: crate::callers::song::response::Response =
serde_json::from_slice(&body).unwrap();
*/
let resp = get_resp_data::<crate::callers::song::response::Response>(response).await; let resp = get_resp_data::<crate::callers::song::response::Response>(response).await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); assert_eq!(false, resp.data.is_empty(), "Should not be empty");
assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); assert_eq!(false, resp.data[0].is_nil(), "Should not be empty");
@@ -297,29 +286,10 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Create multipart form
let mut form = MultipartForm::default();
let _ = form.add_file("flac", "tests/Machine_gun/track01.flac");
// Create request
let content_type = form.content_type();
let body = MultipartBody::from(form);
let req = axum::http::Request::builder()
.method(axum::http::Method::POST)
.uri(crate::callers::endpoints::QUEUESONG)
.header(axum::http::header::CONTENT_TYPE, content_type)
.body(axum::body::Body::from_stream(body))
.unwrap();
// Send request // Send request
match app.clone().oneshot(req).await { match song_queue_req(&app).await {
Ok(response) => { Ok(response) => {
let body = axum::body::to_bytes(response.into_body(), usize::MAX) let resp = get_resp_data::<crate::callers::song::response::Response>(response).await;
.await
.unwrap();
println!("Body: {:?}", body);
let resp: crate::callers::song::response::Response =
serde_json::from_slice(&body).unwrap();
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); assert_eq!(false, resp.data.is_empty(), "Should not be empty");
assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); assert_eq!(false, resp.data[0].is_nil(), "Should not be empty");
@@ -332,11 +302,7 @@ mod tests {
match app.clone().oneshot(fetch_req).await { match app.clone().oneshot(fetch_req).await {
Ok(response) => { Ok(response) => {
let body = axum::body::to_bytes(response.into_body(), usize::MAX) let resp = get_resp_data::<crate::callers::song::response::fetch_queue_song::Response>(response).await;
.await
.unwrap();
let resp: crate::callers::song::response::fetch_queue_song::Response =
serde_json::from_slice(&body).unwrap();
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); assert_eq!(false, resp.data.is_empty(), "Should not be empty");
} }
Err(err) => { Err(err) => {
@@ -371,29 +337,10 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Create multipart form
let mut form = MultipartForm::default();
let _ = form.add_file("flac", "tests/Machine_gun/track01.flac");
// Create request
let content_type = form.content_type();
let body = MultipartBody::from(form);
let req = axum::http::Request::builder()
.method(axum::http::Method::POST)
.uri(crate::callers::endpoints::QUEUESONG)
.header(axum::http::header::CONTENT_TYPE, content_type)
.body(axum::body::Body::from_stream(body))
.unwrap();
// Send request // Send request
match app.clone().oneshot(req).await { match song_queue_req(&app).await {
Ok(response) => { Ok(response) => {
let body = axum::body::to_bytes(response.into_body(), usize::MAX) let resp = get_resp_data::<crate::callers::song::response::Response>(response).await;
.await
.unwrap();
println!("Body: {:?}", body);
let resp: crate::callers::song::response::Response =
serde_json::from_slice(&body).unwrap();
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); assert_eq!(false, resp.data.is_empty(), "Should not be empty");
assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); assert_eq!(false, resp.data[0].is_nil(), "Should not be empty");
let new_payload: serde_json::Value = serde_json::json!( let new_payload: serde_json::Value = serde_json::json!(
@@ -425,11 +372,7 @@ mod tests {
.await .await
{ {
Ok(response) => { Ok(response) => {
let body = axum::body::to_bytes(response.into_body(), usize::MAX) let resp = get_resp_data::<crate::callers::song::response::Response>(response).await;
.await
.unwrap();
let resp: crate::callers::song::response::Response =
serde_json::from_slice(&body).unwrap();
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); assert_eq!(false, resp.data.is_empty(), "Should not be empty");
} }
Err(err) => { Err(err) => {