Merge pull request #15 from Tynamix/BUGFIX_12_RealNamePlugin

bug #12 fixed, unit tests written

Author: Tynamix

ObjectFiller.Test/ObjectFiller.Test.csproj

@@ -54,6 +54,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ObjectFillerTest.cs" />
     <Compile Include="RangePluginTest.cs" />
+    <Compile Include="RealNamePluginTest.cs" />
     <Compile Include="TestPoco\Library\Book.cs" />
     <Compile Include="TestPoco\Library\IBook.cs" />
     <Compile Include="TestPoco\Library\Library.cs" />

ObjectFiller.Test/PersonFillingTest.cs

@@ -235,5 +235,6 @@ public void TestPropertyOrderDoNameFirst()
             Assert.IsNotNull(p);
             Assert.AreEqual(1, p.NameCount);
         }
+
     }
 }

ObjectFiller.Test/RangePluginTest.cs

@@ -36,7 +36,6 @@ public void TestRangeWithMinMaxValue()
             Assert.IsNotNull(sl);
             Assert.IsNotNull(sl.IntegerList);
             Assert.IsTrue(sl.IntegerList.All(x => x >= min && x <= max));
-            Assert.IsFalse(sl.IntegerList.All(x => x == sl.IntegerList[0]));
         }
     }
 }

ObjectFiller.Test/RealNamePluginTest.cs

@@ -0,0 +1,67 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Tynamix.ObjectFiller;
+
+namespace ObjectFiller.Test
+{
+    [TestClass]
+    public class RealNamePluginTest
+    {
+        [TestMethod]
+        public void TestRealNameFirstNameOnly()
+        {
+            Filler<LibraryFillingTest.Person> filler = new Filler<LibraryFillingTest.Person>();
+            filler.Setup()
+                .OnProperty(x => x.Name).Use(new RealNames(RealNameStyle.FirstNameOnly));
+
+            LibraryFillingTest.Person p = filler.Create();
+
+            Assert.IsNotNull(p);
+            Assert.IsNotNull(p.Name);
+            Assert.IsFalse(p.Name.Contains(" "));
+        }
+
+        [TestMethod]
+        public void TestRealNameLastNameOnly()
+        {
+            Filler<LibraryFillingTest.Person> filler = new Filler<LibraryFillingTest.Person>();
+            filler.Setup()
+                .OnProperty(x => x.Name).Use(new RealNames(RealNameStyle.LastNameOnly));
+
+            LibraryFillingTest.Person p = filler.Create();
+
+            Assert.IsNotNull(p);
+            Assert.IsNotNull(p.Name);
+            Assert.IsFalse(p.Name.Contains(" "));
+        }
+
+        [TestMethod]
+        public void TestRealNameFirstNameLastName()
+        {
+            Filler<LibraryFillingTest.Person> filler = new Filler<LibraryFillingTest.Person>();
+            filler.Setup()
+                .OnProperty(x => x.Name).Use(new RealNames(RealNameStyle.FirstNameLastName));
+
+            LibraryFillingTest.Person p = filler.Create();
+
+            Assert.IsNotNull(p);
+            Assert.IsNotNull(p.Name);
+            Assert.IsTrue(p.Name.Contains(" "));
+            Assert.AreEqual(2, p.Name.Split(' ').Length);
+        }
+
+        [TestMethod]
+        public void TestRealNameLastNameFirstName()
+        {
+            Filler<LibraryFillingTest.Person> filler = new Filler<LibraryFillingTest.Person>();
+            filler.Setup()
+                .OnProperty(x => x.Name).Use(new RealNames(RealNameStyle.LastNameFirstName));
+
+            LibraryFillingTest.Person p = filler.Create();
+
+            Assert.IsNotNull(p);
+            Assert.IsNotNull(p.Name);
+            Assert.IsTrue(p.Name.Contains(" "));
+            Assert.AreEqual(2, p.Name.Split(' ').Length);
+        }
+    }
+}

ObjectFiller/Filler.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Diagnostics;
-using System.Globalization;
 using System.Linq;
 using System.Reflection;
 
@@ -290,10 +288,7 @@ private object GetRandomEnumValue(Type type)
 				int index = Random.Next() % values.Length;
 				return values.GetValue(index);
 			}
-			else
-			{
-				return 0; 
-			}
+	        return 0;
 	    }
 
 	    private object GetFilledPoco(Type type, ObjectFillerSetup currentSetup)

ObjectFiller/Plugins/String/RealNames.cs

@@ -23,13 +23,11 @@ public RealNames(RealNameStyle realNameStyle)
             _rnStyle = realNameStyle;
 
 
-            if (_rnStyle == RealNameStyle.FirstNameLastName
-                || _rnStyle == RealNameStyle.FirstNameOnly)
+            if (_rnStyle != RealNameStyle.LastNameOnly)
             {
                 _firstNames = Resources.firstNames.Split(';');
             }
-            if (_rnStyle == RealNameStyle.LastNameFirstName
-                || _rnStyle == RealNameStyle.LastNameOnly)
+            if (_rnStyle != RealNameStyle.FirstNameOnly)
             {
                 _lastNames = Resources.lastNames.Split(';');
             }

ObjectFillerNET.sln

@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30501.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectFiller", "ObjectFiller\ObjectFiller.csproj", "{5D35C338-2162-4D16-A27C-3A0E5E72635D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectFiller.Test", "ObjectFiller.Test\ObjectFiller.Test.csproj", "{E906451F-B7DD-418A-BA2C-BCBB7F0A3BE6}"
@@ -13,9 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = ObjectFillerNET.vsmdi
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -33,4 +32,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = ObjectFillerNET.vsmdi
+	EndGlobalSection
 EndGlobal