Skip to content

Bug fixed #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tynamix merged 1 commit into from
Jul 31, 2017
Merged

Bug fixed #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Tynamix.ObjectFiller.Test/BugfixTests/Bug87ErrorWhenNameInParentIsSameAsParent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ namespace ObjectFiller.Test.BugfixTests
{
using Tynamix.ObjectFiller;



[TestClass]
public class Bug87ErrorWhenNameInParentIsSameAsParent
{
public class Parent
Expand All @@ -29,11 +29,16 @@ public class Child
public void ParentShallGetFilledWithourError()
{
Filler<Parent> filler = new Filler<Parent>();
filler.Setup()
.OnProperty(x => x.MakeTheError).Use(12345)
.SetupFor<Child>()
.OnProperty(x => x.MakeTheError).Use("TEST");

var filledObject = filler.Create();
Assert.IsNotNull(filledObject);
Assert.IsNotNull(filledObject.MakeTheError);
Assert.AreEqual(12345, filledObject.MakeTheError);
Assert.IsFalse(string.IsNullOrWhiteSpace(filledObject.Child.MakeTheError));
Assert.AreEqual("TEST", filledObject.Child.MakeTheError);
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion Tynamix.ObjectFiller/Filler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,9 @@ private IEnumerable<PropertyInfo> GetPropertyFromProperties(
IEnumerable<PropertyInfo> properties,
PropertyInfo property)
{
return properties.Where(x => x.Name == property.Name && x.Module.Equals(property.Module));
return properties.Where(x => x.Name == property.Name
&& x.Module.Equals(property.Module)
&& x.DeclaringType?.AssemblyQualifiedName == property.DeclaringType?.AssemblyQualifiedName);
}

/// <summary>
Expand Down