fix genres conflict (cieslarmichal#587)

Signed-off-by: Uilian Ries <[email protected]>
00thirdeye00 · Jun 20, 2024 · e16a66d · e16a66d
1 parent 31cc4cb
commit e16a66d
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 39 deletions.
diff --git a/src/modules/book/Book.cpp b/src/modules/book/Book.cpp
@@ -15,7 +15,7 @@ std::string_view Book::title()
 
 std::string_view Book::genre()
 {
-    return Helper::arrayElement(genres);
+    return Helper::arrayElement(bookGenres);
 }
 
 std::string_view Book::author()

diff --git a/src/modules/book/BookData.cpp b/src/modules/book/BookData.cpp
@@ -109,31 +109,31 @@ const std::array<std::string_view, 3> bookFormats{
     "Kindle",
 };
 
-const std::array<std::string_view, 25> genres = {"Adventure stories",
-                                                 "Classics",
-                                                 "Crime",
-                                                 "Fairy tales, fables, and folk tales",
-                                                 "Fantasy",
-                                                 "Historical fiction",
-                                                 "Horror",
-                                                 "Humour and satire",
-                                                 "Literary fiction",
-                                                 "Mystery",
-                                                 "Poetry",
-                                                 "Plays",
-                                                 "Romance",
-                                                 "Science fiction",
-                                                 "Short stories",
-                                                 "Thrillers",
-                                                 "War",
-                                                 "Women’s fiction",
-                                                 "Young adult",
-                                                 "Non-fiction",
-                                                 "Autobiography and memoir",
-                                                 "Biography",
-                                                 "Essays",
-                                                 "Non-fiction novel",
-                                                 "Self-help"};
+const std::array<std::string_view, 25> bookGenres = {"Adventure stories",
+                                                    "Classics",
+                                                    "Crime",
+                                                    "Fairy tales, fables, and folk tales",
+                                                    "Fantasy",
+                                                    "Historical fiction",
+                                                    "Horror",
+                                                    "Humour and satire",
+                                                    "Literary fiction",
+                                                    "Mystery",
+                                                    "Poetry",
+                                                    "Plays",
+                                                    "Romance",
+                                                    "Science fiction",
+                                                    "Short stories",
+                                                    "Thrillers",
+                                                    "War",
+                                                    "Women’s fiction",
+                                                    "Young adult",
+                                                    "Non-fiction",
+                                                    "Autobiography and memoir",
+                                                    "Biography",
+                                                    "Essays",
+                                                    "Non-fiction novel",
+                                                    "Self-help"};
 
 const std::array<std::string_view, 263> publishers = {"Academic Press",
                                                       "Ace Books",

diff --git a/src/modules/book/BookData.h b/src/modules/book/BookData.h
@@ -7,7 +7,7 @@ namespace faker
 {
 extern const std::array<std::string_view, 100> authors;
 extern const std::array<std::string_view, 3> bookFormats;
-extern const std::array<std::string_view, 25> genres;
+extern const std::array<std::string_view, 25> bookGenres;
 extern const std::array<std::string_view, 263> publishers;
 extern const std::array<std::string_view, 19> bookSeries;
 extern const std::array<std::string_view, 100> titles;

diff --git a/src/modules/movie/Movie.cpp b/src/modules/movie/Movie.cpp
@@ -7,7 +7,7 @@ namespace faker
 {
 std::string_view Movie::genre()
 {
-    return Helper::arrayElement(genres);
+    return Helper::arrayElement(movieGenres);
 }
 
 std::string_view Movie::movieTitle()

diff --git a/src/modules/movie/MovieData.cpp b/src/modules/movie/MovieData.cpp
@@ -910,7 +910,7 @@ const std::array<std::string_view, 300> directors = {
     "Éric Rohmer"
 };
 
-const std::array<std::string_view, 9> genres = {
+const std::array<std::string_view, 9> movieGenres = {
     "Action",
     "Comedy",
     "Drama",
@@ -1300,4 +1300,4 @@ const std::array<std::string_view, 122> tvShows = {
     "When They See Us"
 };
 
-}
+}
diff --git a/src/modules/movie/MovieData.h b/src/modules/movie/MovieData.h
@@ -10,7 +10,7 @@ namespace faker
 extern const std::array<std::string_view, 299> actors;
 extern const std::array<std::string_view, 300> actresses;
 extern const std::array<std::string_view, 300> directors;
-extern const std::array<std::string_view, 9> genres;
+extern const std::array<std::string_view, 9> movieGenres;
 extern const std::array<std::string_view, 250> movies;
 extern const std::array<std::string_view, 122> tvShows;
 }
diff --git a/src/modules/music/Music.cpp b/src/modules/music/Music.cpp
@@ -14,7 +14,7 @@ std::string Music::artist()
 
 std::string Music::genre()
 {
-    return Helper::arrayElement<std::string>(genres);
+    return Helper::arrayElement<std::string>(musicGenres);
 }
 
 std::string Music::songName()

diff --git a/src/modules/music/data/Genres.h b/src/modules/music/data/Genres.h
@@ -5,7 +5,7 @@
 
 namespace faker
 {
-const std::vector<std::string> genres = {
+const std::vector<std::string> 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/videoGame/VideoGame.cpp b/src/modules/videoGame/VideoGame.cpp
@@ -15,7 +15,7 @@ std::string VideoGame::gameTitle()
 
 std::string VideoGame::genre()
 {
-    return Helper::arrayElement<std::string>(genres);
+    return Helper::arrayElement<std::string>(videoGameGenres);
 }
 
 std::string VideoGame::platform()

diff --git a/src/modules/videoGame/data/Genres.h b/src/modules/videoGame/data/Genres.h
@@ -5,7 +5,8 @@
 
 namespace faker
 {
-const std::vector<std::string> genres = {"Action",
+const std::vector<std::string> videoGameGenres = {
+                                         "Action",
                                          "Adventure",
                                          "Battle royale",
                                          "Dating sim",

diff --git a/tests/modules/book/BookTest.cpp b/tests/modules/book/BookTest.cpp
@@ -26,7 +26,7 @@ TEST_F(BookTest, shouldGenerateGenre)
 {
     const auto bookGenre = Book::genre();
 
-    ASSERT_TRUE(std::ranges::any_of(genres, [bookGenre](const std::string_view& genre) { return genre == bookGenre; }));
+    ASSERT_TRUE(std::ranges::any_of(bookGenres, [bookGenre](const std::string_view& genre) { return genre == bookGenre; }));
 }
 
 TEST_F(BookTest, shouldGenerateAuthor)

diff --git a/tests/modules/movie/MovieTest.cpp b/tests/modules/movie/MovieTest.cpp
@@ -19,7 +19,7 @@ TEST_F(MovieTest, shouldGenerateGenre)
     const auto generatedGenre = Movie::genre();
 
     ASSERT_TRUE(
-        std::ranges::any_of(genres, [generatedGenre](const std::string_view& genre) { return generatedGenre == genre; }));
+        std::ranges::any_of(movieGenres, [generatedGenre](const std::string_view& genre) { return generatedGenre == genre; }));
 }
 
 TEST_F(MovieTest, shouldGenerateMovieTitle)

diff --git a/tests/modules/music/MusicTest.cpp b/tests/modules/music/MusicTest.cpp
@@ -29,7 +29,7 @@ TEST_F(MusicTest, shouldGenerateGenre)
     const auto generatedGenre = Music::genre();
 
     ASSERT_TRUE(
-        std::ranges::any_of(genres, [generatedGenre](const std::string& genre) { return generatedGenre == genre; }));
+        std::ranges::any_of(musicGenres, [generatedGenre](const std::string& genre) { return generatedGenre == genre; }));
 }
 
 TEST_F(MusicTest, shouldGenerateSongName)

diff --git a/tests/modules/videoGame/VideoGameTest.cpp b/tests/modules/videoGame/VideoGameTest.cpp
@@ -30,7 +30,7 @@ TEST_F(VideoGameTest, shouldGenerateGenre)
     const auto generatedGenre = VideoGame::genre();
 
     ASSERT_TRUE(
-        std::ranges::any_of(genres, [generatedGenre](const std::string& genre) { return generatedGenre == genre; }));
+        std::ranges::any_of(videoGameGenres, [generatedGenre](const std::string& genre) { return generatedGenre == genre; }));
 }
 
 TEST_F(VideoGameTest, shouldGeneratePlatform)