From 9eea6a147882512ea487910261d168b82e2f0861 Mon Sep 17 00:00:00 2001
From: Michael Whelan <mjmwdev@gmail.com>
Date: Tue, 19 Jan 2016 21:26:39 +0000
Subject: [PATCH 1/4] Added Pick functionality to builders

---
 .../Picking/PickingTests.cs                   | 48 +++++++++++++++++++
 .../TestStack.Dossier.Tests.csproj            |  2 +
 TestStack.Dossier/Picking/ItemPicker.cs       | 38 +++++++++++++++
 TestStack.Dossier/Picking/Pick.cs             | 32 +++++++++++++
 TestStack.Dossier/Picking/RandomItemPicker.cs | 20 ++++++++
 .../Picking/RepeatingSequenceItemPicker.cs    | 20 ++++++++
 TestStack.Dossier/TestStack.Dossier.csproj    |  4 ++
 7 files changed, 164 insertions(+)
 create mode 100644 TestStack.Dossier.Tests/Picking/PickingTests.cs
 create mode 100644 TestStack.Dossier/Picking/ItemPicker.cs
 create mode 100644 TestStack.Dossier/Picking/Pick.cs
 create mode 100644 TestStack.Dossier/Picking/RandomItemPicker.cs
 create mode 100644 TestStack.Dossier/Picking/RepeatingSequenceItemPicker.cs

diff --git a/TestStack.Dossier.Tests/Picking/PickingTests.cs b/TestStack.Dossier.Tests/Picking/PickingTests.cs
new file mode 100644
index 0000000..dd1e4cb
--- /dev/null
+++ b/TestStack.Dossier.Tests/Picking/PickingTests.cs
@@ -0,0 +1,48 @@
+using System.Linq;
+using Shouldly;
+using TestStack.Dossier.Lists;
+using TestStack.Dossier.Picking;
+using TestStack.Dossier.Tests.TestHelpers.Objects.Entities;
+using Xunit;
+
+namespace TestStack.Dossier.Tests.Picking
+{
+    public class PickingTests
+    {
+        [Fact]
+        public void RandomItemFrom_should_add_items_from_list_randomly()
+        {
+            var addresses = Builder<Address>.CreateListOfSize(15).BuildList();
+            var customers = Builder<Customer>
+                .CreateListOfSize(15)
+                .All()
+                .Set(x => x.PostalAddress, Pick.RandomItemFrom(addresses).Next)
+                .BuildList();
+
+            var uniqueAddresses = customers.Select(x => x.PostalAddress).Distinct().Count();
+            uniqueAddresses.ShouldBeGreaterThan(3);
+            uniqueAddresses.ShouldBeLessThan(15);
+        }
+
+        [Fact]
+        public void RepeatingSequenceFrom_should_add_items_from_list_sequentially_and_repeat_when_list_completes()
+        {
+            var addresses = Builder<Address>.CreateListOfSize(3).BuildList();
+            var customers = Builder<Customer>
+                .CreateListOfSize(9)
+                .All()
+                .Set(x => x.PostalAddress, Pick.RepeatingSequenceFrom(addresses).Next)
+                .BuildList();
+
+            for (int i = 0; i < 2; i++)
+            {
+                var address = customers[i].PostalAddress;
+                address.ShouldBeSameAs(customers[i + 3].PostalAddress);
+                address.ShouldBeSameAs(customers[i + 6].PostalAddress);
+
+                address.ShouldNotBeSameAs(customers[i + 1].PostalAddress);
+                address.ShouldNotBeSameAs(customers[i + 2].PostalAddress);
+            }
+        }
+    }
+}
diff --git a/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj b/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj
index e8fe2ff..617f270 100644
--- a/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj
+++ b/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj
@@ -58,6 +58,7 @@
     <Compile Include="Builder_CreateListTests.cs" />
     <Compile Include="Builder_CreateNewTests.cs" />
     <Compile Include="Builder_SetUsingBuilderTests.cs" />
