Skip to content

Commit 96f0ec1

Browse files
committed
Update tests to Mockito 5 and remove PowerMockito
1 parent a913076 commit 96f0ec1

20 files changed

+1544
-1176
lines changed

pom.xml

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@
5252
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5353
<java.version>21</java.version>
5454
<!-- Non-minecraft related dependencies -->
55-
<powermock.version>2.0.9</powermock.version>
55+
<junit.version>5.10.2</junit.version>
56+
<mockito.version>5.11.0</mockito.version>
57+
<mock-bukkit.version>v1.21-SNAPSHOT</mock-bukkit.version>
5658
<!-- More visible way how to change dependency versions -->
5759
<bentobox.version>2.7.1-SNAPSHOT</bentobox.version>
5860
<items-adder.version>4.0.10</items-adder.version>
@@ -183,24 +185,32 @@
183185
<scope>provided</scope>
184186
</dependency>
185187
<!-- Mockito (Unit testing) -->
188+
<!-- Mockito (Unit testing) This goes at the top to ensure the dependencies are accurate. -->
189+
<dependency>
190+
<groupId>org.junit.jupiter</groupId>
191+
<artifactId>junit-jupiter-api</artifactId>
192+
<version>${junit.version}</version>
193+
<scope>test</scope>
194+
</dependency>
195+
<dependency>
196+
<groupId>org.junit.jupiter</groupId>
197+
<artifactId>junit-jupiter-engine</artifactId>
198+
<version>${junit.version}</version>
199+
<scope>test</scope>
200+
</dependency>
201+
<dependency>
202+
<groupId>org.mockito</groupId>
203+
<artifactId>mockito-junit-jupiter</artifactId>
204+
<version>5.11.0</version>
205+
<scope>test</scope>
206+
</dependency>
186207
<dependency>
187208
<groupId>org.mockito</groupId>
188209
<artifactId>mockito-core</artifactId>
189-
<version>3.11.1</version>
190-
<scope>test</scope>
191-
</dependency>
192-
<dependency>
193-
<groupId>org.powermock</groupId>
194-
<artifactId>powermock-module-junit4</artifactId>
195-
<version>${powermock.version}</version>
196-
<scope>test</scope>
197-
</dependency>
198-
<dependency>
199-
<groupId>org.powermock</groupId>
200-
<artifactId>powermock-api-mockito2</artifactId>
201-
<version>${powermock.version}</version>
210+
<version>${mockito.version}</version>
202211
<scope>test</scope>
203212
</dependency>
213+
<!-- BentoBox -->
204214
<dependency>
205215
<groupId>world.bentobox</groupId>
206216
<artifactId>bentobox</artifactId>
@@ -290,7 +300,7 @@
290300
<plugin>
291301
<groupId>org.apache.maven.plugins</groupId>
292302
<artifactId>maven-surefire-plugin</artifactId>
293-
<version>3.0.0-M5</version>
303+
<version>3.5.4</version>
294304
<configuration>
295305
<argLine>
296306
--add-opens java.base/java.lang=ALL-UNNAMED

src/main/java/world/bentobox/aoneblock/AOneBlock.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import world.bentobox.aoneblock.generators.ChunkGeneratorWorld;
2020
import world.bentobox.aoneblock.listeners.BlockListener;
2121
import world.bentobox.aoneblock.listeners.BlockProtect;
22+
import world.bentobox.aoneblock.listeners.BossBarListener;
2223
import world.bentobox.aoneblock.listeners.HoloListener;
2324
import world.bentobox.aoneblock.listeners.InfoListener;
2425
import world.bentobox.aoneblock.listeners.ItemsAdderListener;
2526
import world.bentobox.aoneblock.listeners.JoinLeaveListener;
26-
import world.bentobox.aoneblock.listeners.BossBarListener;
2727
import world.bentobox.aoneblock.listeners.NoBlockHandler;
2828
import world.bentobox.aoneblock.listeners.StartSafetyListener;
2929
import world.bentobox.aoneblock.oneblocks.OneBlockCustomBlockCreator;

src/main/java/world/bentobox/aoneblock/panels/PhasesPanel.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import world.bentobox.aoneblock.oneblocks.OneBlockPhase;
2828
import world.bentobox.aoneblock.oneblocks.Requirement;
2929
import world.bentobox.bank.Bank;
30-
import world.bentobox.bentobox.BentoBox;
3130
import world.bentobox.bentobox.api.addons.Addon;
3231
import world.bentobox.bentobox.api.localization.TextVariables;
3332
import world.bentobox.bentobox.api.panels.PanelItem;

0 commit comments

Comments
 (0)