Skip to content

Commit 0e789f5

Browse files
mwhelanmwhelan
committed
Marked old equivalence methods obsolete and fixed one breaking change.
1 parent 27cb810 commit 0e789f5

File tree

6 files changed

+44
-31
lines changed

6 files changed

+44
-31
lines changed

‎TestStack.Dossier.Tests/EquivalenceClasses/FrequencyEquivalenceTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ protected override List<object[]> GetData()
2222
return new List<object[]>
2323
{
2424
new object[]
25-
{new Words(FromDictionary.Frequency), GenerateTestCasesForSut(Any.Frequency.Frequency)}
25+
{new Words(FromDictionary.Frequency), GenerateTestCasesForSut(Any.Frequency)}
2626
};
2727
}
2828
}

‎TestStack.Dossier.Tests/PublicApiApproval/PublicApiApproverTests.GivenDossierAssembly_WhenPublicApiChecked_ShouldHaveNoChanges.approved.txt‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ namespace TestStack.Dossier
5656
public static System.Collections.Generic.IEnumerable<TestStack.Dossier.IAnonymousValueSupplier> DefaultValueSuppliers { get; }
5757
public TestStack.Dossier.FinanceEquivalence Finance { get; }
5858
public Ploeh.AutoFixture.Fixture Fixture { get; }
59-
public TestStack.Dossier.FrequencyEquivalence Frequency { get; }
6059
public TestStack.Dossier.GeoEquivalence Geography { get; }
6160
public static System.Collections.Generic.ICollection<TestStack.Dossier.IAnonymousValueSupplier> GlobalValueSuppliers { get; }
6261
public TestStack.Dossier.IdentifierEquivalence Identifier { get; }
@@ -103,10 +102,9 @@ namespace TestStack.Dossier
103102
public string Currency() { }
104103
public string CurrencyCode() { }
105104
}
106-
public class FrequencyEquivalence
105+
public class static FrequencyEquivalence
107106
{
108-
public FrequencyEquivalence(TestStack.Dossier.AnonymousValueFixture fixture) { }
109-
public string Frequency() { }
107+
public static string Frequency(this TestStack.Dossier.AnonymousValueFixture fixture) { }
110108
}
111109
public class GeoEquivalence
112110
{
@@ -482,10 +480,15 @@ namespace TestStack.Dossier.EquivalenceClasses.Geo
482480

483481
public class static GeographyEquivalenceClassescs
484482
{
483+
[System.ObsoleteAttribute("Continent is deprecated, please use Geography.Continent instead.")]
485484
public static string Continent(this TestStack.Dossier.AnonymousValueFixture fixture) { }
485+
[System.ObsoleteAttribute("Country is deprecated, please use Geography.Country instead.")]
486486
public static string Country(this TestStack.Dossier.AnonymousValueFixture fixture) { }
487+
[System.ObsoleteAttribute("CountryCode is deprecated, please use Geography.CountryCode instead.")]
487488
public static string CountryCode(this TestStack.Dossier.AnonymousValueFixture fixture) { }
489+
[System.ObsoleteAttribute("Latitude is deprecated, please use Geography.Latitude instead.")]
488490
public static string Latitude(this TestStack.Dossier.AnonymousValueFixture fixture) { }
491+
[System.ObsoleteAttribute("Longitude is deprecated, please use Geography.Longitude instead.")]
489492
public static string Longitude(this TestStack.Dossier.AnonymousValueFixture fixture) { }
490493
}
491494
}
@@ -494,15 +497,25 @@ namespace TestStack.Dossier.EquivalenceClasses.Person
494497

