From eacfd8f2600580891769b3170eedceedbf29dfe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blar?= Date: Sat, 18 Nov 2023 14:59:44 +0100 Subject: [PATCH] fix documentation typos (#275) * fix documentation typos * fix shuffle params --- .clang-format-ignore | 1 + CMakeLists.txt | 18 +++---- include/faker-cxx/Airline.h | 18 +++---- include/faker-cxx/Date.h | 18 +++---- include/faker-cxx/Helper.h | 43 +++++++++++++---- include/faker-cxx/Location.h | 4 +- include/faker-cxx/Lorem.h | 4 +- include/faker-cxx/Medicine.h | 4 +- include/faker-cxx/Number.h | 1 - include/faker-cxx/Person.h | 21 ++++---- include/faker-cxx/String.h | 1 + include/faker-cxx/System.h | 4 +- include/faker-cxx/VideoGame.h | 2 +- include/faker-cxx/Weather.h | 1 - src/modules/airline/AirlineTest.cpp | 1 + src/modules/food/Food.cpp | 48 ++++++++++++------- src/modules/food/FoodTest.cpp | 8 ++++ ...oholicBeverages.h => AlcoholicBeverages.h} | 9 ++-- .../food/data/{dishNames.h => DishNames.h} | 9 ++-- .../{foodCategories.h => FoodCategories.h} | 0 src/modules/food/data/{fruits.h => Fruits.h} | 0 src/modules/food/data/{grains.h => Grains.h} | 0 src/modules/food/data/{meats.h => Meats.h} | 0 .../data/{milkProducts.h => MilkProducts.h} | 0 ...licBeverages.h => NonalcoholicBeverages.h} | 0 src/modules/food/data/{nuts.h => Nuts.h} | 0 src/modules/food/data/{oils.h => Oils.h} | 0 .../food/data/{seafoods.h => Seafoods.h} | 0 src/modules/food/data/{seeds.h => Seeds.h} | 0 .../data/{sugarProducts.h => SugarProducts.h} | 9 ++-- .../food/data/{vegetables.h => Vegetables.h} | 0 31 files changed, 138 insertions(+), 86 deletions(-) create mode 100644 .clang-format-ignore rename src/modules/food/data/{alcoholicBeverages.h => AlcoholicBeverages.h} (90%) rename src/modules/food/data/{dishNames.h => DishNames.h} (96%) rename src/modules/food/data/{foodCategories.h => FoodCategories.h} (100%) rename src/modules/food/data/{fruits.h => Fruits.h} (100%) rename src/modules/food/data/{grains.h => Grains.h} (100%) rename src/modules/food/data/{meats.h => Meats.h} (100%) rename src/modules/food/data/{milkProducts.h => MilkProducts.h} (100%) rename src/modules/food/data/{nonalcoholicBeverages.h => NonalcoholicBeverages.h} (100%) rename src/modules/food/data/{nuts.h => Nuts.h} (100%) rename src/modules/food/data/{oils.h => Oils.h} (100%) rename src/modules/food/data/{seafoods.h => Seafoods.h} (100%) rename src/modules/food/data/{seeds.h => Seeds.h} (100%) rename src/modules/food/data/{sugarProducts.h => SugarProducts.h} (86%) rename src/modules/food/data/{vegetables.h => Vegetables.h} (100%) diff --git a/.clang-format-ignore b/.clang-format-ignore new file mode 100644 index 000000000..a0f00082c --- /dev/null +++ b/.clang-format-ignore @@ -0,0 +1 @@ +CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a094233e..071907490 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,13 +9,13 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) option(BUILD_FAKER_TESTS DEFAULT ON) -if(MSVC) +if (MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++20 /permissive- /bigobj") -else() +else () set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wconversion -Wformat -Werror" - ) -endif() + ) +endif () set(LIBRARY_NAME faker-cxx) @@ -28,6 +28,7 @@ set(FAKER_SOURCES src/modules/datatype/Datatype.cpp src/modules/date/Date.cpp src/modules/finance/Finance.cpp + src/modules/food/Food.cpp src/modules/helper/Helper.cpp src/modules/internet/Internet.cpp src/modules/location/Location.cpp @@ -64,6 +65,7 @@ set(FAKER_UT_SOURCES src/modules/datatype/DatatypeTest.cpp src/modules/date/DateTest.cpp src/modules/finance/FinanceTest.cpp + src/modules/food/FoodTest.cpp src/modules/internet/InternetTest.cpp src/modules/location/LocationTest.cpp src/modules/lorem/LoremTest.cpp @@ -104,7 +106,7 @@ set(FMT_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/externals/fmt/include") target_link_libraries(${LIBRARY_NAME} PRIVATE fmt) -if(BUILD_FAKER_TESTS) +if (BUILD_FAKER_TESTS) add_subdirectory(externals/googletest) set(GTEST_INCLUDE_DIR @@ -123,12 +125,12 @@ if(BUILD_FAKER_TESTS) add_executable(${LIBRARY_NAME}-UT ${FAKER_UT_SOURCES}) target_link_libraries(${LIBRARY_NAME}-UT PRIVATE gtest_main gmock_main - faker-cxx) + faker-cxx) target_include_directories( ${LIBRARY_NAME}-UT PRIVATE ${FMT_INCLUDE_DIR} ${GTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR} - ${CMAKE_CURRENT_LIST_DIR}) + ${CMAKE_CURRENT_LIST_DIR}) add_test( NAME ${LIBRARY_NAME}-UT @@ -136,4 +138,4 @@ if(BUILD_FAKER_TESTS) WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}) target_code_coverage(${LIBRARY_NAME}-UT ALL) -endif() +endif () diff --git a/include/faker-cxx/Airline.h b/include/faker-cxx/Airline.h index bfcb0a4da..9af869a69 100644 --- a/include/faker-cxx/Airline.h +++ b/include/faker-cxx/Airline.h @@ -15,13 +15,14 @@ class Airline Widebody, }; - /* + /** * @brief Get a random aircraft type * * @return a random aircraft type * * @code * Airline::aircraftType // "narrowbody" + * @endcode */ static std::string aircraftType(); @@ -31,7 +32,7 @@ class Airline std::string iataTypeCode; }; - /* + /** * @brief Get a random airplane * * @return a random airplane and its iataTypeCode @@ -48,7 +49,7 @@ class Airline std::string iataCode; }; - /* + /** * @brief Get a random airline * * @return a random airline and its iataCode @@ -65,7 +66,7 @@ class Airline std::string iataCode; }; - /* + /** * @brief Get a random airport * * @return a random airport and its iataCode @@ -76,7 +77,7 @@ class Airline */ static Airport airport(); - /* + /** * @brief Get a random seat by aircraft type * * @param aircraftType the aircraft type @@ -89,7 +90,7 @@ class Airline */ static std::string seat(AircraftType aircraftType); - /* + /** * @brief Get a random record location * * @return a random record location @@ -101,7 +102,7 @@ class Airline */ static std::string recordLocator(bool allowNumerics = false); - /* + /** * @brief Get a random flight number from given length * * @param addLeadingZeros whether to add leading zeros @@ -123,7 +124,8 @@ class Airline unsigned int min; unsigned int max; }; - /* + + /** * @brief Get a random flight number from given length * * @param addLeadingZeros whether to add leading zeros diff --git a/include/faker-cxx/Date.h b/include/faker-cxx/Date.h index 6369286ba..44887f6c6 100644 --- a/include/faker-cxx/Date.h +++ b/include/faker-cxx/Date.h @@ -15,8 +15,8 @@ class Date * @returns ISO formatted string. * * @code - * Date::past() // "2023-12-08T19:31:32Z" - * Date::past(5) // "2020-06-16T15:24:09Z" + * Date::pastDate() // "2023-12-08T19:31:32Z" + * Date::pastDate(5) // "2020-06-16T15:24:09Z" * @endcode */ static std::string pastDate(int years = 1); @@ -29,8 +29,8 @@ class Date * @returns ISO formatted string. * * @code - * Date::future() // "2023-09-27T09:47:46Z" - * Date::future(5) // "2024-06-11T19:46:29Z" + * Date::futureDate() // "2023-09-27T09:47:46Z" + * Date::futureDate(5) // "2024-06-11T19:46:29Z" * @endcode */ static std::string futureDate(int years = 1); @@ -43,8 +43,8 @@ class Date * @returns ISO formatted string. * * @code - * Date::recent() // "2023-07-05T14:12:40Z" - * Date::recent(10) // "2023-06-29T18:24:12Z" + * Date::recentDate() // "2023-07-05T14:12:40Z" + * Date::recentDate(10) // "2023-06-29T18:24:12Z" * @endcode */ static std::string recentDate(int days = 3); @@ -57,8 +57,8 @@ class Date * @returns ISO formatted string. * * @code - * Date::soon() // "2023-07-07T18:19:12Z" - * Date::soon(10) // "2023-07-15T09:59:11Z" + * Date::soonDate() // "2023-07-07T18:19:12Z" + * Date::soonDate(10) // "2023-07-15T09:59:11Z" * @endcode */ static std::string soonDate(int days = 3); @@ -82,7 +82,7 @@ class Date * @brief Generates a random birthdate by year. * * @param minYear The minimum year to generate a birthdate. Defaults to `1920`. - * @param maxAge The maximum year to generate a birthdate. Defaults to `2000`. + * @param maxYear The maximum year to generate a birthdate. Defaults to `2000`. * * @returns ISO formatted string. * diff --git a/include/faker-cxx/Helper.h b/include/faker-cxx/Helper.h index 2a09dbbcf..ec32e10fd 100644 --- a/include/faker-cxx/Helper.h +++ b/include/faker-cxx/Helper.h @@ -41,6 +41,19 @@ class Helper return data[index]; } + /** + * @brief Get a random element from a vector. + * + * @tparam T an element type of the vector. + * + * @param data vector of elements. + * + * @return T a random element from the vector. + * + * @code + * Helper::arrayElement(std::vector{{"hello"}, {"world"}}) // "hello" + * @endcode + */ template static T arrayElement(const std::vector& data) { @@ -61,6 +74,20 @@ class Helper T value; }; + /** + * @brief Get a random element by weight from a vector. + * + * @tparam T an element type of the weighted element. + * + * @param data vector of weighted elements. + * + * @return T a weighted element value from the vector. + * + * @code + * Helper::weightedArrayElement(std::vector>{{1, "value1"}, {10, + * "value2"}}) // "hello2" + * @endcode + */ template static T weightedArrayElement(const std::vector>& data) { @@ -96,16 +123,16 @@ class Helper } /** - * @brief Returns shuffled STL container. + * @brief Returns shuffled vector. * - * @tparam T an element type of the container. + * @tparam T an element type of the vector. * - * @param data The container. + * @param data The vector. * - * @return Container with shuffled elements. + * @return Vector with shuffled elements. * * @code - * Helper::arrayElement(std::string{"abcd"}) // "dcba" + * Helper::shuffle(std::vector{{"hello"}, {"world"}}) // {{"world"}, {"hello"}} * @endcode */ template @@ -116,12 +143,13 @@ class Helper return data; } + // TODO: remove methods below from helper API, move to src/common + /** * @brief Returns the given string parsed symbol by symbol and replaced the placeholders with digits ("0" - "9"). * "!" will be replaced by digits >=2 ("2" - "9"). * * @param str The template to parse string. - * * @param symbol The symbol to replace with digits. Defaults to '#'. * * @return The string replaced symbols with digits. @@ -141,7 +169,6 @@ class Helper * `L` will be replaced with the appropriate Luhn checksum. * * @param inputString TThe credit card format pattern. Defaults to "6453-####-####-####-###L". - * * @param symbol The symbol to replace with a digit. Defaults to '#'. * * @return The string replaced symbols with digits. @@ -220,7 +247,7 @@ class Helper * @tparam TResult The type of result of the given callback. * * @param callback The callback to that will be invoked if the probability check was successful. - * @param options.probability The probability (`[0.00, 1.00]`) of the callback being invoked. Defaults to `0.5`. + * @param probability The probability (`[0.00, 1.00]`) of the callback being invoked. Defaults to `0.5`. * * @return The result of the callback if the probability check was successful, otherwise empty string. * diff --git a/include/faker-cxx/Location.h b/include/faker-cxx/Location.h index bb5e8094b..5c765bf3b 100644 --- a/include/faker-cxx/Location.h +++ b/include/faker-cxx/Location.h @@ -134,7 +134,7 @@ class Location * Location::latitude() // "-30.9501" * @endcode */ - static std::string latitude(Precision = Precision::FourDp); + static std::string latitude(Precision precision = Precision::FourDp); /** * @brief Generates a random longitude. @@ -147,7 +147,7 @@ class Location * Location::longitude() // "-30.9501" * @endcode */ - static std::string longitude(Precision = Precision::FourDp); + static std::string longitude(Precision precision = Precision::FourDp); /** * @brief Generates a random direction from cardinal and ordinal directions. diff --git a/include/faker-cxx/Lorem.h b/include/faker-cxx/Lorem.h index 37a6af576..220c82c28 100644 --- a/include/faker-cxx/Lorem.h +++ b/include/faker-cxx/Lorem.h @@ -48,8 +48,8 @@ class Lorem /** * @brief Returns a random lorem sentences. * - * @param minWordCount The minimum number of sentences to generate. Defaults to `2`. - * @param maxWordCount The maximum number of sentences to generate. Defaults to `6`. + * @param minNumberOfSentences The minimum number of sentences to generate. Defaults to `2`. + * @param maxNumberOfSentences The maximum number of sentences to generate. Defaults to `6`. * * @returns Lorem sentences separated with spaces. * diff --git a/include/faker-cxx/Medicine.h b/include/faker-cxx/Medicine.h index dedb7fe6b..810a1dbca 100644 --- a/include/faker-cxx/Medicine.h +++ b/include/faker-cxx/Medicine.h @@ -16,7 +16,6 @@ class Medicine * @code * Medicine::condition() // "AIDS" * @endcode - * */ static std::string condition(); @@ -28,7 +27,6 @@ class Medicine * @code * Medicine::medicalTest() // "pulmonary auscultation" * @endcode - * */ static std::string medicalTest(); @@ -36,10 +34,10 @@ class Medicine * @brief Returns a random Medical specialty * * @returns Medical specialty. + * * @code * Medicine::specialty() // "Cardiology" * @endcode - * */ static std::string specialty(); diff --git a/include/faker-cxx/Number.h b/include/faker-cxx/Number.h index 55e2ce086..fb27f5932 100644 --- a/include/faker-cxx/Number.h +++ b/include/faker-cxx/Number.h @@ -65,7 +65,6 @@ class Number * * @param min The minimum value of the range. * @param max The maximum value of the range. - * @param distribution The distribution to use. * * @throws std::invalid_argument if min is greater than max. * diff --git a/include/faker-cxx/Person.h b/include/faker-cxx/Person.h index 914d462fb..dd0708aa5 100644 --- a/include/faker-cxx/Person.h +++ b/include/faker-cxx/Person.h @@ -21,11 +21,11 @@ class Person * * @code * Person::firstName() // "Michael" - * Person::firstName(Country::English, Sex::Female) // "Emma" - * Person::firstName(Country::English, Sex::Male) // "Arthur" + * Person::firstName(Country::England, Sex::Female) // "Emma" + * Person::firstName(Country::England, Sex::Male) // "Arthur" * @endcode */ - static std::string firstName(Country country = Country::England, std::optional = std::nullopt); + static std::string firstName(Country country = Country::England, std::optional sex = std::nullopt); /** * @brief Returns a random last name. @@ -39,7 +39,7 @@ class Person * Person::lastName() // "Peterson" * @endcode */ - static std::string lastName(Country country = Country::England, std::optional = std::nullopt); + static std::string lastName(Country country = Country::England, std::optional sex = std::nullopt); /** * @brief Returns a random middle name. @@ -52,7 +52,7 @@ class Person * Person::middleName() // "Васильевич" * @endcode */ - static std::string middleName(std::optional = std::nullopt); + static std::string middleName(std::optional sex = std::nullopt); /** * @brief Returns a random full name. @@ -64,11 +64,11 @@ class Person * * @code * Person::fullName() // "Marcia Robinson" - * Person::fullName(Country::English, Sex::Female) // "Jennifer Martin" - * Person::fullName(Country::English, Sex::Male) // "Samuel Walker" + * Person::fullName(Country::England, Sex::Female) // "Jennifer Martin" + * Person::fullName(Country::England, Sex::Male) // "Samuel Walker" * @endcode */ - static std::string fullName(Country country = Country::England, std::optional = std::nullopt); + static std::string fullName(Country country = Country::England, std::optional sex = std::nullopt); /** * @brief Returns a random name prefix. @@ -83,7 +83,7 @@ class Person * Person::prefix(Sex::Male) // "Mr." * @endcode */ - static std::string prefix(std::optional = std::nullopt); + static std::string prefix(std::optional sex = std::nullopt); /** * @brief Returns a random name suffix. @@ -193,7 +193,6 @@ class Person * Person::nationality() // "Romanian" * @endcode */ - static std::string nationality(); /** @@ -205,7 +204,6 @@ class Person * Person::westernZodiac() // "Virgo" * @endcode */ - static std::string westernZodiac(); /** @@ -217,7 +215,6 @@ class Person * Person::chineseZodiac() // "Dragon" * @endcode */ - static std::string chineseZodiac(); }; } diff --git a/include/faker-cxx/String.h b/include/faker-cxx/String.h index 301f82816..9c350d0a7 100644 --- a/include/faker-cxx/String.h +++ b/include/faker-cxx/String.h @@ -26,6 +26,7 @@ class String * @returns UUIDv4. * * @param gen A random number generator (type RandomGenerator) + * * @code * String::uuid() // "27666229-cedb-4a45-8018-98b1e1d921e2" * @endcode diff --git a/include/faker-cxx/System.h b/include/faker-cxx/System.h index 5ebe0b2a5..d96b2bc67 100644 --- a/include/faker-cxx/System.h +++ b/include/faker-cxx/System.h @@ -40,7 +40,7 @@ class System * @returns A file extension. * * @code - * System::fileExt(MimeType::Image) // "png" + * System::fileExtension(MimeType::Image) // "png" * @endcode */ static std::string fileExtension(const std::optional& mimeType = std::nullopt); @@ -65,7 +65,7 @@ class System * @returns A commonly used file extension. * * @code - * System::commonFileExt() // "gif" + * System::commonFileExtension() // "gif" * @endcode */ static std::string commonFileExtension(); diff --git a/include/faker-cxx/VideoGame.h b/include/faker-cxx/VideoGame.h index 4c4ace803..5c8af4606 100644 --- a/include/faker-cxx/VideoGame.h +++ b/include/faker-cxx/VideoGame.h @@ -13,7 +13,7 @@ class VideoGame * @returns Video game name. * * @code - * Videogame::gameTitle() // "Rayman Arena" + * VideoGame::gameTitle() // "Rayman Arena" * @endcode */ static std::string gameTitle(); diff --git a/include/faker-cxx/Weather.h b/include/faker-cxx/Weather.h index 4bc7e1a2c..f5a21b2a5 100644 --- a/include/faker-cxx/Weather.h +++ b/include/faker-cxx/Weather.h @@ -21,7 +21,6 @@ class Weather * Weather::temperature(); // Temperature.metric = 10, Temperature.imperial = 50 * @endcode */ - static Temperature temperature(); struct Pressure diff --git a/src/modules/airline/AirlineTest.cpp b/src/modules/airline/AirlineTest.cpp index aef1b8d18..c21170de8 100644 --- a/src/modules/airline/AirlineTest.cpp +++ b/src/modules/airline/AirlineTest.cpp @@ -14,6 +14,7 @@ using namespace ::testing; using namespace faker; +// TODO: add flight number tests class AirlineTest : public Test { public: diff --git a/src/modules/food/Food.cpp b/src/modules/food/Food.cpp index 7a897bc07..981b377be 100644 --- a/src/modules/food/Food.cpp +++ b/src/modules/food/Food.cpp @@ -14,64 +14,78 @@ #include "data/Seeds.h" #include "data/SugarProducts.h" #include "data/Vegetables.h" - #include "faker-cxx/Helper.h" -namespace faker { +namespace faker +{ -std::string Food::alcoholicBeverage() { +std::string Food::alcoholicBeverage() +{ return Helper::arrayElement(alcoholicBeverages); } -std::string Food::dishName() { +std::string Food::dishName() +{ return Helper::arrayElement(dishNames); } -std::string Food::foodCategory() { +std::string Food::foodCategory() +{ return Helper::arrayElement(foodCategories); } -std::string Food::fruit() { +std::string Food::fruit() +{ return Helper::arrayElement(fruits); } -std::string Food::grain() { +std::string Food::grain() +{ return Helper::arrayElement(grains); } -std::string Food::meat() { +std::string Food::meat() +{ return Helper::arrayElement(meats); } -std::string Food::milkProduct() { +std::string Food::milkProduct() +{ return Helper::arrayElement(milkProducts); } -std::string Food::nonalcoholicBeverage() { +std::string Food::nonalcoholicBeverage() +{ return Helper::arrayElement(nonalcoholicBeverages); } -std::string Food::nut() { +std::string Food::nut() +{ return Helper::arrayElement(nuts); } -std::string Food::oil() { +std::string Food::oil() +{ return Helper::arrayElement(oils); } -std::string Food::seafood() { +std::string Food::seafood() +{ return Helper::arrayElement(seafoods); } -std::string Food::seed() { +std::string Food::seed() +{ return Helper::arrayElement(seeds); } -std::string Food::sugarProduct() { +std::string Food::sugarProduct() +{ return Helper::arrayElement(sugarProducts); } -std::string Food::vegetable() { +std::string Food::vegetable() +{ return Helper::arrayElement(vegetables); } -} \ No newline at end of file +} diff --git a/src/modules/food/FoodTest.cpp b/src/modules/food/FoodTest.cpp index 1932e241b..66f99c555 100644 --- a/src/modules/food/FoodTest.cpp +++ b/src/modules/food/FoodTest.cpp @@ -115,6 +115,14 @@ TEST_F(FoodTest, shouldGenerateSeed) { return generatedSeed == seed; })); } +TEST_F(FoodTest, shouldGenerateGrain) +{ + const auto generatedGrain = Food::grain(); + + ASSERT_TRUE(std::ranges::any_of(grains, [generatedGrain](const std::string& grain) + { return generatedGrain == grain; })); +} + TEST_F(FoodTest, shouldGenerateSugarProduct) { const auto generatedSugarProduct = Food::sugarProduct(); diff --git a/src/modules/food/data/alcoholicBeverages.h b/src/modules/food/data/AlcoholicBeverages.h similarity index 90% rename from src/modules/food/data/alcoholicBeverages.h rename to src/modules/food/data/AlcoholicBeverages.h index b0b68958c..e29ebd9cf 100644 --- a/src/modules/food/data/alcoholicBeverages.h +++ b/src/modules/food/data/AlcoholicBeverages.h @@ -3,8 +3,9 @@ #include #include -namespace faker { - const std::vector alcoholicBeverages = { +namespace faker +{ +const std::vector alcoholicBeverages{ "Beer", "Wine", "Vodka", @@ -52,5 +53,5 @@ namespace faker { "Mimosa", "White Russian", "Black Russian", - }; -} \ No newline at end of file +}; +} diff --git a/src/modules/food/data/dishNames.h b/src/modules/food/data/DishNames.h similarity index 96% rename from src/modules/food/data/dishNames.h rename to src/modules/food/data/DishNames.h index fa48ad08c..8c2cf3ed7 100644 --- a/src/modules/food/data/dishNames.h +++ b/src/modules/food/data/DishNames.h @@ -3,8 +3,9 @@ #include #include -namespace faker { - const std::vector dishNames = { +namespace faker +{ +const std::vector dishNames = { "Sushi", "Paella", "Biryani", @@ -90,5 +91,5 @@ namespace faker { "Chicken Caesar Salad", "Beef and Mushroom Pie", "Garlic Herb Roasted Potatoes", - }; -} \ No newline at end of file +}; +} diff --git a/src/modules/food/data/foodCategories.h b/src/modules/food/data/FoodCategories.h similarity index 100% rename from src/modules/food/data/foodCategories.h rename to src/modules/food/data/FoodCategories.h diff --git a/src/modules/food/data/fruits.h b/src/modules/food/data/Fruits.h similarity index 100% rename from src/modules/food/data/fruits.h rename to src/modules/food/data/Fruits.h diff --git a/src/modules/food/data/grains.h b/src/modules/food/data/Grains.h similarity index 100% rename from src/modules/food/data/grains.h rename to src/modules/food/data/Grains.h diff --git a/src/modules/food/data/meats.h b/src/modules/food/data/Meats.h similarity index 100% rename from src/modules/food/data/meats.h rename to src/modules/food/data/Meats.h diff --git a/src/modules/food/data/milkProducts.h b/src/modules/food/data/MilkProducts.h similarity index 100% rename from src/modules/food/data/milkProducts.h rename to src/modules/food/data/MilkProducts.h diff --git a/src/modules/food/data/nonalcoholicBeverages.h b/src/modules/food/data/NonalcoholicBeverages.h similarity index 100% rename from src/modules/food/data/nonalcoholicBeverages.h rename to src/modules/food/data/NonalcoholicBeverages.h diff --git a/src/modules/food/data/nuts.h b/src/modules/food/data/Nuts.h similarity index 100% rename from src/modules/food/data/nuts.h rename to src/modules/food/data/Nuts.h diff --git a/src/modules/food/data/oils.h b/src/modules/food/data/Oils.h similarity index 100% rename from src/modules/food/data/oils.h rename to src/modules/food/data/Oils.h diff --git a/src/modules/food/data/seafoods.h b/src/modules/food/data/Seafoods.h similarity index 100% rename from src/modules/food/data/seafoods.h rename to src/modules/food/data/Seafoods.h diff --git a/src/modules/food/data/seeds.h b/src/modules/food/data/Seeds.h similarity index 100% rename from src/modules/food/data/seeds.h rename to src/modules/food/data/Seeds.h diff --git a/src/modules/food/data/sugarProducts.h b/src/modules/food/data/SugarProducts.h similarity index 86% rename from src/modules/food/data/sugarProducts.h rename to src/modules/food/data/SugarProducts.h index fc42047ff..2fe01de40 100644 --- a/src/modules/food/data/sugarProducts.h +++ b/src/modules/food/data/SugarProducts.h @@ -3,8 +3,9 @@ #include #include -namespace faker { - const std::vector sugarProducts = { +namespace faker +{ +const std::vector sugarProducts = { "Granulated Sugar", "Brown Sugar", "Powdered Sugar", @@ -29,5 +30,5 @@ namespace faker { "Cakes", "Soda", "Ice Cream", - }; -} \ No newline at end of file +}; +} diff --git a/src/modules/food/data/vegetables.h b/src/modules/food/data/Vegetables.h similarity index 100% rename from src/modules/food/data/vegetables.h rename to src/modules/food/data/Vegetables.h