From 1f86c847e2874eb518a4fa8710e96e7658d0de43 Mon Sep 17 00:00:00 2001 From: DerFrZocker Date: Sat, 29 Apr 2023 16:32:25 +0200 Subject: [PATCH] Updated to Mockito 5.3.1 --- pom.xml | 2 +- src/test/java/org/bukkit/TestServer.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index af4d7b99..a95a42a5 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.12.4 + 5.3.1 test diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java index b90ed055..021ceb5a 100644 --- a/src/test/java/org/bukkit/TestServer.java +++ b/src/test/java/org/bukkit/TestServer.java @@ -16,7 +16,7 @@ public final class TestServer { static { try { TestServer server = new TestServer(); - Server instance = Mockito.mock(Server.class); + Server instance = Mockito.mock(Mockito.withSettings().stubOnly()); Mockito.when(instance.isPrimaryThread()).then(mock -> Thread.currentThread().equals(server.creatingThread)); @@ -44,7 +44,7 @@ public final class TestServer { private final Map cache = new HashMap<>(); @Override public Keyed get(NamespacedKey key) { - return cache.computeIfAbsent(key, key2 -> Mockito.mock(aClass)); + return cache.computeIfAbsent(key, key2 -> Mockito.mock(aClass, Mockito.withSettings().stubOnly())); } @Override @@ -55,13 +55,13 @@ public final class TestServer { } }); - UnsafeValues unsafeValues = Mockito.mock(UnsafeValues.class); + UnsafeValues unsafeValues = Mockito.mock(Mockito.withSettings().stubOnly()); Mockito.when(unsafeValues.createLegacyMaterial(Mockito.any(), Mockito.anyInt(), Mockito.anyInt(), Mockito.anyShort(), Mockito.any())).then(new Answer() { Map materials = new HashMap<>(); @Override public Object answer(InvocationOnMock invocationOnMock) { - return materials.computeIfAbsent(invocationOnMock.getArgument(0), name -> Mockito.mock(Material.class, name)); + return materials.computeIfAbsent(invocationOnMock.getArgument(0), name -> Mockito.mock(Material.class, Mockito.withSettings().name(name).stubOnly())); } });