For comparison I tried properties on a partial class rather than extension methods

mwhelan · mwhelan · commit 541c7ef3382c · 2016-02-12T10:08:03.000Z
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/AddressAusEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/AddressAusEquivalenceTests.cs
@@ -22,24 +22,24 @@ protected override List<object[]> GetData()
             return new List<object[]>
             {
                 new object[]
-                {new Words(FromDictionary.AddressAusCity), GenerateTestCasesForSut(Any.AddressAus().City)},
+                {new Words(FromDictionary.AddressAusCity), GenerateTestCasesForSut(Any.AddressAus.City)},
                 new object[]
-                {new Words(FromDictionary.AddressAusCompany), GenerateTestCasesForSut(Any.AddressAus().Company)},
+                {new Words(FromDictionary.AddressAusCompany), GenerateTestCasesForSut(Any.AddressAus.Company)},
                 new object[]
-                {new Words(FromDictionary.AddressAusPhone), GenerateTestCasesForSut(Any.AddressAus().Phone)},
+                {new Words(FromDictionary.AddressAusPhone), GenerateTestCasesForSut(Any.AddressAus.Phone)},
                 new object[]
-                {new Words(FromDictionary.AddressAusPostCode), GenerateTestCasesForSut(Any.AddressAus().PostCode)},
+                {new Words(FromDictionary.AddressAusPostCode), GenerateTestCasesForSut(Any.AddressAus.PostCode)},
                 new object[]
-                {new Words(FromDictionary.AddressAusState), GenerateTestCasesForSut(Any.AddressAus().State)},
+                {new Words(FromDictionary.AddressAusState), GenerateTestCasesForSut(Any.AddressAus.State)},
                 new object[]
                 {
                     new Words(FromDictionary.AddressAusStateAbbreviation),
-                    GenerateTestCasesForSut(Any.AddressAus().StateAbbreviation)
+                    GenerateTestCasesForSut(Any.AddressAus.StateAbbreviation)
                 },
                 new object[]
-                {new Words(FromDictionary.AddressAusStreet), GenerateTestCasesForSut(Any.AddressAus().Street)},
+                {new Words(FromDictionary.AddressAusStreet), GenerateTestCasesForSut(Any.AddressAus.Street)},
                 new object[]
-                {new Words(FromDictionary.AddressAusWebsite), GenerateTestCasesForSut(Any.AddressAus().Website)},
+                {new Words(FromDictionary.AddressAusWebsite), GenerateTestCasesForSut(Any.AddressAus.Website)},
             };
         }
     }
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/AddressUkEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/AddressUkEquivalenceTests.cs
@@ -22,19 +22,19 @@ protected override List<object[]> GetData()
             return new List<object[]>
             {
                 new object[]
-                {new Words(FromDictionary.AddressUkCounty), GenerateTestCasesForSut(Any.AddressUk().County)},
+                {new Words(FromDictionary.AddressUkCounty), GenerateTestCasesForSut(Any.AddressUk.County)},
                 new object[]
-                {new Words(FromDictionary.AddressUkCity), GenerateTestCasesForSut(Any.AddressUk().City)},
+                {new Words(FromDictionary.AddressUkCity), GenerateTestCasesForSut(Any.AddressUk.City)},
                 new object[]
-                {new Words(FromDictionary.AddressUkCompany), GenerateTestCasesForSut(Any.AddressUk().Company)},
+                {new Words(FromDictionary.AddressUkCompany), GenerateTestCasesForSut(Any.AddressUk.Company)},
                 new object[]
-                {new Words(FromDictionary.AddressUkPhone), GenerateTestCasesForSut(Any.AddressUk().Phone)},
+                {new Words(FromDictionary.AddressUkPhone), GenerateTestCasesForSut(Any.AddressUk.Phone)},
                 new object[]
-                {new Words(FromDictionary.AddressUkPostCode), GenerateTestCasesForSut(Any.AddressUk().PostCode)},
+                {new Words(FromDictionary.AddressUkPostCode), GenerateTestCasesForSut(Any.AddressUk.PostCode)},
                 new object[]
-                {new Words(FromDictionary.AddressUkStreet), GenerateTestCasesForSut(Any.AddressUk().Street)},
+                {new Words(FromDictionary.AddressUkStreet), GenerateTestCasesForSut(Any.AddressUk.Street)},
                 new object[]
-                {new Words(FromDictionary.AddressUkWebsite), GenerateTestCasesForSut(Any.AddressUk().Website)},
+                {new Words(FromDictionary.AddressUkWebsite), GenerateTestCasesForSut(Any.AddressUk.Website)},
             };
         }
     }
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/AddressUsEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/AddressUsEquivalenceTests.cs
@@ -22,26 +22,26 @@ protected override List<object[]> GetData()
             return new List<object[]>
             {
                 new object[]
-                {new Words(FromDictionary.AddressUsCity), GenerateTestCasesForSut(Any.AddressUs().City)},
+                {new Words(FromDictionary.AddressUsCity), GenerateTestCasesForSut(Any.AddressUs.City)},
                 new object[]
-                {new Words(FromDictionary.AddressUsCompany), GenerateTestCasesForSut(Any.AddressUs().Company)},
+                {new Words(FromDictionary.AddressUsCompany), GenerateTestCasesForSut(Any.AddressUs.Company)},
                 new object[]
-                {new Words(FromDictionary.AddressUsPhone), GenerateTestCasesForSut(Any.AddressUs().Phone)},
+                {new Words(FromDictionary.AddressUsPhone), GenerateTestCasesForSut(Any.AddressUs.Phone)},
                 new object[]
-                {new Words(FromDictionary.AddressUsSocialSecurityNumber), GenerateTestCasesForSut(Any.AddressUs().SocialSecurityNumber)},
+                {new Words(FromDictionary.AddressUsSocialSecurityNumber), GenerateTestCasesForSut(Any.AddressUs.SocialSecurityNumber)},
                 new object[]
-                {new Words(FromDictionary.AddressUsState), GenerateTestCasesForSut(Any.AddressUs().State)},
+                {new Words(FromDictionary.AddressUsState), GenerateTestCasesForSut(Any.AddressUs.State)},
                 new object[]
                 {
                     new Words(FromDictionary.AddressUsStateAbbreviation),
-                    GenerateTestCasesForSut(Any.AddressUs().StateAbbreviation)
+                    GenerateTestCasesForSut(Any.AddressUs.StateAbbreviation)
                 },
                 new object[]
-                {new Words(FromDictionary.AddressUsStreet), GenerateTestCasesForSut(Any.AddressUs().Street)},
+                {new Words(FromDictionary.AddressUsStreet), GenerateTestCasesForSut(Any.AddressUs.Street)},
                 new object[]
-                {new Words(FromDictionary.AddressUsWebsite), GenerateTestCasesForSut(Any.AddressUs().Website)},
+                {new Words(FromDictionary.AddressUsWebsite), GenerateTestCasesForSut(Any.AddressUs.Website)},
                 new object[]
-                {new Words(FromDictionary.AddressUsZipCode), GenerateTestCasesForSut(Any.AddressUs().ZipCode)}
+                {new Words(FromDictionary.AddressUsZipCode), GenerateTestCasesForSut(Any.AddressUs.ZipCode)}
             };
         }
     }
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/ColourEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/ColourEquivalenceTests.cs
@@ -22,9 +22,9 @@ protected override List<object[]> GetData()
             return new List<object[]>
             {
                 new object[]
-                {new Words(FromDictionary.ColourHex), GenerateTestCasesForSut(Any.Colour().Hex)},
+                {new Words(FromDictionary.ColourHex), GenerateTestCasesForSut(Any.Colour.Hex)},
                 new object[]
-                {new Words(FromDictionary.ColourName), GenerateTestCasesForSut(Any.Colour().Name)}
+                {new Words(FromDictionary.ColourName), GenerateTestCasesForSut(Any.Colour.Name)}
             };
         }
     }
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/CompanyEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/CompanyEquivalenceTests.cs
@@ -22,13 +22,13 @@ protected override List<object[]> GetData()
             return new List<object[]>
             {
                 new object[]
-                {new Words(FromDictionary.CompanyName), GenerateTestCasesForSut(Any.Company().Name)},
+                {new Words(FromDictionary.CompanyName), GenerateTestCasesForSut(Any.Company.Name)},
                 new object[]
-                {new Words(FromDictionary.CompanyIndustry), GenerateTestCasesForSut(Any.Company().Industry)},
+                {new Words(FromDictionary.CompanyIndustry), GenerateTestCasesForSut(Any.Company.Industry)},
                 new object[]
-                {new Words(FromDictionary.CompanyJobTitle), GenerateTestCasesForSut(Any.Company().JobTitle)},
+                {new Words(FromDictionary.CompanyJobTitle), GenerateTestCasesForSut(Any.Company.JobTitle)},
                 new object[]
-                {new Words(FromDictionary.CompanyLocation), GenerateTestCasesForSut(Any.Company().Location)}
+                {new Words(FromDictionary.CompanyLocation), GenerateTestCasesForSut(Any.Company.Location)}
             };
         }
     }
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/FinanceEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/FinanceEquivalenceTests.cs
@@ -22,13 +22,13 @@ protected override List<object[]> GetData()
             return new List<object[]>
             {
                 new object[]
-                {new Words(FromDictionary.FinanceCreditCardNumber), GenerateTestCasesForSut(Any.Finance().CreditCardNumber)},
+                {new Words(FromDictionary.FinanceCreditCardNumber), GenerateTestCasesForSut(Any.Finance.CreditCardNumber)},
                 new object[]
-                {new Words(FromDictionary.FinanceCreditCardType), GenerateTestCasesForSut(Any.Finance().CreditCardType)},
+                {new Words(FromDictionary.FinanceCreditCardType), GenerateTestCasesForSut(Any.Finance.CreditCardType)},
                 new object[]
-                {new Words(FromDictionary.FinanceCurrency), GenerateTestCasesForSut(Any.Finance().Currency)},
+                {new Words(FromDictionary.FinanceCurrency), GenerateTestCasesForSut(Any.Finance.Currency)},
                 new object[]
-                {new Words(FromDictionary.FinanceCurrencyCode), GenerateTestCasesForSut(Any.Finance().CurrencyCode)}
+                {new Words(FromDictionary.FinanceCurrencyCode), GenerateTestCasesForSut(Any.Finance.CurrencyCode)}
             };
         }
     }
diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/FrequencyEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/FrequencyEquivalenceTests.cs
@@ -22,7 +22,7 @@ protected override List<object[]> GetData()
             return new List<object[]>
             {
                 new object[]
-                {new Words(FromDictionary.Frequency), GenerateTestCasesForSut(Any.Frequency)}
+                {new Words(FromDictionary.Frequency), GenerateTestCasesForSut(Any.Frequency.Frequency)}
             };
         }
     }
diff --git a/TestStack.Dossier/AnonymousValueFixture.cs b/TestStack.Dossier/AnonymousValueFixture.cs
@@ -1,9 +1,7 @@
 ﻿using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 using Ploeh.AutoFixture;
 using TestStack.Dossier.DataSources.Dictionaries;
 using TestStack.Dossier.Suppliers;
@@ -14,7 +12,7 @@ namespace TestStack.Dossier
     /// Allows you to create extension methods to generate anonymous values and to set up
     ///   conventions for automatic generation of anonymous values based on property expressions.
     /// </summary>
-    public class AnonymousValueFixture
+    public partial class AnonymousValueFixture
     {
         static AnonymousValueFixture()
         {
diff --git a/TestStack.Dossier/EquivalenceClasses/Equivalence.cs b/TestStack.Dossier/EquivalenceClasses/Equivalence.cs
@@ -2,56 +2,64 @@
 namespace TestStack.Dossier
 {
     /// <summary>
-    /// Extension methods that describe equivalence classes for generating anonymous values.
+    /// Equivalence classes for generating anonymous values.
     /// </summary>
-    public static class Equivalence
+    public partial class AnonymousValueFixture
     {
         /// <summary>
-        /// Extension methods that describe equivalence classes for generating anonymous Australian address-related values.
+        /// Equivalence classes for generating anonymous Australian address-related values.
         /// </summary>
-        public static AddressAusEquivalence AddressAus(this AnonymousValueFixture fixture)
+        public AddressAusEquivalence AddressAus
         {
-            return new AddressAusEquivalence(fixture);
+            get { return new AddressAusEquivalence(this); }
         }
 
         /// <summary>
-        /// Extension methods that describe equivalence classes for generating anonymous United Kingdom address-related values.
+        /// Equivalence classes for generating anonymous United Kingdom address-related values.
         /// </summary>
-        public static AddressUkEquivalence AddressUk(this AnonymousValueFixture fixture)
+        public AddressUkEquivalence AddressUk
         {
-            return new AddressUkEquivalence(fixture);
+            get { return new AddressUkEquivalence(this);}
         }
 
         /// <summary>
-        /// Extension methods that describe equivalence classes for generating anonymous United States address-related values.
+        /// Equivalence classes for generating anonymous United States address-related values.
         /// </summary>
-        public static AddressUsEquivalence AddressUs(this AnonymousValueFixture fixture)
+        public AddressUsEquivalence AddressUs
         {
-            return new AddressUsEquivalence(fixture);
+            get { return new AddressUsEquivalence(this); }
         }
 
         /// <summary>
-        /// Extension methods that describe equivalence classes for generating anonymous colour-related values.
+        /// Equivalence classes for generating anonymous colour-related values.
         /// </summary>
-        public static ColourEquivalence Colour(this AnonymousValueFixture fixture)
+        public ColourEquivalence Colour
         {
-            return new ColourEquivalence(fixture);
+            get { return new ColourEquivalence(this); }
         }
 
         /// <summary>
-        /// Extension methods that describe equivalence classes for generating anonymous company-related values.
+        /// Equivalence classes for generating anonymous company-related values.
         /// </summary>
-        public static CompanyEquivalence Company(this AnonymousValueFixture fixture)
+        public CompanyEquivalence Company
         {
-            return new CompanyEquivalence(fixture);
+            get { return new CompanyEquivalence(this); }
         }
 
         /// <summary>
-        /// Extension methods that describe equivalence classes for generating anonymous finance-related values.
+        /// Equivalence classes for generating anonymous finance-related values.
         /// </summary>
-        public static FinanceEquivalence Finance(this AnonymousValueFixture fixture)
+        public FinanceEquivalence Finance
         {
-            return new FinanceEquivalence(fixture);
+            get { return new FinanceEquivalence(this); }
+        }
+
+        /// <summary>
+        /// Equivalence classes for generating anonymous frequency-related values.
+        /// </summary>
+        public FrequencyEquivalence Frequency
+        {
+            get { return new FrequencyEquivalence(this); }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ protected override List<object[]> GetData()`
`22`	`22`	`return new List<object[]>`
`23`	`23`	`{`
`24`	`24`	`new object[]`
`25`		`- {new Words(FromDictionary.ColourHex), GenerateTestCasesForSut(Any.Colour().Hex)},`
	`25`	`+ {new Words(FromDictionary.ColourHex), GenerateTestCasesForSut(Any.Colour.Hex)},`
`26`	`26`	`new object[]`
`27`		`- {new Words(FromDictionary.ColourName), GenerateTestCasesForSut(Any.Colour().Name)}`
	`27`	`+ {new Words(FromDictionary.ColourName), GenerateTestCasesForSut(Any.Colour.Name)}`
`28`	`28`	`};`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,13 @@ protected override List<object[]> GetData()`
`22`	`22`	`return new List<object[]>`
`23`	`23`	`{`
`24`	`24`	`new object[]`
`25`		`- {new Words(FromDictionary.CompanyName), GenerateTestCasesForSut(Any.Company().Name)},`
	`25`	`+ {new Words(FromDictionary.CompanyName), GenerateTestCasesForSut(Any.Company.Name)},`
`26`	`26`	`new object[]`
`27`		`- {new Words(FromDictionary.CompanyIndustry), GenerateTestCasesForSut(Any.Company().Industry)},`
	`27`	`+ {new Words(FromDictionary.CompanyIndustry), GenerateTestCasesForSut(Any.Company.Industry)},`
`28`	`28`	`new object[]`
`29`		`- {new Words(FromDictionary.CompanyJobTitle), GenerateTestCasesForSut(Any.Company().JobTitle)},`
	`29`	`+ {new Words(FromDictionary.CompanyJobTitle), GenerateTestCasesForSut(Any.Company.JobTitle)},`
`30`	`30`	`new object[]`
`31`		`- {new Words(FromDictionary.CompanyLocation), GenerateTestCasesForSut(Any.Company().Location)}`
	`31`	`+ {new Words(FromDictionary.CompanyLocation), GenerateTestCasesForSut(Any.Company.Location)}`
`32`	`32`	`};`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ protected override List<object[]> GetData()`
`22`	`22`	`return new List<object[]>`
`23`	`23`	`{`
`24`	`24`	`new object[]`
`25`		`- {new Words(FromDictionary.Frequency), GenerateTestCasesForSut(Any.Frequency)}`
	`25`	`+ {new Words(FromDictionary.Frequency), GenerateTestCasesForSut(Any.Frequency.Frequency)}`
`26`	`26`	`};`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,56 +2,64 @@`
`2`	`2`	`namespace TestStack.Dossier`
`3`	`3`	`{`
`4`	`4`	`/// <summary>`
`5`		`- /// Extension methods that describe equivalence classes for generating anonymous values.`
	`5`	`+ /// Equivalence classes for generating anonymous values.`
`6`	`6`	`/// </summary>`
`7`		`- public static class Equivalence`
	`7`	`+ public partial class AnonymousValueFixture`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`		`- /// Extension methods that describe equivalence classes for generating anonymous Australian address-related values.`
	`10`	`+ /// Equivalence classes for generating anonymous Australian address-related values.`
`11`	`11`	`/// </summary>`
`12`		`- public static AddressAusEquivalence AddressAus(this AnonymousValueFixture fixture)`
	`12`	`+ public AddressAusEquivalence AddressAus`
`13`	`13`	`{`
`14`		`- return new AddressAusEquivalence(fixture);`
	`14`	`+ get { return new AddressAusEquivalence(this); }`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`/// <summary>`
`18`		`- /// Extension methods that describe equivalence classes for generating anonymous United Kingdom address-related values.`
	`18`	`+ /// Equivalence classes for generating anonymous United Kingdom address-related values.`
`19`	`19`	`/// </summary>`
`20`		`- public static AddressUkEquivalence AddressUk(this AnonymousValueFixture fixture)`
	`20`	`+ public AddressUkEquivalence AddressUk`
`21`	`21`	`{`
`22`		`- return new AddressUkEquivalence(fixture);`
	`22`	`+ get { return new AddressUkEquivalence(this);}`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/// <summary>`
`26`		`- /// Extension methods that describe equivalence classes for generating anonymous United States address-related values.`
	`26`	`+ /// Equivalence classes for generating anonymous United States address-related values.`
`27`	`27`	`/// </summary>`
`28`		`- public static AddressUsEquivalence AddressUs(this AnonymousValueFixture fixture)`
	`28`	`+ public AddressUsEquivalence AddressUs`
`29`	`29`	`{`
`30`		`- return new AddressUsEquivalence(fixture);`
	`30`	`+ get { return new AddressUsEquivalence(this); }`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/// <summary>`
`34`		`- /// Extension methods that describe equivalence classes for generating anonymous colour-related values.`
	`34`	`+ /// Equivalence classes for generating anonymous colour-related values.`
`35`	`35`	`/// </summary>`
`36`		`- public static ColourEquivalence Colour(this AnonymousValueFixture fixture)`
	`36`	`+ public ColourEquivalence Colour`
`37`	`37`	`{`
`38`		`- return new ColourEquivalence(fixture);`
	`38`	`+ get { return new ColourEquivalence(this); }`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/// <summary>`
`42`		`- /// Extension methods that describe equivalence classes for generating anonymous company-related values.`
	`42`	`+ /// Equivalence classes for generating anonymous company-related values.`
`43`	`43`	`/// </summary>`
`44`		`- public static CompanyEquivalence Company(this AnonymousValueFixture fixture)`
	`44`	`+ public CompanyEquivalence Company`
`45`	`45`	`{`
`46`		`- return new CompanyEquivalence(fixture);`
	`46`	`+ get { return new CompanyEquivalence(this); }`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/// <summary>`
`50`		`- /// Extension methods that describe equivalence classes for generating anonymous finance-related values.`
	`50`	`+ /// Equivalence classes for generating anonymous finance-related values.`
`51`	`51`	`/// </summary>`
`52`		`- public static FinanceEquivalence Finance(this AnonymousValueFixture fixture)`
	`52`	`+ public FinanceEquivalence Finance`
`53`	`53`	`{`
`54`		`- return new FinanceEquivalence(fixture);`
	`54`	`+ get { return new FinanceEquivalence(this); }`
	`55`	`+ }`
	`56`	`+`
	`57`	`+ /// <summary>`
	`58`	`+ /// Equivalence classes for generating anonymous frequency-related values.`
	`59`	`+ /// </summary>`
	`60`	`+ public FrequencyEquivalence Frequency`
	`61`	`+ {`
	`62`	`+ get { return new FrequencyEquivalence(this); }`
`55`	`63`	`}`
`56`	`64`	`}`
`57`	`65`	`}`