Refactoring tests #141

Merged
kdeng00 merged 9 commits from refactoring_tests into v0.2 2025-06-04 20:40:41 -04:00
+276 -519
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,39 +759,13 @@ 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) => { Ok(response) => {
let resp = let resp = get_resp_data::<
get_resp_data::<crate::callers::song::response::Response>(response).await; crate::callers::metadata::response::fetch_metadata::Response,
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); >(response)
assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); .await;
assert_eq!(false, resp.data.is_empty(), "Data 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) => {
let resp = get_resp_data::<
crate::callers::metadata::response::fetch_metadata::Response,
>(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Data 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);
@@ -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) => { Ok(response) => {
let resp = let resp = get_resp_data::<
get_resp_data::<crate::callers::coverart::response::Response>(response) crate::callers::coverart::response::fetch_coverart_no_data::Response,
.await; >(response)
.await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); 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) => {
let resp = get_resp_data::<
crate::callers::coverart::response::fetch_coverart_no_data::Response,
>(response)
.await;
assert_eq!(
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,58 +1273,35 @@ 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) => { Ok(response) => {
let resp = let resp = get_resp_data::<
get_resp_data::<crate::callers::song::response::Response>(response).await; crate::callers::metadata::response::fetch_metadata::Response,
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); >(response)
assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); .await;
assert_eq!(false, resp.data.is_empty(), "Data should not be empty");
let song_q_id = resp.data[0].song_queue_id;
match queue_metadata_req(&app, &resp.data[0]).await { match create_song_req(&app, &song_q_id).await {
Ok(response) => { Ok(response) => {
let resp = let resp = get_resp_data::<
get_resp_data::<crate::callers::song::response::Response>(response) crate::callers::song::response::create_metadata::Response,
.await; >(response)
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); .await;
assert_eq!(
let id = resp.data[0]; false,
resp.data.is_empty(),
match fetch_metadata_queue_req(&app, &id).await { "No songs found, Response {:?}",
Ok(response) => { resp
let resp = get_resp_data::< );
crate::callers::metadata::response::fetch_metadata::Response, let song = &resp.data[0];
>(response) let song_id = song.id;
.await; assert_eq!(
assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); false,
let song_q_id = resp.data[0].song_queue_id; song_id.is_nil(),
"Song id should not be nil {:?}",
match create_song_req(&app, &song_q_id).await { song
Ok(response) => { );
let resp = get_resp_data::<crate::callers::song::response::create_metadata::Response>(response).await;
assert_eq!(
false,
resp.data.is_empty(),
"No songs found, Response {:?}",
resp
);
let song = &resp.data[0];
let song_id = song.id;
assert_eq!(
false,
song_id.is_nil(),
"Song id should not be nil {:?}",
song
);
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
} }
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", err); assert!(false, "Error: {:?}", err);
@@ -1346,164 +1336,60 @@ 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) => { Ok(response) => {
let resp = let resp = get_resp_data::<
get_resp_data::<crate::callers::song::response::Response>(response).await; crate::callers::metadata::response::fetch_metadata::Response,
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); >(response)
assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); .await;
let song_queue_id = resp.data[0]; assert_eq!(false, resp.data.is_empty(), "Data should not be empty");
assert_eq!(false, song_queue_id.is_nil(), "Should not be empty"); let song_queue_id = resp.data[0].song_queue_id;
match queue_metadata_req(&app, &resp.data[0]).await { match create_song_req(&app, &song_queue_id).await {
Ok(response) => { Ok(response) => {
let resp = let resp = get_resp_data::<
get_resp_data::<crate::callers::song::response::Response>(response) crate::callers::song::response::create_metadata::Response,
.await; >(response)
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); .await;
assert_eq!(
false,
resp.data.is_empty(),
"No songs found, Response {:?}",
resp
);
let song = &resp.data[0];
let song_id = song.id;
assert_eq!(
false,
song_id.is_nil(),
"Song id should not be nil {:?}",
song
);
let id = resp.data[0]; eprintln!("Song: {:?}", song);
match fetch_metadata_queue_req(&app, &id).await { match sequence_flow::queue_coverart_flow(&app, &song_queue_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::coverart::response::fetch_coverart_no_data::Response,
>(response) >(response)
.await; .await;
assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let song_q_id = resp.data[0].song_queue_id; let resp_queue_coverart_id = resp.data[0].id;
match create_song_req(&app, &song_q_id).await { match create_coverart_req(&app, &song_id, &resp_queue_coverart_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::coverart::response::create_coverart::Response,
>(response)
.await;
assert_eq!( assert_eq!(
false, false,
resp.data.is_empty(), resp.data.is_empty(),
"No songs found, Response {:?}", "Should not be empty"
resp
); );
let song = &resp.data[0];
let song_id = song.id;
assert_eq!(
false,
song_id.is_nil(),
"Song id should not be nil {:?}",
song
);
eprintln!("Song: {:?}", song);
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) => {
let resp = get_resp_data::<
crate::callers::coverart::response::fetch_coverart_no_data::Response,
>(response)
.await;
assert_eq!(
false,
resp.data.is_empty(),
"Should not be empty"
);
match create_coverart_req(
&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"
);
}
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);
@@ -1515,9 +1401,6 @@ mod tests {
} }
} }
} }
Err(err) => {
assert!(false, "Error: {:?}", err);
}
} }
} }
Err(err) => { Err(err) => {
@@ -1548,83 +1431,73 @@ 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) => { Ok(response) => {
let resp = let resp = get_resp_data::<
get_resp_data::<crate::callers::song::response::Response>(response).await; crate::callers::metadata::response::fetch_metadata::Response,
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); >(response)
assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); .await;
assert_eq!(false, resp.data.is_empty(), "Data should not be empty");
let song_q_id = resp.data[0].song_queue_id;
match queue_metadata_req(&app, &resp.data[0]).await { match create_song_req(&app, &song_q_id).await {
Ok(response) => { Ok(response) => {
let resp = let resp = get_resp_data::<
get_resp_data::<crate::callers::song::response::Response>(response) crate::callers::song::response::create_metadata::Response,
.await; >(response)
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); .await;
assert_eq!(
false,
resp.data.is_empty(),
"No songs found, Response {:?}",
resp
);
let song = &resp.data[0];
let song_id = song.id;
assert_eq!(
false,
song_id.is_nil(),
"Song id should not be nil {:?}",
song
);
let id = resp.data[0]; let payload = serde_json::json!({
"song_queue_id": song_q_id
});
match fetch_metadata_queue_req(&app, &id).await { match app
.clone()
.oneshot(
axum::http::Request::builder()
.method(axum::http::Method::PATCH)
.uri(crate::callers::endpoints::QUEUESONGDATAWIPE)
.header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::from(payload.to_string()))
.unwrap(),
)
.await
{
Ok(response) => { Ok(response) => {
let resp = get_resp_data::< let resp = get_resp_data::<crate::callers::song::response::wipe_data_from_song_queue::Response>(response).await;
crate::callers::metadata::response::fetch_metadata::Response, assert_eq!(
>(response) false,
.await; resp.data.is_empty(),
assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); "Failure in wiping data from song queue {:?}",
let song_q_id = resp.data[0].song_queue_id; resp
);
match create_song_req(&app, &song_q_id).await { let returned_id = &resp.data[0];
Ok(response) => { assert_eq!(
let resp = get_resp_data::<crate::callers::song::response::create_metadata::Response>(response).await; false,
assert_eq!( returned_id.is_nil(),
false, "Returned id should not be nil {:?}",
resp.data.is_empty(), returned_id
"No songs found, Response {:?}", );
resp assert_eq!(
); *returned_id, song_q_id,
let song = &resp.data[0]; "Returned id does not match sent id {:?} {:?}",
let song_id = song.id; returned_id, song_q_id
assert_eq!( );
false,
song_id.is_nil(),
"Song id should not be nil {:?}",
song
);
let payload = serde_json::json!({
"song_queue_id": song_q_id
});
match app.clone().oneshot(
axum::http::Request::builder()
.method(axum::http::Method::PATCH)
.uri(crate::callers::endpoints::QUEUESONGDATAWIPE)
.header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::from(payload.to_string()))
.unwrap()
).await {
Ok(response) => {
let resp = get_resp_data::<crate::callers::song::response::wipe_data_from_song_queue::Response>(response).await;
assert_eq!(
false,
resp.data.is_empty(),
"Failure in wiping data from song queue {:?}",
resp
);
let returned_id = &resp.data[0];
assert_eq!(false, returned_id.is_nil(), "Returned id should not be nil {:?}", returned_id);
assert_eq!(*returned_id, song_q_id, "Returned id does not match sent id {:?} {:?}", returned_id, song_q_id);
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
}
Err(err) => {
assert!(false, "Error: {:?}", err);
}
}
} }
Err(err) => { Err(err) => {
assert!(false, "Error: {:?}", err); assert!(false, "Error: {:?}", err);
@@ -1663,193 +1536,77 @@ 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) => { Ok(response) => {
let resp = let resp = get_resp_data::<
get_resp_data::<crate::callers::song::response::Response>(response).await; crate::callers::metadata::response::fetch_metadata::Response,
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); >(response)
assert_eq!(false, resp.data[0].is_nil(), "Should not be empty"); .await;
let song_queue_id = resp.data[0]; assert_eq!(false, resp.data.is_empty(), "Data should not be empty");
assert_eq!(false, song_queue_id.is_nil(), "Should not be empty"); let song_queue_id = resp.data[0].song_queue_id;
match queue_metadata_req(&app, &resp.data[0]).await { match create_song_req(&app, &song_queue_id).await {
Ok(response) => { Ok(response) => {
let resp = let resp = get_resp_data::<
get_resp_data::<crate::callers::song::response::Response>(response) crate::callers::song::response::create_metadata::Response,
.await; >(response)
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); .await;
assert_eq!(
false,
resp.data.is_empty(),
"No songs found, Response {:?}",
resp
);
let song = &resp.data[0];
let song_id = song.id;
assert_eq!(
false,
song_id.is_nil(),
"Song id should not be nil {:?}",
song
);
let id = resp.data[0]; eprintln!("Song: {:?}", song);
match fetch_metadata_queue_req(&app, &id).await { match sequence_flow::queue_coverart_flow(&app, &song_queue_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::coverart::response::fetch_coverart_no_data::Response,
>(response) >(response)
.await; .await;
assert_eq!(false, resp.data.is_empty(), "Data should not be empty"); assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let song_q_id = resp.data[0].song_queue_id;
match create_song_req(&app, &song_q_id).await { let resp_coverart_queue_id = resp.data[0].id;
let payload = serde_json::json!({
"coverart_queue_id": resp_coverart_queue_id
});
match app
.clone()
.oneshot(
axum::http::Request::builder()
.method(axum::http::Method::PATCH)
.uri(crate::callers::endpoints::QUEUECOVERARTDATAWIPE)
.header(
axum::http::header::CONTENT_TYPE,
"application/json",
)
.body(axum::body::Body::from(payload.to_string()))
.unwrap(),
)
.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::coverart::response::wipe_data_from_coverart_queue::Response,
>(response)
.await;
assert_eq!( assert_eq!(
false, false,
resp.data.is_empty(), resp.data.is_empty(),
"No songs found, Response {:?}", "Should not be empty"
resp
); );
let song = &resp.data[0];
let song_id = song.id;
assert_eq!(
false,
song_id.is_nil(),
"Song id should not be nil {:?}",
song
);
eprintln!("Song: {:?}", song);
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) => {
let resp = get_resp_data::<
crate::callers::coverart::response::fetch_coverart_no_data::Response,
>(response)
.await;
assert_eq!(
false,
resp.data.is_empty(),
"Should not be empty"
);
match create_coverart_req(
&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!({
"coverart_queue_id": resp_coverart_id
});
match app.clone().oneshot(
axum::http::Request::builder()
.method(axum::http::Method::PATCH)
.uri(crate::callers::endpoints::QUEUECOVERARTDATAWIPE)
.header(axum::http::header::CONTENT_TYPE, "application/json")
.body(axum::body::Body::from(payload.to_string()))
.unwrap()
).await {
Ok(response) => {
let resp = get_resp_data::<
crate::callers::coverart::response::wipe_data_from_coverart_queue::Response,
>(response)
.await;
assert_eq!(
false,
resp.data.is_empty(),
"Should not be empty"
);
}
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);