Issue#452 (#470)

* created estonia folder in location with neccesaay files * changed the if statement to test for linux in addition to APPLE * introduction of estonian location data The CMakeLists.txt was modified because Ubuntu 22.04 version had gcc version 11 which did not have the <format> header and did not compile on my machine so i changed the conditional to allow for it to use the fmt::format library The modification lead to updating the FormatHelper.h header to reflect the changes. in addition The fmt library was also added as dependency to the test target to enable the test compile on my machine Estonia locaction data was added which includes EstoniaAddresses EstoniaCounties EstoniaStreetNames EstoniaStreetSuffixes test was appended to the end of LocationTest using the test for denmark as a template estonia was included in AddressCountry enum finally, The estonia data was gotten from resource available on the internet and google maps so their is no guarantee that all the information are correct as i do not live in estonia. * using the format tools * debuged the added test case failuure modified the test case, included the proper headers in location source file modified CMake list by removing the dependency introduced inadverently for g++ version greater than 10 modified the EstoniaStreetNames by removing street suffixes finally corrected error in arguement passed to the estonianadresses object * minor change to check if msvc and clang would compile * reverted back to the prevoius commit where msvc and clang failed * included the extra defined statement * added extra checks for clang compiler
cieslarmichal · Jan 17, 2024 · 3c2e65f · 3c2e65f
1 parent a6091bf
commit 3c2e65f
Show file tree

Hide file tree

Showing 11 changed files with 181 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,7 +113,9 @@ target_include_directories(
     INTERFACE "${CMAKE_CURRENT_LIST_DIR}/include"
     PRIVATE "${CMAKE_CURRENT_LIST_DIR}/include")
 
