Issue:446 Add location address data for Serbia. (#533)

cieslarmichal · May 3, 2024 · 87ba580 · 87ba580
1 parent 69524c9
commit 87ba580
Show file tree

Hide file tree

Showing 7 changed files with 645 additions and 3 deletions.
diff --git a/include/faker-cxx/Location.h b/include/faker-cxx/Location.h
@@ -26,7 +26,8 @@ enum class AddressCountry
     Romania,
     Latvia,
     Nepal,
-    Belgium
+    Belgium,
+    Serbia
 };
 
 class Location

diff --git a/src/modules/location/Location.cpp b/src/modules/location/Location.cpp
@@ -23,6 +23,7 @@
 #include "data/poland/PolandAddresses.h"
 #include "data/romania/RomaniaAddresses.h"
 #include "data/russia/RussiaAddresses.h"
+#include "data/serbia/SerbiaAddresses.h"
 #include "data/spain/SpainAddresses.h"
 #include "data/TimeZones.h"
 #include "data/ukraine/UkraineAddresses.h"
@@ -54,7 +55,8 @@ const std::map<AddressCountry, CountryAddresses> countryToCountryAddressesMappin
     {AddressCountry::Latvia, latviaAddresses},
     {AddressCountry::Nepal, nepalAddresses},
     {AddressCountry::Belgium, belgiumAddresses},
-    };
+    {AddressCountry::Serbia, serbiaAddresses},
+};
 
 const std::map<AddressCountry, Country> countryAddressToCountryMapping{
     {AddressCountry::Usa, Country::Usa},
@@ -76,6 +78,7 @@ const std::map<AddressCountry, Country> countryAddressToCountryMapping{
     {AddressCountry::Latvia, Country::Latvia},
     {AddressCountry::Nepal, Country::Nepal},
     {AddressCountry::Belgium, Country::Belgium},
+    {AddressCountry::Serbia, Country::Serbia},
 };
 }
 

diff --git a/src/modules/location/LocationTest.cpp b/src/modules/location/LocationTest.cpp
@@ -41,6 +41,7 @@
 #include "data/poland/PolandAddresses.h"
 #include "data/romania/RomaniaAddresses.h"
 #include "data/russia/RussiaAddresses.h"
+#include "data/serbia/SerbiaAddresses.h"
 #include "data/spain/SpainAddresses.h"
 #include "data/TimeZones.h"
 #include "data/ukraine/UkraineAddresses.h"
@@ -56,7 +57,7 @@ const std::vector<AddressCountry> addressCountries{
     AddressCountry::Ukraine, AddressCountry::Italy,   AddressCountry::Germany,   AddressCountry::Czech,
     AddressCountry::India,   AddressCountry::Denmark, AddressCountry::Australia, AddressCountry::Spain,
     AddressCountry::Brazil,  AddressCountry::Finland, AddressCountry::Estonia,   AddressCountry::Romania,
-    AddressCountry::Latvia};
+    AddressCountry::Latvia, AddressCountry::Serbia };
 
 const std::map<AddressCountry, CountryAddresses> countryToCountryAddressesMapping{
     {AddressCountry::Usa, usaAddresses},
@@ -78,6 +79,7 @@ const std::map<AddressCountry, CountryAddresses> countryToCountryAddressesMappin
     {AddressCountry::Latvia, latviaAddresses},
     {AddressCountry::Nepal, nepalAddresses},
     {AddressCountry::Belgium, belgiumAddresses},
+    {AddressCountry::Serbia, serbiaAddresses},
 };
 
 const std::map<AddressCountry, std::string> generatedTestName{
@@ -100,6 +102,7 @@ const std::map<AddressCountry, std::string> generatedTestName{
     {AddressCountry::Latvia, "shouldGenerateLatviaAddress"},
     {AddressCountry::Nepal, "shouldGenerateNepalAddress"},
     {AddressCountry::Belgium, "shouldGenerateBelgiumAddress"},
+    {AddressCountry::Serbia, "shouldGenerateSerbiaAddress"},
 };
 }
 
@@ -937,3 +940,19 @@ TEST_F(LocationTest, shouldGenerateBelgiumStreetAddress)
     ASSERT_TRUE(std::ranges::any_of(belgiumStreetSuffixes, [&generatedStreetSuffix](const std::string& streetSuffix)
                                     { return streetSuffix == generatedStreetSuffix; }));
 }
