Skip to content
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

RNET-1133: Fixed equality comparison for collections in mixed #3573

Merged
merged 5 commits into from
Apr 16, 2024
Merged

RNET-1133: Fixed equality comparison for collections in mixed #3573

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da6976e
Fixed equality comparison for collections in mixed
papafe Apr 16, 2024
c245d19
Fix
papafe Apr 16, 2024
cdbf7f6
Corrections
papafe Apr 16, 2024
d943397
Reinstatet cases
papafe Apr 16, 2024
746e17d
Added missing cases plus explanation
papafe Apr 16, 2024
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
2 changes: 2 additions & 0 deletions Realm/Realm/DatabaseTypes/RealmValue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,6 +1533,8 @@ public bool Equals(RealmValue other)
RealmValueType.ObjectId => AsObjectId() == other.AsObjectId(),
RealmValueType.Guid => AsGuid() == other.AsGuid(),
RealmValueType.Object => AsIRealmObject().Equals(other.AsIRealmObject()),
RealmValueType.List => AsList().Equals(other.AsList()),
RealmValueType.Dictionary => AsDictionary().Equals(other.AsDictionary()),
Comment on lines +1536 to +1537
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

RealmValueType.Null => true,
_ => false,
};
Expand Down
38 changes: 13 additions & 25 deletions Tests/Realm.Tests/Database/RealmValueWithCollections.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,27 +90,14 @@ public void List_WhenRetrieved_WorksWithAllTypes([Values(true, false)] bool isMa
}

[Test]
public void List_InRealmValue_NotEqualToAnything([Values(true, false)] bool isManaged)
public void List_InRealmValue_Equality([Values(true, false)] bool isManaged)
{
var innerList = ListGenerator(1);
var innerDict = DictGenerator(1);

var originalList = new List<RealmValue>
{
RealmValue.Null,
1,
true,
"string",
new byte[] { 0, 1, 2 },
new DateTimeOffset(1234, 5, 6, 7, 8, 9, TimeSpan.Zero),
1f,
2d,
3m,
new ObjectId("5f63e882536de46d71877979"),
Guid.Parse("3809d6d9-7618-4b3d-8044-2aa35fd02f31"),
new InternalObject { IntProperty = 10, StringProperty = "brown" },
innerList,
innerDict,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the loss of cases?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could have kept the full list, but in the end it shouldn't make a difference on the test and I thought it would make the test easier to read. I didn't really need to 😁

Copy link
Contributor

@nielsenko nielsenko Apr 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay.. gut reaction was just that the coverage was diminished, and would those tests now have failed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's understandable, I'll put those back so it's easier to follow

"string"
};

RealmValue rv = originalList;
Expand All @@ -120,8 +107,11 @@ public void List_InRealmValue_NotEqualToAnything([Values(true, false)] bool isMa
rv = PersistAndFind(rv).RealmValueProperty;
}

Assert.That(rv == originalList, Is.False);
Assert.That(rv.Equals(originalList), Is.False);
#pragma warning disable CS1718 // Comparison made to same variable
Assert.That(rv == rv, Is.True);
#pragma warning restore CS1718 // Comparison made to same variable
Assert.That(rv == originalList, isManaged ? Is.False : Is.True);
rorbech marked this conversation as resolved.
Show resolved Hide resolved
Assert.That(rv.Equals(originalList), isManaged ? Is.False : Is.True);
}

[Test]
Expand Down Expand Up @@ -577,16 +567,11 @@ public void Dictionary_WhenRetrieved_WorksWithAllTypes([Values(true, false)] boo
}

[Test]
public void Dictionary_InRealmValue_NotEqualToAnything([Values(true, false)] bool isManaged)
public void Dictionary_InRealmValue_Equality([Values(true, false)] bool isManaged)
{
var innerList = ListGenerator(1);
var innerDict = DictGenerator(1);

var originalDict = new Dictionary<string, RealmValue>
{
{ "c", new InternalObject { IntProperty = 10, StringProperty = "brown" } },
{ "d", innerList },
{ "e", innerDict },
};

RealmValue rv = originalDict;
Expand All @@ -596,8 +581,11 @@ public void Dictionary_InRealmValue_NotEqualToAnything([Values(true, false)] boo
rv = PersistAndFind(rv).RealmValueProperty;
}

Assert.That(rv == originalDict, Is.False);
Assert.That(rv.Equals(originalDict), Is.False);
#pragma warning disable CS1718 // Comparison made to same variable
Assert.That(rv == rv, Is.True);
#pragma warning restore CS1718 // Comparison made to same variable
Assert.That(rv == originalDict, isManaged ? Is.False : Is.True);
Assert.That(rv.Equals(originalDict), isManaged ? Is.False : Is.True);
}

[Test]
Expand Down
Loading