diff --git a/src/main.rs b/src/main.rs index 90645e5..ea6b0e0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -247,7 +247,7 @@ mod tests { ) -> Result { // Create multipart form let mut form = MultipartForm::default(); - let _ = form.add_file("flac", "tests/Machine_gun/track01.flac"); + let _ = form.add_file("flac", "tests/IAmWe/track01.flac"); // Create request let content_type = form.content_type(); @@ -331,7 +331,7 @@ mod tests { app: &axum::Router, ) -> Result { let mut form = MultipartForm::default(); - let _ = form.add_file("jpg", "tests/Machine_gun/160809_machinegun.jpg"); + let _ = form.add_file("jpg", "tests/IAmWe/Coverart.jpg"); // Create request let content_type = form.content_type(); @@ -407,22 +407,7 @@ mod tests { song_queue_id: &uuid::Uuid, user_id: &uuid::Uuid, ) -> Result { - let payload = serde_json::json!({ - "title": "Power of Soul", - "artist": "Jimmi Hendrix", - "album_artist": "Jimmi Hendrix", - "album": "Machine Gun", - "genre": "Psychadelic Rock", - "date": "2016-01-01", - "track": 1, - "disc": 1, - "track_count": 11, - "disc_count": 1, - "duration": 330, - "audio_type": "flac", - "user_id": user_id, - "song_queue_id": song_queue_id - }); + let payload = payload_data::create_song(song_queue_id, user_id).await; let req = axum::http::Request::builder() .method(axum::http::Method::POST) @@ -653,17 +638,39 @@ mod tests { serde_json::json!( { "song_queue_id": song_queue_id, - "album" : "Machine Gun: The FillMore East First Show", - "album_artist" : "Jimi Hendrix", - "artist" : "Jimi Hendrix", + "album" : "I", + "album_artist" : "Kuoth", + "artist" : "Kuoth", "disc" : 1, "disc_count" : 1, - "duration" : 330, - "genre" : "Psychadelic Rock", - "title" : "Power of Soul", + "duration" : 139, + "genre" : "Alternative Hip-Hop", + "title" : "Hypocrite Like The Rest", "track" : 1, - "track_count" : 11, - "year" : 2016 + "track_count" : 9, + "year" : 2020 + }) + } + + pub async fn create_song( + song_queue_id: &uuid::Uuid, + user_id: &uuid::Uuid, + ) -> serde_json::Value { + serde_json::json!({ + "title" : "Hypocrite Like The Rest", + "artist" : "Kuoth", + "album_artist": "Kuoth", + "album": "I", + "genre" : "Alternative Hip-Hop", + "date": "2020-01-01", + "track": 1, + "disc": 1, + "track_count": 9, + "disc_count": 1, + "duration": 139, + "audio_type": "flac", + "user_id": user_id, + "song_queue_id": song_queue_id }) } } diff --git a/tests/ADD_FILES_HERE b/tests/ADD_FILES_HERE deleted file mode 100644 index e69de29..0000000 diff --git a/tests/IAmWe/Coverart.jpg b/tests/IAmWe/Coverart.jpg new file mode 100644 index 0000000..3c631f8 Binary files /dev/null and b/tests/IAmWe/Coverart.jpg differ diff --git a/tests/IAmWe/album.json b/tests/IAmWe/album.json new file mode 100644 index 0000000..0e97edf --- /dev/null +++ b/tests/IAmWe/album.json @@ -0,0 +1,73 @@ +{ + "album": "I Am We", + "album_artist": "Kuoth", + "disc_count": 1, + "genre": "Alternative Hip-Hop", + "year": 2020, + "track_count": 9, + "tracks": [ + { + "artist": "Kuoth", + "disc": 1, + "title": "Hypocrite Like the Rest", + "duration": 139, + "track": 1 + }, + { + "artist": "Kuoth", + "disc": 1, + "title": "It's Too Late", + "duration": 116, + "track": 2 + }, + { + "artist": "Kuoth", + "disc": 1, + "title": "Hell Might be Nice", + "duration": 229, + "track": 3 + }, + { + "artist": "Kuoth", + "disc": 1, + "title": "Dark Side of Progress", + "duration": 187, + "track": 4 + }, + { + "artist": "Kuoth", + "disc": 1, + "title": "Distractions", + "duration": 141, + "track": 5 + }, + { + "artist": "Kuoth", + "disc": 1, + "title": "But You Won't Listen", + "duration": 184, + "track": 6 + }, + { + "artist": "Kuoth", + "disc": 1, + "title": "Guidance", + "duration": 121, + "track": 7 + }, + { + "artist": "Kuoth", + "disc": 1, + "title": "M", + "duration": 98, + "track": 8 + }, + { + "artist": "Kuoth", + "disc": 1, + "title": "Social Acceptance", + "duration": 169, + "track": 9 + } + ] +} diff --git a/tests/IAmWe/track01.flac b/tests/IAmWe/track01.flac new file mode 100644 index 0000000..25fd5c6 Binary files /dev/null and b/tests/IAmWe/track01.flac differ diff --git a/tests/IAmWe/track02.flac b/tests/IAmWe/track02.flac new file mode 100644 index 0000000..ed76a49 Binary files /dev/null and b/tests/IAmWe/track02.flac differ diff --git a/tests/Machine_gun/track01.flac b/tests/IAmWe/track03.flac similarity index 74% rename from tests/Machine_gun/track01.flac rename to tests/IAmWe/track03.flac index f3581d0..bfd2933 100644 Binary files a/tests/Machine_gun/track01.flac and b/tests/IAmWe/track03.flac differ diff --git a/tests/IAmWe/track04.flac b/tests/IAmWe/track04.flac new file mode 100644 index 0000000..0c43e72 Binary files /dev/null and b/tests/IAmWe/track04.flac differ diff --git a/tests/IAmWe/track05.flac b/tests/IAmWe/track05.flac new file mode 100644 index 0000000..c83b3e0 Binary files /dev/null and b/tests/IAmWe/track05.flac differ diff --git a/tests/IAmWe/track06.flac b/tests/IAmWe/track06.flac new file mode 100644 index 0000000..0c823d6 Binary files /dev/null and b/tests/IAmWe/track06.flac differ diff --git a/tests/IAmWe/track07.flac b/tests/IAmWe/track07.flac new file mode 100644 index 0000000..4a8248f Binary files /dev/null and b/tests/IAmWe/track07.flac differ diff --git a/tests/IAmWe/track08.flac b/tests/IAmWe/track08.flac new file mode 100644 index 0000000..2a33868 Binary files /dev/null and b/tests/IAmWe/track08.flac differ diff --git a/tests/IAmWe/track09.flac b/tests/IAmWe/track09.flac new file mode 100644 index 0000000..996f3f9 Binary files /dev/null and b/tests/IAmWe/track09.flac differ diff --git a/tests/Machine_gun/160809_machinegun.jpg b/tests/Machine_gun/160809_machinegun.jpg deleted file mode 100644 index 1c2f59f..0000000 Binary files a/tests/Machine_gun/160809_machinegun.jpg and /dev/null differ