Skip to content

Commit 0333bac

Browse files
robdmoorerobdmoore
committed
Renamed geo and person anonymous value suppliers to read better when used
Put them in their own namespace to ensure that there are no name conflicts if people want to use the enum/string/int etc. ones, but not the person/geo ones
1 parent 383070a commit 0333bac

File tree

7 files changed

+40
-35
lines changed

7 files changed

+40
-35
lines changed

‎NTestDataBuilder.Tests/EquivalenceClasses/PersonEquivalenceClassesTests.cs‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
using NTestDataBuilder.DataSources.Geography;
66
using NTestDataBuilder.DataSources.Person;
77
using NTestDataBuilder.EquivalenceClasses;
8+
using NTestDataBuilder.EquivalenceClasses.Geo;
9+
using NTestDataBuilder.EquivalenceClasses.Person;
810
using Shouldly;
911
using Xunit.Extensions;
1012

@@ -41,21 +43,21 @@ public static IEnumerable<object[]> TestCases
4143
{
4244
get
4345
{
44-
yield return new object[] { new PersonEmailAddressSource(), GenerateTestCasesForSut(Any.PersonEmailAddress) };
45-
yield return new object[] { new PersonLanguageSource(), GenerateTestCasesForSut(Any.PersonLanguage) };
46-
yield return new object[] { new PersonNameFirstFemaleSource(), GenerateTestCasesForSut(Any.PersonNameFirstFemale) };
47-
yield return new object[] { new PersonNameFirstSource(), GenerateTestCasesForSut(Any.PersonNameFirst) };
48-
yield return new object[] { new PersonNameFullSource(), GenerateTestCasesForSut(Any.PersonNameFull) };
49-
yield return new object[] { new PersonNameLastSource(), GenerateTestCasesForSut(Any.PersonNameLast) };
50-
yield return new object[] { new PersonNameFirstMaleSource(), GenerateTestCasesForSut(Any.PersonNameFirstMale) };
51-
yield return new object[] { new PersonNameSuffixSource(), GenerateTestCasesForSut(Any.PersonNameSuffix) };
52-
yield return new object[] { new PersonNameTitleSource(), GenerateTestCasesForSut(Any.PersonNameTitle) };
46+
yield return new object[] { new PersonEmailAddressSource(), GenerateTestCasesForSut(Any.EmailAddress) };
47+
yield return new object[] { new PersonLanguageSource(), GenerateTestCasesForSut(Any.Language) };
48+
yield return new object[] { new PersonNameFirstFemaleSource(), GenerateTestCasesForSut(Any.FemaleFirstName) };
49+
yield return new object[] { new PersonNameFirstSource(), GenerateTestCasesForSut(Any.FirstName) };
50+
yield return new object[] { new PersonNameFullSource(), GenerateTestCasesForSut(Any.FullName) };
51+
yield return new object[] { new PersonNameLastSource(), GenerateTestCasesForSut(Any.LastName) };
52+
yield return new object[] { new PersonNameFirstMaleSource(), GenerateTestCasesForSut(Any.MaleFirstName) };
53+
yield return new object[] { new PersonNameSuffixSource(), GenerateTestCasesForSut(Any.Suffix) };
54+
yield return new object[] { new PersonNameTitleSource(), GenerateTestCasesForSut(Any.Title) };
5355

54-
yield return new object[] { new GeoContinentSource(), GenerateTestCasesForSut(Any.GeoContinent) };
55-
yield return new object[] { new GeoCountrySource(), GenerateTestCasesForSut(Any.GeoCountry) };
56-
yield return new object[] { new GeoCountryCodeSource(), GenerateTestCasesForSut(Any.GeoCountryCode) };
57-
yield return new object[] { new GeoLatitudeSource(), GenerateTestCasesForSut(Any.GeoLatitude) };
58-
yield return new object[] { new GeoLongitudeSource(), GenerateTestCasesForSut(Any.GeoLongitude) };
56+
yield return new object[] { new GeoContinentSource(), GenerateTestCasesForSut(Any.Continent) };
57+
yield return new object[] { new GeoCountrySource(), GenerateTestCasesForSut(Any.Country) };
58+
yield return new object[] { new GeoCountryCodeSource(), GenerateTestCasesForSut(Any.CountryCode) };
59+
yield return new object[] { new GeoLatitudeSource(), GenerateTestCasesForSut(Any.Latitude) };
60+
yield return new object[] { new GeoLongitudeSource(), GenerateTestCasesForSut(Any.Longitude) };
5961
}
6062
}
6163