+    <Compile Include="Picking\PickingTests.cs" />
     <Compile Include="TestHelpers\Builders\AddressViewModelBuilder.cs" />
     <Compile Include="TestHelpers\Builders\AutoConstructorCustomerBuilder.cs" />
     <Compile Include="ChildBuilderTests.cs" />
@@ -119,6 +120,7 @@
       <Name>TestStack.Dossier</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/TestStack.Dossier/Picking/ItemPicker.cs b/TestStack.Dossier/Picking/ItemPicker.cs
new file mode 100644
index 0000000..910453c
--- /dev/null
+++ b/TestStack.Dossier/Picking/ItemPicker.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using TestStack.Dossier.DataSources.Generators;
+
+namespace TestStack.Dossier.Picking
+{
+    /// <summary>
+    /// The base class with all of the item picking functionality
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public abstract class ItemPicker<T>
+    {
+        private readonly IList<T> _list;
+        private readonly IGenerator _generator;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ItemPicker{T}"/> class.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        /// <param name="generator">The generator.</param>
+        protected ItemPicker(IList<T> list, IGenerator generator)
+        {
+            _list = list;
+            _generator = generator;
+            _generator.StartIndex = 0;
+            _generator.ListSize = _list.Count;
+        }
+
+        /// <summary>
+        /// Called to return the next item in the sequence.
+        /// </summary>
+        /// <returns></returns>
+        public T Next()
+        {
+            var index = _generator.Generate();
+            return _list[index];
+        }
+    }
+}
\ No newline at end of file
diff --git a/TestStack.Dossier/Picking/Pick.cs b/TestStack.Dossier/Picking/Pick.cs
new file mode 100644
index 0000000..fb84a71
--- /dev/null
+++ b/TestStack.Dossier/Picking/Pick.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+
+namespace TestStack.Dossier.Picking
+{
+    /// <summary>
+    /// Pick a sequence of items from a collection of items according to different selection strategies.
+    /// </summary>
+    public class Pick
+    {
+        /// <summary>
+        /// Selects a random item from the list each time it is called.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="list">The list.</param>
+        /// <returns>The RandomItemPicker class.</returns>
+        public static RandomItemPicker<T> RandomItemFrom<T>(IList<T> list)
+        {
+            return new RandomItemPicker<T>(list);
+        }
+
+        /// <summary>
+        /// Selects each item sequentially from the list and starts again from the beginning when the list is exhausted.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="list">The list.</param>
+        /// <returns></returns>
+        public static RepeatingSequenceItemPicker<T> RepeatingSequenceFrom<T>(IList<T> list)
+        {
+            return new RepeatingSequenceItemPicker<T>(list);
+        }
+    }
+}
\ No newline at end of file
diff --git a/TestStack.Dossier/Picking/RandomItemPicker.cs b/TestStack.Dossier/Picking/RandomItemPicker.cs
new file mode 100644
index 0000000..e82d0d8
--- /dev/null
+++ b/TestStack.Dossier/Picking/RandomItemPicker.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using TestStack.Dossier.DataSources.Generators;
+
+namespace TestStack.Dossier.Picking
+{
+    /// <summary>
+    /// Implements the random item strategy
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <seealso cref="ItemPicker{T}" />
+    public class RandomItemPicker<T> : ItemPicker<T>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RandomItemPicker{T}"/> class.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        public RandomItemPicker(IList<T> list)
+            : base(list, new RandomGenerator()) { }
+    }
+}
\ No newline at end of file
diff --git a/TestStack.Dossier/Picking/RepeatingSequenceItemPicker.cs b/TestStack.Dossier/Picking/RepeatingSequenceItemPicker.cs
new file mode 100644
index 0000000..c9f5280
--- /dev/null
+++ b/TestStack.Dossier/Picking/RepeatingSequenceItemPicker.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using TestStack.Dossier.DataSources.Generators;
+
+namespace TestStack.Dossier.Picking
+{
+    /// <summary>
+    /// Implements the repeatable sequence strategy
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <seealso cref="ItemPicker{T}" />
+    public class RepeatingSequenceItemPicker<T> : ItemPicker<T>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RepeatingSequenceItemPicker{T}"/> class.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        public RepeatingSequenceItemPicker(IList<T> list)
+            : base(list, new SequentialGenerator()) { }
+    }
+}
\ No newline at end of file
diff --git a/TestStack.Dossier/TestStack.Dossier.csproj b/TestStack.Dossier/TestStack.Dossier.csproj
index ebc247e..7763bff 100644
--- a/TestStack.Dossier/TestStack.Dossier.csproj
+++ b/TestStack.Dossier/TestStack.Dossier.csproj
@@ -94,6 +94,10 @@
     <Compile Include="NullingExpandoObject.cs" />
     <Compile Include="Factories\IFactory.cs" />
     <Compile Include="PathExpressionVisitor.cs" />
