Merge pull request #20 from robdmoore/tweaks

Tweaks

Author: robdmoore

NTestDataBuilder.Tests/EquivalenceClasses/PersonEquivalenceClassesTests.cs

@@ -38,12 +38,14 @@ public void WhenGettingAnyPersonData_ThenReturnRandomPersonDataWhichIsReasonably
         }
 
         [Fact]
-        public void WhenGettingUniqueEmail_ThenReturnUniqueEmails()
+        public void WhenGettingUniqueEmail_ThenReturnUniqueEmailsAcrossFixtureInstances()
         {
             var source = new PersonEmailAddressSource();
             var generatedValues = new List<string>();
+            var any2 = new AnonymousValueFixture();
 
-            for (var i = 0; i < source.Data.Count; i++)
+            generatedValues.Add(any2.UniqueEmailAddress());
+            for (var i = 0; i < source.Data.Count - 1; i++)
             {
                 generatedValues.Add(Any.UniqueEmailAddress());
             }

NTestDataBuilder/EquivalenceClasses/Person/PersonEquivalenceClasses.cs

@@ -10,7 +10,7 @@ namespace NTestDataBuilder.EquivalenceClasses.Person
     public static class NameEquivalenceClasses
     {
         private static PersonEmailAddressSource _personEmailAddressSource;
-        private static PersonEmailAddressSource _personUniqueEmailAddressSource;
+        private static PersonEmailAddressSource _uniquePersonEmailAddressSource;
         private static PersonLanguageSource _personLanguageSource;
         private static PersonNameFirstFemaleSource _personNameFirstFemaleSource;
         private static PersonNameFirstSource _personNameFirstSource;
@@ -38,13 +38,14 @@ public static string EmailAddress(this AnonymousValueFixture fixture)
         /// <returns>The generated unique email</returns>
         public static string UniqueEmailAddress(this AnonymousValueFixture fixture)
         {
-            if (fixture.Bag.UniqueEmailAddressSource == null)
+            if (_uniquePersonEmailAddressSource == null)
             {
+                if (_personEmailAddressSource == null) _personEmailAddressSource = new PersonEmailAddressSource();
                 var generator = new SequentialGenerator(0, _personEmailAddressSource.Data.Count, listShouldBeUnique: true);
-                fixture.Bag.UniqueEmailAddressSource = new PersonEmailAddressSource(generator);
+                _uniquePersonEmailAddressSource = new PersonEmailAddressSource(generator);
             }
 
-            return fixture.Bag.UniqueEmailAddressSource.Next();
+            return _uniquePersonEmailAddressSource.Next();
         }
 
         /// <summary>

NTestDataBuilder/TestDataBuilder.cs

@@ -16,7 +16,11 @@ public abstract class TestDataBuilder<TObject, TBuilder>
     {
         private readonly Dictionary<string, object> _properties = new Dictionary<string, object>();
         private ProxyBuilder<TObject> _proxyBuilder;
-        internal ListBuilder<TObject, TBuilder> ListBuilder { get; set; } 
+
+        /// <summary>
+        /// The list builder instance (if this ia a list builder proxy).
+        /// </summary>
+        public ListBuilder<TObject, TBuilder> ListBuilder { get; internal set; } 
 
         /// <summary>
         /// Default Constructor.