From 43d683c782addcbadbe4988e493cc27c91810bc7 Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 31 Jan 2024 15:46:34 +0000 Subject: add tests add tests for the maps location transformation function and the location manager valid location and LocaitonMessage functions --- .../skyblock/dwarven/CrystalsHudTest.java | 19 +++++++++++++ .../dwarven/CrystalsLocationManagerTest.java | 31 ++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java create mode 100644 src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java (limited to 'src/test') diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java new file mode 100644 index 00000000..3086a3e4 --- /dev/null +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java @@ -0,0 +1,19 @@ +package de.hysky.skyblocker.skyblock.dwarven; + +import it.unimi.dsi.fastutil.Pair; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class CrystalsHudTest { + + @Test + void testLocationTransformation(){ + Assertions.assertEquals(CrystalsHud.transformLocation(202,202), Pair.of(0,0)); + Assertions.assertEquals(CrystalsHud.transformLocation(823,823), Pair.of(62,62)); + + Assertions.assertEquals(CrystalsHud.transformLocation(512.5,512.5), Pair.of(31,31)); + + Assertions.assertEquals(CrystalsHud.transformLocation(-50,-50), Pair.of(0,0)); + Assertions.assertEquals(CrystalsHud.transformLocation(1000,1000), Pair.of(62,62)); + } +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java new file mode 100644 index 00000000..592e5ecb --- /dev/null +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java @@ -0,0 +1,31 @@ +package de.hysky.skyblocker.skyblock.dwarven; + +import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class CrystalsLocationManagerTest { + + @Test + void testLocationInCrystals(){ + Assertions.assertTrue(CrystalsLocationsManager.checkInCrystals(new BlockPos(512,70,512))); + + Assertions.assertTrue(CrystalsLocationsManager.checkInCrystals(new BlockPos(202,31,202))); + Assertions.assertTrue(CrystalsLocationsManager.checkInCrystals(new BlockPos(823,188,823))); + + Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(201,31,202))); + Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(202,30,202))); + Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(202,31,201))); + + Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(824,188,823))); + Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(823,189,823))); + Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(823,188,824))); + } + + @Test + void testSetLocationMessage(){ + Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Jungle Temple",new BlockPos(10,11,12)).getString(), "Added waypoint for Jungle Temple at : 10 11 12."); + Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Fairy Grotto",new BlockPos(0,0,0)).getString(), "Added waypoint for Fairy Grotto at : 0 0 0."); + } +} -- cgit From 1ade575c76517a62f8666a57db7072d7b7b6634b Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:38:22 -0500 Subject: Refactor + Other changes - Fix Mines of Divan not showing - Code formatting - Small Optimizations/Changes --- .../de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java | 10 +++++----- .../skyblock/dwarven/CrystalsLocationManagerTest.java | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/test') diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java index 3086a3e4..d8cb806c 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java @@ -8,12 +8,12 @@ public class CrystalsHudTest { @Test void testLocationTransformation(){ - Assertions.assertEquals(CrystalsHud.transformLocation(202,202), Pair.of(0,0)); - Assertions.assertEquals(CrystalsHud.transformLocation(823,823), Pair.of(62,62)); + Assertions.assertEquals(CrystalsHud.transformLocation(202, 202), Pair.of(0, 0)); + Assertions.assertEquals(CrystalsHud.transformLocation(823, 823), Pair.of(62, 62)); - Assertions.assertEquals(CrystalsHud.transformLocation(512.5,512.5), Pair.of(31,31)); + Assertions.assertEquals(CrystalsHud.transformLocation(512.5, 512.5), Pair.of(31, 31)); - Assertions.assertEquals(CrystalsHud.transformLocation(-50,-50), Pair.of(0,0)); - Assertions.assertEquals(CrystalsHud.transformLocation(1000,1000), Pair.of(62,62)); + Assertions.assertEquals(CrystalsHud.transformLocation(-50, -50), Pair.of(0, 0)); + Assertions.assertEquals(CrystalsHud.transformLocation(1000, 1000), Pair.of(62, 62)); } } diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java index 592e5ecb..ecfc1234 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java @@ -1,10 +1,11 @@ package de.hysky.skyblocker.skyblock.dwarven; -import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import de.hysky.skyblocker.utils.Constants; + public class CrystalsLocationManagerTest { @Test @@ -25,7 +26,7 @@ public class CrystalsLocationManagerTest { @Test void testSetLocationMessage(){ - Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Jungle Temple",new BlockPos(10,11,12)).getString(), "Added waypoint for Jungle Temple at : 10 11 12."); - Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Fairy Grotto",new BlockPos(0,0,0)).getString(), "Added waypoint for Fairy Grotto at : 0 0 0."); + Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Jungle Temple",new BlockPos(10,11,12)).getString(), Constants.PREFIX.get().getString() + "Added waypoint for Jungle Temple at : 10 11 12."); + Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Fairy Grotto",new BlockPos(0,0,0)).getString(), Constants.PREFIX.get().getString() + "Added waypoint for Fairy Grotto at : 0 0 0."); } } -- cgit From 26301c0032c96cc96993420e8c7011cea18fc4a2 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:41:11 -0500 Subject: Fix formatting of test classes --- .../skyblock/dwarven/CrystalsHudTest.java | 2 +- .../dwarven/CrystalsLocationManagerTest.java | 26 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/test') diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java index d8cb806c..fbe9e548 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; public class CrystalsHudTest { @Test - void testLocationTransformation(){ + void testLocationTransformation() { Assertions.assertEquals(CrystalsHud.transformLocation(202, 202), Pair.of(0, 0)); Assertions.assertEquals(CrystalsHud.transformLocation(823, 823), Pair.of(62, 62)); diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java index ecfc1234..3649afb5 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java @@ -9,24 +9,24 @@ import de.hysky.skyblocker.utils.Constants; public class CrystalsLocationManagerTest { @Test - void testLocationInCrystals(){ - Assertions.assertTrue(CrystalsLocationsManager.checkInCrystals(new BlockPos(512,70,512))); + void testLocationInCrystals() { + Assertions.assertTrue(CrystalsLocationsManager.checkInCrystals(new BlockPos(512, 70, 512))); - Assertions.assertTrue(CrystalsLocationsManager.checkInCrystals(new BlockPos(202,31,202))); - Assertions.assertTrue(CrystalsLocationsManager.checkInCrystals(new BlockPos(823,188,823))); + Assertions.assertTrue(CrystalsLocationsManager.checkInCrystals(new BlockPos(202, 31, 202))); + Assertions.assertTrue(CrystalsLocationsManager.checkInCrystals(new BlockPos(823, 188, 823))); - Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(201,31,202))); - Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(202,30,202))); - Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(202,31,201))); + Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(201, 31, 202))); + Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(202, 30, 202))); + Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(202, 31, 201))); - Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(824,188,823))); - Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(823,189,823))); - Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(823,188,824))); + Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(824, 188, 823))); + Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(823, 189, 823))); + Assertions.assertFalse(CrystalsLocationsManager.checkInCrystals(new BlockPos(823, 188, 824))); } @Test - void testSetLocationMessage(){ - Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Jungle Temple",new BlockPos(10,11,12)).getString(), Constants.PREFIX.get().getString() + "Added waypoint for Jungle Temple at : 10 11 12."); - Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Fairy Grotto",new BlockPos(0,0,0)).getString(), Constants.PREFIX.get().getString() + "Added waypoint for Fairy Grotto at : 0 0 0."); + void testSetLocationMessage() { + Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Jungle Temple",new BlockPos(10, 11, 12)).getString(), Constants.PREFIX.get().getString() + "Added waypoint for Jungle Temple at : 10 11 12."); + Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Fairy Grotto",new BlockPos(0, 0, 0)).getString(), Constants.PREFIX.get().getString() + "Added waypoint for Fairy Grotto at : 0 0 0."); } } -- cgit From 9702d67ccf15f2bbb2c6a841efde5b71edb08395 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sat, 3 Feb 2024 05:29:50 -0500 Subject: Improve Map Player Marker It will now show you what way you're looking. --- .../hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java | 13 +++++++------ .../skyblock/dwarven/CrystalsLocationManagerTest.java | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/test') diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java index fbe9e548..edb478d8 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java @@ -1,6 +1,7 @@ package de.hysky.skyblocker.skyblock.dwarven; -import it.unimi.dsi.fastutil.Pair; +import it.unimi.dsi.fastutil.ints.IntIntPair; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -8,12 +9,12 @@ public class CrystalsHudTest { @Test void testLocationTransformation() { - Assertions.assertEquals(CrystalsHud.transformLocation(202, 202), Pair.of(0, 0)); - Assertions.assertEquals(CrystalsHud.transformLocation(823, 823), Pair.of(62, 62)); + Assertions.assertEquals(CrystalsHud.transformLocation(202, 202), IntIntPair.of(0, 0)); + Assertions.assertEquals(CrystalsHud.transformLocation(823, 823), IntIntPair.of(62, 62)); - Assertions.assertEquals(CrystalsHud.transformLocation(512.5, 512.5), Pair.of(31, 31)); + Assertions.assertEquals(CrystalsHud.transformLocation(512.5, 512.5), IntIntPair.of(31, 31)); - Assertions.assertEquals(CrystalsHud.transformLocation(-50, -50), Pair.of(0, 0)); - Assertions.assertEquals(CrystalsHud.transformLocation(1000, 1000), Pair.of(62, 62)); + Assertions.assertEquals(CrystalsHud.transformLocation(-50, -50), IntIntPair.of(0, 0)); + Assertions.assertEquals(CrystalsHud.transformLocation(1000, 1000), IntIntPair.of(62, 62)); } } diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java index 3649afb5..4ce61880 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationManagerTest.java @@ -26,7 +26,7 @@ public class CrystalsLocationManagerTest { @Test void testSetLocationMessage() { - Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Jungle Temple",new BlockPos(10, 11, 12)).getString(), Constants.PREFIX.get().getString() + "Added waypoint for Jungle Temple at : 10 11 12."); - Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Fairy Grotto",new BlockPos(0, 0, 0)).getString(), Constants.PREFIX.get().getString() + "Added waypoint for Fairy Grotto at : 0 0 0."); + Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Jungle Temple", new BlockPos(10, 11, 12)).getString(), Constants.PREFIX.get().getString() + "Added waypoint for Jungle Temple at : 10 11 12."); + Assertions.assertEquals(CrystalsLocationsManager.getSetLocationMessage("Fairy Grotto", new BlockPos(0, 0, 0)).getString(), Constants.PREFIX.get().getString() + "Added waypoint for Fairy Grotto at : 0 0 0."); } } -- cgit From 94b0e8ebbd86c941950cf862ae4aa99d2466c511 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sat, 3 Feb 2024 23:09:03 -0500 Subject: Refactor to use Vector2i for pos coordinates Using a vector meant for X and Y values makes much more sense. --- .../hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/test') diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java index edb478d8..2a3afe9c 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudTest.java @@ -1,7 +1,6 @@ package de.hysky.skyblocker.skyblock.dwarven; -import it.unimi.dsi.fastutil.ints.IntIntPair; - +import org.joml.Vector2i; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -9,12 +8,12 @@ public class CrystalsHudTest { @Test void testLocationTransformation() { - Assertions.assertEquals(CrystalsHud.transformLocation(202, 202), IntIntPair.of(0, 0)); - Assertions.assertEquals(CrystalsHud.transformLocation(823, 823), IntIntPair.of(62, 62)); + Assertions.assertEquals(CrystalsHud.transformLocation(202, 202), new Vector2i(0, 0)); + Assertions.assertEquals(CrystalsHud.transformLocation(823, 823), new Vector2i(62, 62)); - Assertions.assertEquals(CrystalsHud.transformLocation(512.5, 512.5), IntIntPair.of(31, 31)); + Assertions.assertEquals(CrystalsHud.transformLocation(512.5, 512.5), new Vector2i(31, 31)); - Assertions.assertEquals(CrystalsHud.transformLocation(-50, -50), IntIntPair.of(0, 0)); - Assertions.assertEquals(CrystalsHud.transformLocation(1000, 1000), IntIntPair.of(62, 62)); + Assertions.assertEquals(CrystalsHud.transformLocation(-50, -50), new Vector2i(0, 0)); + Assertions.assertEquals(CrystalsHud.transformLocation(1000, 1000), new Vector2i(62, 62)); } } -- cgit