EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 10:14:43 +02:00
Code Issues Projects Releases Wiki Activity

Update our dependencies to their latest versions (where possibly)

Browse Source 
Also adds Guava as a dependency as version upgrading our dependencies resulted in the loss of the included Guava libraries
This commit is contained in:
nossr50
2021-04-23 15:08:57 -07:00
parent da1fcfe30a
commit 0d2f370185
5 changed files with 44 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/util/skills/SkillTools.java
View File

@ -10,7 +10,6 @@ import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.text.StringUtils;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@ -18,6 +17,7 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Tameable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.VisibleForTesting;
import java.util.*;

17
src/test/java/com/gmail/nossr50/TestUtil.java
View File

@ -1,17 +0,0 @@
package com.gmail.nossr50;
import org.jetbrains.annotations.NotNull;
import java.io.File;
//TODO: Move generic test stuff here
public class TestUtil {
public static void recursiveDelete(@NotNull File directoryToBeDeleted) {
if (directoryToBeDeleted.isDirectory()) {
for (File file : directoryToBeDeleted.listFiles()) {
recursiveDelete(file);
}
}
directoryToBeDeleted.delete();
}
}

13
src/test/java/com/gmail/nossr50/database/FlatFileDatabaseManagerTest.java
View File

@ -1,6 +1,5 @@
package com.gmail.nossr50.database;
import com.gmail.nossr50.TestUtil;
import com.gmail.nossr50.database.flatfile.LeaderboardStatus;
import com.gmail.nossr50.datatypes.database.DatabaseType;
import com.gmail.nossr50.datatypes.player.PlayerProfile;
@ -86,7 +85,7 @@ public class FlatFileDatabaseManagerTest {
@AfterEach
public void tearDown() {
TestUtil.recursiveDelete(tempDir);
recursiveDelete(tempDir);
db = null;
}
@ -844,4 +843,14 @@ public class FlatFileDatabaseManagerTest {
return false;
}
}
public static void recursiveDelete(@NotNull File directoryToBeDeleted) {
if (directoryToBeDeleted.isDirectory()) {
for (File file : directoryToBeDeleted.listFiles()) {
recursiveDelete(file);
}
}
directoryToBeDeleted.delete();
}
}

12
src/test/java/com/gmail/nossr50/util/blockmeta/ChunkStoreTest.java
View File

@ -1,6 +1,5 @@
package com.gmail.nossr50.util.blockmeta;
import com.gmail.nossr50.TestUtil;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.BlockUtils;
import com.gmail.nossr50.util.compat.CompatibilityManager;
@ -40,7 +39,7 @@ public class ChunkStoreTest {
@AfterClass
public static void tearDownClass() {
TestUtil.recursiveDelete(tempDir);
recursiveDelete(tempDir);
}
private World mockWorld;
@ -440,4 +439,13 @@ public class ChunkStoreTest {
Mockito.when(testBlock.getWorld()).thenReturn(mockWorld);
return testBlock;
}
public static void recursiveDelete(@NotNull File directoryToBeDeleted) {
if (directoryToBeDeleted.isDirectory()) {
for (File file : directoryToBeDeleted.listFiles()) {
recursiveDelete(file);
}
}
directoryToBeDeleted.delete();
}
}