From 245f7e24e4169ec70c594a6b510232b4eae1b7bc Mon Sep 17 00:00:00 2001 From: EnZaXD Date: Sat, 22 Jun 2024 11:04:11 +0200 Subject: [PATCH] Fix DummyInitializer unit test to bootstrap without errors (#3965) --- .../common/dummy/DummyInitializer.java | 8 ++-- .../viaversion/common/dummy/TestInjector.java | 44 +++++++++++++++++++ .../viaversion/common/dummy/TestLoader.java | 31 +++++++++++++ 3 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 common/src/test/java/com/viaversion/viaversion/common/dummy/TestInjector.java create mode 100644 common/src/test/java/com/viaversion/viaversion/common/dummy/TestLoader.java diff --git a/common/src/test/java/com/viaversion/viaversion/common/dummy/DummyInitializer.java b/common/src/test/java/com/viaversion/viaversion/common/dummy/DummyInitializer.java index 04decb134..6a12ca049 100644 --- a/common/src/test/java/com/viaversion/viaversion/common/dummy/DummyInitializer.java +++ b/common/src/test/java/com/viaversion/viaversion/common/dummy/DummyInitializer.java @@ -19,7 +19,6 @@ package com.viaversion.viaversion.common.dummy; import com.viaversion.viaversion.ViaManagerImpl; import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.protocol.ProtocolManagerImpl; public final class DummyInitializer { @@ -31,7 +30,10 @@ public final class DummyInitializer { } initialized = true; - Via.init(new ViaManagerImpl(new TestPlatform(), null, null, null)); - ((ProtocolManagerImpl) Via.getManager().getProtocolManager()).registerProtocols(); + Via.init(new ViaManagerImpl(new TestPlatform(), new TestInjector(), null, new TestLoader())); + + final ViaManagerImpl manager = (ViaManagerImpl) Via.getManager(); + manager.init(); + manager.onServerLoaded(); } } diff --git a/common/src/test/java/com/viaversion/viaversion/common/dummy/TestInjector.java b/common/src/test/java/com/viaversion/viaversion/common/dummy/TestInjector.java new file mode 100644 index 000000000..0d6a1ec47 --- /dev/null +++ b/common/src/test/java/com/viaversion/viaversion/common/dummy/TestInjector.java @@ -0,0 +1,44 @@ +/* + * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion + * Copyright (C) 2016-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.viaversion.common.dummy; + +import com.google.gson.JsonObject; +import com.viaversion.viaversion.api.platform.ViaInjector; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; + +public class TestInjector implements ViaInjector { + + @Override + public void inject() { + } + + @Override + public void uninject() { + + } + + @Override + public ProtocolVersion getServerProtocolVersion() { + return ProtocolVersion.v1_15_2; + } + + @Override + public JsonObject getDump() { + return null; + } +} diff --git a/common/src/test/java/com/viaversion/viaversion/common/dummy/TestLoader.java b/common/src/test/java/com/viaversion/viaversion/common/dummy/TestLoader.java new file mode 100644 index 000000000..415cc7532 --- /dev/null +++ b/common/src/test/java/com/viaversion/viaversion/common/dummy/TestLoader.java @@ -0,0 +1,31 @@ +/* + * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion + * Copyright (C) 2016-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.viaversion.common.dummy; + +import com.viaversion.viaversion.api.platform.ViaPlatformLoader; + +public class TestLoader implements ViaPlatformLoader { + + @Override + public void load() { + } + + @Override + public void unload() { + } +}