TRUNK-5388 Replace deprecated use of ModuleFileParser

with ModuleFileParser(MessageSourceService) * in ModuleFactory * in ModuleExtensionsTest
fruether · Apr 14, 2018 · 63a076e · 63a076e
1 parent e4be754
commit 63a076e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/api/src/main/java/org/openmrs/module/ModuleFactory.java b/api/src/main/java/org/openmrs/module/ModuleFactory.java
@@ -106,7 +106,7 @@ public static Module loadModule(File moduleFile) throws ModuleException {
  * @return Module
  */
  public static Module loadModule(File moduleFile, Boolean replaceIfExists) throws ModuleException {
- Module module = new ModuleFileParser(moduleFile).parse();
+ Module module = new ModuleFileParser(Context.getMessageSourceService()).parse(moduleFile);
 
  if (module != null) {
  loadModule(module, replaceIfExists);

diff --git a/api/src/test/java/org/openmrs/module/ModuleExtensionsTest.java b/api/src/test/java/org/openmrs/module/ModuleExtensionsTest.java
@@ -25,17 +25,23 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mock;
+import org.openmrs.messagesource.MessageSourceService;
+import org.openmrs.test.BaseContextMockTest;
 
 /**
  * Tests for {@link Module#getExtensions()}.
  * 
  * Look at {@link ModuleFileParser#parse()} for how a Module is constructed and initialized.
  * At first the extension tags found in config.xml are parsed and set in {@link Module#setExtensionNames(Map)}.
  */
-public class ModuleExtensionsTest {
+public class ModuleExtensionsTest extends BaseContextMockTest {
 
  private static final String EXTENSION_POINT_ID_PATIENT_DASHBOARD = "org.openmrs.patientDashboard";
  private static final String LOGIC_MODULE_PATH = "org/openmrs/module/include/logic-0.2.omod";
+
+ @Mock
+ MessageSourceService messageSourceService;
 
  private Module module;
 
@@ -87,8 +93,9 @@ public void getExtensions_shouldNotFailExpandingAnExtensionNameCausingANoClassDe
  // legacyui module, which since thats not loaded cannot be found, more specifically leads to
  // java.lang.NoClassDefFoundError: org/openmrs/module/web/extension/AdministrationSectionExt
 
- File moduleFile = new File(getClass().getClassLoader().getResource(LOGIC_MODULE_PATH).getPath());
- module = new ModuleFileParser(moduleFile).parse();
+ module = new ModuleFileParser(messageSourceService).parse(
+ new File(getClass().getClassLoader().getResource(LOGIC_MODULE_PATH).getPath())
+ );
  ModuleClassLoader moduleClassLoader = new ModuleClassLoader(module, getClass().getClassLoader());
  ModuleFactory.getModuleClassLoaderMap().put(module, moduleClassLoader);