diff --git a/application/build.gradle b/application/build.gradle index 87e2b1b1c4..728b8c56b9 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -76,7 +76,7 @@ dependencies { implementation 'org.kohsuke:github-api:1.319' - testImplementation 'org.mockito:mockito-core:5.3.1' + testImplementation 'org.mockito:mockito-core:5.10.0' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' diff --git a/application/src/test/java/org/togetherjava/tjbot/jda/JdaTester.java b/application/src/test/java/org/togetherjava/tjbot/jda/JdaTester.java index a634c93165..688b5c3287 100644 --- a/application/src/test/java/org/togetherjava/tjbot/jda/JdaTester.java +++ b/application/src/test/java/org/togetherjava/tjbot/jda/JdaTester.java @@ -45,6 +45,7 @@ import org.mockito.ArgumentMatcher; import org.mockito.ArgumentMatchers; import org.mockito.MockingDetails; +import org.mockito.internal.util.MockUtil; import org.mockito.stubbing.Answer; import org.togetherjava.tjbot.features.SlashCommand; @@ -245,9 +246,11 @@ public JdaTester() { public SlashCommandInteractionEventBuilder createSlashCommandInteractionEvent( SlashCommand command) { UnaryOperator mockOperator = event -> { - SlashCommandInteractionEvent SlashCommandInteractionEvent = spy(event); - mockInteraction(SlashCommandInteractionEvent); - return SlashCommandInteractionEvent; + if (!MockUtil.isMock(event)) { + event = spy(event); + } + mockInteraction(event); + return event; }; return new SlashCommandInteractionEventBuilder(jda, mockOperator).setCommand(command)