Skip to content

Commit b2bca5f

Browse files
mwhelanmwhelan
committed
Started alternate API for dictionaries
1 parent 8310b7f commit b2bca5f

16 files changed

+253
-154
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@ protected override List<object[]> GetData()
2222
return new List<object[]>
2323
{
2424
new object[]
25-
{new Words(FromDictionary.AddressAusCity), GenerateTestCasesForSut(Any.AddressAusCity)},
25+
{new Words(FromDictionary.AddressAusCity), GenerateTestCasesForSut(Any.AddressAus().City)},
2626
new object[]
27-
{new Words(FromDictionary.AddressAusCompany), GenerateTestCasesForSut(Any.AddressAusCompany)},
27+
{new Words(FromDictionary.AddressAusCompany), GenerateTestCasesForSut(Any.AddressAus().Company)},
2828
new object[]
29-
{new Words(FromDictionary.AddressAusPhone), GenerateTestCasesForSut(Any.AddressAusPhone)},
29+
{new Words(FromDictionary.AddressAusPhone), GenerateTestCasesForSut(Any.AddressAus().Phone)},
3030
new object[]
31-
{new Words(FromDictionary.AddressAusPostCode), GenerateTestCasesForSut(Any.AddressAusPostCode)},
31+
{new Words(FromDictionary.AddressAusPostCode), GenerateTestCasesForSut(Any.AddressAus().PostCode)},
3232
new object[]
33-
{new Words(FromDictionary.AddressAusState), GenerateTestCasesForSut(Any.AddressAusState)},
33+
{new Words(FromDictionary.AddressAusState), GenerateTestCasesForSut(Any.AddressAus().State)},
3434
new object[]
3535
{
3636
new Words(FromDictionary.AddressAusStateAbbreviation),
37-
GenerateTestCasesForSut(Any.AddressAusStateAbbreviation)
37+
GenerateTestCasesForSut(Any.AddressAus().StateAbbreviation)
3838
},
3939
new object[]
40-
{new Words(FromDictionary.AddressAusStreet), GenerateTestCasesForSut(Any.AddressAusStreet)},
40+
{new Words(FromDictionary.AddressAusStreet), GenerateTestCasesForSut(Any.AddressAus().Street)},
4141
new object[]
42-
{new Words(FromDictionary.AddressAusWebsite), GenerateTestCasesForSut(Any.AddressAusWebsite)},
42+
{new Words(FromDictionary.AddressAusWebsite), GenerateTestCasesForSut(Any.AddressAus().Website)},
4343
};
4444
}
4545
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ protected override List<object[]> GetData()
2222
return new List<object[]>
2323
{
2424
new object[]
25-
{new Words(FromDictionary.AddressUkCounty), GenerateTestCasesForSut(Any.AddressUkCounty)},
25+
{new Words(FromDictionary.AddressUkCounty), GenerateTestCasesForSut(Any.AddressUk().County)},
2626
new object[]
27-
{new Words(FromDictionary.AddressUkCity), GenerateTestCasesForSut(Any.AddressUkCity)},
27+
{new Words(FromDictionary.AddressUkCity), GenerateTestCasesForSut(Any.AddressUk().City)},
2828
new object[]
29-
{new Words(FromDictionary.AddressUkCompany), GenerateTestCasesForSut(Any.AddressUkCompany)},
29+
{new Words(FromDictionary.AddressUkCompany), GenerateTestCasesForSut(Any.AddressUk().Company)},
3030
new object[]
31-
{new Words(FromDictionary.AddressUkPhone), GenerateTestCasesForSut(Any.AddressUkPhone)},
31+
{new Words(FromDictionary.AddressUkPhone), GenerateTestCasesForSut(Any.AddressUk().Phone)},
3232
new object[]
33-
{new Words(FromDictionary.AddressUkPostCode), GenerateTestCasesForSut(Any.AddressUkPostCode)},
33+
{new Words(FromDictionary.AddressUkPostCode), GenerateTestCasesForSut(Any.AddressUk().PostCode)},
3434
new object[]
35-
{new Words(FromDictionary.AddressUkStreet), GenerateTestCasesForSut(Any.AddressUkStreet)},
35+
{new Words(FromDictionary.AddressUkStreet), GenerateTestCasesForSut(Any.AddressUk().Street)},
3636
new object[]
37-
{new Words(FromDictionary.AddressUkWebsite), GenerateTestCasesForSut(Any.AddressUkWebsite)},
37+
{new Words(FromDictionary.AddressUkWebsite), GenerateTestCasesForSut(Any.AddressUk().Website)},
3838
};
3939
}
4040
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,26 @@ protected override List<object[]> GetData()
2222
return new List<object[]>
2323
{
2424
new object[]
25-
{new Words(FromDictionary.AddressUsCity), GenerateTestCasesForSut(Any.AddressUsCity)},
25+
{new Words(FromDictionary.AddressUsCity), GenerateTestCasesForSut(Any.AddressUs().City)},
2626
new object[]
27-
{new Words(FromDictionary.AddressUsCompany), GenerateTestCasesForSut(Any.AddressUsCompany)},
27+
{new Words(FromDictionary.AddressUsCompany), GenerateTestCasesForSut(Any.AddressUs().Company)},
2828
new object[]
29-
{new Words(FromDictionary.AddressUsPhone), GenerateTestCasesForSut(Any.AddressUsPhone)},
29+
{new Words(FromDictionary.AddressUsPhone), GenerateTestCasesForSut(Any.AddressUs().Phone)},
3030
new object[]
31-
{new Words(FromDictionary.AddressUsSocialSecurityNumber), GenerateTestCasesForSut(Any.AddressUsSocialSecurityNumber)},
31+
{new Words(FromDictionary.AddressUsSocialSecurityNumber), GenerateTestCasesForSut(Any.AddressUs().SocialSecurityNumber)},
3232
new object[]
33-
{new Words(FromDictionary.AddressUsState), GenerateTestCasesForSut(Any.AddressUsState)},
33+
{new Words(FromDictionary.AddressUsState), GenerateTestCasesForSut(Any.AddressUs().State)},
3434
new object[]
3535
{
3636
new Words(FromDictionary.AddressUsStateAbbreviation),
37-
GenerateTestCasesForSut(Any.AddressUsStateAbbreviation)
37+
GenerateTestCasesForSut(Any.AddressUs().StateAbbreviation)
3838
},
3939
new object[]
40-
{new Words(FromDictionary.AddressUsStreet), GenerateTestCasesForSut(Any.AddressUsStreet)},
40+
{new Words(FromDictionary.AddressUsStreet), GenerateTestCasesForSut(Any.AddressUs().Street)},
4141
new object[]
42-
{new Words(FromDictionary.AddressUsWebsite), GenerateTestCasesForSut(Any.AddressUsWebsite)},
42+
{new Words(FromDictionary.AddressUsWebsite), GenerateTestCasesForSut(Any.AddressUs().Website)},
4343
new object[]
44-
{new Words(FromDictionary.AddressUsZipCode), GenerateTestCasesForSut(Any.AddressUsZipCode)}
44+
{new Words(FromDictionary.AddressUsZipCode), GenerateTestCasesForSut(Any.AddressUs().ZipCode)}
4545
};
4646
}
4747
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ protected override List<object[]> GetData()
2222
return new List<object[]>
2323
{
2424
new object[]
25-
{new Words(FromDictionary.ColourHex), GenerateTestCasesForSut(Any.ColourHex)},
25+
{new Words(FromDictionary.ColourHex), GenerateTestCasesForSut(Any.Colour().Hex)},
2626
new object[]
27-
{new Words(FromDictionary.ColourName), GenerateTestCasesForSut(Any.ColourName)}
27+
{new Words(FromDictionary.ColourName), GenerateTestCasesForSut(Any.Colour().Name)}
2828
};
2929
}
3030
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ protected override List<object[]> GetData()
2222
return new List<object[]>
2323
{
2424
new object[]
25-
{new Words(FromDictionary.CompanyName), GenerateTestCasesForSut(Any.CompanyName)},
25+
{new Words(FromDictionary.CompanyName), GenerateTestCasesForSut(Any.Company().Name)},
2626
new object[]
27-
{new Words(FromDictionary.CompanyIndustry), GenerateTestCasesForSut(Any.CompanyIndustry)},
27+
{new Words(FromDictionary.CompanyIndustry), GenerateTestCasesForSut(Any.Company().Industry)},
2828
new object[]
29-
{new Words(FromDictionary.CompanyJobTitle), GenerateTestCasesForSut(Any.CompanyJobTitle)},
29+
{new Words(FromDictionary.CompanyJobTitle), GenerateTestCasesForSut(Any.Company().JobTitle)},
3030
new object[]
31-
{new Words(FromDictionary.CompanyLocation), GenerateTestCasesForSut(Any.CompanyLocation)}
31+
{new Words(FromDictionary.CompanyLocation), GenerateTestCasesForSut(Any.Company().Location)}
3232
};
3333
}
3434
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ protected override List<object[]> GetData()
2222
return new List<object[]>
2323
{
2424
new object[]
25-
{new Words(FromDictionary.FinanceCreditCardNumber), GenerateTestCasesForSut(Any.FinanceCreditCardNumber)},
25+
{new Words(FromDictionary.FinanceCreditCardNumber), GenerateTestCasesForSut(Any.Finance().CreditCardNumber)},
2626
new object[]
27-
{new Words(FromDictionary.FinanceCreditCardType), GenerateTestCasesForSut(Any.FinanceCreditCardType)},
27+
{new Words(FromDictionary.FinanceCreditCardType), GenerateTestCasesForSut(Any.Finance().CreditCardType)},
2828
new object[]
29-
{new Words(FromDictionary.FinanceCurrency), GenerateTestCasesForSut(Any.FinanceCurrency)},
29+
{new Words(FromDictionary.FinanceCurrency), GenerateTestCasesForSut(Any.Finance().Currency)},
3030
new object[]
31-
{new Words(FromDictionary.FinanceCurrencyCode), GenerateTestCasesForSut(Any.FinanceCurrencyCode)}
31+
{new Words(FromDictionary.FinanceCurrencyCode), GenerateTestCasesForSut(Any.Finance().CurrencyCode)}
3232
};
3333
}
3434
}

