Migrate from AsssertJ to AssertK #3178
Merged
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
oldergod
force-pushed
the
bquenaudon.2024-11-15.assertk
branch
4 times, most recently
from
d0b7ef4
to
7cb2f4b
Compare
oldergod
requested review from
squarejesse,
JakeWharton and
swankjesse
and removed request for
squarejesse
oldergod
force-pushed
the
bquenaudon.2024-11-15.assertk
branch
from
7cb2f4b
to
174e8cc
Compare
squarejesse
reviewed
Nov 15, 2024
| @@ -69,7 +72,7 @@ class ManifestParseTest { | |||
| """.trimMargin() | |||
|
|
|||
| val modules = parseManifestModules(yaml) | |||
| assertThat(modules.keys).containsExactly("one", "two") | |||
| assertThat(modules.getValue("one").dependencies).containsExactly("two") | |||
| assertThat(modules.keys.toList()).containsExactly("one", "two") | |||
There was a problem hiding this comment.
containsExactly –> containsOnly
willowtreeapps/assertk#489
There was a problem hiding this comment.
But assertJ containsExactly also checks the order, which is why I keep this assertion here.
There was a problem hiding this comment.
but sets don't have ordering... so
squarejesse
reviewed
Nov 15, 2024
| @@ -827,7 +830,7 @@ class WireCompilerTest { | |||
| private fun assertOutputs(target: TargetLanguage, outputs: Array<String>, suffix: String = "") { | |||
| val filesAfter = paths | |||
| assertThat(filesAfter.size) | |||
| .overridingErrorMessage(filesAfter.toString()) | |||
| // .overridingErrorMessage(filesAfter.toString()) | |||
There was a problem hiding this comment.
assertThat(filesAfter).hasSize(outputs.size)
squarejesse
reviewed
Nov 15, 2024
| .cause() // Synthetic exception added by coroutines in StackTraceRecovery.kt. | ||
| .cause() | ||
| .hasMessage("boom!") | ||
| assertThat(expected).all { |
There was a problem hiding this comment.
switch to assertFailsWith<IOException>
squarejesse
reviewed
Nov 15, 2024
| // |Expected :$message (unknownFields: `${(message as com.squareup.wire.Message<*, *>).unknownFields.hex()}`) | ||
| // |Actual :$fromJson (unknownFields: `${(fromJson as com.squareup.wire.Message<*, *>).unknownFields.hex()}`) | ||
| // """.trimMargin() | ||
| // } |
There was a problem hiding this comment.
assertThat(fromJson, displayActual = {...})
squarejesse
approved these changes
Nov 15, 2024
JakeWharton
approved these changes
Nov 15, 2024
Comment on lines
832
to
835
| assertThat(filesAfter.size) | ||
| .overridingErrorMessage(filesAfter.toString()) | ||
| // .overridingErrorMessage(filesAfter.toString()) | ||
| .isEqualTo(outputs.size) |
There was a problem hiding this comment.
You can do
assertThat(filesAfter)
.size()
.isEqualTo(outputs.size)which should include the list if it fails.
| @@ -335,7 +350,7 @@ class GrpcClientTest { | |||
| delay(200) | |||
| responseChannel.cancel() | |||
| mockService.awaitSuccess() | |||
| assertThat(callReference.get()?.isCanceled()).isTrue() | |||
| assertThat(callReference.get()!!.isCanceled()).isTrue() | |||
There was a problem hiding this comment.
The need to do this !! is fixed on AssertK trunk
There was a problem hiding this comment.
just waiting for a release, really
| @@ -459,7 +474,7 @@ class GrpcClientTest { | |||
|
|
|||
| val latch = Mutex(locked = true) | |||
| requestChannel.invokeOnClose { expected -> | |||
| assertThat(expected).isInstanceOf(CancellationException::class.java) | |||
| assertThat(expected!!).isInstanceOf<CancellationException>() | |||
There was a problem hiding this comment.
Similarly, the need to do this !! is fixed on AssertK trunk
| assertThat(expected).all { | ||
| hasMessage("gRPC transport failure (HTTP status=200, grpc-status=null, grpc-message=null)") | ||
| // Synthetic exception added by coroutines in StackTraceRecovery.kt. | ||
| prop(Throwable::cause) |
There was a problem hiding this comment.
Suggested change
| prop(Throwable::cause) | |
| cause() |
| // Synthetic exception added by coroutines in StackTraceRecovery.kt. | ||
| prop(Throwable::cause) | ||
| .isNotNull() | ||
| .prop(Throwable::cause) |
There was a problem hiding this comment.
Suggested change
| .prop(Throwable::cause) | |
| .cause() |
| @@ -15,6 +15,7 @@ | |||
| */ | |||
| package com.squareup.wire | |||
|
|
|||
| import assertk.assertions.message | |||
There was a problem hiding this comment.
Are these really used? Or was this from some kind of automated refactor?
oldergod
force-pushed
the
bquenaudon.2024-11-15.assertk
branch
from
174e8cc
to
dea98d6
Compare
oldergod
force-pushed
the
bquenaudon.2024-11-15.assertk
branch
from
dea98d6
to
c394f17
Compare
|
I addressed all comments, thank you |
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.
No description provided.