Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-09-24 21:02:48 +02:00
Code Issues Projects Releases Wiki Activity

Delete backup database during tests.

Browse Source
This commit is contained in:
tastybento 2021-03-07 11:34:30 -08:00
parent 7d6cce6563
commit 6849c2a8bd
4 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/test/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandlerTest.java
View File

@ -8,13 +8,13 @@ import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.framework;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.beans.IntrospectionException;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.nio.file.Files;
import java.nio.file.Path;
@ -30,7 +30,7 @@ import org.bukkit.Location;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import org.junit.AfterClass;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@ -128,14 +128,20 @@ public class YamlDatabaseHandlerTest {
/**
* @throws java.lang.Exception
*/
@AfterClass
public static void tearDown() throws Exception {
// Clean up file system
Files.walk(database.toPath())
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
framework().clearInlineMocks();
@After
public void tearDown() throws Exception {
deleteAll(new File("database"));
deleteAll(new File("database_backup"));
}
private void deleteAll(File file) throws IOException {
if (file.exists()) {
Files.walk(file.toPath())
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
}
}
/**

15
src/test/java/world/bentobox/bentobox/managers/IslandDeletionManagerTest.java
View File

@ -11,6 +11,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Comparator;
@ -83,7 +84,8 @@ public class IslandDeletionManagerTest {
when(Bukkit.getScheduler()).thenReturn(scheduler);
// Clear any remaining database
clearDatabase();
deleteAll(new File("database"));
deleteAll(new File("database_backup"));
// Set up plugin
plugin = mock(BentoBox.class);
Whitebox.setInternalState(BentoBox.class, "instance", plugin);
@ -109,17 +111,14 @@ public class IslandDeletionManagerTest {
*/
@After
public void tearDown() throws Exception {
clearDatabase();
Mockito.framework().clearInlineMocks();
deleteAll(new File("database"));
deleteAll(new File("database_backup"));
}
private void clearDatabase() throws Exception {
//remove any database data
File file = new File("database");
Path pathToBeDeleted = file.toPath();
private void deleteAll(File file) throws IOException {
if (file.exists()) {
Files.walk(pathToBeDeleted)
Files.walk(file.toPath())
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);

18
src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java
View File

@ -332,18 +332,24 @@ public class IslandsManagerTest {
//im.setIslandCache(islandCache);
}
/**
* @throws java.lang.Exception
*/
@After
public void tearDown() throws IOException{
//remove any database data
File file = new File("database");
Path pathToBeDeleted = file.toPath();
public void tearDown() throws Exception {
Mockito.framework().clearInlineMocks();
deleteAll(new File("database"));
deleteAll(new File("database_backup"));
}
private void deleteAll(File file) throws IOException {
if (file.exists()) {
Files.walk(pathToBeDeleted)
Files.walk(file.toPath())
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
}
Mockito.framework().clearInlineMocks();
}
/**

11
src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java
View File

@ -9,9 +9,9 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.never;
import java.beans.IntrospectionException;
import java.io.File;
@ -226,24 +226,25 @@ public class PlayersManagerTest {
}
/**
* @throws java.lang.Exception - exception
* @throws java.lang.Exception
*/
@After
public void tearDown() throws Exception {
deleteAll(new File("database"));
User.clearUsers();
Mockito.framework().clearInlineMocks();
deleteAll(new File("database"));
deleteAll(new File("database_backup"));
}
private static void deleteAll(File file) throws IOException {
private void deleteAll(File file) throws IOException {
if (file.exists()) {
Files.walk(file.toPath())
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
}
}
}
/**
* Test method for {@link world.bentobox.bentobox.managers.PlayersManager#PlayersManager(world.bentobox.bentobox.BentoBox)}.
*/