Removed the redundant method in AnonymousValueFixture and bumped to v3.0 due to the breaking change

robdmoore · robdmoore · commit e0d928f32e75 · 2015-05-14T19:06:54.000+02:00
diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md
@@ -1,7 +1,40 @@
 Breaking Changes
 ================
 
-Breaking change from NTestDataBuilder -> TestStack.Dossier 1.0
+Version 3.0
+-----------
+
+The signature of `IAnonymousValueSupplier` has changed from:
+
+```c#
+public interface IAnonymousValueSupplier
+{
+    bool CanSupplyValue(Type type, string propertyName);
+    TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName);
+}
+```
+
+To:
+
+```c#
+public interface IAnonymousValueSupplier
+{
+    bool CanSupplyValue(Type type, string propertyName);
+    object GenerateAnonymousValue(AnonymousValueFixture any, Type type, string propertyName);
+}
+```
+
+Note: the `GenerateAnonymousValue` method is no longer generic.
+
+### Reason
+
+In order to implement the `BuildUsing` method that allows you to build an object by convention in one line rather than having to call the constructor yourself we needed to have a non-generic version of the method. This change actually ended up making the anonymous value suppliers slightly easier to implement (no longer any need for type casting).
+
+### Fix
+
+If you have any custom anonymous value suppliers change the signature of your `GenerateAnonymousValue` method so it's no logner generic.
+
+Breaking change from NTestDataBuilder -> TestStack.Dossier 2.0
 --------------------------------------------------------------
 
 Namespace has changed from NTestDataBuilder to TestStack.Dossier.
@@ -14,7 +47,7 @@ The project has been renamed.
 
 Do a global find and replace of `using NTestDataBuilder` with `using TestStack.Dossier`.
 
-Breaking change from NTestDataBuilder -> TestStack.Dossier 1.0
+Breaking change from NTestDataBuilder -> TestStack.Dossier 2.0
 --------------------------------------------------------------
 
 When you don't `Set` a default value for a property that you later `Get` in your builder it will now generate an anonymous value for that property rather than throwing an exception.
@@ -29,7 +62,7 @@ The old behaviour of throwing an exception if a value hasn't been specified is n
 
 If you want to fix a static value for a property then by all means you can still use `Set` calls in your builder constructor. If you aren't happy with the default anonymous value that is generated for a property you can use the `Any` property to generate a value from a different equivalence class in combination with a `Set` call in your builder constructor.
 
-Breaking change from NTestDataBuilder -> TestStack.Dossier 1.0
+Breaking change from NTestDataBuilder -> TestStack.Dossier 2.0
 --------------------------------------------------------------
 
 The way that lists are generated no longer uses NBuilder - the new syntax is backwards compatible with NBuilder except that the namespace you need to include is different. You can also refactor your list generation to be a lot more terse, but that is optional. Any `BuildList` extension methods you created will now need to be deleted since they are no longer needed. You also need to ensure that all of the methods you call are marked virtual so the list generation can proxy those method calls.
diff --git a/NextVersion.txt b/NextVersion.txt
@@ -1 +1 @@
-2.1.0
+3.0.0
diff --git a/TestStack.Dossier.Tests/TestHelpers/Builders/BasicCustomerBuilder.cs b/TestStack.Dossier.Tests/TestHelpers/Builders/BasicCustomerBuilder.cs
@@ -1,6 +1,4 @@
-﻿using System;
-using System.Linq.Expressions;
-using TestStack.Dossier.Tests.TestHelpers.Objects.Entities;
+﻿using TestStack.Dossier.Tests.TestHelpers.Objects.Entities;
 
 namespace TestStack.Dossier.Tests.TestHelpers.Builders
 {
diff --git a/TestStack.Dossier.sln b/TestStack.Dossier.sln
@@ -1,13 +1,14 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BC8508D1-6FCB-46B2-9C14-F41F6AD76B09}"
 	ProjectSection(SolutionItems) = preProject
 		BREAKING_CHANGES.md = BREAKING_CHANGES.md
 		LICENSE = LICENSE
 		logo.png = logo.png
+		NextVersion.txt = NextVersion.txt
 		README.md = README.md
 	EndProjectSection
 EndProject
