From 71e2d52967fcc0dda4ba72cd0c64634ebc1944f6 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 13 Oct 2018 09:52:08 +0300 Subject: [PATCH] [Test] Renamed PlayerKillTest methods --- Plan/dependency-reduced-pom.xml | 156 +++++++++++------- .../tasks/server/PingCountTimerBukkit.java | 2 +- .../djrapitops/plan/data/PlayerKillTest.java | 31 +++- 3 files changed, 120 insertions(+), 69 deletions(-) diff --git a/Plan/dependency-reduced-pom.xml b/Plan/dependency-reduced-pom.xml index 002ae44e4..8766ebbe7 100644 --- a/Plan/dependency-reduced-pom.xml +++ b/Plan/dependency-reduced-pom.xml @@ -154,9 +154,13 @@ https://repo.spongepowered.org/maven - md_5-snapshots - http://repo.md-5.net/content/repositories/snapshots/ + velocity-repo + https://repo.velocitypowered.com/snapshots/ + + md_5-snapshots + http://repo.md-5.net/content/repositories/snapshots/ + bstats-repo http://repo.bstats.org/content/repositories/releases/ @@ -300,65 +304,97 @@ - org.spongepowered - spongeapi - 7.0.0 - provided - - - error_prone_annotations - com.google.errorprone - - - guice - com.google.inject - - - guava - com.github.ben-manes.caffeine - - - plugin-meta - org.spongepowered - - - configurate-hocon - ninja.leaping.configurate - - - configurate-gson - ninja.leaping.configurate - - - configurate-yaml - ninja.leaping.configurate - - - flow-math - com.flowpowered - - - flow-noise - com.flowpowered - - - jsr305 - com.google.code.findbugs - - - asm - org.ow2.asm - - - gson - com.google.code.gson - - - guava - com.google.guava - - + com.velocitypowered + velocity-api + 1.0-SNAPSHOT + provided + + + text + net.kyori + + + toml4j + com.moandjiezana.toml + + + guice + com.google.inject + + + checker-qual + org.checkerframework + + + gson + com.google.code.gson + + + guava + com.google.guava + + + + org.spongepowered + spongeapi + 7.0.0 + provided + + + error_prone_annotations + com.google.errorprone + + + guava + com.github.ben-manes.caffeine + + + plugin-meta + org.spongepowered + + + configurate-hocon + ninja.leaping.configurate + + + configurate-gson + ninja.leaping.configurate + + + configurate-yaml + ninja.leaping.configurate + + + flow-math + com.flowpowered + + + flow-noise + com.flowpowered + + + jsr305 + com.google.code.findbugs + + + guice + com.google.inject + + + asm + org.ow2.asm + + + gson + com.google.code.gson + + + guava + com.google.guava + + + com.imaginarycode.minecraft RedisBungee diff --git a/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/PingCountTimerBukkit.java b/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/PingCountTimerBukkit.java index a7c90a68a..581b3aab1 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/PingCountTimerBukkit.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/tasks/server/PingCountTimerBukkit.java @@ -189,7 +189,7 @@ public class PingCountTimerBukkit extends AbsRunnable implements Listener { if (player.isOnline()) { addPlayer(player); } - }// TODO Config + } }).runTaskLater(TimeAmount.toTicks(config.getNumber(Settings.PING_PLAYER_LOGIN_DELAY), TimeUnit.SECONDS)); } diff --git a/Plan/src/test/java/com/djrapitops/plan/data/PlayerKillTest.java b/Plan/src/test/java/com/djrapitops/plan/data/PlayerKillTest.java index 1537e4b9c..d1d252fa2 100644 --- a/Plan/src/test/java/com/djrapitops/plan/data/PlayerKillTest.java +++ b/Plan/src/test/java/com/djrapitops/plan/data/PlayerKillTest.java @@ -12,28 +12,43 @@ import utilities.RandomData; import java.util.UUID; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; /** + * Tests for {@link PlayerKill}. + * * @author Rsl1122 */ public class PlayerKillTest { - private String randomString = RandomData.randomString(10); + private String weapon = RandomData.randomString(10); private UUID testUUID = UUID.randomUUID(); - private PlayerKill playerKill = new PlayerKill(testUUID, randomString, 100L); + private PlayerKill underTest = new PlayerKill(testUUID, weapon, 100L); @Test - public void testGetVictim() { - assertEquals(playerKill.getVictim(), testUUID); + public void victimUUIDIsReturned() { + assertEquals(testUUID, underTest.getVictim()); } @Test - public void testGetDate() { - assertEquals(playerKill.getDate(), 100L); + public void dateIsReturned() { + assertEquals(100L, underTest.getDate()); } @Test - public void testGetWeapon() { - assertEquals(playerKill.getWeapon(), randomString); + public void weaponIsReturned() { + assertEquals(weapon, underTest.getWeapon()); + } + + @Test + public void noVictimFound() { + assertFalse(underTest.getVictimName().isPresent()); + } + + @Test + public void victimFound() { + String expectedName = "Test Victim"; + PlayerKill underTest = new PlayerKill(testUUID, weapon, 100L, expectedName); + assertEquals("Test Victim", underTest.getVictimName().orElse("Unknown")); } }