Merge pull request #5 from Tynamix/BREAK_CHANGE_Renaming

Break change renaming, completly fluent api refactoring

Author: Tynamix

ObjectFiller.Test/AddressFillingTest.cs

@@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using ObjectFiller.Test.TestPoco.Person;
 using Tynamix.ObjectFiller;
 
@@ -10,8 +10,8 @@ public class AddressFillingTest
         [TestMethod]
         public void FillAllAddressProperties()
         {
-            ObjectFiller<Address> addressFiller = new ObjectFiller<Address>();
-            Address a = addressFiller.Fill();
+            Filler<Address> addressFiller = new Filler<Address>();
+            Address a = addressFiller.Create();
 
             Assert.IsNotNull(a.City);
             Assert.IsNotNull(a.Country);
@@ -23,9 +23,10 @@ public void FillAllAddressProperties()
         [TestMethod]
         public void IgnoreCountry()
         {
-            ObjectFiller<Address> addressFiller = new ObjectFiller<Address>();
-            addressFiller.Setup().IgnoreProperties(x => x.Country);
-            Address a = addressFiller.Fill();
+            Filler<Address> addressFiller = new Filler<Address>();
+            addressFiller.Setup()
+                    .OnProperty(x=>x.Country).IgnoreIt();
+            Address a = addressFiller.Create();
 
             Assert.IsNotNull(a.City);
             Assert.IsNull(a.Country);
@@ -37,9 +38,10 @@ public void IgnoreCountry()
         [TestMethod]
         public void IgnoreCountryAndCity()
         {
-            ObjectFiller<Address> addressFiller = new ObjectFiller<Address>();
-            addressFiller.Setup().IgnoreProperties(x => x.Country, x => x.City);
-            Address a = addressFiller.Fill();
+            Filler<Address> addressFiller = new Filler<Address>();
+            addressFiller.Setup()
+                .OnProperty(x => x.Country, x => x.City).IgnoreIt();
+            Address a = addressFiller.Create();
 
             Assert.IsNull(a.City);
             Assert.IsNull(a.Country);
@@ -51,9 +53,10 @@ public void IgnoreCountryAndCity()
         [TestMethod]
         public void SetupCityPropertyWithConstantValue()
         {
-            ObjectFiller<Address> addressFiller = new ObjectFiller<Address>();
-            addressFiller.Setup().RandomizerForProperty(() => "City", ad => ad.City);
-            Address a = addressFiller.Fill();
+            Filler<Address> addressFiller = new Filler<Address>();
+            addressFiller.Setup()
+                .OnProperty(ad => ad.City).Use(() => "City");
+            Address a = addressFiller.Create();
 
             Assert.AreEqual("City", a.City);
             Assert.IsNotNull(a.Country);
@@ -65,10 +68,10 @@ public void SetupCityPropertyWithConstantValue()
         [TestMethod]
         public void SetupCityAndCountryPropertyWithConstantValue()
         {
-            ObjectFiller<Address> addressFiller = new ObjectFiller<Address>();
+            Filler<Address> addressFiller = new Filler<Address>();
             addressFiller.Setup()
-                .RandomizerForProperty(() => "CityCountry", ad => ad.City, ad => ad.Country);
-            Address a = addressFiller.Fill();
+                .OnProperty(ad => ad.City, ad => ad.Country).Use(() => "CityCountry");
+            Address a = addressFiller.Create();
 
             Assert.AreEqual("CityCountry", a.City);
             Assert.IsNotNull(a.Country);

ObjectFiller.Test/LibraryFillingTest.cs

@@ -1,4 +1,5 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using ObjectFiller.Test.TestPoco.Library;
 using Tynamix.ObjectFiller;
 
@@ -10,10 +11,10 @@ public class LibraryFillingTest
         [TestMethod]
         public void TestFillLibraryWithSimpleTypes()
         {
-            ObjectFiller<LibraryConstructorWithSimple> lib = new ObjectFiller<LibraryConstructorWithSimple>();
+            Filler<LibraryConstructorWithSimple> lib = new Filler<LibraryConstructorWithSimple>();
             lib.Setup()
-                .IgnoreProperties(x => x.Books);
-            LibraryConstructorWithSimple filledLib = lib.Fill();
+                .OnProperty(x => x.Books).IgnoreIt();
+            LibraryConstructorWithSimple filledLib = lib.Create();
 
             Assert.IsNull(filledLib.Books);
             Assert.IsNotNull(filledLib);
@@ -24,12 +25,12 @@ public void TestFillLibraryWithSimpleTypes()
         [TestMethod]
         public void TestFillLibraryWithListOfBooks()
         {
-            ObjectFiller<LibraryConstructorList> lib = new ObjectFiller<LibraryConstructorList>();
+            Filler<LibraryConstructorList> lib = new Filler<LibraryConstructorList>();
             lib.Setup()
-                .IgnoreProperties(x => x.Books, x => x.Name);
+                .OnProperty(x => x.Books).IgnoreIt()
+                .OnProperty(x => x.Name).IgnoreIt();
 
-
-            LibraryConstructorList filledLib = lib.Fill();
+            LibraryConstructorList filledLib = lib.Create();
 
             Assert.IsNotNull(filledLib);
             Assert.IsNotNull(filledLib.Books);
@@ -39,54 +40,74 @@ public void TestFillLibraryWithListOfBooks()
         [TestMethod]
         public void TestFillLibraryWithListOfIBooks()
         {
-            ObjectFiller<LibraryConstructorList> lib = new ObjectFiller<LibraryConstructorList>();
+            Filler<LibraryConstructorList> lib = new Filler<LibraryConstructorList>();
             lib.Setup()
-                .IgnoreProperties(x => x.Books)
-                .RegisterInterface<IBook, Book>();
+                .OnProperty(x => x.Books).IgnoreIt()
+                .OnType<IBook>().CreateInstanceOf<Book>();
 
-            LibraryConstructorList filledLib = lib.Fill();
+            LibraryConstructorList filledLib = lib.Create();
 
             Assert.IsNotNull(filledLib.Books);
         }
 
         [TestMethod]
         public void TestFillLibraryWithPocoOfABook()
         {
-            ObjectFiller<LibraryConstructorPoco> lib = new ObjectFiller<LibraryConstructorPoco>();
+            Filler<LibraryConstructorPoco> lib = new Filler<LibraryConstructorPoco>();
             lib.Setup()
-               .IgnoreProperties(x => x.Books);
-
+                .OnProperty(x => x.Books).IgnoreIt();
 
-            LibraryConstructorPoco filledLib = lib.Fill();
+            LibraryConstructorPoco filledLib = lib.Create();
             Assert.IsNotNull(filledLib.Books);
             Assert.AreEqual(1, filledLib.Books.Count);
         }
 
         [TestMethod]
         public void TestFillLibraryWithDictionary()
         {
-            ObjectFiller<LibraryConstructorDictionary> lib = new ObjectFiller<LibraryConstructorDictionary>();
+            Filler<LibraryConstructorDictionary> lib = new Filler<LibraryConstructorDictionary>();
             lib.Setup()
-                .RegisterInterface<IBook, Book>()
-                .IgnoreProperties(x => x.Books);
-
+                .OnType<IBook>().CreateInstanceOf<Book>()
+                .OnProperty(x => x.Books).IgnoreIt();
 
-            LibraryConstructorDictionary filledLib = lib.Fill();
+            LibraryConstructorDictionary filledLib = lib.Create();
             Assert.IsNotNull(filledLib.Books);
         }
 
         [TestMethod]
         public void TestFillLibraryWithDictionaryAndPoco()
         {
-            ObjectFiller<LibraryConstructorDictionary> lib = new ObjectFiller<LibraryConstructorDictionary>();
+            Filler<LibraryConstructorDictionary> lib = new Filler<LibraryConstructorDictionary>();
             lib.Setup()
-               .IgnoreProperties(x => x.Books, x => x.Name);
+                .OnProperty(x => x.Books).IgnoreIt()
+                .OnProperty(x => x.Name).IgnoreIt();
 
 
-            LibraryConstructorDictionary filledLib = lib.Fill();
+            LibraryConstructorDictionary filledLib = lib.Create();
             Assert.IsNotNull(filledLib.Books);
             Assert.IsNotNull(filledLib.Name);
 
         }
+
+
+        public class Person
+        {
+            public string Name { get; set; }
+            public string LastName { get; set; }
+            public int Age { get; set; }
+            public DateTime Birthday { get; set; }
+        }
+
+        public class HelloFiller
+        {
+            public void FillPerson()
+            {
+                Person person = new Person();
+
+                Filler<Person> pFiller = new Filler<Person>();
+                Person p = pFiller.Fill(person);
+            }
+        }
+
     }
-}
+}

ObjectFiller.Test/ListFillingTest.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using ObjectFiller.Test.TestPoco.ListTest;
 using Tynamix.ObjectFiller;
@@ -11,10 +11,11 @@ public class ListFillingTest
         [TestMethod]
         public void TestFillAllListsExceptArray()
         {
-            ObjectFiller<EntityCollection> eFiller = new ObjectFiller<EntityCollection>();
+            Filler<EntityCollection> eFiller = new Filler<EntityCollection>();
             eFiller.Setup()
-                .IgnoreProperties(ec => ec.EntityArray);
-            EntityCollection entity = eFiller.Fill();
+                .OnProperty(x => x.EntityArray).IgnoreIt();
+
+            EntityCollection entity = eFiller.Create();
 
             Assert.IsNotNull(entity);
             Assert.IsNotNull(entity.EntityList);
@@ -26,10 +27,10 @@ public void TestFillAllListsExceptArray()
         [TestMethod]
         public void TestFillList()
         {
-            ObjectFiller<EntityCollection> eFiller = new ObjectFiller<EntityCollection>();
+            Filler<EntityCollection> eFiller = new Filler<EntityCollection>();
             eFiller.Setup()
-                .RandomizerForProperty(GetArray, ec => ec.EntityArray);
-            EntityCollection entity = eFiller.Fill();
+                .OnProperty(ec => ec.EntityArray).Use(GetArray);
+            EntityCollection entity = eFiller.Create();
 
             Assert.IsNotNull(entity);
             Assert.IsNotNull(entity.EntityList);
@@ -42,23 +43,21 @@ public void TestFillList()
 
         private Entity[] GetArray()
         {
-            ObjectFiller<Entity> of = new ObjectFiller<Entity>();
+            Filler<Entity> of = new Filler<Entity>();
 
             List<Entity> entities = new List<Entity>();
-            entities.Add(of.Fill());
-            entities.Add(of.Fill());
-            entities.Add(of.Fill());
-            entities.Add(of.Fill());
-            entities.Add(of.Fill());
-            entities.Add(of.Fill());
-            entities.Add(of.Fill());
-            entities.Add(of.Fill());
-            entities.Add(of.Fill());
+            entities.Add(of.Create());
+            entities.Add(of.Create());
+            entities.Add(of.Create());
+            entities.Add(of.Create());
+            entities.Add(of.Create());
+            entities.Add(of.Create());
+            entities.Add(of.Create());
+            entities.Add(of.Create());
+            entities.Add(of.Create());
 
 
             return entities.ToArray();
-
-
         }
     }
-}
+}

ObjectFiller.Test/LoremIpsumPluginTest.cs

@@ -1,8 +1,7 @@
-using System;
+using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using ObjectFiller.Test.TestPoco.Library;
 using Tynamix.ObjectFiller;
-using Tynamix.ObjectFiller.Plugins;
 
 namespace ObjectFiller.Test
 {
@@ -14,12 +13,12 @@ public void TestPlugin()
         {
             int isbnWordCount = 1000;
             int nameWordCount = 500;
-            ObjectFiller<Book> bookFill = new ObjectFiller<Book>();
+            Filler<Book> bookFill = new Filler<Book>();
             bookFill.Setup()
-                .RandomizerForProperty(new LoremIpsumPlugin(isbnWordCount), x => x.ISBN)
-                .RandomizerForProperty(new LoremIpsumPlugin(nameWordCount), x => x.Name);
+                .OnProperty(x => x.ISBN).Use(new LoremIpsum(isbnWordCount))
+                .OnProperty(x => x.Name).Use(new LoremIpsum(nameWordCount));
 
-            Book book = bookFill.Fill();
+            Book book = bookFill.Create();
 
             Assert.IsNotNull(book);
             Assert.IsNotNull(book.ISBN);

ObjectFiller.Test/ObjectFiller.Test.csproj

@@ -52,6 +52,7 @@
     <Compile Include="PersonFillingTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ObjectFillerTest.cs" />
+    <Compile Include="RangePluginTest.cs" />
     <Compile Include="TestPoco\Library\Book.cs" />
     <Compile Include="TestPoco\Library\IBook.cs" />
     <Compile Include="TestPoco\Library\Library.cs" />
@@ -65,6 +66,8 @@
     <Compile Include="TestPoco\Person\IAddress.cs" />
     <Compile Include="TestPoco\Person\Person.cs" />
     <Compile Include="PatternGeneratorTest.cs" />
+    <Compile Include="TestPoco\Person\OrderedPersonProperties.cs" />
+    <Compile Include="TestPoco\SimpleList.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ObjectFiller\ObjectFiller.csproj">

ObjectFiller.Test/ObjectFillerTest.cs

@@ -1,9 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using ObjectFiller.Test.TestPoco.Person;
 using Tynamix.ObjectFiller;
-using Tynamix.ObjectFiller.Plugins;
 
 namespace ObjectFiller.Test
 {
@@ -14,17 +13,17 @@ public class ObjectFillerTest
         public void TestFillPerson()
         {
             Person p = new Person();
-            ObjectFiller<Person> objectFiller = new ObjectFiller<Person>();
-            objectFiller.Setup()
-                .RegisterInterface<IAddress, Address>()
-                .RandomizerForType(new MnemonicStringPlugin(10))
-                .RandomizerForProperty(new MnemonicStringPlugin(1), person => person.FirstName)
-                .RandomizerForProperty(new RandomListItem<string>(new List<string>() { "Maik", "Tom", "Anton" }), person => person.LastName)
-                .RandomizerForProperty(() => new Random().Next(12, 83), person => person.Age)
+            Filler<Person> filler = new Filler<Person>();
+            filler.Setup()
+                .OnType<IAddress>().CreateInstanceOf<Address>()
+                .OnType<string>().Use(new MnemonicString(10))
+                .OnProperty(person => person.FirstName).Use(new MnemonicString(1))
+                .OnProperty(person => person.LastName).Use(new RandomListItem<string>(new List<string>() { "Maik", "Tom", "Anton" }))
+                .OnProperty(person => person.Age).Use(() => new Random().Next(12, 83))
                 .SetupFor<Address>()
-                .IgnoreProperties(a => a.City, a => a.Country);
+                .OnProperty(x => x.City, x => x.Country).IgnoreIt();
 
-            Person pFilled = objectFiller.Fill(p);
+            Person pFilled = filler.Fill(p);
         }
     }
 }