diff --git a/TestStack.Dossier/AnonymousValueFixture.cs b/TestStack.Dossier/AnonymousValueFixture.cs
@@ -88,7 +88,7 @@ public T Get<TObject, T>(Expression<Func<TObject, T>> property)
                 .Concat(DefaultValueSuppliers)
                 .First(s => s.CanSupplyValue(typeof(T), propertyName));
 
-            return valueSupplier.GenerateAnonymousValue<TObject, T>(this, propertyName);
+            return (T) valueSupplier.GenerateAnonymousValue(this, typeof(T), propertyName);
         }
 
         /// <summary>
@@ -102,7 +102,7 @@ public object Get(Type type, string propertyName)
             var valueSupplier = LocalValueSuppliers
                 .Concat(GlobalValueSuppliers)
                 .Concat(DefaultValueSuppliers)
-                .First(s => s.CanSupplyValue(type,propertyName));
+                .First(s => s.CanSupplyValue(type, propertyName));
 
             return valueSupplier.GenerateAnonymousValue(this, type, propertyName);
         }
diff --git a/TestStack.Dossier/IAnonymousValueSupplier.cs b/TestStack.Dossier/IAnonymousValueSupplier.cs
@@ -15,16 +15,6 @@ public interface IAnonymousValueSupplier
         /// <returns>Whether or not this supplier can supply an anonymous value</returns>
         bool CanSupplyValue(Type type, string propertyName);
 
-        /// <summary>
-        /// Return an anonymous value for the given property and fixture.
-        /// </summary>
-        /// <typeparam name="TObject">The type that the property is enclosed in</typeparam>
-        /// <typeparam name="TValue">The type of the target property - the required anonymous value is of this type</typeparam>
-        /// <param name="any">Anonymous value fixture</param>
-        /// <param name="propertyName">The name of the property to return an anonymous value for</param>
-        /// <returns>The anonymous value</returns>
-        TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName);
-
         /// <summary>
         /// Return an anonymous value for the given property and fixture.
         /// </summary>
diff --git a/TestStack.Dossier/Suppliers/DefaultEmailValueSupplier.cs b/TestStack.Dossier/Suppliers/DefaultEmailValueSupplier.cs
@@ -14,12 +14,6 @@ public bool CanSupplyValue(Type type, string propertyName)
             return type == typeof(string) && propertyName.ToLower().Contains("email");
         }
 
-        /// <inheritdoc />
-        public TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName)
-        {
-            return (TValue) (object) any.EmailAddress();
-        }
-
         /// <inheritdoc />
         public object GenerateAnonymousValue(AnonymousValueFixture any, Type type, string propertyName)
         {
diff --git a/TestStack.Dossier/Suppliers/DefaultFirstNameValueSupplier.cs b/TestStack.Dossier/Suppliers/DefaultFirstNameValueSupplier.cs
@@ -14,12 +14,6 @@ public bool CanSupplyValue(Type type, string propertyName)
             return type == typeof(string) && propertyName.ToLower() == "firstname";
         }
 
-        /// <inheritdoc />
-        public TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName)
-        {
-            return (TValue) (object) any.FirstName();
-        }
-
         /// <inheritdoc />
         public object GenerateAnonymousValue(AnonymousValueFixture any, Type type, string propertyName)
         {
diff --git a/TestStack.Dossier/Suppliers/DefaultLastNameValueSupplier.cs b/TestStack.Dossier/Suppliers/DefaultLastNameValueSupplier.cs
@@ -15,12 +15,6 @@ public bool CanSupplyValue(Type type, string propertyName)
                 (propertyName.ToLower() == "lastname" || propertyName.ToLower() == "surname");
         }
 
-        /// <inheritdoc />
-        public TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName)
-        {
-            return (TValue)(object)any.LastName();
-        }
-
         /// <inheritdoc />
         public object GenerateAnonymousValue(AnonymousValueFixture any, Type type, string propertyName)
         {
diff --git a/TestStack.Dossier/Suppliers/DefaultStringValueSupplier.cs b/TestStack.Dossier/Suppliers/DefaultStringValueSupplier.cs
@@ -14,12 +14,6 @@ public bool CanSupplyValue(Type type, string propertyName)
             return type == typeof(string);
         }
 
