diff --git a/.gitignore b/.gitignore index 625bf365d..cca1b8e0e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,6 @@ cmake-build-* .DS_Store src/.DS_Store src/modules/.DS_Store -src/modules/location/.DS_Store html/ latex/ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d750f4047..50ebf87f8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,40 +3,40 @@ cmake_minimum_required(VERSION 3.22) include("${CMAKE_SOURCE_DIR}/cmake/CompilerWarnings.cmake") set(FAKER_SOURCES - modules/airline/airline.cpp - modules/animal/animal.cpp - modules/book/book.cpp - modules/color/color.cpp - modules/commerce/commerce.cpp - modules/company/company.cpp - modules/computer/computer.cpp - modules/crypto/crypto.cpp - modules/database/database.cpp - modules/datatype/datatype.cpp - modules/date/date.cpp - modules/finance/finance.cpp - modules/food/food.cpp - modules/git/git.cpp - modules/hacker/hacker.cpp - modules/helper/helper.cpp - modules/image/image.cpp - modules/internet/internet.cpp - modules/location/location.cpp - modules/lorem/lorem.cpp - modules/medicine/medicine.cpp - modules/movie/movie.cpp - modules/music/music.cpp - modules/person/person.cpp - modules/phone/phone.cpp - modules/plant/plant.cpp - modules/science/science.cpp - modules/sport/sport.cpp - modules/string/string.cpp - modules/system/system.cpp - modules/vehicle/vehicle.cpp - modules/video_game/video_game.cpp - modules/weather/weather.cpp - modules/word/word.cpp + modules/airline.cpp + modules/animal.cpp + modules/book.cpp + modules/color.cpp + modules/commerce.cpp + modules/company.cpp + modules/computer.cpp + modules/crypto.cpp + modules/database.cpp + modules/datatype.cpp + modules/date.cpp + modules/finance.cpp + modules/food.cpp + modules/git.cpp + modules/hacker.cpp + modules/helper.cpp + modules/image.cpp + modules/internet.cpp + modules/location.cpp + modules/lorem.cpp + modules/medicine.cpp + modules/movie.cpp + modules/music.cpp + modules/person.cpp + modules/phone.cpp + modules/plant.cpp + modules/science.cpp + modules/sport.cpp + modules/string.cpp + modules/system.cpp + modules/vehicle.cpp + modules/video_game.cpp + modules/weather.cpp + modules/word.cpp common/format_helper.cpp common/luhn_check.cpp common/string_helper.cpp @@ -47,36 +47,36 @@ set(FAKER_HEADERS common/format_helper.h common/algo_helper.h common/string_helper.h - modules/plant/plant_data.h - modules/person/person_data.h - modules/internet/internet_data.h - modules/sport/sport_data.h - modules/airline/airline_data.h - modules/location/location_data.h - modules/book/book_data.h - modules/string/string_data.h - modules/video_game/video_game_data.h - modules/medicine/medicine_data.h - modules/vehicle/vehicle_data.h - modules/hacker/hacker_data.h - modules/science/science_data.h - modules/date/date_data.h - modules/system/system_data.h - modules/commerce/commerce_data.h - modules/computer/computer_data.h - modules/weather/weather_data.h - modules/music/music_data.h - modules/database/database_data.h - modules/movie/movie_data.h - modules/food/food_data.h - modules/word/word_data.h - modules/word/word_store.h - modules/animal/animal_data.h - modules/company/company_data.h - modules/finance/finance_data.h - modules/phone/phone_data.h - modules/color/color_data.h - modules/lorem/lorem_data.h + modules/plant_data.h + modules/person_data.h + modules/internet_data.h + modules/sport_data.h + modules/airline_data.h + modules/location_data.h + modules/book_data.h + modules/string_data.h + modules/video_game_data.h + modules/medicine_data.h + modules/vehicle_data.h + modules/hacker_data.h + modules/science_data.h + modules/date_data.h + modules/system_data.h + modules/commerce_data.h + modules/computer_data.h + modules/weather_data.h + modules/music_data.h + modules/database_data.h + modules/movie_data.h + modules/food_data.h + modules/word_data.h + modules/word_store.h + modules/animal_data.h + modules/company_data.h + modules/finance_data.h + modules/phone_data.h + modules/color_data.h + modules/lorem_data.h ) target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${FAKER_SOURCES} ${FAKER_HEADERS}) diff --git a/src/modules/airline/airline.cpp b/src/modules/airline.cpp similarity index 100% rename from src/modules/airline/airline.cpp rename to src/modules/airline.cpp diff --git a/src/modules/airline/airline_data.h b/src/modules/airline_data.h similarity index 100% rename from src/modules/airline/airline_data.h rename to src/modules/airline_data.h diff --git a/src/modules/animal/animal.cpp b/src/modules/animal.cpp similarity index 100% rename from src/modules/animal/animal.cpp rename to src/modules/animal.cpp diff --git a/src/modules/animal/animal_data.h b/src/modules/animal_data.h similarity index 100% rename from src/modules/animal/animal_data.h rename to src/modules/animal_data.h diff --git a/src/modules/book/book.cpp b/src/modules/book.cpp similarity index 100% rename from src/modules/book/book.cpp rename to src/modules/book.cpp diff --git a/src/modules/book/book_data.h b/src/modules/book_data.h similarity index 100% rename from src/modules/book/book_data.h rename to src/modules/book_data.h diff --git a/src/modules/color/color.cpp b/src/modules/color.cpp similarity index 100% rename from src/modules/color/color.cpp rename to src/modules/color.cpp diff --git a/src/modules/color/color_data.h b/src/modules/color_data.h similarity index 100% rename from src/modules/color/color_data.h rename to src/modules/color_data.h diff --git a/src/modules/commerce/commerce.cpp b/src/modules/commerce.cpp similarity index 100% rename from src/modules/commerce/commerce.cpp rename to src/modules/commerce.cpp diff --git a/src/modules/commerce/commerce_data.h b/src/modules/commerce_data.h similarity index 100% rename from src/modules/commerce/commerce_data.h rename to src/modules/commerce_data.h diff --git a/src/modules/company/company.cpp b/src/modules/company.cpp similarity index 100% rename from src/modules/company/company.cpp rename to src/modules/company.cpp diff --git a/src/modules/company/company_data.h b/src/modules/company_data.h similarity index 100% rename from src/modules/company/company_data.h rename to src/modules/company_data.h diff --git a/src/modules/computer/computer.cpp b/src/modules/computer.cpp similarity index 100% rename from src/modules/computer/computer.cpp rename to src/modules/computer.cpp diff --git a/src/modules/computer/computer_data.h b/src/modules/computer_data.h similarity index 100% rename from src/modules/computer/computer_data.h rename to src/modules/computer_data.h diff --git a/src/modules/crypto/crypto.cpp b/src/modules/crypto.cpp similarity index 100% rename from src/modules/crypto/crypto.cpp rename to src/modules/crypto.cpp diff --git a/src/modules/database/database.cpp b/src/modules/database.cpp similarity index 100% rename from src/modules/database/database.cpp rename to src/modules/database.cpp diff --git a/src/modules/database/database_data.h b/src/modules/database_data.h similarity index 100% rename from src/modules/database/database_data.h rename to src/modules/database_data.h diff --git a/src/modules/datatype/datatype.cpp b/src/modules/datatype.cpp similarity index 100% rename from src/modules/datatype/datatype.cpp rename to src/modules/datatype.cpp diff --git a/src/modules/date/date.cpp b/src/modules/date.cpp similarity index 100% rename from src/modules/date/date.cpp rename to src/modules/date.cpp diff --git a/src/modules/date/date_data.h b/src/modules/date_data.h similarity index 100% rename from src/modules/date/date_data.h rename to src/modules/date_data.h diff --git a/src/modules/finance/finance.cpp b/src/modules/finance.cpp similarity index 100% rename from src/modules/finance/finance.cpp rename to src/modules/finance.cpp diff --git a/src/modules/finance/finance_data.h b/src/modules/finance_data.h similarity index 100% rename from src/modules/finance/finance_data.h rename to src/modules/finance_data.h diff --git a/src/modules/food/food.cpp b/src/modules/food.cpp similarity index 100% rename from src/modules/food/food.cpp rename to src/modules/food.cpp diff --git a/src/modules/food/food_data.h b/src/modules/food_data.h similarity index 100% rename from src/modules/food/food_data.h rename to src/modules/food_data.h diff --git a/src/modules/git/git.cpp b/src/modules/git.cpp similarity index 100% rename from src/modules/git/git.cpp rename to src/modules/git.cpp diff --git a/src/modules/hacker/hacker.cpp b/src/modules/hacker.cpp similarity index 100% rename from src/modules/hacker/hacker.cpp rename to src/modules/hacker.cpp diff --git a/src/modules/hacker/hacker_data.h b/src/modules/hacker_data.h similarity index 100% rename from src/modules/hacker/hacker_data.h rename to src/modules/hacker_data.h diff --git a/src/modules/helper/helper.cpp b/src/modules/helper.cpp similarity index 100% rename from src/modules/helper/helper.cpp rename to src/modules/helper.cpp diff --git a/src/modules/image/image.cpp b/src/modules/image.cpp similarity index 100% rename from src/modules/image/image.cpp rename to src/modules/image.cpp diff --git a/src/modules/internet/internet.cpp b/src/modules/internet.cpp similarity index 99% rename from src/modules/internet/internet.cpp rename to src/modules/internet.cpp index 9848ad515..172d58e1a 100644 --- a/src/modules/internet/internet.cpp +++ b/src/modules/internet.cpp @@ -21,7 +21,7 @@ #include "faker-cxx/types/hex.h" #include "faker-cxx/word.h" #include "internet_data.h" -#include "modules/string/string_data.h" +#include "modules/string_data.h" namespace faker::internet { diff --git a/src/modules/internet/internet_data.h b/src/modules/internet_data.h similarity index 100% rename from src/modules/internet/internet_data.h rename to src/modules/internet_data.h diff --git a/src/modules/location/location.cpp b/src/modules/location.cpp similarity index 100% rename from src/modules/location/location.cpp rename to src/modules/location.cpp diff --git a/src/modules/location/location_data.h b/src/modules/location_data.h similarity index 100% rename from src/modules/location/location_data.h rename to src/modules/location_data.h diff --git a/src/modules/lorem/lorem.cpp b/src/modules/lorem.cpp similarity index 100% rename from src/modules/lorem/lorem.cpp rename to src/modules/lorem.cpp diff --git a/src/modules/lorem/lorem_data.h b/src/modules/lorem_data.h similarity index 100% rename from src/modules/lorem/lorem_data.h rename to src/modules/lorem_data.h diff --git a/src/modules/medicine/medicine.cpp b/src/modules/medicine.cpp similarity index 100% rename from src/modules/medicine/medicine.cpp rename to src/modules/medicine.cpp diff --git a/src/modules/medicine/medicine_data.h b/src/modules/medicine_data.h similarity index 100% rename from src/modules/medicine/medicine_data.h rename to src/modules/medicine_data.h diff --git a/src/modules/movie/movie.cpp b/src/modules/movie.cpp similarity index 100% rename from src/modules/movie/movie.cpp rename to src/modules/movie.cpp diff --git a/src/modules/movie/movie_data.h b/src/modules/movie_data.h similarity index 100% rename from src/modules/movie/movie_data.h rename to src/modules/movie_data.h diff --git a/src/modules/music/music.cpp b/src/modules/music.cpp similarity index 100% rename from src/modules/music/music.cpp rename to src/modules/music.cpp diff --git a/src/modules/music/music_data.h b/src/modules/music_data.h similarity index 100% rename from src/modules/music/music_data.h rename to src/modules/music_data.h diff --git a/src/modules/person/person.cpp b/src/modules/person.cpp similarity index 100% rename from src/modules/person/person.cpp rename to src/modules/person.cpp diff --git a/src/modules/person/person_data.h b/src/modules/person_data.h similarity index 100% rename from src/modules/person/person_data.h rename to src/modules/person_data.h diff --git a/src/modules/phone/phone.cpp b/src/modules/phone.cpp similarity index 100% rename from src/modules/phone/phone.cpp rename to src/modules/phone.cpp diff --git a/src/modules/phone/phone_data.h b/src/modules/phone_data.h similarity index 100% rename from src/modules/phone/phone_data.h rename to src/modules/phone_data.h diff --git a/src/modules/plant/plant.cpp b/src/modules/plant.cpp similarity index 100% rename from src/modules/plant/plant.cpp rename to src/modules/plant.cpp diff --git a/src/modules/plant/plant_data.h b/src/modules/plant_data.h similarity index 100% rename from src/modules/plant/plant_data.h rename to src/modules/plant_data.h diff --git a/src/modules/science/science.cpp b/src/modules/science.cpp similarity index 100% rename from src/modules/science/science.cpp rename to src/modules/science.cpp diff --git a/src/modules/science/science_data.h b/src/modules/science_data.h similarity index 100% rename from src/modules/science/science_data.h rename to src/modules/science_data.h diff --git a/src/modules/sport/sport.cpp b/src/modules/sport.cpp similarity index 100% rename from src/modules/sport/sport.cpp rename to src/modules/sport.cpp diff --git a/src/modules/sport/sport_data.h b/src/modules/sport_data.h similarity index 100% rename from src/modules/sport/sport_data.h rename to src/modules/sport_data.h diff --git a/src/modules/string/string.cpp b/src/modules/string.cpp similarity index 100% rename from src/modules/string/string.cpp rename to src/modules/string.cpp diff --git a/src/modules/string/string_data.h b/src/modules/string_data.h similarity index 100% rename from src/modules/string/string_data.h rename to src/modules/string_data.h diff --git a/src/modules/system/system.cpp b/src/modules/system.cpp similarity index 100% rename from src/modules/system/system.cpp rename to src/modules/system.cpp diff --git a/src/modules/system/system_data.h b/src/modules/system_data.h similarity index 100% rename from src/modules/system/system_data.h rename to src/modules/system_data.h diff --git a/src/modules/vehicle/vehicle.cpp b/src/modules/vehicle.cpp similarity index 100% rename from src/modules/vehicle/vehicle.cpp rename to src/modules/vehicle.cpp diff --git a/src/modules/vehicle/vehicle_data.h b/src/modules/vehicle_data.h similarity index 100% rename from src/modules/vehicle/vehicle_data.h rename to src/modules/vehicle_data.h diff --git a/src/modules/video_game/video_game.cpp b/src/modules/video_game.cpp similarity index 100% rename from src/modules/video_game/video_game.cpp rename to src/modules/video_game.cpp diff --git a/src/modules/video_game/video_game_data.h b/src/modules/video_game_data.h similarity index 100% rename from src/modules/video_game/video_game_data.h rename to src/modules/video_game_data.h diff --git a/src/modules/weather/weather.cpp b/src/modules/weather.cpp similarity index 100% rename from src/modules/weather/weather.cpp rename to src/modules/weather.cpp diff --git a/src/modules/weather/weather_data.h b/src/modules/weather_data.h similarity index 100% rename from src/modules/weather/weather_data.h rename to src/modules/weather_data.h diff --git a/src/modules/word/word.cpp b/src/modules/word.cpp similarity index 100% rename from src/modules/word/word.cpp rename to src/modules/word.cpp diff --git a/src/modules/word/word_data.h b/src/modules/word_data.h similarity index 100% rename from src/modules/word/word_data.h rename to src/modules/word_data.h diff --git a/src/modules/word/word_store.h b/src/modules/word_store.h similarity index 100% rename from src/modules/word/word_store.h rename to src/modules/word_store.h diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 13cd02990..b96827232 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,42 +8,42 @@ set(FAKER_UT_SOURCES common/format_helper_test.cpp common/luhn_check_test.cpp common/string_helper_test.cpp - modules/airline/airline_test.cpp - modules/animal/animal_test.cpp - modules/book/book_test.cpp - modules/color/color_test.cpp - modules/commerce/commerce_test.cpp - modules/company/company_test.cpp - modules/computer/computer_test.cpp - modules/crypto/crypto_test.cpp - modules/database/database_test.cpp - modules/datatype/datatype_test.cpp - modules/date/date_test.cpp - modules/finance/finance_test.cpp - modules/food/food_test.cpp - modules/git/git_test.cpp - modules/hacker/hacker_test.cpp - modules/helper/helper_test.cpp - modules/image/image_test.cpp - modules/internet/internet_test.cpp - modules/location/location_test.cpp - modules/lorem/lorem_test.cpp - modules/medicine/medicine_test.cpp - modules/movie/movie_test.cpp - modules/music/music_test.cpp - modules/number/number_test.cpp - modules/person/person_test.cpp - modules/phone/phone_test.cpp - modules/plant/plant_test.cpp - modules/science/science_test.cpp - modules/sport/sport_test.cpp - modules/string/string_test.cpp - modules/system/system_test.cpp - modules/vehicle/vehicle_test.cpp - modules/version/version_test.cpp - modules/video_game/video_game_test.cpp - modules/weather/weather_test.cpp - modules/word/word_test.cpp + modules/airline_test.cpp + modules/animal_test.cpp + modules/book_test.cpp + modules/color_test.cpp + modules/commerce_test.cpp + modules/company_test.cpp + modules/computer_test.cpp + modules/crypto_test.cpp + modules/database_test.cpp + modules/datatype_test.cpp + modules/date_test.cpp + modules/finance_test.cpp + modules/food_test.cpp + modules/git_test.cpp + modules/hacker_test.cpp + modules/helper_test.cpp + modules/image_test.cpp + modules/internet_test.cpp + modules/location_test.cpp + modules/lorem_test.cpp + modules/medicine_test.cpp + modules/movie_test.cpp + modules/music_test.cpp + modules/number_test.cpp + modules/person_test.cpp + modules/phone_test.cpp + modules/plant_test.cpp + modules/science_test.cpp + modules/sport_test.cpp + modules/string_test.cpp + modules/system_test.cpp + modules/vehicle_test.cpp + modules/version_test.cpp + modules/video_game_test.cpp + modules/weather_test.cpp + modules/word_test.cpp ) add_executable(${PROJECT_NAME} ${FAKER_UT_SOURCES}) diff --git a/tests/modules/airline/airline_test.cpp b/tests/modules/airline_test.cpp similarity index 99% rename from tests/modules/airline/airline_test.cpp rename to tests/modules/airline_test.cpp index cec523938..dee29a904 100644 --- a/tests/modules/airline/airline_test.cpp +++ b/tests/modules/airline_test.cpp @@ -7,7 +7,7 @@ #include "gtest/gtest.h" -#include "airline/airline_data.h" +#include "airline_data.h" using namespace ::testing; using namespace faker::airline; diff --git a/tests/modules/animal/animal_test.cpp b/tests/modules/animal_test.cpp similarity index 99% rename from tests/modules/animal/animal_test.cpp rename to tests/modules/animal_test.cpp index 0a3801d65..e742a2f06 100644 --- a/tests/modules/animal/animal_test.cpp +++ b/tests/modules/animal_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "animal/animal_data.h" +#include "animal_data.h" using namespace ::testing; using namespace faker::animal; diff --git a/tests/modules/book/book_test.cpp b/tests/modules/book_test.cpp similarity index 98% rename from tests/modules/book/book_test.cpp rename to tests/modules/book_test.cpp index 342989f71..348b040a3 100644 --- a/tests/modules/book/book_test.cpp +++ b/tests/modules/book_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "book/book_data.h" +#include "book_data.h" using namespace ::testing; using namespace faker::book; diff --git a/tests/modules/color/color_test.cpp b/tests/modules/color_test.cpp similarity index 99% rename from tests/modules/color/color_test.cpp rename to tests/modules/color_test.cpp index 39144294a..d77a64f81 100644 --- a/tests/modules/color/color_test.cpp +++ b/tests/modules/color_test.cpp @@ -7,10 +7,10 @@ #include "gtest/gtest.h" -#include "color/color_data.h" +#include "color_data.h" #include "common/string_helper.h" #include "faker-cxx/types/hex.h" -#include "string/string_data.h" +#include "string_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/commerce/commerce_test.cpp b/tests/modules/commerce_test.cpp similarity index 99% rename from tests/modules/commerce/commerce_test.cpp rename to tests/modules/commerce_test.cpp index 714d8e241..7c559571d 100644 --- a/tests/modules/commerce/commerce_test.cpp +++ b/tests/modules/commerce_test.cpp @@ -5,9 +5,9 @@ #include "gtest/gtest.h" -#include "commerce/commerce_data.h" +#include "commerce_data.h" #include "common/string_helper.h" -#include "string/string_data.h" +#include "string_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/company/company_test.cpp b/tests/modules/company_test.cpp similarity index 99% rename from tests/modules/company/company_test.cpp rename to tests/modules/company_test.cpp index af14c9f3c..7664efb5d 100644 --- a/tests/modules/company/company_test.cpp +++ b/tests/modules/company_test.cpp @@ -7,8 +7,8 @@ #include "gtest/gtest.h" #include "common/string_helper.h" -#include "company/company_data.h" -#include "person/person_data.h" +#include "company_data.h" +#include "person_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/computer/computer_test.cpp b/tests/modules/computer_test.cpp similarity index 98% rename from tests/modules/computer/computer_test.cpp rename to tests/modules/computer_test.cpp index 8abdf0255..02048b7e1 100644 --- a/tests/modules/computer/computer_test.cpp +++ b/tests/modules/computer_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "computer/computer_data.h" +#include "computer_data.h" using namespace ::testing; using namespace faker::computer; diff --git a/tests/modules/crypto/crypto_test.cpp b/tests/modules/crypto_test.cpp similarity index 100% rename from tests/modules/crypto/crypto_test.cpp rename to tests/modules/crypto_test.cpp diff --git a/tests/modules/database/database_test.cpp b/tests/modules/database_test.cpp similarity index 96% rename from tests/modules/database/database_test.cpp rename to tests/modules/database_test.cpp index c28c12c78..b257d7e1a 100644 --- a/tests/modules/database/database_test.cpp +++ b/tests/modules/database_test.cpp @@ -5,8 +5,8 @@ #include "gtest/gtest.h" -#include "database/database_data.h" -#include "string/string_data.h" +#include "database_data.h" +#include "string_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/datatype/datatype_test.cpp b/tests/modules/datatype_test.cpp similarity index 100% rename from tests/modules/datatype/datatype_test.cpp rename to tests/modules/datatype_test.cpp diff --git a/tests/modules/date/date_test.cpp b/tests/modules/date_test.cpp similarity index 99% rename from tests/modules/date/date_test.cpp rename to tests/modules/date_test.cpp index c58fafb64..c38550970 100644 --- a/tests/modules/date/date_test.cpp +++ b/tests/modules/date_test.cpp @@ -13,7 +13,7 @@ #include "gtest/gtest.h" #include "common/string_helper.h" -#include "date/date_data.h" +#include "date_data.h" #ifdef _WIN32 #define timegm _mkgmtime diff --git a/tests/modules/finance/finance_test.cpp b/tests/modules/finance_test.cpp similarity index 99% rename from tests/modules/finance/finance_test.cpp rename to tests/modules/finance_test.cpp index 5613d5d24..6522bd117 100644 --- a/tests/modules/finance/finance_test.cpp +++ b/tests/modules/finance_test.cpp @@ -12,9 +12,9 @@ #include "common/luhn_check.h" #include "common/string_helper.h" #include "faker-cxx/types/precision.h" -#include "finance/finance_data.h" +#include "finance_data.h" #include "gmock/gmock.h" -#include "string/string_data.h" +#include "string_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/food/food_test.cpp b/tests/modules/food_test.cpp similarity index 99% rename from tests/modules/food/food_test.cpp rename to tests/modules/food_test.cpp index 6442bec8b..dcf58d266 100644 --- a/tests/modules/food/food_test.cpp +++ b/tests/modules/food_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "food/food_data.h" +#include "food_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/git/git_test.cpp b/tests/modules/git_test.cpp similarity index 100% rename from tests/modules/git/git_test.cpp rename to tests/modules/git_test.cpp diff --git a/tests/modules/hacker/hacker_test.cpp b/tests/modules/hacker_test.cpp similarity index 98% rename from tests/modules/hacker/hacker_test.cpp rename to tests/modules/hacker_test.cpp index 6ce7582dc..013fdebde 100644 --- a/tests/modules/hacker/hacker_test.cpp +++ b/tests/modules/hacker_test.cpp @@ -6,7 +6,7 @@ #include "gtest/gtest.h" -#include "hacker/hacker_data.h" +#include "hacker_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/helper/helper_test.cpp b/tests/modules/helper_test.cpp similarity index 100% rename from tests/modules/helper/helper_test.cpp rename to tests/modules/helper_test.cpp diff --git a/tests/modules/image/image_test.cpp b/tests/modules/image_test.cpp similarity index 100% rename from tests/modules/image/image_test.cpp rename to tests/modules/image_test.cpp diff --git a/tests/modules/internet/internet_test.cpp b/tests/modules/internet_test.cpp similarity index 99% rename from tests/modules/internet/internet_test.cpp rename to tests/modules/internet_test.cpp index 66bc7f9f6..68407a24d 100644 --- a/tests/modules/internet/internet_test.cpp +++ b/tests/modules/internet_test.cpp @@ -14,10 +14,10 @@ #include "common/string_helper.h" #include "faker-cxx/number.h" #include "faker-cxx/types/country.h" -#include "internet/internet_data.h" -#include "person/person_data.h" -#include "string/string_data.h" -#include "word/word_data.h" +#include "internet_data.h" +#include "person_data.h" +#include "string_data.h" +#include "word_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/location/location_test.cpp b/tests/modules/location_test.cpp similarity index 99% rename from tests/modules/location/location_test.cpp rename to tests/modules/location_test.cpp index ce488793d..e822c7d86 100644 --- a/tests/modules/location/location_test.cpp +++ b/tests/modules/location_test.cpp @@ -10,9 +10,9 @@ #include "common/string_helper.h" #include "faker-cxx/types/precision.h" -#include "location/location_data.h" -#include "person/person_data.h" -#include "string/string_data.h" +#include "location_data.h" +#include "person_data.h" +#include "string_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/lorem/lorem_test.cpp b/tests/modules/lorem_test.cpp similarity index 99% rename from tests/modules/lorem/lorem_test.cpp rename to tests/modules/lorem_test.cpp index d91ef4279..f55ffc494 100644 --- a/tests/modules/lorem/lorem_test.cpp +++ b/tests/modules/lorem_test.cpp @@ -7,7 +7,7 @@ #include "gtest/gtest.h" #include "common/string_helper.h" -#include "lorem/lorem_data.h" +#include "lorem_data.h" using namespace ::testing; using namespace::faker; diff --git a/tests/modules/medicine/medicine_test.cpp b/tests/modules/medicine_test.cpp similarity index 97% rename from tests/modules/medicine/medicine_test.cpp rename to tests/modules/medicine_test.cpp index 8b2a580c7..df3e9026e 100644 --- a/tests/modules/medicine/medicine_test.cpp +++ b/tests/modules/medicine_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "medicine/medicine_data.h" +#include "medicine_data.h" using namespace ::testing; using namespace faker::medicine; diff --git a/tests/modules/movie/movie_test.cpp b/tests/modules/movie_test.cpp similarity index 98% rename from tests/modules/movie/movie_test.cpp rename to tests/modules/movie_test.cpp index 488ba86e6..f31b08c2f 100644 --- a/tests/modules/movie/movie_test.cpp +++ b/tests/modules/movie_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "movie/movie_data.h" +#include "movie_data.h" using namespace ::testing; using namespace faker::movie; diff --git a/tests/modules/music/music_test.cpp b/tests/modules/music_test.cpp similarity index 97% rename from tests/modules/music/music_test.cpp rename to tests/modules/music_test.cpp index 5018d38ad..fb036ac6e 100644 --- a/tests/modules/music/music_test.cpp +++ b/tests/modules/music_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "music/music_data.h" +#include "music_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/number/number_test.cpp b/tests/modules/number_test.cpp similarity index 100% rename from tests/modules/number/number_test.cpp rename to tests/modules/number_test.cpp diff --git a/tests/modules/person/person_test.cpp b/tests/modules/person_test.cpp similarity index 99% rename from tests/modules/person/person_test.cpp rename to tests/modules/person_test.cpp index 113fcce9a..d18c05789 100644 --- a/tests/modules/person/person_test.cpp +++ b/tests/modules/person_test.cpp @@ -12,9 +12,9 @@ #include "faker-cxx/internet.h" #include "faker-cxx/types/country.h" -#include "person/person_data.h" +#include "person_data.h" #include "string_helper.h" -#include "word/word_data.h" +#include "word_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/phone/phone_test.cpp b/tests/modules/phone_test.cpp similarity index 99% rename from tests/modules/phone/phone_test.cpp rename to tests/modules/phone_test.cpp index 92dd600ee..7223e0aba 100644 --- a/tests/modules/phone/phone_test.cpp +++ b/tests/modules/phone_test.cpp @@ -7,7 +7,7 @@ #include "gtest/gtest.h" -#include "phone/phone_data.h" +#include "phone_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/plant/plant_test.cpp b/tests/modules/plant_test.cpp similarity index 98% rename from tests/modules/plant/plant_test.cpp rename to tests/modules/plant_test.cpp index ad6658531..fae23ce48 100644 --- a/tests/modules/plant/plant_test.cpp +++ b/tests/modules/plant_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "plant/plant_data.h" +#include "plant_data.h" using namespace ::testing; using namespace faker::plant; diff --git a/tests/modules/science/science_test.cpp b/tests/modules/science_test.cpp similarity index 98% rename from tests/modules/science/science_test.cpp rename to tests/modules/science_test.cpp index e25736b35..aa539e8fd 100644 --- a/tests/modules/science/science_test.cpp +++ b/tests/modules/science_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "science/science_data.h" +#include "science_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/sport/sport_test.cpp b/tests/modules/sport_test.cpp similarity index 98% rename from tests/modules/sport/sport_test.cpp rename to tests/modules/sport_test.cpp index 5177fb4cf..9046035d4 100644 --- a/tests/modules/sport/sport_test.cpp +++ b/tests/modules/sport_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "sport/sport_data.h" +#include "sport_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/string/string_test.cpp b/tests/modules/string_test.cpp similarity index 99% rename from tests/modules/string/string_test.cpp rename to tests/modules/string_test.cpp index 59503fdf0..6cfddaf83 100644 --- a/tests/modules/string/string_test.cpp +++ b/tests/modules/string_test.cpp @@ -11,7 +11,7 @@ #include "faker-cxx/random_generator.h" #include "faker-cxx/types/hex.h" -#include "string/string_data.h" +#include "string_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/system/system_test.cpp b/tests/modules/system_test.cpp similarity index 99% rename from tests/modules/system/system_test.cpp rename to tests/modules/system_test.cpp index 0f800948e..608cc861d 100644 --- a/tests/modules/system/system_test.cpp +++ b/tests/modules/system_test.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -#include "system/system_data.h" +#include "system_data.h" using namespace ::testing; using namespace faker::system; diff --git a/tests/modules/vehicle/vehicle_test.cpp b/tests/modules/vehicle_test.cpp similarity index 98% rename from tests/modules/vehicle/vehicle_test.cpp rename to tests/modules/vehicle_test.cpp index 9142bef1c..e2c521e38 100644 --- a/tests/modules/vehicle/vehicle_test.cpp +++ b/tests/modules/vehicle_test.cpp @@ -7,7 +7,7 @@ #include "gtest/gtest.h" -#include "vehicle/vehicle_data.h" +#include "vehicle_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/version/version_test.cpp b/tests/modules/version_test.cpp similarity index 100% rename from tests/modules/version/version_test.cpp rename to tests/modules/version_test.cpp diff --git a/tests/modules/video_game/video_game_test.cpp b/tests/modules/video_game_test.cpp similarity index 97% rename from tests/modules/video_game/video_game_test.cpp rename to tests/modules/video_game_test.cpp index f7424ad72..8f286ca8d 100644 --- a/tests/modules/video_game/video_game_test.cpp +++ b/tests/modules/video_game_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "video_game/video_game_data.h" +#include "video_game_data.h" using namespace ::testing; using namespace faker; diff --git a/tests/modules/weather/weather_test.cpp b/tests/modules/weather_test.cpp similarity index 94% rename from tests/modules/weather/weather_test.cpp rename to tests/modules/weather_test.cpp index f3d02b7f6..134ab8c33 100644 --- a/tests/modules/weather/weather_test.cpp +++ b/tests/modules/weather_test.cpp @@ -5,7 +5,7 @@ #include "gtest/gtest.h" -#include "weather/weather_data.h" +#include "weather_data.h" using namespace ::testing; using namespace faker::weather; diff --git a/tests/modules/word/word_test.cpp b/tests/modules/word_test.cpp similarity index 99% rename from tests/modules/word/word_test.cpp rename to tests/modules/word_test.cpp index 53b2cf595..6388d90ee 100644 --- a/tests/modules/word/word_test.cpp +++ b/tests/modules/word_test.cpp @@ -7,7 +7,7 @@ #include "gtest/gtest.h" #include "common/string_helper.h" -#include "word/word_data.h" +#include "word_data.h" using namespace faker::word; using namespace faker;