+    <Compile Include="Picking\ItemPicker.cs" />
+    <Compile Include="Picking\Pick.cs" />
+    <Compile Include="Picking\RandomItemPicker.cs" />
+    <Compile Include="Picking\RepeatingSequenceItemPicker.cs" />
     <Compile Include="Reflector.cs" />
     <Compile Include="Suppliers\DefaultEmailValueSupplier.cs" />
     <Compile Include="Suppliers\DefaultLastNameValueSupplier.cs" />

From 76a322a7f86107bba5cf36e36f931c1b25f9e1ad Mon Sep 17 00:00:00 2001
From: Michael Whelan <mjmwdev@gmail.com>
Date: Thu, 21 Jan 2016 13:05:24 +0000
Subject: [PATCH 2/4] Refactored Pickers as DataSources

---
 .../Picking/PickingTests.cs                   |  2 +-
 TestStack.Dossier/DataSources/DataSource.cs   |  1 +
 .../{Picking => DataSources}/Pick.cs          | 12 +++---
 .../DataSources/RandomItemSource.cs           | 26 +++++++++++++
 .../DataSources/RepeatingSequenceSource.cs    | 28 ++++++++++++++
 TestStack.Dossier/Picking/ItemPicker.cs       | 38 -------------------
 TestStack.Dossier/Picking/RandomItemPicker.cs | 20 ----------
 .../Picking/RepeatingSequenceItemPicker.cs    | 20 ----------
 TestStack.Dossier/TestStack.Dossier.csproj    | 10 +++--
 9 files changed, 68 insertions(+), 89 deletions(-)
 rename TestStack.Dossier/{Picking => DataSources}/Pick.cs (68%)
 create mode 100644 TestStack.Dossier/DataSources/RandomItemSource.cs
 create mode 100644 TestStack.Dossier/DataSources/RepeatingSequenceSource.cs
 delete mode 100644 TestStack.Dossier/Picking/ItemPicker.cs
 delete mode 100644 TestStack.Dossier/Picking/RandomItemPicker.cs
 delete mode 100644 TestStack.Dossier/Picking/RepeatingSequenceItemPicker.cs

diff --git a/TestStack.Dossier.Tests/Picking/PickingTests.cs b/TestStack.Dossier.Tests/Picking/PickingTests.cs
index dd1e4cb..5dba255 100644
--- a/TestStack.Dossier.Tests/Picking/PickingTests.cs
+++ b/TestStack.Dossier.Tests/Picking/PickingTests.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Shouldly;
+using TestStack.Dossier.DataSources;
 using TestStack.Dossier.Lists;
-using TestStack.Dossier.Picking;
 using TestStack.Dossier.Tests.TestHelpers.Objects.Entities;
 using Xunit;
 
diff --git a/TestStack.Dossier/DataSources/DataSource.cs b/TestStack.Dossier/DataSources/DataSource.cs
index ffecf7c..3a52770 100644
--- a/TestStack.Dossier/DataSources/DataSource.cs
+++ b/TestStack.Dossier/DataSources/DataSource.cs
@@ -40,6 +40,7 @@ public IList<T> Data
                 }
                 return _list;
             }