-if(APPLE)
+if(APPLE OR (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION
+                                                      VERSION_LESS 12))
+
     add_subdirectory(externals/fmt)
     set(FMT_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/externals/fmt/include")
     target_link_libraries(${LIBRARY_NAME} PRIVATE fmt)
@@ -140,7 +142,10 @@ if(BUILD_FAKER_TESTS)
     target_link_libraries(${LIBRARY_NAME}-UT PRIVATE gtest_main gmock_main
                                                      faker-cxx)
 
-    if(APPLE)
+    if(APPLE OR (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+                 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12))
+
+        target_link_libraries(${LIBRARY_NAME}-UT PRIVATE fmt)
         target_include_directories(
             ${LIBRARY_NAME}-UT
             PRIVATE ${FMT_INCLUDE_DIR} ${GTEST_INCLUDE_DIR}

diff --git a/include/faker-cxx/Internet.h b/include/faker-cxx/Internet.h
@@ -3,6 +3,7 @@
 #include <array>
 #include <optional>
 #include <string>
+
 #include "types/Country.h"
 #include "types/EmojiType.h"
 
@@ -57,8 +58,7 @@ class Internet
      * @endcode
      */
     static std::string username(std::optional<std::string> firstName = std::nullopt,
-                                std::optional<std::string> lastName = std::nullopt,
-                                Country country = Country::Usa);
+                                std::optional<std::string> lastName = std::nullopt, Country country = Country::Usa);
 
     /**
      * @brief Generates an email address using the given person's name as base.

diff --git a/include/faker-cxx/types/AddressCountry.h b/include/faker-cxx/types/AddressCountry.h
@@ -22,7 +22,8 @@ namespace faker
         Denmark,
         Spain,
         Brazil,
-        Finland
+        Finland,
+        Estonia
     };
 
     const std::vector<AddressCountry> addressCountries{

diff --git a/src/common/FormatHelper.h b/src/common/FormatHelper.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#if defined(__APPLE__) || defined(__MINGW32__)
+#if defined(__APPLE__) || defined(__MINGW32__) || (defined(__GNUC__) && (__GNUC__ < 12)  && !defined(__clang__))
 #include <fmt/format.h>
 #else
 #include <format>
@@ -16,7 +16,7 @@ namespace faker
 class FormatHelper
 {
 public:
-#if defined(__APPLE__) || defined(__MINGW32__)
+#if defined(__APPLE__) || defined(__MINGW32__) || (defined(__GNUC__) && (__GNUC__ < 12)  && !defined(__clang__))
     template <typename... Args>
     static std::string format(fmt::format_string<Args...> fmt, Args&&... args)
     {

diff --git a/src/modules/location/Location.cpp b/src/modules/location/Location.cpp
@@ -24,6 +24,7 @@
 #include "faker-cxx/String.h"
 #include "data/india/IndiaAddresses.h"
 #include "data/denmark/DenmarkAddresses.h"
+#include "data/estonia/EstoniaAddresses.h"
 
 namespace faker
 {
@@ -37,6 +38,7 @@ namespace faker
                 {AddressCountry::Australia, australiaAddresses}, {AddressCountry::India, indiaAddresses},
                 {AddressCountry::Denmark, denmarkAddresses}, {AddressCountry::Spain, spainAddresses},
                 {AddressCountry::Brazil, brazilAddresses},   {AddressCountry::Finland, finlandAddresses},
+                {AddressCountry::Estonia, estoniaAddresses},
         };
 
         const std::map<AddressCountry, Country> countryAddressToCountryMapping{
@@ -47,6 +49,7 @@ namespace faker
                 {AddressCountry::Australia, Country::Australia}, {AddressCountry::India, Country::India},
                 {AddressCountry::Denmark, Country::Denmark}, {AddressCountry::Spain, Country::Spain},
                 {AddressCountry::Brazil, Country::Brazil},   {AddressCountry::Finland, Country::Finland},
+                 {AddressCountry::Estonia, Country::Estonia},
         };
     }
 

diff --git a/src/modules/location/LocationTest.cpp b/src/modules/location/LocationTest.cpp
@@ -21,6 +21,8 @@
 #include "../person/data/australia/AustralianLastNames.h"
 #include "../person/data/finland/FinnishFirstNames.h"
 #include "../person/data/finland/FinnishLastNames.h"
+#include "../person/data/estonia/EstonianFirstNames.h"
+#include "../person/data/estonia/EstonianLastNames.h"
 #include "../string/data/Characters.h"
 #include "data/Countries.h"
 #include "data/CountryAddresses.h"
@@ -40,6 +42,7 @@
 #include "data/spain/SpainAddresses.h"
 #include "data/brazil/BrazilAddresses.h"
 #include "data/finland/FinlandAddresses.h"
+#include "data/estonia/EstoniaAddresses.h"
 
 using namespace ::testing;
 using namespace faker;
@@ -54,6 +57,7 @@ namespace
             {AddressCountry::Australia, australiaAddresses}, {AddressCountry::India, indiaAddresses},
             {AddressCountry::Denmark, denmarkAddresses}, {AddressCountry::Spain, spainAddresses},
             {AddressCountry::Brazil, brazilAddresses},   {AddressCountry::Finland, finlandAddresses},
+            {AddressCountry::Estonia, estoniaAddresses}, 
     };
 
     const std::map<AddressCountry, std::string> generatedTestName{
@@ -71,6 +75,7 @@ namespace
             {AddressCountry::Spain, "shouldGenerateSpainAddress"},
             {AddressCountry::Brazil, "shouldGenerateBrazilAddress"},
             {AddressCountry::Finland, "shouldGenerateFinlandAddress"},
+            {AddressCountry::Estonia, "shouldGenerateEstoniaAddress"},
     };
 }
 
@@ -701,7 +706,8 @@ TEST_F(LocationTest, shouldGenerateIndiaStreetAddress)
 TEST_F(LocationTest, shouldGenerateDenmarkStreet)
 {
     const auto generatedStreet = Location::street(AddressCountry::Denmark);
-
+
+
     ASSERT_TRUE(std::ranges::any_of(denmarkStreetNames, [&generatedStreet](const std::string& streetName)
     { return streetName == generatedStreet; }));
 }
@@ -790,4 +796,21 @@ TEST_F(LocationTest, shouldGenerateFinlandStreetAddress)
     { return generatedStreetAddress.find(firstName) != std::string::npos; }) ||
                 std::ranges::any_of(lastNames, [&generatedStreetAddress](const std::string& lastName)
                 { return generatedStreetAddress.find(lastName) != std::string::npos; }));
-}
+}
+
+
+TEST_F(LocationTest, shouldGenerateEstoniaStreet)
+{
+    const auto generatedStreet = Location::street(AddressCountry::Estonia);
+
+    ASSERT_TRUE(std::ranges::any_of(estoniaStreetNames, [&generatedStreet](const std::string& streetName)
+    { return generatedStreet.find(streetName) != std::string::npos; }));
+}
+
+TEST_F(LocationTest, shouldGenerateEstoniaStreetAddress)
+{
+    const auto generatedStreetAddress = Location::streetAddress(AddressCountry::Estonia);
+
+    ASSERT_TRUE(std::ranges::any_of(estoniaStreetNames, [&generatedStreetAddress](const std::string& streetName)
+    { return generatedStreetAddress.find(streetName) != std::string::npos; }));
+}
diff --git a/src/modules/location/data/estonia/EstoniaAddresses.h b/src/modules/location/data/estonia/EstoniaAddresses.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "../CountryAddresses.h"
+#include "EstoniaCities.h"
+#include "EstoniaCounties.h"
+#include "EstoniaStreetNames.h"
+#include "EstoniaStreetSuffixes.h"
+
+namespace faker {
+
+const std::string estoniaZipCodeFormat{"#####"};
+
+const std::vector<std::string> estoniaAddressFormats{"{street} {buildingNumber}"};
+
+const std::vector<std::string> estoniaBuildingNumberFormats{"###", "##", "#"};
+
+const std::vector<std::string> estoniaStreetFormats{"{streetName} {streetSuffix}"};
+
+const std::vector<std::string> estoniaCityFormats{"{cityName}"};
+
+const CountryAddresses estoniaAddresses{estoniaZipCodeFormat,
+                                        estoniaAddressFormats,
+                                        {},
+                                        estoniaStreetFormats,
+                                        {},
+                                        estoniaStreetNames,
+                                        estoniaStreetSuffixes,
+                                        estoniaBuildingNumberFormats,
+                                        estoniaCityFormats,
+                                        {},
+                                        estoniaCities,
+                                        {},
+                                        {},
+                                        estoniaCounties};
+}
diff --git a/src/modules/location/data/estonia/EstoniaCities.h b/src/modules/location/data/estonia/EstoniaCities.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace faker
+{
+const std::vector<std::string> estoniaCities{
+    "Tallinn",
+    "Tartu",
+    "Narva",
+    "Pärnu",
+    "Kohtla-Järve",
+
+};
+
+}
diff --git a/src/modules/location/data/estonia/EstoniaCounties.h b/src/modules/location/data/estonia/EstoniaCounties.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace faker
+{
+const std::vector<std::string> estoniaCounties  {
+
+    "Harju",
+    "Hiiu",
+    "Ida-Viru",
+    "Jõgeva",
+    "Järva",
+    "Lääne",
+    "Lääne-Viru",
+    "Põlva",
+    "Pärnu",
+    "Rapla",
+    "Saare",
+    "Tartu",
+    "Valga",
+    "Viljandi",
+    "Võru",
+
+};
+
+}
diff --git a/src/modules/location/data/estonia/EstoniaStreetNames.h b/src/modules/location/data/estonia/EstoniaStreetNames.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace faker
+{
+const std::vector<std::string> estoniaStreetNames{
+"Laagna",
+"Punane",
+"Paepargi",
+"Pae",
+"Peterburi",
+"Valukoja",
+"Betooni",
+"Sõpruse",
+"Mustamäe",
+"Tuisu",
+"Külmallika",
+"Tammi",
+"Koore",
+"Kuubi",
+"Okka",
+"Vaba",
+"Tähe",
+"Õnne",
+"Aleksandri",
+"Kalevi",
+"Turu",
+"Tähe",
+"Lina",
+"Õnne",
+"Era",
+"Vanemuise",
+"Tiigi",
+"Tiigi",
+"Juhan Liivi",
+"K. A. Hermanni",
+"Veski",
+};
+
+}
diff --git a/src/modules/location/data/estonia/EstoniaStreetSuffixes.h b/src/modules/location/data/estonia/EstoniaStreetSuffixes.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace faker
+{
+const std::vector<std::string> estoniaStreetSuffixes {
+    	"Tänav",
+        "tn",
+        "Tee",
+        "Allee",
+        "Plats",
+        "Käik",
+        "Põik",
+};
+
+}