From 5aff7ff0662a20bbe5bdfad67aaf4044c2f05c74 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 9 Aug 2024 01:22:26 +0200 Subject: [PATCH] Fix database trans in unit tests --- .../core/database/MaterialDatabaseTest.java | 36 +++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/core/src/test/java/info/openrocket/core/database/MaterialDatabaseTest.java b/core/src/test/java/info/openrocket/core/database/MaterialDatabaseTest.java index 1472ff6cd..07770315e 100644 --- a/core/src/test/java/info/openrocket/core/database/MaterialDatabaseTest.java +++ b/core/src/test/java/info/openrocket/core/database/MaterialDatabaseTest.java @@ -1,10 +1,23 @@ package info.openrocket.core.database; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Module; +import com.google.inject.util.Modules; +import info.openrocket.core.ServicesForTesting; +import info.openrocket.core.l10n.ResourceBundleTranslator; +import info.openrocket.core.l10n.Translator; import info.openrocket.core.material.Material; import info.openrocket.core.material.MaterialGroup; +import info.openrocket.core.plugin.PluginModule; +import info.openrocket.core.startup.Application; import info.openrocket.core.util.BaseTestCase; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import java.util.Locale; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -12,7 +25,24 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -public class MaterialDatabaseTest extends BaseTestCase { +public class MaterialDatabaseTest { + @BeforeAll + public static void setUp() throws Exception { + Module applicationModule = new ServicesForTesting(); + Module debugTranslator = new AbstractModule() { + + @Override + protected void configure() { + bind(Translator.class).toInstance(new ResourceBundleTranslator("l10n.messages", Locale.US)); + } + + }; + Module pluginModule = new PluginModule(); + Injector injector = Guice.createInjector(Modules.override(applicationModule).with(debugTranslator), + pluginModule); + Application.setInjector(injector); + } + @Test void testDatabasesInitialization() { assertNotNull(Databases.BULK_MATERIAL); @@ -28,7 +58,7 @@ public class MaterialDatabaseTest extends BaseTestCase { void testFindMaterialByTypeAndName() { Material aluminum = Databases.findMaterial(Material.Type.BULK, "Aluminum"); assertNotNull(aluminum); - assertEquals("[material:Aluminum]", aluminum.getName()); + assertEquals("Aluminum", aluminum.getName()); assertEquals(Material.Type.BULK, aluminum.getType()); assertEquals(2700, aluminum.getDensity(), 0.001); } @@ -37,7 +67,7 @@ public class MaterialDatabaseTest extends BaseTestCase { void testFindMaterialByTypeNameAndDensity() { Material customMaterial = Databases.findMaterial(Material.Type.BULK, "CustomMaterial", 1000, MaterialGroup.PLASTICS); assertNotNull(customMaterial); - assertEquals("[material:CustomMaterial]", customMaterial.getName()); + assertEquals("CustomMaterial", customMaterial.getName()); assertEquals(Material.Type.BULK, customMaterial.getType()); assertEquals(1000, customMaterial.getDensity(), 0.001); assertEquals(MaterialGroup.PLASTICS, customMaterial.getGroup());