NTestDataBuilder/EquivalenceClasses/GeographyEquivalenceClassescs.cs renamed to NTestDataBuilder/EquivalenceClasses/Geo/GeographyEquivalenceClassescs.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using NTestDataBuilder.DataSources.Geography;
22

3-
namespace NTestDataBuilder.EquivalenceClasses
3+
namespace NTestDataBuilder.EquivalenceClasses.Geo
44
{
55
/// <summary>
66
/// Extension methods that describe equivalence classes for generating anonymous geography-related values.
@@ -18,7 +18,7 @@ public static class GeographyEquivalenceClassescs
1818
/// </summary>
1919
/// <param name="fixture">The fixture to generate a string for</param>
2020
/// <returns>The generated string</returns>
21-
public static string GeoContinent(this AnonymousValueFixture fixture)
21+
public static string Continent(this AnonymousValueFixture fixture)
2222
{
2323
if (_geoContinentSource == null) _geoContinentSource = new GeoContinentSource();
2424
return _geoContinentSource.Next();
@@ -29,7 +29,7 @@ public static string GeoContinent(this AnonymousValueFixture fixture)
2929
/// </summary>
3030
/// <param name="fixture">The fixture to generate a string for</param>
3131
/// <returns>The generated string</returns>
32-
public static string GeoCountry(this AnonymousValueFixture fixture)
32+
public static string Country(this AnonymousValueFixture fixture)
3333
{
3434
if (_geoCountrySource == null) _geoCountrySource = new GeoCountrySource();
3535
return _geoCountrySource.Next();
@@ -40,7 +40,7 @@ public static string GeoCountry(this AnonymousValueFixture fixture)
4040
/// </summary>
4141
/// <param name="fixture">The fixture to generate a string for</param>
4242
/// <returns>The generated string</returns>
43-
public static string GeoCountryCode(this AnonymousValueFixture fixture)
43+
public static string CountryCode(this AnonymousValueFixture fixture)
4444
{
4545
if (_geoCountryCodeSource == null) _geoCountryCodeSource = new GeoCountryCodeSource();
4646
return _geoCountryCodeSource.Next();
@@ -52,7 +52,7 @@ public static string GeoCountryCode(this AnonymousValueFixture fixture)
5252
/// </summary>
5353
/// <param name="fixture">The fixture to generate a string for</param>
5454
/// <returns>The generated string</returns>
55-
public static string GeoLatitude(this AnonymousValueFixture fixture)
55+
public static string Latitude(this AnonymousValueFixture fixture)
5656
{
5757
if (_geoLatitudeSource == null) _geoLatitudeSource = new GeoLatitudeSource();
5858
return _geoLatitudeSource.Next();
@@ -63,7 +63,7 @@ public static string GeoLatitude(this AnonymousValueFixture fixture)
6363
/// </summary>
6464
/// <param name="fixture">The fixture to generate a string for</param>
6565
/// <returns>The generated string</returns>
66-
public static string GeoLongitude(this AnonymousValueFixture fixture)
66+
public static string Longitude(this AnonymousValueFixture fixture)
6767
{
6868
if (_geoLongitudeSource == null) _geoLongitudeSource = new GeoLongitudeSource();
6969
return _geoLongitudeSource.Next();

NTestDataBuilder/EquivalenceClasses/PersonEquivalenceClasses.cs renamed to NTestDataBuilder/EquivalenceClasses/Person/PersonEquivalenceClasses.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using NTestDataBuilder.DataSources.Person;
22

3-
namespace NTestDataBuilder.EquivalenceClasses
3+
namespace NTestDataBuilder.EquivalenceClasses.Person
44
{
55
/// <summary>
66
/// Extension methods that describe equivalence classes for generating anonymous person-related values.
@@ -22,7 +22,7 @@ public static class NameEquivalenceClasses
2222
/// </summary>
2323
/// <param name="fixture">The fixture to generate a string for</param>
2424
/// <returns>The generated string</returns>
25-
public static string PersonEmailAddress(this AnonymousValueFixture fixture)
25+
public static string EmailAddress(this AnonymousValueFixture fixture)
2626
{
2727
if (_personEmailAddressSource == null) _personEmailAddressSource = new PersonEmailAddressSource();
2828
return _personEmailAddressSource.Next();
@@ -33,7 +33,7 @@ public static string PersonEmailAddress(this AnonymousValueFixture fixture)
3333
/// </summary>
3434
/// <param name="fixture">The fixture to generate a string for</param>
3535
/// <returns>The generated string</returns>
36-
public static string PersonLanguage(this AnonymousValueFixture fixture)
36+
public static string Language(this AnonymousValueFixture fixture)
3737
{
3838
if (_personLanguageSource == null) _personLanguageSource = new PersonLanguageSource();
3939
return _personLanguageSource.Next();
@@ -44,7 +44,7 @@ public static string PersonLanguage(this AnonymousValueFixture fixture)
4444
/// </summary>
4545
/// <param name="fixture">The fixture to generate a string for</param>
4646
/// <returns>The generated string</returns>
47-
public static string PersonNameFirstFemale(this AnonymousValueFixture fixture)
47+
public static string FemaleFirstName(this AnonymousValueFixture fixture)
4848
{
4949
if (_personNameFirstFemaleSource == null) _personNameFirstFemaleSource = new PersonNameFirstFemaleSource();
5050
return _personNameFirstFemaleSource.Next();
@@ -55,7 +55,7 @@ public static string PersonNameFirstFemale(this AnonymousValueFixture fixture)
5555
/// </summary>
5656
/// <param name="fixture">The fixture to generate a string for</param>
5757
/// <returns>The generated string</returns>
58-
public static string PersonNameFirst(this AnonymousValueFixture fixture)
58+
public static string FirstName(this AnonymousValueFixture fixture)
5959
{
6060
if (_personNameFirstSource == null) _personNameFirstSource = new PersonNameFirstSource();
6161
return _personNameFirstSource.Next();
@@ -66,7 +66,7 @@ public static string PersonNameFirst(this AnonymousValueFixture fixture)
6666
/// </summary>
6767
/// <param name="fixture">The fixture to generate a string for</param>
6868
/// <returns>The generated string</returns>
69-
public static string PersonNameFull(this AnonymousValueFixture fixture)
69+
public static string FullName(this AnonymousValueFixture fixture)
7070
{
7171
if (_personNameFullSource == null) _personNameFullSource = new PersonNameFullSource();
7272
return _personNameFullSource.Next();
@@ -77,7 +77,7 @@ public static string PersonNameFull(this AnonymousValueFixture fixture)
7777
/// </summary>
7878
/// <param name="fixture">The fixture to generate a string for</param>
7979
/// <returns>The generated string</returns>
80-
public static string PersonNameLast(this AnonymousValueFixture fixture)
80+
public static string LastName(this AnonymousValueFixture fixture)
8181
{
8282
if (_personNameLastSource == null) _personNameLastSource = new PersonNameLastSource();
8383
return _personNameLastSource.Next();
@@ -88,7 +88,7 @@ public static string PersonNameLast(this AnonymousValueFixture fixture)
8888
/// </summary>
8989
/// <param name="fixture">The fixture to generate a string for</param>
9090
/// <returns>The generated string</returns>
91-
public static string PersonNameFirstMale(this AnonymousValueFixture fixture)
91+
public static string MaleFirstName(this AnonymousValueFixture fixture)
9292
{
9393
if (_personNameFirstMaleSource == null) _personNameFirstMaleSource = new PersonNameFirstMaleSource();
9494
return _personNameFirstMaleSource.Next();
@@ -99,7 +99,7 @@ public static string PersonNameFirstMale(this AnonymousValueFixture fixture)
9999
/// </summary>
100100
/// <param name="fixture">The fixture to generate a string for</param>
101101
/// <returns>The generated string</returns>
102-
public static string PersonNameSuffix(this AnonymousValueFixture fixture)
102+
public static string Suffix(this AnonymousValueFixture fixture)
103103
{
104104
if (_personNameSuffixSource == null) _personNameSuffixSource = new PersonNameSuffixSource();
105105
return _personNameSuffixSource.Next();
@@ -110,7 +110,7 @@ public static string PersonNameSuffix(this AnonymousValueFixture fixture)
110110
/// </summary>
111111
/// <param name="fixture">The fixture to generate a string for</param>
112112
/// <returns>The generated string</returns>
113-
public static string PersonNameTitle(this AnonymousValueFixture fixture)
113+
public static string Title(this AnonymousValueFixture fixture)
114114
{
115115
if (_personNameTitleSource == null) _personNameTitleSource = new PersonNameTitleSource();
116116
return _personNameTitleSource.Next();

‎NTestDataBuilder/NTestDataBuilder.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
<Compile Include="DataSources\Person\PersonNameSuffixSource.cs" />
7373
<Compile Include="DataSources\Person\PersonNameTitleSource.cs" />
7474
<Compile Include="EquivalenceClasses\EnumEquivalenceClasses.cs" />
75-
<Compile Include="EquivalenceClasses\GeographyEquivalenceClassescs.cs" />
75+
<Compile Include="EquivalenceClasses\Geo\GeographyEquivalenceClassescs.cs" />
7676
<Compile Include="EquivalenceClasses\IntegerEquivalenceClasses.cs" />
77-
<Compile Include="EquivalenceClasses\PersonEquivalenceClasses.cs" />
77+
<Compile Include="EquivalenceClasses\Person\PersonEquivalenceClasses.cs" />
7878
<Compile Include="DataSources\Generators\IGenerator.cs" />
7979
<Compile Include="DataSources\Generators\RandomGenerator.cs" />
8080
<Compile Include="DataSources\Generators\SequentialGenerator.cs" />

‎NTestDataBuilder/Suppliers/DefaultEmailValueSupplier.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using NTestDataBuilder.EquivalenceClasses;
2+
using NTestDataBuilder.EquivalenceClasses.Person;
23

34
namespace NTestDataBuilder.Suppliers
45
{
@@ -16,7 +17,7 @@ public bool CanSupplyValue<TObject, TValue>(string propertyName)
1617
/// <inheritdoc />
1718
public TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName)
1819
{
19-
return (TValue) (object) any.PersonEmailAddress();
20+
return (TValue) (object) any.EmailAddress();
2021
}
2122
}
2223
}

‎NTestDataBuilder/Suppliers/DefaultFirstNameValueSupplier.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using NTestDataBuilder.EquivalenceClasses;
2+
using NTestDataBuilder.EquivalenceClasses.Person;
23

34
namespace NTestDataBuilder.Suppliers
45
{
@@ -16,7 +17,7 @@ public bool CanSupplyValue<TObject, TValue>(string propertyName)
1617
/// <inheritdoc />
1718
public TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName)
1819
{
19-
return (TValue) (object) any.PersonNameFirst();
20+
return (TValue) (object) any.FirstName();
2021
}
2122
}
2223
}

‎NTestDataBuilder/Suppliers/DefaultLastNameValueSupplier.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using NTestDataBuilder.EquivalenceClasses;
2+
using NTestDataBuilder.EquivalenceClasses.Person;
23

34
namespace NTestDataBuilder.Suppliers
45
{
@@ -17,7 +18,7 @@ public bool CanSupplyValue<TObject, TValue>(string propertyName)
1718
/// <inheritdoc />
1819
public TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName)
1920
{
20-
return (TValue) (object) any.PersonNameLast();
21+
return (TValue) (object) any.LastName();
2122
}
2223
}
2324
}

0 commit comments

Comments
 (0)