Fix isDataClassEqualTo not working with data objects
#552
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VirtualParticle
requested review from
evant,
rf43 and
nishtahir
as code owners
VirtualParticle
commented
Oct 25, 2024
| @@ -82,7 +82,7 @@ fun <T : Any> Assert<T>.isDataClassEqualTo(expected: T) = given { actual -> | |||
| private fun <T> Assert<T>.isDataClassEqualToImpl(expected: T, kclass: KClass<*>?): Unit = given { actual -> | |||
| if (actual == expected) return | |||
| val compareProps = actual != null && expected != null | |||
| if (compareProps && kclass != null && kclass.isData) { | |||
| if (compareProps && kclass != null && kclass.isData && kclass.objectInstance == null) { | |||
There was a problem hiding this comment.
This seemed like the best way to check if kclass is a data object, but there could be a better way.
There was a problem hiding this comment.
could we check the types directly? This should always fail if expected::class != actual::class right?
There was a problem hiding this comment.
Sure, how does this look?
val compareProps = actual != null && expected?.let { it::class } == kclass
if (compareProps && kclass != null && kclass.isData) {
VirtualParticle
commented
Oct 25, 2024
Comment on lines
-84
to
85
| val compareProps = actual != null && expected != null | ||
| val compareProps = actual != null && expected?.let { it::class } == kclass | ||
| if (compareProps && kclass != null && kclass.isData) { |
There was a problem hiding this comment.
This technically removes the expected != null check, but it's essentially still done since we check for equality with kclass which is then later checked not to be null.
evant
approved these changes
Oct 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #551 by going right to
isEqualToif the passed value is adata object.