-        /// <inheritdoc />
-        public TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName)
-        {
-            return (TValue) (object) any.StringStartingWith(propertyName);
-        }
-
         /// <inheritdoc />
         public object GenerateAnonymousValue(AnonymousValueFixture any, Type type, string propertyName)
         {
diff --git a/TestStack.Dossier/Suppliers/DefaultValueSupplier.cs b/TestStack.Dossier/Suppliers/DefaultValueSupplier.cs
@@ -13,12 +13,6 @@ public bool CanSupplyValue(Type type, string propertyName)
             return true;
         }
 
-        /// <inheritdoc />
-        public TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName)
-        {
-            return default(TValue);
-        }
-
         /// <inheritdoc />
         public object GenerateAnonymousValue(AnonymousValueFixture any, Type type, string propertyName)
         {
diff --git a/TestStack.Dossier/Suppliers/DefaultValueTypeValueSupplier.cs b/TestStack.Dossier/Suppliers/DefaultValueTypeValueSupplier.cs
@@ -16,17 +16,10 @@ public bool CanSupplyValue(Type type, string propertyName)
             return type.IsValueType;
         }
 
-        /// <inerhitdoc />
-        public TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName)
-        {
-            return any.Fixture.Create<TValue>();
-        }
-
-        /// How to create weakly-typed CreateAnonymous with AutoFixture
-        /// http://autofixture.codeplex.com/workitem/4229
         /// <inerhitdoc />
         public object GenerateAnonymousValue(AnonymousValueFixture any, Type type, string propertyName)
         {
+            // http://autofixture.codeplex.com/workitem/4229
             var context = new SpecimenContext(any.Fixture);
             var specimen = context.Resolve(type);
             return specimen;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Linq.Expressions;`
`3`		`-using TestStack.Dossier.Tests.TestHelpers.Objects.Entities;`
	`1`	`+using TestStack.Dossier.Tests.TestHelpers.Objects.Entities;`
`4`	`2`
`5`	`3`	`namespace TestStack.Dossier.Tests.TestHelpers.Builders`
`6`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public T Get<TObject, T>(Expression<Func<TObject, T>> property)`
`88`	`88`	`.Concat(DefaultValueSuppliers)`
`89`	`89`	`.First(s => s.CanSupplyValue(typeof(T), propertyName));`
`90`	`90`
`91`		`- return valueSupplier.GenerateAnonymousValue<TObject, T>(this, propertyName);`
	`91`	`+ return (T) valueSupplier.GenerateAnonymousValue(this, typeof(T), propertyName);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/// <summary>`
`@@ -102,7 +102,7 @@ public object Get(Type type, string propertyName)`
`102`	`102`	`var valueSupplier = LocalValueSuppliers`
`103`	`103`	`.Concat(GlobalValueSuppliers)`
`104`	`104`	`.Concat(DefaultValueSuppliers)`
`105`		`- .First(s => s.CanSupplyValue(type,propertyName));`
	`105`	`+ .First(s => s.CanSupplyValue(type, propertyName));`
`106`	`106`
`107`	`107`	`return valueSupplier.GenerateAnonymousValue(this, type, propertyName);`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,6 @@ public bool CanSupplyValue(Type type, string propertyName)`
`14`	`14`	`return type == typeof(string) && propertyName.ToLower().Contains("email");`
`15`	`15`	`}`
`16`	`16`
`17`		`- /// <inheritdoc />`
`18`		`- public TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName)`
`19`		`- {`
`20`		`- return (TValue) (object) any.EmailAddress();`
`21`		`- }`
`22`		`-`
`23`	`17`	`/// <inheritdoc />`
`24`	`18`	`public object GenerateAnonymousValue(AnonymousValueFixture any, Type type, string propertyName)`
`25`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,6 @@ public bool CanSupplyValue(Type type, string propertyName)`
`15`	`15`	`(propertyName.ToLower() == "lastname" \|\| propertyName.ToLower() == "surname");`
`16`	`16`	`}`
`17`	`17`
`18`		`- /// <inheritdoc />`
`19`		`- public TValue GenerateAnonymousValue<TObject, TValue>(AnonymousValueFixture any, string propertyName)`
`20`		`- {`
`21`		`- return (TValue)(object)any.LastName();`
`22`		`- }`
`23`		`-`
`24`	`18`	`/// <inheritdoc />`
`25`	`19`	`public object GenerateAnonymousValue(AnonymousValueFixture any, Type type, string propertyName)`
`26`	`20`	`{`