‎TestStack.Dossier/Builder.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Linq.Expressions;
3-
using Ploeh.AutoFixture.Kernel;
43
using TestStack.Dossier.Factories;
54
using TestStack.Dossier.Lists;
65

‎TestStack.Dossier/EquivalenceClasses/AddressAusEquivalence.cs‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,89 +4,91 @@
44
namespace TestStack.Dossier
55
{
66
/// <summary>
7-
/// Extension methods that describe equivalence classes for generating anonymous Australian address-related values.
7+
/// Methods that describe equivalence classes for generating anonymous Australian address-related values.
88
/// </summary>
9-
public static class AddressAusEquivalence
9+
public class AddressAusEquivalence
1010
{
11+
private readonly AnonymousValueFixture _fixture;
12+
13+
/// <summary>
14+
/// Creates a new <see cref="AddressAusEquivalence"/> with the AnonymousValueFixture from the extension method.
15+
/// </summary>
16+
/// <param name="fixture">The </param>
17+
public AddressAusEquivalence(AnonymousValueFixture fixture)
18+
{
19+
_fixture = fixture;
20+
}
21+
1122
/// <summary>
1223
/// Generate and return an Australian address city name.
1324
/// </summary>
14-
/// <param name="fixture">The fixture to generate a value for.</param>
1525
/// <returns>The generated value.</returns>
16-
public static string AddressAusCity(this AnonymousValueFixture fixture)
26+
public string City()
1727
{
18-
return fixture.Words(FromDictionary.AddressAusCity).Next();
28+
return _fixture.Words(FromDictionary.AddressAusCity).Next();
1929
}
2030

2131
/// <summary>
2232
/// Generate and return an Australian address company name.
2333
/// </summary>
24-
/// <param name="fixture">The fixture to generate a value for.</param>
2534
/// <returns>The generated value.</returns>
26-
public static string AddressAusCompany(this AnonymousValueFixture fixture)
35+
public string Company()
2736
{
28-
return fixture.Words(FromDictionary.AddressAusCompany).Next();
37+
return _fixture.Words(FromDictionary.AddressAusCompany).Next();
2938
}
3039

3140
/// <summary>
3241
/// Generate and return an Australian address phone number.
3342
/// </summary>
34-
/// <param name="fixture">The fixture to generate a value for.</param>
3543
/// <returns>The generated value.</returns>
36-
public static string AddressAusPhone(this AnonymousValueFixture fixture)
44+
public string Phone()
3745
{
38-
return fixture.Words(FromDictionary.AddressAusPhone).Next();
46+
return _fixture.Words(FromDictionary.AddressAusPhone).Next();
3947
}
4048

4149
/// <summary>
4250
/// Generate and return an Australian address post code.
4351
/// </summary>
44-
/// <param name="fixture">The fixture to generate a value for.</param>
4552
/// <returns>The generated value.</returns>
46-
public static string AddressAusPostCode(this AnonymousValueFixture fixture)
53+
public string PostCode()
4754
{
48-
return fixture.Words(FromDictionary.AddressAusPostCode).Next();
55+
return _fixture.Words(FromDictionary.AddressAusPostCode).Next();
4956
}
5057

5158
/// <summary>
5259
/// Generate and return an Australian address state name.
5360
/// </summary>
54-
/// <param name="fixture">The fixture to generate a value for.</param>
5561
/// <returns>The generated value.</returns>
56-
public static string AddressAusState(this AnonymousValueFixture fixture)
62+
public string State()
5763
{
58-
return fixture.Words(FromDictionary.AddressAusState).Next();
64+
return _fixture.Words(FromDictionary.AddressAusState).Next();
5965
}
6066

6167
/// <summary>
6268
/// Generate and return an Australian address state abbreviation.
6369
/// </summary>
64-
/// <param name="fixture">The fixture to generate a value for.</param>
6570
/// <returns>The generated value.</returns>
66-
public static string AddressAusStateAbbreviation(this AnonymousValueFixture fixture)
71+
public string StateAbbreviation()
6772
{
68-
return fixture.Words(FromDictionary.AddressAusStateAbbreviation).Next();
73+
return _fixture.Words(FromDictionary.AddressAusStateAbbreviation).Next();
6974
}
7075

7176
/// <summary>
7277
/// Generate and return an Australian address street name.
7378
/// </summary>
74-
/// <param name="fixture">The fixture to generate a value for.</param>
7579
/// <returns>The generated value.</returns>
76-
public static string AddressAusStreet(this AnonymousValueFixture fixture)
80+
public string Street()
7781
{
78-
return fixture.Words(FromDictionary.AddressAusStreet).Next();
82+
return _fixture.Words(FromDictionary.AddressAusStreet).Next();
7983
}
8084

8185
/// <summary>
8286
/// Generate and return an Australian address website name.
8387
/// </summary>
84-
/// <param name="fixture">The fixture to generate a value for.</param>
8588
/// <returns>The generated value.</returns>
86-
public static string AddressAusWebsite(this AnonymousValueFixture fixture)
89+
public string Website()
8790
{
88-
return fixture.Words(FromDictionary.AddressAusWebsite).Next();
91+
return _fixture.Words(FromDictionary.AddressAusWebsite).Next();
8992
}
90-
9193
}
9294
}

