Skip to content

Commit b0fda3d

Browse files
robdmoorerobdmoore
authored
Merge pull request #52 from mwhelan/categorised-api
Started alternate API for dictionaries
2 parents 8310b7f + 0e789f5 commit b0fda3d

35 files changed

+595
-396
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.Tests/EquivalenceClasses/GeoEquivalenceTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ protected override List<object[]> GetData()
2121
{
2222
return new List<object[]>
2323
{
24-
new object[] {new Words(FromDictionary.GeoContinent), GenerateTestCasesForSut(Any.GeoContinent)},
25-
new object[] {new Words(FromDictionary.GeoCountry), GenerateTestCasesForSut(Any.GeoCountry)},
26-
new object[] {new Words(FromDictionary.GeoCountryCode), GenerateTestCasesForSut(Any.GeoCountryCode)},
27-
new object[] {new Words(FromDictionary.GeoLatitude), GenerateTestCasesForSut(Any.GeoLatitude)},
28-
new object[] {new Words(FromDictionary.GeoLongitude), GenerateTestCasesForSut(Any.GeoLongitude)},
24+
new object[] {new Words(FromDictionary.GeoContinent), GenerateTestCasesForSut(Any.Geography.Continent)},
25+
new object[] {new Words(FromDictionary.GeoCountry), GenerateTestCasesForSut(Any.Geography.Country)},
26+
new object[] {new Words(FromDictionary.GeoCountryCode), GenerateTestCasesForSut(Any.Geography.CountryCode)},
27+
new object[] {new Words(FromDictionary.GeoLatitude), GenerateTestCasesForSut(Any.Geography.Latitude)},
28+
new object[] {new Words(FromDictionary.GeoLongitude), GenerateTestCasesForSut(Any.Geography.Longitude)},
2929
};
3030
}
3131
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@ protected override List<object[]> GetData()
2424
new object[]
2525
{
2626
new Words(FromDictionary.IdentifierBitcoinAddress),
27-
GenerateTestCasesForSut(Any.IdentifierBitcoinAddress)
27+
GenerateTestCasesForSut(Any.Identifier.BitcoinAddress)
2828
},
2929
new object[]
30-
{new Words(FromDictionary.IdentifierIban), GenerateTestCasesForSut(Any.IdentifierIban)},
30+
{new Words(FromDictionary.IdentifierIban), GenerateTestCasesForSut(Any.Identifier.Iban)},
3131
new object[]
3232
{
33-
new Words(FromDictionary.IdentifierIpAddressV4), GenerateTestCasesForSut(Any.IdentifierIpAddressV4)
33+
new Words(FromDictionary.IdentifierIpAddressV4), GenerateTestCasesForSut(Any.Identifier.IpAddressV4)
3434
},
3535
new object[]
3636
{
37-
new Words(FromDictionary.IdentifierIpAddressV6), GenerateTestCasesForSut(Any.IdentifierIpAddressV6)
37+
new Words(FromDictionary.IdentifierIpAddressV6), GenerateTestCasesForSut(Any.Identifier.IpAddressV6)
3838
},
3939
new object[]
40-
{new Words(FromDictionary.IdentifierIsbn), GenerateTestCasesForSut(Any.IdentifierIsbn)},
40+
{new Words(FromDictionary.IdentifierIsbn), GenerateTestCasesForSut(Any.Identifier.Isbn)},
4141
new object[]
4242
{
4343
new Words(FromDictionary.IdentifierMacAddress),
44-
GenerateTestCasesForSut(Any.IdentifierMacAddress)
44+
GenerateTestCasesForSut(Any.Identifier.MacAddress)
4545
}
4646
};
4747
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ protected override List<object[]> GetData()
2424
new object[]
2525
{
2626
new Words(FromDictionary.InternetDomainCountryCodeTopLevelDomain),
27-
GenerateTestCasesForSut(Any.InternetDomainCountryCodeTopLevelDomain)
27+
GenerateTestCasesForSut(Any.Internet.DomainCountryCodeTopLevelDomain)
2828
},
2929
new object[]
30-
{new Words(FromDictionary.InternetDomainName), GenerateTestCasesForSut(Any.InternetDomainName)},
30+
{new Words(FromDictionary.InternetDomainName), GenerateTestCasesForSut(Any.Internet.DomainName)},
3131
new object[]
3232
{
3333
new Words(FromDictionary.InternetDomainTopLevel),
34-
GenerateTestCasesForSut(Any.InternetDomainTopLevel)
34+
GenerateTestCasesForSut(Any.Internet.DomainTopLevel)
3535
},
3636
new object[]
37-
{new Words(FromDictionary.InternetUrl), GenerateTestCasesForSut(Any.InternetUrl)}
37+
{new Words(FromDictionary.InternetUrl), GenerateTestCasesForSut(Any.Internet.Url)}
3838
};
3939
}
4040
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void WhenGettingUniqueEmail_ThenReturnUniqueEmailsAcrossFixtureInstances(
2525
var generatedValues = new List<string>();
2626
var any2 = new AnonymousValueFixture();
2727

28-
any2.ResetUniqueEmailAddressSource();
28+
PersonEquivalenceExtensions.InitializeUniqueEmailAddressSource();
2929
generatedValues.Add(any2.UniqueEmailAddress());
3030
for (var i = 0; i < source.Data.Count - 1; i++)
3131
{

0 commit comments

Comments
 (0)