+
+TEST_F(LocationTest, shouldGenerateSerbiaStreet)
+{
+    const auto generatedStreet = Location::street(AddressCountry::Serbia);
+
+    ASSERT_TRUE(std::ranges::any_of(serbiaStreetNames, [&generatedStreet](const std::string& streetName)
+                                    { return streetName == generatedStreet; }));
+}
+
+TEST_F(LocationTest, shouldGenerateSerbiaStreetAddress)
+{
+    const auto generatedStreetAddress = Location::streetAddress(AddressCountry::Serbia);
+
+    ASSERT_TRUE(std::ranges::any_of(serbiaStreetNames, [&generatedStreetAddress](const std::string& streetName)
+                                    { return generatedStreetAddress.find(streetName) != std::string::npos; }));
+}
diff --git a/src/modules/location/data/serbia/SerbiaAddresses.h b/src/modules/location/data/serbia/SerbiaAddresses.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "../CountryAddresses.h"
+#include "SerbiaCities.h"
+#include "SerbiaStates.h"
+#include "SerbiaStreetNames.h"
+
+namespace faker
+{
+const std::string serbiaZipCodeFormat{"#####"};
+
+const std::vector<std::string> serbiaAddressFormats{"{buildingNumber} {street}"};
+
+const std::vector<std::string> serbiaSecondaryAddressFormats{"Sprat #", "Stan ##"};
+
+const std::vector<std::string> serbiaBuildingNumberFormats{
+    "#",
+    "##",
+    "###",
+};
+
+const std::vector<std::string> serbiaStreetFormats{"{streetName}"};
+
+const std::vector<std::string> serbiaCityFormats{"{cityName}"};
+
+const CountryAddresses serbiaAddresses{serbiaZipCodeFormat,
+                                       serbiaAddressFormats,
+                                       serbiaSecondaryAddressFormats,
+                                       serbiaStreetFormats,
+                                       {},
+                                       serbiaStreetNames,
+                                       {},
+                                       serbiaBuildingNumberFormats,
+                                       serbiaCityFormats,
+                                       {},
+                                       serbiaCities,
+                                       {},
+                                       serbiaStates,
+                                       {}};
+}
diff --git a/src/modules/location/data/serbia/SerbiaCities.h b/src/modules/location/data/serbia/SerbiaCities.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace faker
+{
+const std::vector<std::string> serbiaCities = {
+    "Beograd",
+    "Bor",
+    "Jagodina",
+    "Kikinda",
+    "Kraljevo",
+    "Kruševac",
+    "Leskovac",
+    "Niš",
+    "Novi Pazar",
+    "Novi Sad",
+    "Pančevo",
+    "Paraćin",
+    "Pirot",
+    "Požarevac",
+    "Prokuplje",
+    "Smederevo",
+    "Sombor",
+    "Sopot",
+    "Sremska Mitrovica",
+    "Subotica",
+    "Užice",
+    "Vranje",
+    "Vršac",
+    "Zaječar",
+    "Zrenjanjin",
+    "Čačak",
+    "Šabac",
+};
+}
diff --git a/src/modules/location/data/serbia/SerbiaStates.h b/src/modules/location/data/serbia/SerbiaStates.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace faker
+{
+const std::vector<std::string> serbiaStates = {
+    "Borski okrug",
+    "Braničevski okrug",
+    "Grad Beograd",
+    "Zaječarski okrug",
+    "Zapadnobački okrug",
+    "Zlatiborski okrug",
+    "Jablanički okrug",
+    "Južnobanatski okrug",
+    "Južnobački okrug",
+    "Kolubarski okrug",
+    "Kosovski okrug",
+    "Kosovskomitrovački okrug",
+    "Kosovskopomoravski okrug",
+    "Mačvanski okrug",
+    "Moravički okrug",
+    "Nišavski okrug",
+    "Pećki okrug",
+    "Pirotski okrug",
+    "Podunavski okrug",
+    "Pomoravski okrug",
+    "Prizrenski okrug",
+    "Pčinjski okrug",
+    "Rasinski okrug",
+    "Raški okrug",
+    "Severnobanatski okrug",
+    "Severnobački okrug",
+    "Srednjobanatski okrug",
+    "Sremski okrug",
+    "Toplički okrug",
+    "Šumadijski okrug",
+};
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,8 @@ enum class AddressCountry @@
         Romania,
         Latvia,
         Nepal,
-        Belgium
+        Belgium,
+        Serbia
     };
     class Location
@@ Expand Down @@