+            internal set { _list = value; }
         }
 
         /// <summary>
diff --git a/TestStack.Dossier/Picking/Pick.cs b/TestStack.Dossier/DataSources/Pick.cs
similarity index 68%
rename from TestStack.Dossier/Picking/Pick.cs
rename to TestStack.Dossier/DataSources/Pick.cs
index fb84a71..91d396c 100644
--- a/TestStack.Dossier/Picking/Pick.cs
+++ b/TestStack.Dossier/DataSources/Pick.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace TestStack.Dossier.Picking
+namespace TestStack.Dossier.DataSources
 {
     /// <summary>
     /// Pick a sequence of items from a collection of items according to different selection strategies.
@@ -12,10 +12,10 @@ public class Pick
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="list">The list.</param>
-        /// <returns>The RandomItemPicker class.</returns>
-        public static RandomItemPicker<T> RandomItemFrom<T>(IList<T> list)
+        /// <returns>The RandomItemSource class.</returns>
+        public static RandomItemSource<T> RandomItemFrom<T>(IList<T> list)
         {
-            return new RandomItemPicker<T>(list);
+            return new RandomItemSource<T>(list);
         }
 
         /// <summary>
@@ -24,9 +24,9 @@ public static RandomItemPicker<T> RandomItemFrom<T>(IList<T> list)
         /// <typeparam name="T"></typeparam>
         /// <param name="list">The list.</param>
         /// <returns></returns>
-        public static RepeatingSequenceItemPicker<T> RepeatingSequenceFrom<T>(IList<T> list)
+        public static RepeatingSequenceSource<T> RepeatingSequenceFrom<T>(IList<T> list)
         {
-            return new RepeatingSequenceItemPicker<T>(list);
+            return new RepeatingSequenceSource<T>(list);
         }
     }
 }
