Browse Source

Merge pull request #12605 from abpframework/auto-merge/rel-5-3/1063

Merge branch dev with rel-5.3
pull/12471/merge
liangshiwei 4 years ago
committed by GitHub
parent
commit
6b3ec8f73c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Values/ValueObject.cs
  2. 25
      framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Values/EmailAddress.cs
  3. 5
      framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Values/ValueObject_Tests.cs

2
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Values/ValueObject.cs

@ -44,6 +44,6 @@ public abstract class ValueObject
}
}
return !thisValues.MoveNext() && !otherValues.MoveNext();
return !thisMoveNext && !otherMoveNext;
}
}

25
framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Values/EmailAddress.cs

@ -0,0 +1,25 @@
using System.Collections.Generic;
namespace Volo.Abp.Domain.Values;
public class EmailAddress : ValueObject
{
public string Email { get; }
private EmailAddress()
{
}
public EmailAddress(string email)
{
Email = email;
}
protected override IEnumerable<object> GetAtomicValues()
{
if (Email != null)
{
yield return Email;
}
}
}

5
framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Values/ValueObject_Tests.cs

@ -31,5 +31,10 @@ public class ValueObject_Tests
address2 = new Address(cityId, "Baris Manco", 42, "home");
address1.ValueEquals(address2).ShouldBeFalse();
var emailAddress1 = new EmailAddress("test@abp.io");
var emailAddress2 = new EmailAddress(null);
emailAddress1.ValueEquals(emailAddress2).ShouldBeFalse();
}
}

Loading…
Cancel
Save