495498
public class static PersonEquivalenceClasses
496499
{
500+
[System.ObsoleteAttribute("EmailAddress is deprecated, please use Person.EmailAddress instead.")]
497501
public static string EmailAddress(this TestStack.Dossier.AnonymousValueFixture fixture) { }
502+
[System.ObsoleteAttribute("FemaleFirstName is deprecated, please use Person.NameFirstFemale instead.")]
498503
public static string FemaleFirstName(this TestStack.Dossier.AnonymousValueFixture fixture) { }
504+
[System.ObsoleteAttribute("FirstName is deprecated, please use Person.NameFirst instead.")]
499505
public static string FirstName(this TestStack.Dossier.AnonymousValueFixture fixture) { }
506+
[System.ObsoleteAttribute("FullName is deprecated, please use Person.NameFull instead.")]
500507
public static string FullName(this TestStack.Dossier.AnonymousValueFixture fixture) { }
508+
[System.ObsoleteAttribute("Language is deprecated, please use Person.Language instead.")]
501509
public static string Language(this TestStack.Dossier.AnonymousValueFixture fixture) { }
510+
[System.ObsoleteAttribute("LastName is deprecated, please use Person.NameLast instead.")]
502511
public static string LastName(this TestStack.Dossier.AnonymousValueFixture fixture) { }
512+
[System.ObsoleteAttribute("MaleFirstName is deprecated, please use Person.NameFirstMale instead.")]
503513
public static string MaleFirstName(this TestStack.Dossier.AnonymousValueFixture fixture) { }
514+
[System.ObsoleteAttribute("Suffix is deprecated, please use Person.NameSuffix instead.")]
504515
public static string Suffix(this TestStack.Dossier.AnonymousValueFixture fixture) { }
516+
[System.ObsoleteAttribute("Title is deprecated, please use Person.Title instead.")]
505517
public static string Title(this TestStack.Dossier.AnonymousValueFixture fixture) { }
518+
[System.ObsoleteAttribute("UniqueEmailAddress is deprecated, please use Person.UniqueEmailAddress instead.")]
506519
public static string UniqueEmailAddress(this TestStack.Dossier.AnonymousValueFixture fixture) { }
507520
}
508521
}

‎TestStack.Dossier/EquivalenceClasses/Equivalence.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,6 @@ public FinanceEquivalence Finance
5454
get { return new FinanceEquivalence(this); }
5555
}
5656

57-
/// <summary>
58-
/// Equivalence classes for generating anonymous frequency-related values.
59-
/// </summary>
60-
public FrequencyEquivalence Frequency
61-
{
62-
get { return new FrequencyEquivalence(this); }
63-
}
64-
6557
/// <summary>
6658
/// Equivalence classes for generating anonymous geography-related values.
6759
/// </summary>

‎TestStack.Dossier/EquivalenceClasses/FrequencyEquivalence.cs‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,18 @@
44
namespace TestStack.Dossier
55
{
66
/// <summary>
7-
/// Methods that describe equivalence classes for generating anonymous Frequency-related values.
7+
/// Extension methods that describe equivalence classes for generating anonymous Frequency-related values.
88
/// </summary>
9-
public class FrequencyEquivalence
9+
public static class FrequencyEquivalence
1010
{
11-
private readonly AnonymousValueFixture _fixture;
12-
13-
/// <summary>
14-
/// Creates a new <see cref="FrequencyEquivalence"/> with the AnonymousValueFixture from the extension method.
15-
/// </summary>
16-
/// <param name="fixture">The </param>
17-
public FrequencyEquivalence(AnonymousValueFixture fixture)
18-
{
19-
_fixture = fixture;
20-
}
21-
2211
/// <summary>
2312
/// Generate and return a frequency.
2413
/// </summary>
14+
/// <param name="fixture">The fixture to generate a value for.</param>
2515
/// <returns>The generated value.</returns>
26-
public string Frequency()
16+
public static string Frequency(this AnonymousValueFixture fixture)
2717
{
28-
return _fixture.Words(FromDictionary.Frequency).Next();
18+
return fixture.Words(FromDictionary.Frequency).Next();
2919
}
3020
}
3121
}