\ No newline at end of file
diff --git a/TestStack.Dossier/DataSources/RandomItemSource.cs b/TestStack.Dossier/DataSources/RandomItemSource.cs
new file mode 100644
index 0000000..97d40b8
--- /dev/null
+++ b/TestStack.Dossier/DataSources/RandomItemSource.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace TestStack.Dossier.DataSources
+{
+    /// <summary>
+    /// Implements the random item strategy
+    /// </summary>
+    public class RandomItemSource<T> : DataSource<T>
+    {
+        /// <inheritdoc />
+        public RandomItemSource(IList<T> list)
+        {
+            Data = list;
+            Generator.StartIndex = 0;
+            Generator.ListSize = Data.Count;
+        }
+
+        /// <inheritdoc />
+        protected override IList<T> InitializeDataSource()
+        {
+            // This method will never be called as the list is set in the constructor.
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/TestStack.Dossier/DataSources/RepeatingSequenceSource.cs b/TestStack.Dossier/DataSources/RepeatingSequenceSource.cs
new file mode 100644
index 0000000..0894436
--- /dev/null
+++ b/TestStack.Dossier/DataSources/RepeatingSequenceSource.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using TestStack.Dossier.DataSources.Generators;
+
+namespace TestStack.Dossier.DataSources
+{
+    /// <summary>
+    /// Implements the repeatable sequence strategy
+    /// </summary>
+    public class RepeatingSequenceSource<T> : DataSource<T>
+    {
+        /// <inheritdoc />
+        public RepeatingSequenceSource(IList<T> list)
+            : base(new SequentialGenerator())
+        {
+            Data = list;
+            Generator.StartIndex = 0;
+            Generator.ListSize = Data.Count;
+        }
+
+        /// <inheritdoc />
+        protected override IList<T> InitializeDataSource()
+        {
+            // This method will never be called as the list is set in the constructor.
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/TestStack.Dossier/Picking/ItemPicker.cs b/TestStack.Dossier/Picking/ItemPicker.cs
deleted file mode 100644
index 910453c..0000000
--- a/TestStack.Dossier/Picking/ItemPicker.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Collections.Generic;
-using TestStack.Dossier.DataSources.Generators;
-
-namespace TestStack.Dossier.Picking
-{
-    /// <summary>
-    /// The base class with all of the item picking functionality
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public abstract class ItemPicker<T>
-    {
-        private readonly IList<T> _list;
-        private readonly IGenerator _generator;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ItemPicker{T}"/> class.
-        /// </summary>
-        /// <param name="list">The list.</param>
-        /// <param name="generator">The generator.</param>
-        protected ItemPicker(IList<T> list, IGenerator generator)
-        {
-            _list = list;
-            _generator = generator;
-            _generator.StartIndex = 0;
-            _generator.ListSize = _list.Count;
-        }
-
-        /// <summary>
-        /// Called to return the next item in the sequence.
-        /// </summary>
-        /// <returns></returns>
-        public T Next()
-        {
-            var index = _generator.Generate();
-            return _list[index];
-        }
-    }
-}
\ No newline at end of file
diff --git a/TestStack.Dossier/Picking/RandomItemPicker.cs b/TestStack.Dossier/Picking/RandomItemPicker.cs
deleted file mode 100644
index e82d0d8..0000000
--- a/TestStack.Dossier/Picking/RandomItemPicker.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using TestStack.Dossier.DataSources.Generators;
-
-namespace TestStack.Dossier.Picking
-{
-    /// <summary>
-    /// Implements the random item strategy
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <seealso cref="ItemPicker{T}" />
-    public class RandomItemPicker<T> : ItemPicker<T>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RandomItemPicker{T}"/> class.
-        /// </summary>
-        /// <param name="list">The list.</param>
-        public RandomItemPicker(IList<T> list)
-            : base(list, new RandomGenerator()) { }
-    }
-}
\ No newline at end of file
diff --git a/TestStack.Dossier/Picking/RepeatingSequenceItemPicker.cs b/TestStack.Dossier/Picking/RepeatingSequenceItemPicker.cs
deleted file mode 100644
index c9f5280..0000000
--- a/TestStack.Dossier/Picking/RepeatingSequenceItemPicker.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using TestStack.Dossier.DataSources.Generators;
-
-namespace TestStack.Dossier.Picking
-{
-    /// <summary>
-    /// Implements the repeatable sequence strategy
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <seealso cref="ItemPicker{T}" />
-    public class RepeatingSequenceItemPicker<T> : ItemPicker<T>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RepeatingSequenceItemPicker{T}"/> class.
-        /// </summary>
-        /// <param name="list">The list.</param>
-        public RepeatingSequenceItemPicker(IList<T> list)
-            : base(list, new SequentialGenerator()) { }
-    }
-}
\ No newline at end of file
diff --git a/TestStack.Dossier/TestStack.Dossier.csproj b/TestStack.Dossier/TestStack.Dossier.csproj
index 7763bff..b5dbca0 100644
--- a/TestStack.Dossier/TestStack.Dossier.csproj
+++ b/TestStack.Dossier/TestStack.Dossier.csproj
@@ -52,6 +52,9 @@
   <ItemGroup>
     <Compile Include="AnonymousValueFixture.cs" />
     <Compile Include="Builder.cs" />
+    <Compile Include="DataSources\Pick.cs" />
+    <Compile Include="DataSources\RandomItemSource.cs" />
+    <Compile Include="DataSources\RepeatingSequenceSource.cs" />
     <Compile Include="ITestDataBuilder.cs" />
     <Compile Include="DataSources\Dictionaries\Cache.cs" />
     <Compile Include="DataSources\Dictionaries\IDictionaryRepository.cs" />
@@ -94,10 +97,6 @@
     <Compile Include="NullingExpandoObject.cs" />
     <Compile Include="Factories\IFactory.cs" />
     <Compile Include="PathExpressionVisitor.cs" />
-    <Compile Include="Picking\ItemPicker.cs" />
-    <Compile Include="Picking\Pick.cs" />
-    <Compile Include="Picking\RandomItemPicker.cs" />
-    <Compile Include="Picking\RepeatingSequenceItemPicker.cs" />
     <Compile Include="Reflector.cs" />
     <Compile Include="Suppliers\DefaultEmailValueSupplier.cs" />
     <Compile Include="Suppliers\DefaultLastNameValueSupplier.cs" />
@@ -183,6 +182,9 @@
     <EmbeddedResource Include="DataSources\Dictionaries\Resources\PersonUsername.txt" />
     <EmbeddedResource Include="DataSources\Dictionaries\Resources\ShirtSize.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Picking\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

From bd5b292420b2c0deaa6de2d948409fd74c59f7e7 Mon Sep 17 00:00:00 2001
From: Michael Whelan <mjmwdev@gmail.com>
Date: Thu, 21 Jan 2016 13:54:28 +0000
Subject: [PATCH 3/4] Moved Picking data sources to separate folder

---
 TestStack.Dossier.Tests/Picking/PickingTests.cs             | 1 +
 TestStack.Dossier/DataSources/{ => Picking}/Pick.cs         | 2 +-
 .../DataSources/{ => Picking}/RandomItemSource.cs           | 2 +-
 .../DataSources/{ => Picking}/RepeatingSequenceSource.cs    | 2 +-
 TestStack.Dossier/TestStack.Dossier.csproj                  | 6 +++---
 5 files changed, 7 insertions(+), 6 deletions(-)
 rename TestStack.Dossier/DataSources/{ => Picking}/Pick.cs (95%)
 rename TestStack.Dossier/DataSources/{ => Picking}/RandomItemSource.cs (93%)
 rename TestStack.Dossier/DataSources/{ => Picking}/RepeatingSequenceSource.cs (94%)

diff --git a/TestStack.Dossier.Tests/Picking/PickingTests.cs b/TestStack.Dossier.Tests/Picking/PickingTests.cs
index 5dba255..677137a 100644
--- a/TestStack.Dossier.Tests/Picking/PickingTests.cs
+++ b/TestStack.Dossier.Tests/Picking/PickingTests.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using Shouldly;
 using TestStack.Dossier.DataSources;
+using TestStack.Dossier.DataSources.Picking;
 using TestStack.Dossier.Lists;
 using TestStack.Dossier.Tests.TestHelpers.Objects.Entities;
 using Xunit;
diff --git a/TestStack.Dossier/DataSources/Pick.cs b/TestStack.Dossier/DataSources/Picking/Pick.cs
similarity index 95%
rename from TestStack.Dossier/DataSources/Pick.cs
rename to TestStack.Dossier/DataSources/Picking/Pick.cs
index 91d396c..bff87f9 100644
--- a/TestStack.Dossier/DataSources/Pick.cs
+++ b/TestStack.Dossier/DataSources/Picking/Pick.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace TestStack.Dossier.DataSources
+namespace TestStack.Dossier.DataSources.Picking
 {
     /// <summary>
     /// Pick a sequence of items from a collection of items according to different selection strategies.
diff --git a/TestStack.Dossier/DataSources/RandomItemSource.cs b/TestStack.Dossier/DataSources/Picking/RandomItemSource.cs
similarity index 93%
rename from TestStack.Dossier/DataSources/RandomItemSource.cs
rename to TestStack.Dossier/DataSources/Picking/RandomItemSource.cs
index 97d40b8..bc7fc08 100644
--- a/TestStack.Dossier/DataSources/RandomItemSource.cs
+++ b/TestStack.Dossier/DataSources/Picking/RandomItemSource.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace TestStack.Dossier.DataSources
+namespace TestStack.Dossier.DataSources.Picking
 {
     /// <summary>
     /// Implements the random item strategy
diff --git a/TestStack.Dossier/DataSources/RepeatingSequenceSource.cs b/TestStack.Dossier/DataSources/Picking/RepeatingSequenceSource.cs
similarity index 94%
rename from TestStack.Dossier/DataSources/RepeatingSequenceSource.cs
rename to TestStack.Dossier/DataSources/Picking/RepeatingSequenceSource.cs
index 0894436..5d98dda 100644
--- a/TestStack.Dossier/DataSources/RepeatingSequenceSource.cs
+++ b/TestStack.Dossier/DataSources/Picking/RepeatingSequenceSource.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources.Generators;
 
-namespace TestStack.Dossier.DataSources
+namespace TestStack.Dossier.DataSources.Picking
 {
     /// <summary>
     /// Implements the repeatable sequence strategy
diff --git a/TestStack.Dossier/TestStack.Dossier.csproj b/TestStack.Dossier/TestStack.Dossier.csproj
index b5dbca0..db23423 100644
--- a/TestStack.Dossier/TestStack.Dossier.csproj
+++ b/TestStack.Dossier/TestStack.Dossier.csproj
@@ -52,9 +52,9 @@
   <ItemGroup>
     <Compile Include="AnonymousValueFixture.cs" />
     <Compile Include="Builder.cs" />
-    <Compile Include="DataSources\Pick.cs" />
-    <Compile Include="DataSources\RandomItemSource.cs" />
-    <Compile Include="DataSources\RepeatingSequenceSource.cs" />
+    <Compile Include="DataSources\Picking\Pick.cs" />
+    <Compile Include="DataSources\Picking\RandomItemSource.cs" />
+    <Compile Include="DataSources\Picking\RepeatingSequenceSource.cs" />
     <Compile Include="ITestDataBuilder.cs" />
     <Compile Include="DataSources\Dictionaries\Cache.cs" />
     <Compile Include="DataSources\Dictionaries\IDictionaryRepository.cs" />

From 42af0771136b19d714f96389021f0c30f9b9cdf5 Mon Sep 17 00:00:00 2001
From: Michael Whelan <mjmwdev@gmail.com>
Date: Thu, 21 Jan 2016 13:55:55 +0000
Subject: [PATCH 4/4] Moved Picking tests to match source location

---
 .../{ => DataSources}/Picking/PickingTests.cs                  | 3 +--
 TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename TestStack.Dossier.Tests/{ => DataSources}/Picking/PickingTests.cs (95%)

diff --git a/TestStack.Dossier.Tests/Picking/PickingTests.cs b/TestStack.Dossier.Tests/DataSources/Picking/PickingTests.cs
similarity index 95%
rename from TestStack.Dossier.Tests/Picking/PickingTests.cs
rename to TestStack.Dossier.Tests/DataSources/Picking/PickingTests.cs
index 677137a..566161c 100644
--- a/TestStack.Dossier.Tests/Picking/PickingTests.cs
+++ b/TestStack.Dossier.Tests/DataSources/Picking/PickingTests.cs
@@ -1,12 +1,11 @@
 using System.Linq;
 using Shouldly;
-using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Picking;
 using TestStack.Dossier.Lists;
 using TestStack.Dossier.Tests.TestHelpers.Objects.Entities;
 using Xunit;
 
-namespace TestStack.Dossier.Tests.Picking
+namespace TestStack.Dossier.Tests.DataSources.Picking
 {
     public class PickingTests
     {
diff --git a/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj b/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj
index 617f270..b9368a6 100644
--- a/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj
+++ b/TestStack.Dossier.Tests/TestStack.Dossier.Tests.csproj
@@ -58,7 +58,7 @@
     <Compile Include="Builder_CreateListTests.cs" />
     <Compile Include="Builder_CreateNewTests.cs" />
     <Compile Include="Builder_SetUsingBuilderTests.cs" />
-    <Compile Include="Picking\PickingTests.cs" />
+    <Compile Include="DataSources\Picking\PickingTests.cs" />
     <Compile Include="TestHelpers\Builders\AddressViewModelBuilder.cs" />
     <Compile Include="TestHelpers\Builders\AutoConstructorCustomerBuilder.cs" />
     <Compile Include="ChildBuilderTests.cs" />