From af2f06ea8366279da94352709717a65d8ad40cdc Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Sun, 26 May 2024 18:17:52 +0200 Subject: [PATCH 1/3] change music to use string view Signed-off-by: Uilian Ries --- include/faker-cxx/Music.h | 8 ++++---- src/modules/music/Music.cpp | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/faker-cxx/Music.h b/include/faker-cxx/Music.h index eefacef9d..151b52e87 100644 --- a/include/faker-cxx/Music.h +++ b/include/faker-cxx/Music.h @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace faker { @@ -16,7 +16,7 @@ class Music * Music::artist() // "Nirvana" * @endcode */ - static std::string artist(); + static std::string_view artist(); /** * @brief Returns a random music genre. @@ -27,7 +27,7 @@ class Music * Music::genre() // "Rock" * @endcode */ - static std::string genre(); + static std::string_view genre(); /** * @brief Returns a random song name. @@ -38,6 +38,6 @@ class Music * Music::songName() // "Light My Fire" * @endcode */ - static std::string songName(); + static std::string_view songName(); }; } diff --git a/src/modules/music/Music.cpp b/src/modules/music/Music.cpp index 015bed976..4a3b13997 100644 --- a/src/modules/music/Music.cpp +++ b/src/modules/music/Music.cpp @@ -7,18 +7,18 @@ namespace faker { -std::string Music::artist() +std::string_view Music::artist() { - return Helper::arrayElement(artists); + return Helper::arrayElement(artists); } -std::string Music::genre() +std::string_view Music::genre() { - return Helper::arrayElement(musicGenres); + return Helper::arrayElement(musicGenres); } -std::string Music::songName() +std::string_view Music::songName() { - return Helper::arrayElement(songNames); + return Helper::arrayElement(songNames); } } From ca8766326222d1a0b73479c9640efce70cfb3c55 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Sun, 26 May 2024 18:24:41 +0200 Subject: [PATCH 2/3] Add artists to music data Signed-off-by: Uilian Ries --- src/modules/music/Music.cpp | 10 +- src/modules/music/MusicData.cpp | 305 ++++++++++++++++++++++++++++++++ src/modules/music/MusicData.h | 10 ++ 3 files changed, 319 insertions(+), 6 deletions(-) create mode 100644 src/modules/music/MusicData.cpp create mode 100644 src/modules/music/MusicData.h diff --git a/src/modules/music/Music.cpp b/src/modules/music/Music.cpp index 4a3b13997..fb89416e5 100644 --- a/src/modules/music/Music.cpp +++ b/src/modules/music/Music.cpp @@ -1,24 +1,22 @@ #include "faker-cxx/Music.h" -#include "data/Artists.h" -#include "data/Genres.h" -#include "data/SongNames.h" +#include "MusicData.h" #include "faker-cxx/Helper.h" namespace faker { std::string_view Music::artist() { - return Helper::arrayElement(artists); + return Helper::arrayElement(music::artists); } std::string_view Music::genre() { - return Helper::arrayElement(musicGenres); + return Helper::arrayElement(music::musicGenres); } std::string_view Music::songName() { - return Helper::arrayElement(songNames); + return Helper::arrayElement(music::songNames); } } diff --git a/src/modules/music/MusicData.cpp b/src/modules/music/MusicData.cpp new file mode 100644 index 000000000..dee8bd7af --- /dev/null +++ b/src/modules/music/MusicData.cpp @@ -0,0 +1,305 @@ +#include "MusicData.h" + +namespace faker::music +{ +const std::array artists = { + "2 Pac", + "AC/DC", + "Abba", + "Adele", + "Aerosmith", + "Al Green", + "Al Jolson", + "Alabama", + "Allman Brothers Band", + "Andrews Sisters", + "Aretha Franklin", + "Art Blakey", + "Art Tatum", + "Artie Shaw", + "B.B. King", + "Barbra Streisand", + "Barry White", + "Beach Boys", + "Beastie Boys", + "Beatles", + "Bee Gees", + "Benny Goodman", + "Bessie Smith", + "Beyoncé", + "Big Bill Broonzy", + "Big Joe Turner", + "Bill Evans", + "Bill Haley and the Comets", + "Bill Monroe", + "Billie Holiday", + "Billy Eckstine", + "Billy Joel", + "Billy Murray and the American Quartet", + "Billy Ward and The Dominoes", + "Bing Crosby", + "Blondie", + "Bo Diddley", + "Bob Dylan", + "Bob Marley and the Wailers", + "Bob Wills and the Texas Playboys", + "Bobby Darin", + "Bon Jovi", + "Brenda Lee", + "Britney Spears", + "Bruce Springsteen", + "Buck Owens", + "Buddy Holly and the Crickets", + "Byrds", + "Cab Calloway", + "Carole King", + "Carpenters", + "Carter Family", + "Celine Dion", + "Charles Brown", + "Charles Mingus", + "Charley Patton", + "Charlie Parker", + "Chicago", + "Chuck Berry", + "Clara Ward Singers", + "Clovers", + "Coldplay", + "Coleman Hawkins", + "Connie Francis", + "Conway Twitty", + "Count Basie", + "Crosby, Stills and Nash", + "Curtis Mayfield and the Impressions", + "Daryl Hall & John Oates", + "David Bowie", + "Dean Martin", + "Deep Purple", + "Dells", + "Diana Ross and the Supremes", + "Dinah Washington", + "Dionne Warwick", + "Dizzy Gillespie", + "Dolly Parton", + "Donna Summer", + "Doors", + "Dr. Dre", + "Drake", + "Drifters / Clyde McPhatter / Ben E. King", + "Duke Ellington", + "Eagles", + "Earth, Wind and Fire", + "Ed Sheeran", + "Eddy Arnold", + "Ella Fitzgerald", + "Elmore James", + "Elton John", + "Elvis Costello", + "Elvis Presley", + "Emerson, Lake and Palmer", + "Eminem", + "Enrico Caruso", + "Eric B. and Rakim", + "Eric Clapton (solo and with bands)", + "Ernest Tubb", + "Ethel Waters", + "Etta James", + "Everly Brothers", + "Fats Domino", + "Fats Waller", + "Fleetwood Mac", + "Four Tops", + "Frank Sinatra", + "Frank Zappa / Mothers Of Invention", + "Frankie Laine", + "Frankie Valli and the Four Seasons", + "Garth Brooks", + "Gene Autry", + "Genesis / Phil Collins", + "George Clinton / Parliament / Funkadelic", + "George Jones", + "Gladys Knight and the Pips", + "Glen Campbell", + "Glenn Miller", + "Grandmaster Flash and the Furious Five", + "Grateful Dead", + "Green Day", + "Guns N' Roses", + "Guy Lombardo", + "Hank Snow", + "Hank Williams", + "Harry Belafonte", + "Harry James", + "Henry Burr and the Peerless Quartet", + "Henry Mancini", + "Herb Alpert and the Tijuana Brass", + "Herbie Hancock", + "Howlin' Wolf", + "Ike & Tina Turner", + "Ink Spots", + "Iron Maiden", + "Isley Brothers", + "Jackie Wilson", + "James Brown", + "Janet Jackson", + "Janis Joplin", + "Jay-Z", + "Jelly Roll Morton", + "Jerry Lee Lewis", + "Jethro Tull", + "Jimi Hendrix", + "Jimmie Rodgers", + "Jimmy Dorsey", + "Jimmy Reed", + "Joan Baez", + "John Coltrane", + "John Denver", + "John Fogerty & Creedence Clearwater Revival", + "John Lee Hooker", + "John Lennon", + "Johnny Cash", + "Johnny Mathis", + "Joni Mitchell", + "Judy Collins", + "Judy Garland", + "Justin Timberlake", + "Kanye West", + "Kendrick Lamar", + "Kenny Rogers", + "King Crimson", + "Kingston Trio", + "Kinks", + "Kool and the Gang", + "Kraftwerk", + "LL Cool J", + "Lady Gaga", + "Leadbelly", + "Led Zeppelin", + "Lester Young", + "Lil Wayne", + "Linda Ronstadt", + "Lionel Hampton", + "Lionel Richie / Commodores", + "Little Richard", + "Little Walter", + "Lonnie Johnson", + "Loretta Lynn", + "Louis Armstrong", + "Louis Jordan", + "Luther Vandross", + "Lynyrd Skynyrd", + "Ma Rainey", + "Madonna", + "Mahalia Jackson", + "Mariah Carey", + "Martha and the Vandellas", + "Marty Robbins", + "Marvin Gaye", + "Mary J. Blige", + "Merle Haggard", + "Metallica", + "Michael Jackson / Jackson 5", + "Miles Davis", + "Mills Brothers", + "Moody Blues", + "Muddy Waters", + "N.W.A", + "Nas", + "Nat King Cole", + "Neil Diamond", + "Neil Young", + "Nina Simone", + "Nirvana", + "O'Jays", + "Ornette Coleman", + "Otis Redding", + "Outkast", + "Ozzy Osbourne / Black Sabbath", + "Patsy Cline", + "Patti Page", + "Paul McCartney and Wings", + "Paul Simon & Art Garfunkel", + "Paul Whiteman", + "Pearl Jam", + "Peggy Lee", + "Perry Como", + "Pete Seeger and the Weavers", + "Peter, Paul and Mary", + "Pink Floyd", + "Platters", + "Police / Sting", + "Prince", + "Professor Longhair", + "Public Enemy", + "Queen", + "R. Kelly", + "R.E.M.", + "Radiohead", + "Ramones", + "Ravens", + "Ray Charles", + "Ray Price", + "Reba McEntire", + "Red Hot Chili Peppers", + "Rev. James Cleveland", + "Rick Nelson", + "Rihanna", + "Robert Johnson", + "Robins / Coasters", + "Rod Stewart", + "Rolling Stones", + "Roy Acuff", + "Roy Orbison", + "Run-D.M.C.", + "Ruth Brown", + "Sam Cooke", + "Sammy Kaye", + "Santana", + "Sarah Vaughan", + "Scott Joplin", + "Shirelles", + "Sister Rosetta Tharpe", + "Sly and the Family Stone", + "Smokey Robinson and the Miracles", + "Son House", + "Sonny Boy Williamson I (John Lee Williamson)", + "Sonny Boy Williamson II (Rice Miller)", + "Sonny Rollins", + "Sonny Til and the Orioles", + "Soul Stirrers", + "Spinners", + "Stan Getz", + "Staple Singers", + "Stevie Wonder", + "T-Bone Walker", + "Talking Heads / David Byrne", + "Tammy Wynette", + "Tampa Red", + "Taylor Swift", + "Ted Lewis", + "Temptations", + "Tennessee Ernie Ford", + "The Band", + "The Clash", + "The Notorious B.I.G.", + "The Who", + "Thelonious Monk", + "Tito Puente", + "Tom Petty and the Heartbreakers", + "Tommy Dorsey", + "Tony Bennett", + "U2", + "Van Halen", + "Van Morrison", + "Velvet Underground", + "Waylon Jennings", + "Webb Pierce", + "Whitney Houston", + "Willie Nelson", + "Wilson Pickett", + "Woody Guthrie", + "Wynonie Harris", + "Yardbirds", + "Yes" +}; +} diff --git a/src/modules/music/MusicData.h b/src/modules/music/MusicData.h new file mode 100644 index 000000000..b6f04f24e --- /dev/null +++ b/src/modules/music/MusicData.h @@ -0,0 +1,10 @@ +#pragma once + +#include +#include + +namespace faker::music { +extern const std::array artists; +extern const std::array musicGenres; +extern const std::array songNames; +} From d5553e9f06c53256df6875676e3593f596d2a901 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Sun, 26 May 2024 18:32:28 +0200 Subject: [PATCH 3/3] Update Music tests to use string view Signed-off-by: Uilian Ries --- CMakeLists.txt | 1 + src/modules/music/MusicData.cpp | 994 +++++++++++++++++++++++++++++ src/modules/music/MusicData.h | 4 +- src/modules/music/data/Artists.h | 306 --------- src/modules/music/data/Genres.h | 12 - src/modules/music/data/SongNames.h | 979 ---------------------------- tests/modules/music/MusicTest.cpp | 11 +- 7 files changed, 1002 insertions(+), 1305 deletions(-) delete mode 100644 src/modules/music/data/Artists.h delete mode 100644 src/modules/music/data/Genres.h delete mode 100644 src/modules/music/data/SongNames.h diff --git a/CMakeLists.txt b/CMakeLists.txt index e85f79d9f..695f32d25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,7 @@ set(FAKER_SOURCES src/modules/movie/Movie.cpp src/modules/movie/MovieData.cpp src/modules/music/Music.cpp + src/modules/music/MusicData.cpp src/modules/number/Number.cpp src/modules/person/Person.cpp src/modules/phone/Phone.cpp diff --git a/src/modules/music/MusicData.cpp b/src/modules/music/MusicData.cpp index dee8bd7af..429671ecd 100644 --- a/src/modules/music/MusicData.cpp +++ b/src/modules/music/MusicData.cpp @@ -302,4 +302,998 @@ const std::array artists = { "Yardbirds", "Yes" }; + +const std::array musicGenres = { + "Blues", + "Classical", + "Country", + "Electronic", + "Folk", + "Funk", + "Hip Hop", + "Jazz", + "Latin", + "Metal", + "Pop", + "Rap", + "Reggae", + "Rock", + "Soul", + "Stage And Screen", + "World" +}; + +const std::array songNames = { + "(Everything I Do) I Do it For You", + "(Ghost) Riders in the Sky", + "(I've Got a Gal In) Kalamazoo", + "(I've Had) the Time of My Life", + "(It's No) Sin", + "(Just Like) Starting Over", + "(Let Me Be Your) Teddy Bear", + "(Put Another Nickel In) Music! Music! Music!", + "(Sexual) Healing", + "(They Long to Be) Close to You", + "(You Keep Me) Hangin' On", + "(You're My) Soul & Inspiration", + "(Your Love Keeps Lifting Me) Higher & Higher", + "12th Street Rag", + "1999", + "19th Nervous Breakdown", + "50 Ways to Leave Your Lover", + "9 to 5", + "96 Tears", + "A Boy Named Sue", + "A Hard Day's Night", + "A String of Pearls", + "A Thousand Miles", + "A Tree in the Meadow", + "A Whiter Shade of Pale", + "A Whole New World (Aladdin's Theme)", + "A Woman in Love", + "A-Tisket A-Tasket", + "ABC", + "Abracadabra", + "Ac-cent-tchu-ate the Positive", + "Addicted to Love", + "After You've Gone", + "Afternoon Delight", + "Again", + "Against All Odds (Take a Look At Me Now)", + "Ain't Misbehavin'", + "Ain't No Mountain High Enough", + "Ain't No Sunshine", + "Ain't That a Shame", + "Airplanes", + "All Along the Watchtower", + "All I Have to Do is Dream", + "All I Wanna Do", + "All My Lovin' (You're Never Gonna Get It)", + "All Night Long (All Night)", + "All Out of Love", + "All Shook Up", + "All You Need is Love", + "Alone", + "Alone Again (Naturally)", + "Always On My Mind", + "American Pie", + "American Woman", + "Angie", + "Another Brick in the Wall (part 2)", + "Another Day in Paradise", + "Another Night", + "Another One Bites the Dust", + "Apologize", + "April Showers", + "Aquarius/Let The Sunshine In", + "Are You Lonesome Tonight?", + "Arthur's Theme (Best That You Can Do)", + "As Time Goes By", + "At Last", + "At the Hop", + "Auf Wiederseh'n Sweetheart", + "Baby Baby", + "Baby Come Back", + "Baby Got Back", + "Baby Love", + "Baby One More Time", + "Bad", + "Bad Day", + "Bad Girls", + "Bad Moon Rising", + "Bad Romance", + "Baker Street", + "Ball of Confusion (That's What the World is Today)", + "Ballad of the Green Berets", + "Ballerina", + "Band On the Run", + "Band of Gold", + "Battle of New Orleans", + "Be Bop a Lula", + "Be My Baby", + "Be My Love", + "Beat It", + "Beautiful Day", + "Beauty & the Beast", + "Because I Love You (The Postman Song)", + "Because You Loved Me", + "Because of You", + "Before The Next Teardrop Falls", + "Begin the Beguine", + "Behind Closed Doors", + "Being With You", + "Believe", + "Ben", + "Bennie & the Jets", + "Besame Mucho", + "Best of My Love", + "Bette Davis Eyes", + "Big Bad John", + "Big Girls Don't Cry", + "Billie Jean", + "Bitter Sweet Symphony", + "Black Or White", + "Black Velvet", + "Blaze of Glory", + "Bleeding Love", + "Blue Suede Shoes", + "Blue Tango", + "Blueberry Hill", + "Blurred Lines", + "Body & Soul", + "Bohemian Rhapsody", + "Boogie Oogie Oogie", + "Boogie Woogie Bugle Boy", + "Boom Boom Pow", + "Born in the USA", + "Born to Be Wild", + "Born to Run", + "Boulevard of Broken Dreams", + "Brand New Key", + "Brandy (You're A Fine Girl)", + "Breaking Up is Hard to Do", + "Breathe", + "Bridge Over Troubled Water", + "Brother", + "Brother Louie", + "Brown Eyed Girl", + "Brown Sugar", + "Build Me Up Buttercup", + "Burn", + "Buttons & Bows", + "Bye", + "Bye Bye", + "Bye Bye Love", + "Caldonia Boogie (What Makes Your Big Head So Hard)", + "California Dreamin'", + "California Girls", + "Call Me", + "Call Me Maybe", + "Can You Feel the Love Tonight", + "Can't Buy Me Love", + "Can't Get Enough of Your Love", + "Can't Help Falling in Love", + "Candy Man", + "Car Wash", + "Careless Whisper", + "Cars", + "Cat's in the Cradle", + "Cathy's Clown", + "Celebration", + "Centerfold", + "Chain of Fools", + "Chances Are", + "Change the World", + "Chapel of Love", + "Chattanooga Choo Choo", + "Chattanoogie Shoe-Shine Boy", + "Check On It", + "Cheek to Cheek", + "Cherish", + "Cherry Pink & Apple Blossom White", + "Cold", + "Colors of the Wind", + "Come On Eileen", + "Come On-a My House", + "Come Together", + "Coming Up", + "Cracklin' Rosie", + "Crazy", + "Crazy For You", + "Crazy Little Thing Called Love", + "Crazy in Love", + "Creep", + "Crimson & Clover", + "Crocodile Rock", + "Cry", + "Cry Like a Baby", + "Crying", + "Da Doo Ron Ron (When He Walked Me Home)", + "Dance to the Music", + "Dancing Queen", + "Dancing in the Dark", + "Dancing in the Street", + "Dardanella", + "Daydream Believer", + "December 1963 (Oh What a Night)", + "Delicado", + "Dilemma", + "Disco Duck", + "Disco Lady", + "Disturbia", + "Dizzy", + "Do That to Me One More Time", + "Do Wah Diddy Diddy", + "Do Ya Think I'm Sexy?", + "Do You Love Me?", + "Don't Be Cruel", + "Don't Fence Me In", + "Don't Go Breaking My Heart", + "Don't Leave Me This Way", + "Don't Let the Stars Get in Your Eyes", + "Don't Let the Sun Go Down On Me", + "Don't Speak", + "Don't Stop 'Til You Get Enough", + "Don't Worry Be Happy", + "Don't You (Forget About Me)", + "Don't You Want Me", + "Doo Wop (That Thing)", + "Down", + "Down Hearted Blues", + "Down Under", + "Downtown", + "Dreamlover", + "Dreams", + "Drop it Like It's Hot", + "Drops of Jupiter (Tell Me)", + "Duke of Earl", + "E.T.", + "Earth Angel", + "Ebony & Ivory", + "Eight Days a Week", + "Empire State Of Mind", + "End of the Road", + "Endless Love", + "Escape (The Pina Colada Song)", + "Eve of Destruction", + "Every Breath You Take", + "Every Little Thing She Does is Magic", + "Everybody Loves Somebody", + "Everybody Wants to Rule the World", + "Everyday People", + "Eye of the Tiger", + "Faith", + "Fallin'", + "Fame", + "Family Affair", + "Fantasy", + "Fast Car", + "Feel Good Inc", + "Feel Like Making Love", + "Fire & Rain", + "Firework", + "Flashdance. What a Feeling", + "Fly Robin Fly", + "Foolish Games", + "Footloose", + "For What It's Worth (Stop", + "Fortunate Son", + "Frankenstein", + "Freak Me", + "Freebird", + "Frenesi", + "Funkytown", + "Gangsta's Paradise", + "Georgia On My Mind", + "Georgy Girl", + "Get Back", + "Get Down Tonight", + "Get Off of My Cloud", + "Ghostbusters", + "Gimme Some Lovin'", + "Girls Just Wanna Have Fun", + "Give Me Everything", + "Gives You Hell", + "Glamorous", + "Glory of Love", + "Go Your Own Way", + "God Bless America", + "God Bless the Child", + "Gold Digger", + "Gonna Make You Sweat (Everybody Dance Now)", + "Good Lovin'", + "Good Times", + "Good Vibrations", + "Goodbye Yellow Brick Road", + "Goodnight", + "Got to Give it Up", + "Grease", + "Great Balls of Fire", + "Greatest Love of All", + "Green Onions", + "Green River", + "Green Tambourine", + "Grenade", + "Groove is in the Heart", + "Groovin'", + "Gypsies", + "Hair", + "Hang On Sloopy", + "Hanging by a Moment", + "Hanky Panky", + "Happy Days Are Here Again", + "Happy Together", + "Harbour Lights", + "Hard to Say I'm Sorry", + "Harper Valley PTA", + "Have You Ever Really Loved a Woman?", + "He'll Have to Go", + "He's So Fine", + "He's a Rebel", + "Heart of Glass", + "Heart of Gold", + "Heartbreak Hotel", + "Hello", + "Hello Dolly", + "Help Me", + "Help!", + "Here Without You", + "Here in My Heart", + "Hero", + "Hey Baby", + "Hey Jude", + "Hey Paula", + "Hey There", + "Hey There Delilah", + "Hey Ya!", + "Higher Love", + "Hips don't lie", + "Hit the Road", + "Hold On", + "Hollaback Girl", + "Honey", + "Honky Tonk", + "Honky Tonk Woman", + "Horse With No Name", + "Hot Child In The City", + "Hot Stuff", + "Hotel California", + "Hound Dog", + "House of the Rising Sun", + "How Deep is Your Love?", + "How Do I Live?", + "How Do You Mend a Broken Heart", + "How High the Moon", + "How Much is That Doggy in the Window?", + "How Will I Know", + "How You Remind Me", + "How to Save a Life", + "Hungry Heart", + "Hurt So Good", + "I Believe I Can Fly", + "I Can Dream", + "I Can Help", + "I Can See Clearly Now", + "I Can't Get Next to You", + "I Can't Get Started", + "I Can't Go For That (No Can Do)", + "I Can't Help Myself (Sugar Pie", + "I Can't Stop Loving You", + "I Don't Want to Miss a Thing", + "I Fall to Pieces", + "I Feel Fine", + "I Feel For You", + "I Feel Love", + "I Get Around", + "I Got You (I Feel Good)", + "I Got You Babe", + "I Gotta Feeling", + "I Heard it Through the Grapevine", + "I Honestly Love You", + "I Just Called to Say I Love You", + "I Just Wanna Be Your Everything", + "I Kissed A Girl", + "I Love Rock 'n' Roll", + "I Need You Now", + "I Only Have Eyes For You", + "I Shot the Sheriff", + "I Still Haven't Found What I'm Looking For", + "I Swear", + "I Think I Love You", + "I Walk the Line", + "I Wanna Dance With Somebody (Who Loves Me)", + "I Wanna Love You", + "I Want You Back", + "I Want to Hold Your Hand", + "I Want to Know What Love Is", + "I Went to Your Wedding", + "I Will Always Love You", + "I Will Follow Him", + "I Will Survive", + "I Write the Songs", + "I'll Be Missing You", + "I'll Be There", + "I'll Make Love to You", + "I'll Never Smile Again", + "I'll Take You There", + "I'll Walk Alone", + "I'll be seeing you", + "I'm Looking Over a Four Leaf Clover", + "I'm So Lonesome I Could Cry", + "I'm Sorry", + "I'm Walking Behind You", + "I'm Your Boogie Man", + "I'm Yours", + "I'm a Believer", + "I've Heard That Song Before", + "If (They Made Me a King)", + "If I Didn't Care", + "If You Don't Know Me By Now", + "If You Leave Me Now", + "Imagine", + "In Da Club", + "In the End", + "In the Ghetto", + "In the Mood", + "In the Summertime", + "In the Year 2525 (Exordium & Terminus)", + "Incense & Peppermints", + "Indian Reservation (The Lament Of The Cherokee Reservation Indian)", + "Instant Karma", + "Iris", + "Ironic", + "Irreplaceable", + "It Had to Be You", + "It's All in the Game", + "It's My Party", + "It's Now Or Never", + "It's Still Rock 'n' Roll to Me", + "Jack & Diane", + "Jailhouse Rock", + "Jessie's Girl", + "Jive Talkin'", + "Johnny B Goode", + "Joy to the World", + "Judy in Disguise (With Glasses)", + "Jump", + "Jumpin' Jack Flash", + "Just Dance", + "Just My Imagination (Running Away With Me)", + "Just the Way You Are", + "Kansas City", + "Karma Chameleon", + "Keep On Loving You", + "Killing Me Softly With His Song", + "King of the Road", + "Kiss", + "Kiss & Say Goodbye", + "Kiss From a Rose", + "Kiss Me", + "Kiss On My List", + "Kiss You All Over", + "Knock On Wood", + "Knock Three Times", + "Kokomo", + "Kryptonite", + "Kung Fu Fighting", + "La Bamba", + "Lady", + "Lady Marmalade (Voulez-Vous Coucher Aver Moi Ce Soir?)", + "Last Train to Clarksville", + "Layla", + "Le Freak", + "Leader of the Pack", + "Lean On Me", + "Leaving", + "Let Me Call You Sweetheart", + "Let Me Love You", + "Let it Be", + "Let it Snow! Let it Snow! Let it Snow!", + "Let's Dance", + "Let's Groove", + "Let's Hear it For the Boy", + "Let's Stay Together", + "Light My Fire", + "Lights", + "Like a Prayer", + "Like a Rolling Stone", + "Like a Virgin", + "Little Darlin'", + "Little Things Mean a Lot", + "Live & Let Die", + "Livin' La Vida Loca", + "Livin' On a Prayer", + "Living For the City", + "Locked Out Of Heaven", + "Lola", + "Lonely Boy", + "Long Cool Woman in a Black Dress", + "Long Tall Sally", + "Look Away", + "Lookin' Out My Back Door", + "Lose Yourself", + "Losing My Religion", + "Louie Louie", + "Love Child", + "Love Hangover", + "Love In This Club", + "Love Letters in the Sand", + "Love Me Do", + "Love Me Tender", + "Love Shack", + "Love Train", + "Love Will Keep Us Together", + "Love is a Many Splendoured Thing", + "Love to Love You Baby", + "Love's Theme", + "Loving You", + "Low", + "Macarena", + "Mack the Knife", + "Maggie May", + "Magic", + "Magic Carpet Ride", + "Make Love to Me", + "Make it With You", + "Makin' Whoopee", + "Mama Told Me Not to Come", + "Man in the Mirror", + "Manana (Is Soon Enough For Me)", + "Maneater", + "Maniac", + "Maybellene", + "Me & Bobby McGee", + "Me & Mrs Jones", + "Memories Are Made of This", + "Mercy Mercy Me (The Ecology)", + "Mickey", + "Midnight Train to Georgia", + "Minnie the Moocher", + "Miss You", + "Miss You Much", + "Mister Sandman", + "Mmmbop", + "Mona Lisa", + "Monday Monday", + "Money For Nothing", + "Mony Mony", + "Mood Indigo", + "Moonlight Cocktail", + "Moonlight Serenade", + "More Than Words", + "More Than a Feeling", + "Morning Train (Nine to Five)", + "Mr Big Stuff", + "Mr Brightside", + "Mr Tambourine Man", + "Mrs Brown You've Got a Lovely Daughter", + "Mrs Robinson", + "Mule Train", + "Music", + "My Blue Heaven", + "My Boyfriend's Back", + "My Eyes Adored You", + "My Girl", + "My Guy", + "My Heart Will Go On", + "My Life", + "My Love", + "My Man", + "My Prayer", + "My Sharona", + "My Sweet Lord", + "Na Na Hey Hey (Kiss Him Goodbye)", + "Nature Boy", + "Near You", + "Need You Now", + "Need You Tonight", + "Never Gonna Give You Up", + "Night & Day", + "Night Fever", + "Nights in White Satin", + "No One", + "No Scrubs", + "Nobody Does it Better", + "Nothin' on You", + "Nothing Compares 2 U", + "Nothing's Gonna Stop Us Now", + "Ode To Billie Joe", + "Oh", + "Oh Happy Day", + "Oh My Papa (O Mein Papa)", + "Ol' Man River", + "Ole Buttermilk Sky", + "On Bended Knee", + "On My Own", + "On the Atchison", + "One", + "One Bad Apple", + "One More Try", + "One O'Clock Jump", + "One Sweet Day", + "One of These Nights", + "One of Us", + "Only The Lonely (Know The Way I Feel)", + "Only You (And You Alone)", + "Open Arms", + "Over There", + "Over the Rainbow", + "Paint it Black", + "Papa Don't Preach", + "Papa Was a Rolling Stone", + "Papa's Got a Brand New Bag", + "Paper Doll", + "Paper Planes", + "Paperback Writer", + "Party Rock Anthem", + "Peg o' My Heart", + "Peggy Sue", + "Pennies From Heaven", + "Penny Lane", + "People", + "People Got to Be Free", + "Personality", + "Philadelphia Freedom", + "Physical", + "Piano Man", + "Pick Up the Pieces", + "Pistol Packin' Mama", + "Play That Funky Music", + "Please Mr Postman", + "Poker Face", + "Pon De Replay", + "Pony Time", + "Pop Muzik", + "Prisoner of Love", + "Private Eyes", + "Promiscuous", + "Proud Mary", + "Purple Haze", + "Purple Rain", + "Puttin' on the Ritz", + "Que sera sera (Whatever will be will be)", + "Queen of Hearts", + "Rag Doll", + "Rag Mop", + "Rags to Riches", + "Raindrops Keep Falling On My Head", + "Rapture", + "Ray of Light", + "Reach Out (I'll Be There)", + "Red Red Wine", + "Rehab", + "Respect", + "Return to Sender", + "Reunited", + "Revolution", + "Rhapsody in Blue", + "Rhinestone Cowboy", + "Rich Girl", + "Riders On the Storm", + "Right Back Where We Started From", + "Ring My Bell", + "Ring of Fire", + "Rock Around the Clock", + "Rock With You", + "Rock Your Baby", + "Rock the Boat", + "Rock the Casbah", + "Roll Over Beethoven", + "Roll With It", + "Rolling In The Deep", + "Rosanna", + "Roses Are Red", + "Royals", + "Ruby Tuesday", + "Rudolph", + "Rum & Coca-Cola", + "Runaround Sue", + "Runaway", + "Running Scared", + "Rush Rush", + "Sailing", + "Save the Best For Last", + "Save the Last Dance For Me", + "Say It Right", + "Say My Name", + "Say Say Say", + "Say You", + "School's Out", + "Seasons in the Sun", + "Secret Love", + "Sentimental Journey", + "Sexyback", + "Sh-Boom (Life Could Be a Dream)", + "Shadow Dancing", + "Shake Down", + "Shake You Down", + "She Drives Me Crazy", + "She Loves You", + "She's a Lady", + "Shining Star", + "Shop Around", + "Shout", + "Silly Love Songs", + "Since U Been Gone", + "Sing", + "Singing The Blues", + "Single Ladies (Put A Ring On It)", + "Sir Duke", + "Sixteen Tons", + "Sledgehammer", + "Sleep Walk", + "Sleepy Lagoon", + "Slow Poke", + "Smells Like Teen Spirit", + "Smoke Gets in Your Eyes", + "Smoke On the Water", + "Smoke! Smoke! Smoke! (That Cigarette)", + "Smooth", + "So Much in Love", + "Soldier Boy", + "Some Enchanted Evening", + "Some of These Days", + "Somebody That I Used to Know", + "Somebody to Love", + "Someday", + "Somethin' Stupid", + "Something", + "Soul Man", + "Spanish Harlem", + "Spill the Wine", + "Spinning Wheel", + "Spirit in the Sky", + "St George & the Dragonette", + "St Louis Blues", + "Stagger Lee", + "Stairway to Heaven", + "Stand By Me", + "Stardust", + "Stars & Stripes Forever", + "Stay (I Missed You)", + "Stayin' Alive", + "Stop! in the Name of Love", + "Stormy Weather (Keeps Rainin' All the Time)", + "Straight Up", + "Strange Fruit", + "Stranger On the Shore", + "Strangers in the Night", + "Strawberry Fields Forever", + "Streets of Philadelphia", + "Stronger", + "Stuck On You", + "Sugar Shack", + "Sugar Sugar", + "Summer in the City", + "Summertime Blues", + "Sunday", + "Sunshine Superman", + "Sunshine of Your Love", + "Superstar", + "Superstition", + "Surfin' USA", + "Suspicious Minds", + "Swanee", + "Sweet Caroline (Good Times Never Seemed So Good)", + "Sweet Child O' Mine", + "Sweet Dreams (Are Made of This)", + "Sweet Georgia Brown", + "Sweet Home Alabama", + "Sweet Soul Music", + "Swinging On a Star", + "T For Texas (Blue Yodel No 1)", + "TSOP (The Sound of Philadelphia)", + "Take Me Home", + "Take My Breath Away", + "Take On Me", + "Take The 'A' Train", + "Take a Bow", + "Tammy", + "Tangerine", + "Tears in Heaven", + "Tears of a Clown", + "Temperature", + "Tennessee Waltz", + "Tequila", + "Tha Crossroads", + "Thank You (Falettinme be Mice Elf Again)", + "That Lucky Old Sun (Just Rolls Around Heaven All Day)", + "That Old Black Magic", + "That'll Be the Day", + "That's Amore", + "That's the Way (I Like It)", + "That's the Way Love Goes", + "The Boy is Mine", + "The Boys of Summer", + "The Christmas Song (Chestnuts Roasting On An Open Fire)", + "The End of the World", + "The First Time Ever I Saw Your Face", + "The Girl From Ipanema", + "The Glow-Worm", + "The Great Pretender", + "The Gypsy", + "The Hustle", + "The Joker", + "The Last Dance", + "The Letter", + "The Loco-Motion", + "The Long & Winding Road", + "The Love You Save", + "The Morning After", + "The Power of Love", + "The Prisoner's Song", + "The Reason", + "The Rose", + "The Sign", + "The Song From Moulin Rouge (Where Is Your Heart)", + "The Sounds of Silence", + "The Streak", + "The Sweet Escape", + "The Thing", + "The Tide is High", + "The Tracks of My Tears", + "The Twist", + "The Wanderer", + "The Way We Were", + "The Way You Look Tonight", + "The Way You Move", + "There goes my baby", + "These Boots Are Made For Walking", + "Third Man Theme", + "This Diamond Ring", + "This Guy's in Love With You", + "This Land is Your Land", + "This Love", + "This Ole House", + "This Used to Be My Playground", + "Three Coins in the Fountain", + "Three Times a Lady", + "Thrift Shop", + "Thriller", + "Ticket to Ride", + "Tie a Yellow Ribbon 'round the Old Oak Tree", + "Tiger Rag", + "Tighten Up", + "Tik-Toc", + "Till I Waltz Again With You", + "Till The End of Time", + "Time After Time", + "Time of the Season", + "To Sir", + "Tom Dooley", + "Tonight's the Night (Gonna Be Alright)", + "Too Close", + "Too Young", + "Tossing & Turning", + "Total Eclipse of the Heart", + "Touch Me", + "Toxic", + "Travellin' Band", + "Travellin' Man", + "Truly Madly Deeply", + "Turn! Turn! Turn! (To Everything There is a Season)", + "Tutti Frutti", + "Twist & Shout", + "Two Hearts", + "U Can't Touch This", + "U Got it Bad", + "Umbrella", + "Un-Break My Heart", + "Unbelievable", + "Unchained Melody", + "Uncle Albert (Admiral Halsey)", + "Under the Boardwalk", + "Under the Bridge", + "Unforgettable", + "Up Around the Bend", + "Up Up & Away", + "Up Where We Belong", + "Upside Down", + "Use Somebody", + "Vaya Con Dios (may God Be With You)", + "Venus", + "Vision of Love", + "Viva La Vida", + "Vogue", + "Volare", + "Wabash Cannonball", + "Waiting For a Girl Like You", + "Wake Me Up Before You Go Go", + "Wake Up Little Susie", + "Walk Don't Run", + "Walk Like a Man", + "Walk Like an Egyptian", + "Walk On By", + "Walk On the Wild Side", + "Walk This Way", + "Wannabe", + "Want Ads", + "Wanted", + "War", + "Waterfalls", + "Wayward Wind", + "We Are Family", + "We Are Young", + "We Are the Champions", + "We Are the World", + "We Belong Together", + "We Built This City", + "We Can Work it Out", + "We Didn't Start the Fire", + "We Found Love", + "We Got The Beat", + "We Will Rock You", + "We've Only Just Begun", + "Weak", + "Wedding Bell Blues", + "West End Blues", + "West End Girls", + "What Goes Around Comes Around", + "What a Fool Believes", + "What'd I Say", + "What's Going On?", + "What's Love Got to Do With It?", + "Whatcha Say", + "Wheel of Fortune", + "When Doves Cry", + "When You Wish Upon a Star", + "When a Man Loves a Woman", + "Where Did Our Love Go", + "Where is the Love?", + "Whip It", + "Whispering", + "White Christmas", + "White Rabbit", + "Whole Lotta Love", + "Whole Lotta Shakin' Goin' On", + "Whoomp! (There it Is)", + "Why Do Fools Fall in Love?", + "Why Don't You Believe Me?", + "Wichita Lineman", + "Wicked Game", + "Wild Thing", + "Wild Wild West", + "Will It Go Round In Circles", + "Will You Love Me Tomorrow", + "Winchester Cathedral", + "Wind Beneath My Wings", + "Wipe Out", + "Wishing Well", + "With Or Without You", + "Without Me", + "Without You", + "Woman", + "Won't Get Fooled Again", + "Wooly Bully", + "Working My Way Back to You", + "YMCA", + "Yakety Yak", + "Yeah!", + "Yellow Rose of Texas", + "Yesterday", + "You Ain't Seen Nothin' Yet", + "You Always Hurt the One You Love", + "You Are the Sunshine of My Life", + "You Belong With Me", + "You Belong to Me", + "You Can't Hurry Love", + "You Don't Bring Me Flowers", + "You Don't Have to Be a Star (To Be in My Show)", + "You Light Up My Life", + "You Make Me Feel Brand New", + "You Make Me Feel Like Dancing", + "You Really Got Me", + "You Send Me", + "You Sexy Thing", + "You Were Meant for Me", + "You make Me Wanna", + "You'll Never Know", + "You're Beautiful", + "You're So Vain", + "You're Still the One", + "You're the One That I Want", + "You've Got a Friend", + "Your Cheatin' Heart", + "Your Song" +}; } diff --git a/src/modules/music/MusicData.h b/src/modules/music/MusicData.h index b6f04f24e..a316c05e7 100644 --- a/src/modules/music/MusicData.h +++ b/src/modules/music/MusicData.h @@ -5,6 +5,6 @@ namespace faker::music { extern const std::array artists; -extern const std::array musicGenres; -extern const std::array songNames; +extern const std::array musicGenres; +extern const std::array songNames; } diff --git a/src/modules/music/data/Artists.h b/src/modules/music/data/Artists.h deleted file mode 100644 index e959c719a..000000000 --- a/src/modules/music/data/Artists.h +++ /dev/null @@ -1,306 +0,0 @@ -#pragma once - -#include -#include - -namespace faker -{ -const std::vector artists = {"Beatles", - "Elvis Presley", - "Frank Sinatra", - "Bing Crosby", - "Michael Jackson / Jackson 5", - "Louis Armstrong", - "James Brown", - "Billie Holiday", - "Johnny Cash", - "Duke Ellington", - "Bob Dylan", - "Ray Charles", - "Chuck Berry", - "Hank Williams", - "Aretha Franklin", - "Madonna", - "Stevie Wonder", - "Al Jolson", - "Glenn Miller", - "B.B. King", - "Nat King Cole", - "Rolling Stones", - "Ella Fitzgerald", - "Muddy Waters", - "Beach Boys", - "Charlie Parker", - "Benny Goodman", - "Miles Davis", - "Little Richard", - "Louis Jordan", - "John Coltrane", - "Bessie Smith", - "Bob Marley and the Wailers", - "Prince", - "Led Zeppelin", - "Mahalia Jackson", - "Tommy Dorsey", - "Mills Brothers", - "Marvin Gaye", - "Jimi Hendrix", - "Jay-Z", - "Elton John", - "Jimmie Rodgers", - "Robert Johnson", - "Kanye West", - "Sam Cooke", - "Mariah Carey", - "Bruce Springsteen", - "Queen", - "Whitney Houston", - "The Who", - "Abba", - "Pink Floyd", - "Buddy Holly and the Crickets", - "Temptations", - "Drifters / Clyde McPhatter / Ben E. King", - "Barbra Streisand", - "Tony Bennett", - "Diana Ross and the Supremes", - "Fats Domino", - "Otis Redding", - "David Bowie", - "U2", - "Smokey Robinson and the Miracles", - "Eric Clapton (solo and with bands)", - "2 Pac", - "Ink Spots", - "Count Basie", - "Howlin' Wolf", - "Johnny Mathis", - "George Jones", - "Eagles", - "Enrico Caruso", - "Run-D.M.C.", - "Public Enemy", - "Paul Whiteman", - "Dizzy Gillespie", - "Big Joe Turner", - "Willie Nelson", - "Paul Simon & Art Garfunkel", - "Bee Gees", - "John Fogerty & Creedence Clearwater Revival", - "Jerry Lee Lewis", - "Bo Diddley", - "Nirvana", - "Patsy Cline", - "Woody Guthrie", - "Everly Brothers", - "Dolly Parton", - "Eminem", - "Eddy Arnold", - "Drake", - "Garth Brooks", - "Rod Stewart", - "Scott Joplin", - "Fats Waller", - "Perry Como", - "Jelly Roll Morton", - "Carter Family", - "Thelonious Monk", - "Jimmy Dorsey", - "Merle Haggard", - "Ike & Tina Turner", - "Jackie Wilson", - "Beyoncé", - "Sarah Vaughan", - "Billy Joel", - "Doors", - "T-Bone Walker", - "Judy Garland", - "Bon Jovi", - "Harry Belafonte", - "Sly and the Family Stone", - "Neil Young", - "Conway Twitty", - "AC/DC", - "Curtis Mayfield and the Impressions", - "Four Tops", - "Frankie Valli and the Four Seasons", - "George Clinton / Parliament / Funkadelic", - "Ozzy Osbourne / Black Sabbath", - "Roy Orbison", - "Bobby Darin", - "Crosby, Stills and Nash", - "Isley Brothers", - "Kinks", - "Kingston Trio", - "Fleetwood Mac", - "Brenda Lee", - "Dinah Washington", - "Billy Murray and the American Quartet", - "Britney Spears", - "Police / Sting", - "Platters", - "Neil Diamond", - "Kenny Rogers", - "Andrews Sisters", - "Dells", - "Bill Monroe", - "Yardbirds", - "Metallica", - "Bill Haley and the Comets", - "Celine Dion", - "Rihanna", - "Radiohead", - "Charles Mingus", - "John Lee Hooker", - "Stan Getz", - "Ray Price", - "Donna Summer", - "Leadbelly", - "Buck Owens", - "Byrds", - "Wynonie Harris", - "Sonny Til and the Orioles", - "Etta James", - "Harry James", - "Clovers", - "Elmore James", - "Frank Zappa / Mothers Of Invention", - "Wilson Pickett", - "Webb Pierce", - "Ravens", - "Soul Stirrers", - "Chicago", - "Loretta Lynn", - "Lester Young", - "Janis Joplin", - "Grateful Dead", - "Coleman Hawkins", - "Paul McCartney and Wings", - "Ramones", - "Tammy Wynette", - "Dean Martin", - "Art Tatum", - "Joan Baez", - "Eric B. and Rakim", - "Santana", - "John Lennon", - "Peter, Paul and Mary", - "Kendrick Lamar", - "R. Kelly", - "Sonny Rollins", - "Yes", - "Robins / Coasters", - "Sammy Kaye", - "Ruth Brown", - "Pete Seeger and the Weavers", - "Ernest Tubb", - "Dionne Warwick", - "Billy Ward and The Dominoes", - "Peggy Lee", - "Sonny Boy Williamson II (Rice Miller)", - "Van Morrison", - "Janet Jackson", - "Earth, Wind and Fire", - "Charley Patton", - "Son House", - "LL Cool J", - "Cab Calloway", - "Al Green", - "Bob Wills and the Texas Playboys", - "Glen Campbell", - "The Clash", - "Genesis / Phil Collins", - "Joni Mitchell", - "Grandmaster Flash and the Furious Five", - "Gladys Knight and the Pips", - "Beastie Boys", - "Linda Ronstadt", - "Big Bill Broonzy", - "Martha and the Vandellas", - "Ornette Coleman", - "Guns N' Roses", - "Charles Brown", - "Mary J. Blige", - "Judy Collins", - "Staple Singers", - "Spinners", - "Little Walter", - "Lynyrd Skynyrd", - "R.E.M.", - "Taylor Swift", - "Justin Timberlake", - "Henry Mancini", - "Elvis Costello", - "Alabama", - "Lil Wayne", - "Carole King", - "Carpenters", - "Pearl Jam", - "Van Halen", - "Outkast", - "Herbie Hancock", - "Kool and the Gang", - "Coldplay", - "Lonnie Johnson", - "Tito Puente", - "N.W.A", - "Professor Longhair", - "Moody Blues", - "Lionel Richie / Commodores", - "Lionel Hampton", - "The Band", - "Sonny Boy Williamson I (John Lee Williamson)", - "Jimmy Reed", - "Connie Francis", - "Dr. Dre", - "Luther Vandross", - "Ma Rainey", - "Deep Purple", - "Barry White", - "Patti Page", - "Green Day", - "Aerosmith", - "Jethro Tull", - "Velvet Underground", - "Herb Alpert and the Tijuana Brass", - "Guy Lombardo", - "Emerson, Lake and Palmer", - "Billy Eckstine", - "Bill Evans", - "Allman Brothers Band", - "Iron Maiden", - "Tom Petty and the Heartbreakers", - "Sister Rosetta Tharpe", - "The Notorious B.I.G.", - "Shirelles", - "Art Blakey", - "Rev. James Cleveland", - "Tampa Red", - "Clara Ward Singers", - "Talking Heads / David Byrne", - "Frankie Laine", - "Rick Nelson", - "Reba McEntire", - "Henry Burr and the Peerless Quartet", - "Ted Lewis", - "King Crimson", - "Artie Shaw", - "Ethel Waters", - "Red Hot Chili Peppers", - "Waylon Jennings", - "Nina Simone", - "Lady Gaga", - "John Denver", - "Gene Autry", - "Adele", - "Hank Snow", - "Kraftwerk", - "O'Jays", - "Marty Robbins", - "Roy Acuff", - "Tennessee Ernie Ford", - "Blondie", - "Nas", - "Daryl Hall & John Oates", - "Ed Sheeran"}; -} diff --git a/src/modules/music/data/Genres.h b/src/modules/music/data/Genres.h deleted file mode 100644 index 2fb5ce0ca..000000000 --- a/src/modules/music/data/Genres.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include -#include - -namespace faker -{ -const std::vector musicGenres = { - "Rock", "Metal", "Pop", "Electronic", "Folk", "World", "Country", "Jazz", "Funk", "Soul", "Hip Hop", - "Classical", "Latin", "Reggae", "Stage And Screen", "Blues", "Rap", -}; -} diff --git a/src/modules/music/data/SongNames.h b/src/modules/music/data/SongNames.h deleted file mode 100644 index 237535ac9..000000000 --- a/src/modules/music/data/SongNames.h +++ /dev/null @@ -1,979 +0,0 @@ -#pragma once - -#include -#include - -namespace faker -{ -const std::vector songNames = {"White Christmas", - "Hey Jude", - "Every Breath You Take", - "Mack the Knife", - "Rock Around the Clock", - "I Want to Hold Your Hand", - "The Twist", - "(Everything I Do) I Do it For You", - "Bridge Over Troubled Water", - "When Doves Cry", - "Call Me", - "Bette Davis Eyes", - "I Will Always Love You", - "Over the Rainbow", - "American Pie", - "Flashdance. What a Feeling", - "The Way We Were", - "I Heard it Through the Grapevine", - "Nothing Compares 2 U", - "Endless Love", - "Yeah!", - "You Light Up My Life", - "Joy to the World", - "Heartbreak Hotel", - "Aquarius/Let The Sunshine In", - "I Will Survive", - "Respect", - "Sugar Sugar", - "Stayin' Alive", - "Maggie May", - "My Heart Will Go On", - "Eye of the Tiger", - "End of the Road", - "Another One Bites the Dust", - "Billie Jean", - "Let's Stay Together", - "Battle of New Orleans", - "Oh", - "Hound Dog", - "I Love Rock 'n' Roll", - "Smooth", - "Good Vibrations", - "Physical", - "Light My Fire", - "Low", - "Hey Ya!", - "Let it Be", - "Don't Be Cruel", - "Hotel California", - "We Belong Together", - "Le Freak", - "Raindrops Keep Falling On My Head", - "How High the Moon", - "My Girl", - "I Can't Stop Loving You", - "Killing Me Softly With His Song", - "Mona Lisa", - "In the Mood", - "She Loves You", - "The Letter", - "Mister Sandman", - "Careless Whisper", - "What's Love Got to Do With It?", - "I'm a Believer", - "Wooly Bully", - "Hot Stuff", - "Centerfold", - "Honky Tonk Woman", - "I'll Be There", - "Gangsta's Paradise", - "Yesterday", - "My Sharona", - "Tennessee Waltz", - "Reach Out (I'll Be There)", - "California Dreamin'", - "Jailhouse Rock", - "Irreplaceable", - "Dancing in the Street", - "Rolling In The Deep", - "Tie a Yellow Ribbon 'round the Old Oak Tree", - "Stand By Me", - "Sentimental Journey", - "The First Time Ever I Saw Your Face", - "Louie Louie", - "Another Brick in the Wall (part 2)", - "(Just Like) Starting Over", - "Night Fever", - "To Sir", - "You're So Vain", - "Be My Baby", - "Celebration", - "(They Long to Be) Close to You", - "Begin the Beguine", - "I Still Haven't Found What I'm Looking For", - "I Want You Back", - "Arthur's Theme (Best That You Can Do)", - "Boulevard of Broken Dreams", - "With Or Without You", - "Tonight's the Night (Gonna Be Alright)", - "Are You Lonesome Tonight?", - "Upside Down", - "Dancing Queen", - "Sweet Child O' Mine", - "Where Did Our Love Go", - "Unchained Melody", - "Rudolph", - "Take My Breath Away", - "I'll Make Love to You", - "Love Will Keep Us Together", - "When a Man Loves a Woman", - "Walk Like an Egyptian", - "Crazy in Love", - "Strangers in the Night", - "You Belong to Me", - "In Da Club", - "Say You", - "We Are the World", - "Johnny B Goode", - "Shadow Dancing", - "Superstition", - "Beat It", - "Night & Day", - "Waterfalls", - "House of the Rising Sun", - "Paper Doll", - "Downtown", - "I Can't Help Myself (Sugar Pie", - "Kiss From a Rose", - "Believe", - "Ballad of the Green Berets", - "Proud Mary", - "Too Young", - "Umbrella", - "Swanee", - "Need You Tonight", - "Like a Rolling Stone", - "Lady", - "One Sweet Day", - "Lean On Me", - "Tik-Toc", - "Monday Monday", - "What'd I Say", - "How You Remind Me", - "Silly Love Songs", - "My Guy", - "Macarena", - "Goodnight", - "Just My Imagination (Running Away With Me)", - "The Sounds of Silence", - "Imagine", - "Me & Bobby McGee", - "Near You", - "What's Going On?", - "Suspicious Minds", - "Ode To Billie Joe", - "Wind Beneath My Wings", - "The Boy is Mine", - "Mr Tambourine Man", - "Faith", - "Green Onions", - "Mrs Robinson", - "How Deep is Your Love?", - "Hey There", - "Heart of Glass", - "Pennies From Heaven", - "Like a Virgin", - "Midnight Train to Georgia", - "Help!", - "Tossing & Turning", - "The Sign", - "Born to Be Wild", - "Layla", - "I Just Wanna Be Your Everything", - "War", - "96 Tears", - "I Get Around", - "Because You Loved Me", - "Summer in the City", - "Get Back", - "Secret Love", - "9 to 5", - "(Ghost) Riders in the Sky", - "The Loco-Motion", - "Play That Funky Music", - "Bohemian Rhapsody", - "Little Things Mean a Lot", - "Cry", - "All Shook Up", - "Up Where We Belong", - "Sledgehammer", - "Fire & Rain", - "Stop! in the Name of Love", - "Sweet Home Alabama", - "Another Day in Paradise", - "Bleeding Love", - "Lady Marmalade (Voulez-Vous Coucher Aver Moi Ce Soir?)", - "Whispering", - "Vogue", - "Under the Bridge", - "Sixteen Tons", - "Sugar Shack", - "Baby Love", - "What a Fool Believes", - "Lose Yourself", - "Hello Dolly", - "Brown Eyed Girl", - "Without You", - "Build Me Up Buttercup", - "We Found Love", - "Tears in Heaven", - "Family Affair", - "All I Wanna Do", - "Soul Man", - "Tequila", - "Rock With You", - "Livin' La Vida Loca", - "Best of My Love", - "Runaway", - "Alone Again (Naturally)", - "Can't Help Falling in Love", - "My Sweet Lord", - "Runaround Sue", - "Swinging On a Star", - "Gold Digger", - "Happy Together", - "Losing My Religion", - "Heart of Gold", - "Stardust", - "Will You Love Me Tomorrow", - "You Are the Sunshine of My Life", - "You Were Meant for Me", - "Take On Me", - "Hollaback Girl", - "God Bless America", - "I Swear", - "Sunshine of Your Love", - "Firework", - "Groovin'", - "Smells Like Teen Spirit", - "Big Girls Don't Cry", - "Jack & Diane", - "Addicted to Love", - "The Last Dance", - "Georgia On My Mind", - "Money For Nothing", - "Jump", - "Vaya Con Dios (may God Be With You)", - "You'll Never Know", - "That'll Be the Day", - "Girls Just Wanna Have Fun", - "Wheel of Fortune", - "When You Wish Upon a Star", - "Don't Fence Me In", - "Turn! Turn! Turn! (To Everything There is a Season)", - "Volare", - "Sweet Dreams (Are Made of This)", - "Whole Lotta Love", - "You've Got a Friend", - "Penny Lane", - "People Got to Be Free", - "Nature Boy", - "Sexyback", - "Crying", - "Single Ladies (Put A Ring On It)", - "Bad Girls", - "Too Close", - "I Got You Babe", - "We've Only Just Begun", - "Sh-Boom (Life Could Be a Dream)", - "Shining Star", - "Kansas City", - "Like a Prayer", - "Cheek to Cheek", - "Papa Was a Rolling Stone", - "Promiscuous", - "Love Shack", - "Funkytown", - "Crazy", - "Philadelphia Freedom", - "Temperature", - "Somebody That I Used to Know", - "All I Have to Do is Dream", - "Jessie's Girl", - "Rhinestone Cowboy", - "Blue Suede Shoes", - "Ebony & Ivory", - "I'll Never Smile Again", - "Keep On Loving You", - "Since U Been Gone", - "The Way You Look Tonight", - "Crazy Little Thing Called Love", - "The Great Pretender", - "Brown Sugar", - "Que sera sera (Whatever will be will be)", - "No One", - "Bad Day", - "Boom Boom Pow", - "Party Rock Anthem", - "Because of You", - "Chattanooga Choo Choo", - "A Whiter Shade of Pale", - "Love Me Tender", - "Higher Love", - "Footloose", - "Blurred Lines", - "I Just Called to Say I Love You", - "Come Together", - "It's Now Or Never", - "Under the Boardwalk", - "Don't You Want Me", - "You Can't Hurry Love", - "Fame", - "Fallin'", - "Poker Face", - "Bad Romance", - "Ruby Tuesday", - "All Night Long (All Night)", - "Baby Got Back", - "Whole Lotta Shakin' Goin' On", - "Frenesi", - "December 1963 (Oh What a Night)", - "Bad Moon Rising", - "Abracadabra", - "I Gotta Feeling", - "The Song From Moulin Rouge (Where Is Your Heart)", - "Waiting For a Girl Like You", - "Everybody Loves Somebody", - "I Can't Go For That (No Can Do)", - "Buttons & Bows", - "It's All in the Game", - "Love Train", - "Dance to the Music", - "Honey", - "Kiss", - "I'll Take You There", - "Paint it Black", - "Band of Gold", - "Just the Way You Are", - "Spirit in the Sky", - "Vision of Love", - "Hips don't lie", - "Till The End of Time", - "Duke of Earl", - "YMCA", - "Oh My Papa (O Mein Papa)", - "Pistol Packin' Mama", - "Gonna Make You Sweat (Everybody Dance Now)", - "Dilemma", - "I Need You Now", - "Wanted", - "Jumpin' Jack Flash", - "Against All Odds (Take a Look At Me Now)", - "Tom Dooley", - "Goodbye Yellow Brick Road", - "Rhapsody in Blue", - "Bennie & the Jets", - "Call Me Maybe", - "You Really Got Me", - "God Bless the Child", - "I'm Sorry", - "Bad", - "I Can't Get Next to You", - "The Power of Love", - "Dreamlover", - "Only The Lonely (Know The Way I Feel)", - "We Are Family", - "At Last", - "Brand New Key", - "I've Heard That Song Before", - "Stay (I Missed You)", - "Do Ya Think I'm Sexy?", - "Tutti Frutti", - "This Ole House", - "Please Mr Postman", - "Good Times", - "Something", - "(I've Had) the Time of My Life", - "I Don't Want to Miss a Thing", - "Down Hearted Blues", - "Rag Doll", - "Blueberry Hill", - "Ain't No Sunshine", - "Wild Thing", - "Blaze of Glory", - "Ray of Light", - "The Hustle", - "Grenade", - "Cathy's Clown", - "Minnie the Moocher", - "Iris", - "The Boys of Summer", - "The Tide is High", - "She Drives Me Crazy", - "Save the Best For Last", - "These Boots Are Made For Walking", - "I Feel Love", - "A Woman in Love", - "We Can Work it Out", - "The Reason", - "Locked Out Of Heaven", - "Do That to Me One More Time", - "That's the Way Love Goes", - "A Hard Day's Night", - "I Believe I Can Fly", - "Karma Chameleon", - "One O'Clock Jump", - "Mule Train", - "Car Wash", - "Rapture", - "Creep", - "Streets of Philadelphia", - "West End Girls", - "Leader of the Pack", - "T For Texas (Blue Yodel No 1)", - "Mama Told Me Not to Come", - "Just Dance", - "Mercy Mercy Me (The Ecology)", - "Livin' On a Prayer", - "Good Lovin'", - "50 Ways to Leave Your Lover", - "Stronger", - "I Can See Clearly Now", - "We Are the Champions", - "(I've Got a Gal In) Kalamazoo", - "No Scrubs", - "How Do You Mend a Broken Heart", - "I Got You (I Feel Good)", - "Don't Let the Stars Get in Your Eyes", - "The Girl From Ipanema", - "(Sexual) Healing", - "Tears of a Clown", - "We Will Rock You", - "Hold On", - "Bye Bye Love", - "Chapel of Love", - "White Rabbit", - "Rock the Boat", - "The Gypsy", - "Take The 'A' Train", - "Crimson & Clover", - "Crocodile Rock", - "Make Love to Me", - "Nothing's Gonna Stop Us Now", - "Say Say Say", - "The Christmas Song (Chestnuts Roasting On An Open Fire)", - "Un-Break My Heart", - "Cherish", - "I'll Be Missing You", - "Drops of Jupiter (Tell Me)", - "There goes my baby", - "You Send Me", - "If (They Made Me a King)", - "The Prisoner's Song", - "ABC", - "Do Wah Diddy Diddy", - "He's So Fine", - "A Boy Named Sue", - "Roll Over Beethoven", - "Sweet Georgia Brown", - "Earth Angel", - "Rehab", - "(You Keep Me) Hangin' On", - "This Diamond Ring", - "Be My Love", - "Rush Rush", - "You're Beautiful", - "Roll With It", - "Moonlight Serenade", - "Unbelievable", - "Peg o' My Heart", - "This Land is Your Land", - "Stranger On the Shore", - "Rum & Coca-Cola", - "Hit the Road", - "Without Me", - "Crazy For You", - "I Want to Know What Love Is", - "Bye Bye", - "Down Under", - "At the Hop", - "One Bad Apple", - "Kiss & Say Goodbye", - "For What It's Worth (Stop", - "The Long & Winding Road", - "Baby One More Time", - "Stairway to Heaven", - "How Do I Live?", - "Hello", - "Truly Madly Deeply", - "Great Balls of Fire", - "King of the Road", - "I Wanna Dance With Somebody (Who Loves Me)", - "Reunited", - "Help Me", - "Rags to Riches", - "(It's No) Sin", - "Say My Name", - "Nobody Does it Better", - "Paperback Writer", - "Don't Worry Be Happy", - "I Fall to Pieces", - "Body & Soul", - "You're Still the One", - "Stormy Weather (Keeps Rainin' All the Time)", - "Horse With No Name", - "American Woman", - "Chattanoogie Shoe-Shine Boy", - "Pick Up the Pieces", - "Everybody Wants to Rule the World", - "Blue Tango", - "Hurt So Good", - "Apologize", - "Let's Dance", - "(You're My) Soul & Inspiration", - "I Only Have Eyes For You", - "Wichita Lineman", - "Hanging by a Moment", - "Spinning Wheel", - "Look Away", - "Ironic", - "Don't Stop 'Til You Get Enough", - "Empire State Of Mind", - "Do You Love Me?", - "Jive Talkin'", - "You're the One That I Want", - "Sweet Soul Music", - "Hey There Delilah", - "A Whole New World (Aladdin's Theme)", - "Somethin' Stupid", - "Knock Three Times", - "Mickey", - "The Wanderer", - "Dancing in the Dark", - "It's Still Rock 'n' Roll to Me", - "Boogie Oogie Oogie", - "Can You Feel the Love Tonight", - "Harper Valley PTA", - "Seasons in the Sun", - "Come On-a My House", - "Viva La Vida", - "Walk On By", - "Drop it Like It's Hot", - "Private Eyes", - "Maniac", - "All My Lovin' (You're Never Gonna Get It)", - "Take a Bow", - "Ring of Fire", - "Save the Last Dance For Me", - "Make it With You", - "Don't Speak", - "I Shot the Sheriff", - "Say It Right", - "Sing", - "Twist & Shout", - "Walk This Way", - "A-Tisket A-Tasket", - "Let Me Love You", - "I Can Dream", - "Toxic", - "The Joker", - "Hero", - "In the Year 2525 (Exordium & Terminus)", - "Your Song", - "Oh Happy Day", - "Grease", - "Love In This Club", - "Angie", - "How Much is That Doggy in the Window?", - "Daydream Believer", - "Whip It", - "Boogie Woogie Bugle Boy", - "Down", - "Hanky Panky", - "Total Eclipse of the Heart", - "Cat's in the Cradle", - "Strange Fruit", - "Breathe", - "On My Own", - "Dizzy", - "Ticket to Ride", - "We Got The Beat", - "On the Atchison", - "Always On My Mind", - "Unforgettable", - "In the End", - "Music", - "Can't Buy Me Love", - "Chain of Fools", - "Won't Get Fooled Again", - "Happy Days Are Here Again", - "Third Man Theme", - "Your Cheatin' Heart", - "Thriller", - "Venus", - "Time After Time", - "That Lucky Old Sun (Just Rolls Around Heaven All Day)", - "E.T.", - "Three Coins in the Fountain", - "Touch Me", - "You Ain't Seen Nothin' Yet", - "Gives You Hell", - "Knock On Wood", - "One of These Nights", - "Again", - "Doo Wop (That Thing)", - "Whoomp! (There it Is)", - "Magic", - "I'm Walking Behind You", - "We Didn't Start the Fire", - "Lola", - "Ghostbusters", - "Winchester Cathedral", - "Greatest Love of All", - "My Love", - "Wannabe", - "Miss You", - "I Feel Fine", - "Baby Baby", - "TSOP (The Sound of Philadelphia)", - "Loving You", - "This Guy's in Love With You", - "Till I Waltz Again With You", - "Why Do Fools Fall in Love?", - "Nights in White Satin", - "That's the Way (I Like It)", - "My Prayer", - "(Put Another Nickel In) Music! Music! Music!", - "Colors of the Wind", - "Morning Train (Nine to Five)", - "I Went to Your Wedding", - "Kiss Me", - "Gypsies", - "Cracklin' Rosie", - "Maybellene", - "Born in the USA", - "Here Without You", - "Mony Mony", - "Mmmbop", - "You Always Hurt the One You Love", - "Eight Days a Week", - "What Goes Around Comes Around", - "Kung Fu Fighting", - "Fantasy", - "Sir Duke", - "Ain't Misbehavin'", - "Need You Now", - "Last Train to Clarksville", - "Yakety Yak", - "I'll be seeing you", - "Hard to Say I'm Sorry", - "It's My Party", - "Love to Love You Baby", - "Miss You Much", - "Born to Run", - "Instant Karma", - "The Rose", - "Purple Rain", - "One", - "Groove is in the Heart", - "Gimme Some Lovin'", - "Beautiful Day", - "Escape (The Pina Colada Song)", - "Use Somebody", - "Fortunate Son", - "Afternoon Delight", - "Love's Theme", - "Sailing", - "Cherry Pink & Apple Blossom White", - "Georgy Girl", - "How to Save a Life", - "I Walk the Line", - "All You Need is Love", - "U Can't Touch This", - "All Out of Love", - "Where is the Love?", - "Revolution", - "The Love You Save", - "Black Or White", - "This Used to Be My Playground", - "Living For the City", - "School's Out", - "Disturbia", - "Riders On the Storm", - "Some Enchanted Evening", - "Weak", - "Maneater", - "More Than Words", - "Time of the Season", - "Mrs Brown You've Got a Lovely Daughter", - "If You Leave Me Now", - "Can't Get Enough of Your Love", - "Na Na Hey Hey (Kiss Him Goodbye)", - "Mr Brightside", - "Black Velvet", - "I'm Yours", - "My Blue Heaven", - "It Had to Be You", - "Tha Crossroads", - "Ac-cent-tchu-ate the Positive", - "Everyday People", - "We Are Young", - "Take Me Home", - "Smoke! Smoke! Smoke! (That Cigarette)", - "In the Summertime", - "The Tracks of My Tears", - "Fly Robin Fly", - "Love is a Many Splendoured Thing", - "Another Night", - "Long Tall Sally", - "You Sexy Thing", - "The Morning After", - "Get Off of My Cloud", - "Roses Are Red", - "Thank You (Falettinme be Mice Elf Again)", - "Slow Poke", - "You Belong With Me", - "Ain't No Mountain High Enough", - "Auf Wiederseh'n Sweetheart", - "Beauty & the Beast", - "St Louis Blues", - "Peggy Sue", - "U Got it Bad", - "Sweet Caroline (Good Times Never Seemed So Good)", - "Wedding Bell Blues", - "Freebird", - "Wipe Out", - "California Girls", - "Being With You", - "Makin' Whoopee", - "Shop Around", - "Smoke On the Water", - "Hungry Heart", - "That's Amore", - "My Life", - "Brandy (You're A Fine Girl)", - "Walk Don't Run", - "Surfin' USA", - "Ball of Confusion (That's What the World is Today)", - "Sunshine Superman", - "Frankenstein", - "Kiss You All Over", - "Wishing Well", - "Piano Man", - "Ben", - "In the Ghetto", - "Hang On Sloopy", - "Singing The Blues", - "Cry Like a Baby", - "I Honestly Love You", - "Brother", - "Lookin' Out My Back Door", - "Candy Man", - "Burn", - "Stagger Lee", - "Moonlight Cocktail", - "Coming Up", - "Pop Muzik", - "As Time Goes By", - "My Eyes Adored You", - "Strawberry Fields Forever", - "Some of These Days", - "I Think I Love You", - "Judy in Disguise (With Glasses)", - "All Along the Watchtower", - "A Thousand Miles", - "Fast Car", - "Red Red Wine", - "Live & Let Die", - "Come On Eileen", - "Right Back Where We Started From", - "Brother Louie", - "Ol' Man River", - "Band On the Run", - "Rich Girl", - "Green River", - "Got to Give it Up", - "Behind Closed Doors", - "Don't Go Breaking My Heart", - "I'm Looking Over a Four Leaf Clover", - "Mr Big Stuff", - "Tiger Rag", - "Kryptonite", - "Hey Paula", - "Go Your Own Way", - "Big Bad John", - "Wake Me Up Before You Go Go", - "Tangerine", - "Wayward Wind", - "Disco Lady", - "Spanish Harlem", - "Wicked Game", - "Rosanna", - "Papa Don't Preach", - "Somebody to Love", - "Kokomo", - "Manana (Is Soon Enough For Me)", - "Puttin' on the Ritz", - "One More Try", - "I'll Walk Alone", - "Shout", - "Woman", - "Ballerina", - "We Built This City", - "19th Nervous Breakdown", - "Working My Way Back to You", - "Superstar", - "Foolish Games", - "Get Down Tonight", - "On Bended Knee", - "Magic Carpet Ride", - "Only You (And You Alone)", - "A String of Pearls", - "A Tree in the Meadow", - "So Much in Love", - "Every Little Thing She Does is Magic", - "La Bamba", - "Tighten Up", - "Three Times a Lady", - "Airplanes", - "Don't Leave Me This Way", - "Rock the Casbah", - "Feel Good Inc", - "Love Me Do", - "Kiss On My List", - "Give Me Everything", - "Have You Ever Really Loved a Woman?", - "Love Letters in the Sand", - "Ring My Bell", - "Love Child", - "I Feel For You", - "Bye", - "(Let Me Be Your) Teddy Bear", - "Soldier Boy", - "Papa's Got a Brand New Bag", - "Love Hangover", - "Spill the Wine", - "Royals", - "April Showers", - "Don't You (Forget About Me)", - "Travellin' Man", - "The Thing", - "You Make Me Feel Brand New", - "The Glow-Worm", - "You Don't Bring Me Flowers", - "Summertime Blues", - "Straight Up", - "Sunday", - "Wake Up Little Susie", - "She's a Lady", - "Over There", - "Little Darlin'", - "Rag Mop", - "Shake Down", - "Up Around the Bend", - "Harbour Lights", - "Chances Are", - "Mood Indigo", - "Pony Time", - "After You've Gone", - "I Wanna Love You", - "Da Doo Ron Ron (When He Walked Me Home)", - "If You Don't Know Me By Now", - "Green Tambourine", - "My Man", - "If I Didn't Care", - "St George & the Dragonette", - "Why Don't You Believe Me?", - "How Will I Know", - "Disco Duck", - "Lonely Boy", - "Never Gonna Give You Up", - "Before The Next Teardrop Falls", - "Running Scared", - "Let's Hear it For the Boy", - "Sleep Walk", - "Walk On the Wild Side", - "Memories Are Made of This", - "Open Arms", - "Stuck On You", - "Personality", - "Feel Like Making Love", - "Stars & Stripes Forever", - "Besame Mucho", - "Let Me Call You Sweetheart", - "Indian Reservation (The Lament Of The Cherokee Reservation Indian)", - "Cars", - "You Make Me Feel Like Dancing", - "Whatcha Say", - "Me & Mrs Jones", - "Bitter Sweet Symphony", - "Uncle Albert (Admiral Halsey)", - "More Than a Feeling", - "My Boyfriend's Back", - "People", - "He'll Have to Go", - "I Can Help", - "The Streak", - "Dreams", - "Hair", - "Cold", - "Nothin' on You", - "The End of the World", - "Caldonia Boogie (What Makes Your Big Head So Hard)", - "I Kissed A Girl", - "Incense & Peppermints", - "12th Street Rag", - "West End Blues", - "The Way You Move", - "Smoke Gets in Your Eyes", - "Want Ads", - "Long Cool Woman in a Black Dress", - "Hey Baby", - "(Your Love Keeps Lifting Me) Higher & Higher", - "He's a Rebel", - "Alone", - "Thrift Shop", - "Don't Let the Sun Go Down On Me", - "The Sweet Escape", - "Return to Sender", - "Here in My Heart", - "Wabash Cannonball", - "Ain't That a Shame", - "Travellin' Band", - "I'm Your Boogie Man", - "I Write the Songs", - "This Love", - "Lights", - "Will It Go Round In Circles", - "Purple Haze", - "Rock Your Baby", - "Delicado", - "Tammy", - "Check On It", - "Breaking Up is Hard to Do", - "1999", - "Prisoner of Love", - "Wild Wild West", - "Walk Like a Man", - "I Will Follow Him", - "Glamorous", - "Yellow Rose of Texas", - "That Old Black Magic", - "I'm So Lonesome I Could Cry", - "Up Up & Away", - "Baby Come Back", - "Let it Snow! Let it Snow! Let it Snow!", - "Pon De Replay", - "Because I Love You (The Postman Song)", - "Sleepy Lagoon", - "Baker Street", - "Dardanella", - "You Don't Have to Be a Star (To Be in My Show)", - "Leaving", - "Glory of Love", - "Shake You Down", - "Ole Buttermilk Sky", - "I Can't Get Started", - "Freak Me", - "Hot Child In The City", - "Man in the Mirror", - "Queen of Hearts", - "Let's Groove", - "Change the World", - "You make Me Wanna", - "Someday", - "Eve of Destruction", - "One of Us", - "Honky Tonk", - "Be Bop a Lula", - "Two Hearts", - "Paper Planes"}; -} diff --git a/tests/modules/music/MusicTest.cpp b/tests/modules/music/MusicTest.cpp index 82740bc6b..c934043a6 100644 --- a/tests/modules/music/MusicTest.cpp +++ b/tests/modules/music/MusicTest.cpp @@ -1,12 +1,11 @@ #include "faker-cxx/Music.h" #include +#include #include "gtest/gtest.h" -#include "music/data/Artists.h" -#include "music/data/Genres.h" -#include "music/data/SongNames.h" +#include "music/MusicData.h" using namespace ::testing; using namespace faker; @@ -20,7 +19,7 @@ TEST_F(MusicTest, shouldGenerateArtist) { const auto generatedArtist = Music::artist(); - ASSERT_TRUE(std::ranges::any_of(artists, [generatedArtist](const std::string& artist) + ASSERT_TRUE(std::ranges::any_of(music::artists, [generatedArtist](const std::string_view& artist) { return generatedArtist == artist; })); } @@ -29,13 +28,13 @@ TEST_F(MusicTest, shouldGenerateGenre) const auto generatedGenre = Music::genre(); ASSERT_TRUE( - std::ranges::any_of(musicGenres, [generatedGenre](const std::string& genre) { return generatedGenre == genre; })); + std::ranges::any_of(music::musicGenres, [generatedGenre](const std::string_view& genre) { return generatedGenre == genre; })); } TEST_F(MusicTest, shouldGenerateSongName) { const auto generatedSongName = Music::songName(); - ASSERT_TRUE(std::ranges::any_of(songNames, [generatedSongName](const std::string& songName) + ASSERT_TRUE(std::ranges::any_of(music::songNames, [generatedSongName](const std::string_view& songName) { return generatedSongName == songName; })); }