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

Refactoring tests #141

Merged
kdeng00 merged 9 commits from refactoring_tests into v0.2 2025-06-04 20:40:41 -04:00
Conversation 0 Commits 9 Files Changed 1
+276 -519
1 changed files with 276 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.rs
+146 -389
View File
@@ -428,6 +428,88 @@ mod tests {
app.clone().oneshot(req).await app.clone().oneshot(req).await
} }
mod sequence_flow {
// Flow for queueing song
pub async fn queue_song_flow(
app: &axum::Router,
) -> Result<axum::response::Response, std::convert::Infallible> {
match super::song_queue_req(&app).await {
Ok(response) => {
let resp =
super::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[0].is_nil(), "Should not be empty");
let song_queue_id = resp.data[0];
assert_eq!(false, song_queue_id.is_nil(), "Should not be empty");
match super::queue_metadata_req(&app, &resp.data[0]).await {
Ok(response) => {
let resp = super::get_resp_data::<
crate::callers::song::response::Response,
>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let id = resp.data[0];
match super::fetch_metadata_queue_req(&app, &id).await {
Ok(response) => Ok(response),
Err(err) => Err(err),
}
}
}
}
Err(err) => Err(err),
}
}
// Flow for queueing coverart
pub async fn queue_coverart_flow(
app: &axum::Router,
song_queue_id: &uuid::Uuid,
) -> Result<axum::response::Response, std::convert::Infallible> {
match super::upload_coverart_queue_req(&app).await {
Ok(response) => {
let resp =
super::get_resp_data::<crate::callers::coverart::response::Response>(
response,
)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let coverart_id = resp.data[0];
assert_eq!(false, coverart_id.is_nil(), "Should not be empty");
match super::coverart_queue_song_queue_link_req(
&app,
&coverart_id,
&song_queue_id,
)
.await
{
Ok(response) => {
let resp = super::get_resp_data::<
crate::callers::coverart::response::link::Response,
>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let resp_coverart_id = resp.data[0].coverart_id;
let resp_song_queue_id = resp.data[0].song_queue_id;
assert_eq!(false, resp_coverart_id.is_nil(), "Should not be empty");
assert_eq!(false, resp_song_queue_id.is_nil(), "Should not be empty");
match super::get_queued_coverart(&app, &resp_coverart_id).await {
Ok(response) => Ok(response),
Err(err) => Err(err),
}
}
}
}
}
}
}
pub async fn resp_to_bytes( pub async fn resp_to_bytes(
response: axum::response::Response, response: axum::response::Response,
) -> Result<axum::body::Bytes, axum::Error> { ) -> Result<axum::body::Bytes, axum::Error> {
@@ -677,23 +759,7 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Send request // Send request
match song_queue_req(&app).await { match sequence_flow::queue_song_flow(&app).await {
Ok(response) => {
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[0].is_nil(), "Should not be empty");
match queue_metadata_req(&app, &resp.data[0]).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::song::response::Response>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let id = resp.data[0];
match fetch_metadata_queue_req(&app, &id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::metadata::response::fetch_metadata::Response, crate::callers::metadata::response::fetch_metadata::Response,
@@ -704,16 +770,6 @@ mod tests {
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", err); assert!(false, "Error: {:?}", err);
} }
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}; };
let _ = db_mgr::drop_database(&tm_pool, &db_name).await; let _ = db_mgr::drop_database(&tm_pool, &db_name).await;
@@ -945,56 +1001,13 @@ mod tests {
let song_queue_id = resp.data[0]; let song_queue_id = resp.data[0];
assert_eq!(false, song_queue_id.is_nil(), "Should not be empty"); assert_eq!(false, song_queue_id.is_nil(), "Should not be empty");
// Send request match sequence_flow::queue_coverart_flow(&app, &song_queue_id).await {
match upload_coverart_queue_req(&app).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::coverart::response::Response>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let coverart_id = resp.data[0];
assert_eq!(false, coverart_id.is_nil(), "Should not be empty");
match coverart_queue_song_queue_link_req(&app, &coverart_id, &song_queue_id)
.await
{
Ok(response) => {
let resp = get_resp_data::<
crate::callers::coverart::response::link::Response,
>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let resp_coverart_id = resp.data[0].coverart_id;
let resp_song_queue_id = resp.data[0].song_queue_id;
assert_eq!(false, resp_coverart_id.is_nil(), "Should not be empty");
assert_eq!(
false,
resp_song_queue_id.is_nil(),
"Should not be empty"
);
match get_queued_coverart(&app, &resp_coverart_id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::coverart::response::fetch_coverart_no_data::Response, crate::callers::coverart::response::fetch_coverart_no_data::Response,
>(response) >(response)
.await; .await;
assert_eq!( assert_eq!(false, resp.data.is_empty(), "Should not be empty");
false,
resp.data.is_empty(),
"Should not be empty"
);
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
} }
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", err); assert!(false, "Error: {:?}", err);
@@ -1260,23 +1273,7 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Send request // Send request
match song_queue_req(&app).await { match sequence_flow::queue_song_flow(&app).await {
Ok(response) => {
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[0].is_nil(), "Should not be empty");
match queue_metadata_req(&app, &resp.data[0]).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::song::response::Response>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let id = resp.data[0];
match fetch_metadata_queue_req(&app, &id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::metadata::response::fetch_metadata::Response, crate::callers::metadata::response::fetch_metadata::Response,
@@ -1287,7 +1284,10 @@ mod tests {
match create_song_req(&app, &song_q_id).await { match create_song_req(&app, &song_q_id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::<crate::callers::song::response::create_metadata::Response>(response).await; let resp = get_resp_data::<
crate::callers::song::response::create_metadata::Response,
>(response)
.await;
assert_eq!( assert_eq!(
false, false,
resp.data.is_empty(), resp.data.is_empty(),
@@ -1311,16 +1311,6 @@ mod tests {
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", err); assert!(false, "Error: {:?}", err);
} }
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}; };
let _ = db_mgr::drop_database(&tm_pool, &db_name).await; let _ = db_mgr::drop_database(&tm_pool, &db_name).await;
@@ -1346,36 +1336,21 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Send request // Send request
match song_queue_req(&app).await { match sequence_flow::queue_song_flow(&app).await {
Ok(response) => {
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[0].is_nil(), "Should not be empty");
let song_queue_id = resp.data[0];
assert_eq!(false, song_queue_id.is_nil(), "Should not be empty");
match queue_metadata_req(&app, &resp.data[0]).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::song::response::Response>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let id = resp.data[0];
match fetch_metadata_queue_req(&app, &id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::metadata::response::fetch_metadata::Response, crate::callers::metadata::response::fetch_metadata::Response,
>(response) >(response)
.await; .await;
assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); assert_eq!(false, resp.data.is_empty(), "Data should not be empty");
let song_q_id = resp.data[0].song_queue_id; let song_queue_id = resp.data[0].song_queue_id;
match create_song_req(&app, &song_q_id).await { match create_song_req(&app, &song_queue_id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::<crate::callers::song::response::create_metadata::Response>(response).await; let resp = get_resp_data::<
crate::callers::song::response::create_metadata::Response,
>(response)
.await;
assert_eq!( assert_eq!(
false, false,
resp.data.is_empty(), resp.data.is_empty(),
@@ -1393,81 +1368,16 @@ mod tests {
eprintln!("Song: {:?}", song); eprintln!("Song: {:?}", song);
match upload_coverart_queue_req(&app).await { match sequence_flow::queue_coverart_flow(&app, &song_queue_id).await {
Ok(response) => {
let resp = get_resp_data::<
crate::callers::coverart::response::Response,
>(
response
)
.await;
assert_eq!(
false,
resp.data.is_empty(),
"Should not be empty"
);
let coverart_id = resp.data[0];
assert_eq!(
false,
coverart_id.is_nil(),
"Should not be empty"
);
match coverart_queue_song_queue_link_req(
&app,
&coverart_id,
&song_queue_id,
)
.await
{
Ok(response) => {
let resp = get_resp_data::<
crate::callers::coverart::response::link::Response,
>(response)
.await;
assert_eq!(
false,
resp.data.is_empty(),
"Should not be empty"
);
let resp_coverart_id =
resp.data[0].coverart_id;
let resp_song_queue_id =
resp.data[0].song_queue_id;
assert_eq!(
false,
resp_coverart_id.is_nil(),
"Should not be empty"
);
assert_eq!(
false,
resp_song_queue_id.is_nil(),
"Should not be empty"
);
match get_queued_coverart(
&app,
&resp_coverart_id,
)
.await
{
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::coverart::response::fetch_coverart_no_data::Response, crate::callers::coverart::response::fetch_coverart_no_data::Response,
>(response) >(response)
.await; .await;
assert_eq!( assert_eq!(false, resp.data.is_empty(), "Should not be empty");
false, let resp_queue_coverart_id = resp.data[0].id;
resp.data.is_empty(),
"Should not be empty"
);
match create_coverart_req( match create_coverart_req(&app, &song_id, &resp_queue_coverart_id)
&app,
&song_id,
&resp_coverart_id,
)
.await .await
{ {
Ok(response) => { Ok(response) => {
@@ -1481,15 +1391,6 @@ mod tests {
"Should not be empty" "Should not be empty"
); );
} }
Err(err) => {
assert!(
false,
"Error: {:?}",
err
);
}
}
}
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", err); assert!(false, "Error: {:?}", err);
} }
@@ -1500,24 +1401,6 @@ mod tests {
} }
} }
} }
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
} }
} }
Err(err) => { Err(err) => {
@@ -1548,23 +1431,7 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Send request // Send request
match song_queue_req(&app).await { match sequence_flow::queue_song_flow(&app).await {
Ok(response) => {
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[0].is_nil(), "Should not be empty");
match queue_metadata_req(&app, &resp.data[0]).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::song::response::Response>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let id = resp.data[0];
match fetch_metadata_queue_req(&app, &id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::metadata::response::fetch_metadata::Response, crate::callers::metadata::response::fetch_metadata::Response,
@@ -1575,7 +1442,10 @@ mod tests {
match create_song_req(&app, &song_q_id).await { match create_song_req(&app, &song_q_id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::<crate::callers::song::response::create_metadata::Response>(response).await; let resp = get_resp_data::<
crate::callers::song::response::create_metadata::Response,
>(response)
.await;
assert_eq!( assert_eq!(
false, false,
resp.data.is_empty(), resp.data.is_empty(),
@@ -1595,14 +1465,18 @@ mod tests {
"song_queue_id": song_q_id "song_queue_id": song_q_id
}); });
match app.clone().oneshot( match app
.clone()
.oneshot(
axum::http::Request::builder() axum::http::Request::builder()
.method(axum::http::Method::PATCH) .method(axum::http::Method::PATCH)
.uri(crate::callers::endpoints::QUEUESONGDATAWIPE) .uri(crate::callers::endpoints::QUEUESONGDATAWIPE)
.header(axum::http::header::CONTENT_TYPE, "application/json") .header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::from(payload.to_string())) .body(axum::body::Body::from(payload.to_string()))
.unwrap() .unwrap(),
).await { )
.await
{
Ok(response) => { Ok(response) => {
let resp = get_resp_data::<crate::callers::song::response::wipe_data_from_song_queue::Response>(response).await; let resp = get_resp_data::<crate::callers::song::response::wipe_data_from_song_queue::Response>(response).await;
assert_eq!( assert_eq!(
@@ -1613,18 +1487,17 @@ mod tests {
); );
let returned_id = &resp.data[0]; let returned_id = &resp.data[0];
assert_eq!(false, returned_id.is_nil(), "Returned id should not be nil {:?}", returned_id); assert_eq!(
assert_eq!(*returned_id, song_q_id, "Returned id does not match sent id {:?} {:?}", returned_id, song_q_id); false,
} returned_id.is_nil(),
Err(err) => { "Returned id should not be nil {:?}",
assert!(false, "Error: {:?}", err); returned_id
} );
} assert_eq!(
} *returned_id, song_q_id,
Err(err) => { "Returned id does not match sent id {:?} {:?}",
assert!(false, "Error: {:?}", err); returned_id, song_q_id
} );
}
} }
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", err); assert!(false, "Error: {:?}", err);
@@ -1663,37 +1536,21 @@ mod tests {
let app = init::app(pool).await; let app = init::app(pool).await;
// Send request match sequence_flow::queue_song_flow(&app).await {
match song_queue_req(&app).await {
Ok(response) => {
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[0].is_nil(), "Should not be empty");
let song_queue_id = resp.data[0];
assert_eq!(false, song_queue_id.is_nil(), "Should not be empty");
match queue_metadata_req(&app, &resp.data[0]).await {
Ok(response) => {
let resp =
get_resp_data::<crate::callers::song::response::Response>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let id = resp.data[0];
match fetch_metadata_queue_req(&app, &id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::metadata::response::fetch_metadata::Response, crate::callers::metadata::response::fetch_metadata::Response,
>(response) >(response)
.await; .await;
assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); assert_eq!(false, resp.data.is_empty(), "Data should not be empty");
let song_q_id = resp.data[0].song_queue_id; let song_queue_id = resp.data[0].song_queue_id;
match create_song_req(&app, &song_q_id).await { match create_song_req(&app, &song_queue_id).await {
Ok(response) => { Ok(response) => {
let resp = get_resp_data::<crate::callers::song::response::create_metadata::Response>(response).await; let resp = get_resp_data::<
crate::callers::song::response::create_metadata::Response,
>(response)
.await;
assert_eq!( assert_eq!(
false, false,
resp.data.is_empty(), resp.data.is_empty(),
@@ -1711,106 +1568,35 @@ mod tests {
eprintln!("Song: {:?}", song); eprintln!("Song: {:?}", song);
match upload_coverart_queue_req(&app).await { match sequence_flow::queue_coverart_flow(&app, &song_queue_id).await {
Ok(response) => {
let resp = get_resp_data::<
crate::callers::coverart::response::Response,
>(
response
)
.await;
assert_eq!(
false,
resp.data.is_empty(),
"Should not be empty"
);
let coverart_id = resp.data[0];
assert_eq!(
false,
coverart_id.is_nil(),
"Should not be empty"
);
match coverart_queue_song_queue_link_req(
&app,
&coverart_id,
&song_queue_id,
)
.await
{
Ok(response) => {
let resp = get_resp_data::<
crate::callers::coverart::response::link::Response,
>(response)
.await;
assert_eq!(
false,
resp.data.is_empty(),
"Should not be empty"
);
let resp_coverart_id =
resp.data[0].coverart_id;
let resp_song_queue_id =
resp.data[0].song_queue_id;
assert_eq!(
false,
resp_coverart_id.is_nil(),
"Should not be empty"
);
assert_eq!(
false,
resp_song_queue_id.is_nil(),
"Should not be empty"
);
match get_queued_coverart(
&app,
&resp_coverart_id,
)
.await
{
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::coverart::response::fetch_coverart_no_data::Response, crate::callers::coverart::response::fetch_coverart_no_data::Response,
>(response) >(response)
.await; .await;
assert_eq!( assert_eq!(false, resp.data.is_empty(), "Should not be empty");
false,
resp.data.is_empty(),
"Should not be empty"
);
match create_coverart_req( let resp_coverart_queue_id = resp.data[0].id;
&app,
&song_id,
&resp_coverart_id,
)
.await
{
Ok(response) => {
let resp = get_resp_data::<
crate::callers::coverart::response::create_coverart::Response,
>(response)
.await;
assert_eq!(
false,
resp.data.is_empty(),
"Should not be empty"
);
let payload = serde_json::json!({ let payload = serde_json::json!({
"coverart_queue_id": resp_coverart_id "coverart_queue_id": resp_coverart_queue_id
}); });
match app.clone().oneshot( match app
.clone()
.oneshot(
axum::http::Request::builder() axum::http::Request::builder()
.method(axum::http::Method::PATCH) .method(axum::http::Method::PATCH)
.uri(crate::callers::endpoints::QUEUECOVERARTDATAWIPE) .uri(crate::callers::endpoints::QUEUECOVERARTDATAWIPE)
.header(axum::http::header::CONTENT_TYPE, "application/json") .header(
axum::http::header::CONTENT_TYPE,
"application/json",
)
.body(axum::body::Body::from(payload.to_string())) .body(axum::body::Body::from(payload.to_string()))
.unwrap() .unwrap(),
).await { )
.await
{
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<
crate::callers::coverart::response::wipe_data_from_coverart_queue::Response, crate::callers::coverart::response::wipe_data_from_coverart_queue::Response,
@@ -1827,35 +1613,6 @@ mod tests {
} }
} }
} }
Err(err) => {
assert!(
false,
"Error: {:?}",
err
);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", err); assert!(false, "Error: {:?}", err);
} }