‎TestStack.Dossier/EquivalenceClasses/Geo/GeographyEquivalenceClassescs.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace TestStack.Dossier.EquivalenceClasses.Geo
1+
using System;
2+
3+
namespace TestStack.Dossier.EquivalenceClasses.Geo
24
{
35
/// <summary>
46
/// Extension methods that describe equivalence classes for generating anonymous geography-related values.
@@ -10,6 +12,7 @@ public static class GeographyEquivalenceClassescs
1012
/// </summary>
1113
/// <param name="fixture">The fixture to generate a continent for</param>
1214
/// <returns>The generated continent</returns>
15+
[Obsolete("Continent is deprecated, please use Geography.Continent instead.")]
1316
public static string Continent(this AnonymousValueFixture fixture)
1417
{
1518
return fixture.Geography.Continent();
@@ -20,6 +23,7 @@ public static string Continent(this AnonymousValueFixture fixture)
2023
/// </summary>
2124
/// <param name="fixture">The fixture to generate a country for</param>
2225
/// <returns>The generated country</returns>
26+
[Obsolete("Country is deprecated, please use Geography.Country instead.")]
2327
public static string Country(this AnonymousValueFixture fixture)
2428
{
2529
return fixture.Geography.Country();
@@ -30,17 +34,18 @@ public static string Country(this AnonymousValueFixture fixture)
3034
/// </summary>
3135
/// <param name="fixture">The fixture to generate a country code for</param>
3236
/// <returns>The generated country code</returns>
37+
[Obsolete("CountryCode is deprecated, please use Geography.CountryCode instead.")]
3338
public static string CountryCode(this AnonymousValueFixture fixture)
3439
{
3540
return fixture.Geography.CountryCode();
3641
}
3742

38-
3943
/// <summary>
4044
/// Generate and return a latitude coordinate.
4145
/// </summary>
4246
/// <param name="fixture">The fixture to generate a latitutde for</param>
4347
/// <returns>The generated latitude</returns>
48+
[Obsolete("Latitude is deprecated, please use Geography.Latitude instead.")]
4449
public static string Latitude(this AnonymousValueFixture fixture)
4550
{
4651
return fixture.Geography.Latitude();
@@ -51,6 +56,7 @@ public static string Latitude(this AnonymousValueFixture fixture)
5156
/// </summary>
5257
/// <param name="fixture">The fixture to generate a longitude for</param>
5358
/// <returns>The generated longitude</returns>
59+
[Obsolete("Longitude is deprecated, please use Geography.Longitude instead.")]
5460
public static string Longitude(this AnonymousValueFixture fixture)
5561
{
5662
return fixture.Geography.Longitude();

‎TestStack.Dossier/EquivalenceClasses/Person/PersonEquivalenceClasses.cs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace TestStack.Dossier.EquivalenceClasses.Person
1+
using System;
2+
3+
namespace TestStack.Dossier.EquivalenceClasses.Person
24
{
35
/// <summary>
46
/// Extension methods that describe equivalence classes for generating anonymous person-related values.
@@ -10,6 +12,7 @@ public static class PersonEquivalenceClasses
1012
/// </summary>
1113
/// <param name="fixture">The fixture to generate a email for</param>
1214
/// <returns>The generated email</returns>
15+
[Obsolete("EmailAddress is deprecated, please use Person.EmailAddress instead.")]
1316
public static string EmailAddress(this AnonymousValueFixture fixture)
1417
{
1518
return fixture.Person.EmailAddress();
@@ -20,6 +23,7 @@ public static string EmailAddress(this AnonymousValueFixture fixture)
2023
/// </summary>
2124
/// <param name="fixture">The fixture to generate a unique email for</param>
2225
/// <returns>The generated unique email</returns>
26+
[Obsolete("UniqueEmailAddress is deprecated, please use Person.UniqueEmailAddress instead.")]
2327
public static string UniqueEmailAddress(this AnonymousValueFixture fixture)
2428
{
2529
return fixture.Person.UniqueEmailAddress();
@@ -30,6 +34,7 @@ public static string UniqueEmailAddress(this AnonymousValueFixture fixture)
3034
/// </summary>
3135
/// <param name="fixture">The fixture to generate a language for</param>
3236
/// <returns>The generated language</returns>
37+
[Obsolete("Language is deprecated, please use Person.Language instead.")]
3338
public static string Language(this AnonymousValueFixture fixture)
3439
{
3540
return fixture.Person.Language();
@@ -40,6 +45,7 @@ public static string Language(this AnonymousValueFixture fixture)
4045
/// </summary>
4146
/// <param name="fixture">The fixture to generate a first name for</param>
4247
/// <returns>The generated female first name</returns>
48+
[Obsolete("FemaleFirstName is deprecated, please use Person.NameFirstFemale instead.")]
4349
public static string FemaleFirstName(this AnonymousValueFixture fixture)
4450
{
4551
return fixture.Person.NameFirstFemale();
@@ -50,6 +56,7 @@ public static string FemaleFirstName(this AnonymousValueFixture fixture)
5056
/// </summary>
5157
/// <param name="fixture">The fixture to generate a first name for</param>
5258
/// <returns>The generated first name</returns>
59+
[Obsolete("FirstName is deprecated, please use Person.NameFirst instead.")]
5360
public static string FirstName(this AnonymousValueFixture fixture)
5461
{
5562
return fixture.Person.NameFirst();
@@ -60,6 +67,7 @@ public static string FirstName(this AnonymousValueFixture fixture)
6067
/// </summary>
6168
/// <param name="fixture">The fixture to generate a full name for</param>
6269
/// <returns>The generated full name</returns>
70+
[Obsolete("FullName is deprecated, please use Person.NameFull instead.")]
6371
public static string FullName(this AnonymousValueFixture fixture)
6472
{
6573
return fixture.Person.NameFull();
@@ -70,6 +78,7 @@ public static string FullName(this AnonymousValueFixture fixture)
7078
/// </summary>
7179
/// <param name="fixture">The fixture to generate a last name for</param>
7280
/// <returns>The generated last name</returns>
81+
[Obsolete("LastName is deprecated, please use Person.NameLast instead.")]
7382
public static string LastName(this AnonymousValueFixture fixture)
7483
{
7584
return fixture.Person.NameLast();
@@ -80,6 +89,7 @@ public static string LastName(this AnonymousValueFixture fixture)
8089
/// </summary>
8190
/// <param name="fixture">The fixture to generate a male first name for</param>
8291
/// <returns>The generated male first name</returns>
92+
[Obsolete("MaleFirstName is deprecated, please use Person.NameFirstMale instead.")]
8393
public static string MaleFirstName(this AnonymousValueFixture fixture)
8494
{
8595
return fixture.Person.NameFirstMale();
@@ -90,6 +100,7 @@ public static string MaleFirstName(this AnonymousValueFixture fixture)
90100
/// </summary>
91101
/// <param name="fixture">The fixture to generate a suffix for</param>
92102
/// <returns>The generated suffix</returns>
103+
[Obsolete("Suffix is deprecated, please use Person.NameSuffix instead.")]
93104
public static string Suffix(this AnonymousValueFixture fixture)
94105
{
95106
return fixture.Person.NameSuffix();
@@ -100,6 +111,7 @@ public static string Suffix(this AnonymousValueFixture fixture)
100111
/// </summary>
101112
/// <param name="fixture">The fixture to generate a title for</param>
102113
/// <returns>The generated title</returns>
114+
[Obsolete("Title is deprecated, please use Person.Title instead.")]
103115
public static string Title(this AnonymousValueFixture fixture)
104116
{
105117
return fixture.Person.NameTitle();

0 commit comments

Comments
 (0)