‎TestStack.Dossier/EquivalenceClasses/AddressUkEquivalence.cs‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,79 +4,82 @@
44
namespace TestStack.Dossier
55
{
66
/// <summary>
7-
/// Extension methods that describe equivalence classes for generating anonymous UK address-related values.
7+
/// Methods that describe equivalence classes for generating anonymous UK address-related values.
88
/// </summary>
9-
public static class AddressUkEquivalence
9+
public class AddressUkEquivalence
1010
{
11+
private readonly AnonymousValueFixture _fixture;
12+
13+
/// <summary>
14+
/// Creates a new <see cref="AddressUkEquivalence"/> with the AnonymousValueFixture from the extension method.
15+
/// </summary>
16+
/// <param name="fixture">The </param>
17+
public AddressUkEquivalence(AnonymousValueFixture fixture)
18+
{
19+
_fixture = fixture;
20+
}
21+
1122
/// <summary>
1223
/// Generate and return a UK address city name.
1324
/// </summary>
14-
/// <param name="fixture">The fixture to generate a value for.</param>
1525
/// <returns>The generated value.</returns>
16-
public static string AddressUkCity(this AnonymousValueFixture fixture)
26+
public string City()
1727
{
18-
return fixture.Words(FromDictionary.AddressUkCity).Next();
28+
return _fixture.Words(FromDictionary.AddressUkCity).Next();
1929
}
2030

2131
/// <summary>
2232
/// Generate and return a UK address company name.
2333
/// </summary>
24-
/// <param name="fixture">The fixture to generate a value for.</param>
2534
/// <returns>The generated value.</returns>
26-
public static string AddressUkCompany(this AnonymousValueFixture fixture)
35+
public string Company()
2736
{
28-
return fixture.Words(FromDictionary.AddressUkCompany).Next();
37+
return _fixture.Words(FromDictionary.AddressUkCompany).Next();
2938
}
3039

3140
/// <summary>
3241
/// Generate and return a UK address county name.
3342
/// </summary>
34-
/// <param name="fixture">The fixture to generate a value for.</param>
3543
/// <returns>The generated value.</returns>
36-
public static string AddressUkCounty(this AnonymousValueFixture fixture)
44+
public string County()
3745
{
38-
return fixture.Words(FromDictionary.AddressUkCounty).Next();
46+
return _fixture.Words(FromDictionary.AddressUkCounty).Next();
3947
}
4048

4149
/// <summary>
4250
/// Generate and return a UK address phone number.
4351
/// </summary>
44-
/// <param name="fixture">The fixture to generate a value for.</param>
4552
/// <returns>The generated value.</returns>
46-
public static string AddressUkPhone(this AnonymousValueFixture fixture)
53+
public string Phone()
4754
{
48-
return fixture.Words(FromDictionary.AddressUkPhone).Next();
55+
return _fixture.Words(FromDictionary.AddressUkPhone).Next();
4956
}
5057

5158
/// <summary>
5259
/// Generate and return a UK address post code.
5360
/// </summary>
54-
/// <param name="fixture">The fixture to generate a value for.</param>
5561
/// <returns>The generated value.</returns>
56-
public static string AddressUkPostCode(this AnonymousValueFixture fixture)
62+
public string PostCode()
5763
{
58-
return fixture.Words(FromDictionary.AddressUkPostCode).Next();
64+
return _fixture.Words(FromDictionary.AddressUkPostCode).Next();
5965
}
6066

6167
/// <summary>
6268
/// Generate and return a UK address street name.
6369
/// </summary>
64-
/// <param name="fixture">The fixture to generate a value for.</param>
6570
/// <returns>The generated value.</returns>
66-
public static string AddressUkStreet(this AnonymousValueFixture fixture)
71+
public string Street()
6772
{
68-
return fixture.Words(FromDictionary.AddressUkStreet).Next();
73+
return _fixture.Words(FromDictionary.AddressUkStreet).Next();
6974
}
7075

7176
/// <summary>
7277
/// Generate and return a UK address website name.
7378
/// </summary>
74-
/// <param name="fixture">The fixture to generate a value for.</param>
7579
/// <returns>The generated value.</returns>
76-
public static string AddressUkWebsite(this AnonymousValueFixture fixture)
80+
public string Website()
7781
{
78-
return fixture.Words(FromDictionary.AddressUkWebsite).Next();
82+
return _fixture.Words(FromDictionary.AddressUkWebsite).Next();
7983
}
80-
8184
}
8285
}

0 commit comments

Comments
 (0)