diff --git a/common/src/test/java/net/william278/husksync/data/DataAdaptionTests.java b/common/src/test/java/net/william278/husksync/data/DataAdaptionTests.java index 9a34a1e2..6a7f7b32 100644 --- a/common/src/test/java/net/william278/husksync/data/DataAdaptionTests.java +++ b/common/src/test/java/net/william278/husksync/data/DataAdaptionTests.java @@ -4,13 +4,11 @@ import net.william278.husksync.config.Settings; import net.william278.husksync.logger.DummyLogger; import net.william278.husksync.player.DummyPlayer; import net.william278.husksync.player.OnlineUser; -import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; import java.util.HashMap; -import java.util.Map; import java.util.concurrent.atomic.AtomicReference; /** @@ -21,7 +19,7 @@ public class DataAdaptionTests { @Test public void testJsonDataAdapter() { final OnlineUser dummyUser = DummyPlayer.create(); - dummyUser.getUserData(new DummyLogger(), DummySettings.get()).join().ifPresent(dummyUserData -> { + dummyUser.getUserData(new DummyLogger(), new Settings()).join().ifPresent(dummyUserData -> { final DataAdapter dataAdapter = new JsonDataAdapter(); final byte[] data = dataAdapter.toBytes(dummyUserData); final UserData deserializedUserData = dataAdapter.fromBytes(data); @@ -40,7 +38,7 @@ public class DataAdaptionTests { final OnlineUser dummyUser = DummyPlayer.create(); final String expectedJson = "{\"status\":{\"health\":20.0,\"max_health\":20.0,\"health_scale\":0.0,\"hunger\":20,\"saturation\":5.0,\"saturation_exhaustion\":5.0,\"selected_item_slot\":1,\"total_experience\":100,\"experience_level\":1,\"experience_progress\":1.0,\"game_mode\":\"SURVIVAL\",\"is_flying\":false},\"inventory\":{\"serialized_items\":\"\"},\"ender_chest\":{\"serialized_items\":\"\"},\"potion_effects\":{\"serialized_potion_effects\":\"\"},\"advancements\":[],\"statistics\":{\"untyped_statistics\":{},\"block_statistics\":{},\"item_statistics\":{},\"entity_statistics\":{}},\"location\":{\"world_name\":\"dummy_world\",\"world_uuid\":\"00000000-0000-0000-0000-000000000000\",\"world_environment\":\"NORMAL\",\"x\":0.0,\"y\":64.0,\"z\":0.0,\"yaw\":90.0,\"pitch\":180.0},\"persistent_data_container\":{\"persistent_data_map\":{}},\"minecraft_version\":\"1.19-beta123456\",\"format_version\":2}"; AtomicReference json = new AtomicReference<>(); - dummyUser.getUserData(new DummyLogger(), DummySettings.get()).join().ifPresent(dummyUserData -> { + dummyUser.getUserData(new DummyLogger(), new Settings()).join().ifPresent(dummyUserData -> { final DataAdapter dataAdapter = new JsonDataAdapter(); final byte[] data = dataAdapter.toBytes(dummyUserData); json.set(new String(data, StandardCharsets.UTF_8)); @@ -51,7 +49,7 @@ public class DataAdaptionTests { @Test public void testCompressedDataAdapter() { final OnlineUser dummyUser = DummyPlayer.create(); - dummyUser.getUserData(new DummyLogger(), DummySettings.get()).join().ifPresent(dummyUserData -> { + dummyUser.getUserData(new DummyLogger(), new Settings()).join().ifPresent(dummyUserData -> { final DataAdapter dataAdapter = new CompressedDataAdapter(); final byte[] data = dataAdapter.toBytes(dummyUserData); final UserData deserializedUserData = dataAdapter.fromBytes(data); @@ -87,18 +85,5 @@ public class DataAdaptionTests { Assertions.assertEquals(getTestSerializedPersistentDataContainer(), "{\"persistent_data_container\":{\"persistent_data_map\":{\"husksync:int_test\":{\"type\":\"INTEGER\",\"value\":3},\"husksync:string_test\":{\"type\":\"STRING\",\"value\":\"test\"},\"husksync:long_test\":{\"type\":\"LONG\",\"value\":4},\"husksync:byte_test\":{\"type\":\"BYTE\",\"value\":1},\"husksync:short_test\":{\"type\":\"SHORT\",\"value\":6},\"husksync:double_test\":{\"type\":\"DOUBLE\",\"value\":2.0},\"husksync:float_test\":{\"type\":\"FLOAT\",\"value\":5.0}}},\"format_version\":0}"); } - // For testing settings - private static class DummySettings extends Settings { - private DummySettings(@NotNull Map settings) { - super(settings); - } - - public static DummySettings get() { - return new DummySettings(Map.of( - ConfigOption.SYNCHRONIZATION_SAVE_DEAD_PLAYER_INVENTORIES, true - )); - } - } - }