Fix remaining test issues: null locale in getMessage, test datasets, duplicate handler adapter, WebComponentRegistrar null check

Copilot · dkayiwa · Copilot · commit cbac1fb4c0b6 · 2026-02-23T12:46:49.000Z
Co-authored-by: dkayiwa &lt;1390773+dkayiwa@users.noreply.github.com&gt;
diff --git a/omod/src/main/java/org/openmrs/web/WebComponentRegistrar.java b/omod/src/main/java/org/openmrs/web/WebComponentRegistrar.java
@@ -66,6 +66,9 @@ public void setServletContext(ServletContext servletContext) {
 	}
 	
 	private void addMappings(ServletRegistration reg, String... mappings) {
+		if (reg == null) {
+			return;
+		}
 		for (String mapping : mappings) {
 			reg.addMapping(mapping);
 		}
diff --git a/omod/src/main/java/org/openmrs/web/controller/ConceptFormValidator.java b/omod/src/main/java/org/openmrs/web/controller/ConceptFormValidator.java
@@ -209,7 +209,7 @@ private void setReferenceRangeErrorsWithValue(BindException errors, long index,
 	        Double value, Double thresholdValue) {
 		errors.pushNestedPath("referenceRanges[" + index + "]");
 		errors.rejectValue(field,
-		    Context.getMessageSourceService().getMessage(errorCode, new Object[] { value, thresholdValue }, null),
+		    Context.getMessageSourceService().getMessage(errorCode, new Object[] { value, thresholdValue }, Context.getLocale()),
 		    "Concept.referenceRanges.error.absolute.value.invalid");
 		errors.popNestedPath();
 	}
diff --git a/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java b/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java
@@ -378,7 +378,7 @@ protected Map<String, Object> referenceData(HttpServletRequest request) throws E
 				//ignore
 			}
 			
-			hints.add(mss.getMessage("options.login.password.minCharacterCount", new Object[] { minChar }, null));
+			hints.add(mss.getMessage("options.login.password.minCharacterCount", new Object[] { minChar }, Context.getLocale()));
 			addHint(hints, as.getGlobalProperty(OpenmrsConstants.GP_PASSWORD_CANNOT_MATCH_USERNAME_OR_SYSTEMID),
 			    mss.getMessage("options.login.password.cannotMatchUsername"));
 			addHint(hints, as.getGlobalProperty(OpenmrsConstants.GP_PASSWORD_REQUIRES_UPPER_AND_LOWER_CASE),
diff --git a/omod/src/main/resources/webModuleApplicationContext.xml b/omod/src/main/resources/webModuleApplicationContext.xml
@@ -39,6 +39,9 @@
 	<!-- Alias for messageSource resolution - in Platform 3.0.0 services use @Service annotation -->
 	<alias name="messageSourceService" alias="messageSource"/>
 	
+	<!-- Prevent duplicate SimpleControllerHandlerAdapter registration from MVC namespace and @EnableWebMvc -->
+	<bean id="simpleControllerHandlerAdapter" class="org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter"/>
+	
 	<bean id="legacyUiUrlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
 		<property name="interceptors">
 			<list>
diff --git a/omod/src/test/resources/org/openmrs/web/include/SchedulerFormControllerTest.xml b/omod/src/test/resources/org/openmrs/web/include/SchedulerFormControllerTest.xml
@@ -11,5 +11,5 @@
 
 -->
 <dataset>  
-  <scheduler_task_config task_config_id="1" name="Hello World Task" description="Hello World Test Task" schedulable_class="org.openmrs.scheduler.tasks.HelloWorldTask" repeat_interval="3600" started="0" start_on_startup="0" uuid="29754c38-6711-11e0-9d74-18a905e044dc" created_by="1" date_created="2006-07-18 11:03:31.0" />
+  <scheduler_task_config task_config_id="1" name="Hello World Task" description="Hello World Test Task" schedulable_class="org.openmrs.scheduler.tasks.HelloWorldTask" repeat_interval="3600" started="0" start_on_startup="0" uuid="29754c38-6711-11e0-9d74-18a905e044dc" creator="1" date_created="2006-07-18 11:03:31.0" retired="false" />
 </dataset>
diff --git a/omod/src/test/resources/org/openmrs/web/include/TaskHelperTest.xml b/omod/src/test/resources/org/openmrs/web/include/TaskHelperTest.xml
@@ -11,5 +11,5 @@
 
 -->
 <dataset>  
-  <scheduler_task_config task_config_id="2" name="Hello World Task" description="Hello World Test Task" schedulable_class="org.openmrs.scheduler.tasks.HelloWorldTask" repeat_interval="3600" started="0" start_on_startup="0" uuid="FA010D31-4040-4574-A083-315A781106FA" created_by="1" date_created="2006-07-18 11:03:31.0" />
+  <scheduler_task_config task_config_id="2" name="Hello World Task" description="Hello World Test Task" schedulable_class="org.openmrs.scheduler.tasks.HelloWorldTask" repeat_interval="3600" started="0" start_on_startup="0" uuid="FA010D31-4040-4574-A083-315A781106FA" creator="1" date_created="2006-07-18 11:03:31.0" retired="false" />
 </dataset>
diff --git a/omod/src/test/resources/org/openmrs/web/taglib/include/PrivilegeTagTest.xml b/omod/src/test/resources/org/openmrs/web/taglib/include/PrivilegeTagTest.xml
@@ -11,9 +11,9 @@
 
 -->
 <dataset>
-  <privilege privilege="Manage Patients" description="Able to manage patients" uuid="b0da53a7-e5f5-4584-a9b9-bf911470fe57" creator="1" date_created="2005-01-01 00:00:00.0"/>
-  <privilege privilege="View Patients" description="Able to view patients" uuid="83756836-aa91-44d0-97de-2cfcf3a64808" creator="1" date_created="2005-01-01 00:00:00.0"/>
-  <privilege privilege="Edit Patients" description="Able to edit patients" uuid="68ba469c-22cc-46fd-a992-e4ec7db92b7f" creator="1" date_created="2005-01-01 00:00:00.0"/>
+  <privilege privilege="Manage Patients" description="Able to manage patients" uuid="b0da53a7-e5f5-4584-a9b9-bf911470fe57" creator="1" date_created="2005-01-01 00:00:00.0" retired="false"/>
+  <privilege privilege="View Patients" description="Able to view patients" uuid="83756836-aa91-44d0-97de-2cfcf3a64808" creator="1" date_created="2005-01-01 00:00:00.0" retired="false"/>
+  <privilege privilege="Edit Patients" description="Able to edit patients" uuid="68ba469c-22cc-46fd-a992-e4ec7db92b7f" creator="1" date_created="2005-01-01 00:00:00.0" retired="false"/>
   
   <role role="Data Clerk" description="Takes care of entering, editing patients." uuid="dddf8f8e-c6e3-49d3-8f70-2107a60f7df2"/>
   <role role="Clinician" description="Looks up patients." uuid="fa2fd77d-a586-4e89-9bd0-193a34b6d01e"/>
diff --git a/omod/src/test/resources/org/openmrs/web/taglib/include/RequireTagTest.xml b/omod/src/test/resources/org/openmrs/web/taglib/include/RequireTagTest.xml
@@ -14,9 +14,9 @@
   <person person_id="2" gender="M" dead="false" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" uuid="2d70a8dc-d233-460b-8717-35169091f03f"/>
   <person_name person_name_id="2" preferred="true" person_id="2" given_name="John" middle_name=" " family_name="Doe" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" uuid="55ccd5eb-aaab-458f-9507-7beffda23855"/>
   
-  <privilege privilege="Manage WhirleyGigs" description="Able to manage whirleygigs" uuid="b0da53a7-e5f5-4584-a9b9-bf911470fe57" creator="1" date_created="2005-01-01 00:00:00.0"/>
-  <privilege privilege="Manage WhoopDeDoos" description="Able to manage whoopdedoos" uuid="83756836-aa91-44d0-97de-2cfcf3a64808" creator="1" date_created="2005-01-01 00:00:00.0"/>
-  <privilege privilege="Manage Thingamajigs" description="Able to manage thingamajigs" uuid="68ba469c-22cc-46fd-a992-e4ec7db92b7f" creator="1" date_created="2005-01-01 00:00:00.0"/>
+  <privilege privilege="Manage WhirleyGigs" description="Able to manage whirleygigs" uuid="b0da53a7-e5f5-4584-a9b9-bf911470fe57" creator="1" date_created="2005-01-01 00:00:00.0" retired="false"/>
+  <privilege privilege="Manage WhoopDeDoos" description="Able to manage whoopdedoos" uuid="83756836-aa91-44d0-97de-2cfcf3a64808" creator="1" date_created="2005-01-01 00:00:00.0" retired="false"/>
+  <privilege privilege="Manage Thingamajigs" description="Able to manage thingamajigs" uuid="68ba469c-22cc-46fd-a992-e4ec7db92b7f" creator="1" date_created="2005-01-01 00:00:00.0" retired="false"/>
   
   <role role="WhirleyGig Manager" description="Works with WhirleyGigs only" uuid="dddf8f8e-c6e3-49d3-8f70-2107a60f7df2"/>
   <role role="Manager" description="Works with all objects" uuid="fa2fd77d-a586-4e89-9bd0-193a34b6d01e"/>

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ public void setServletContext(ServletContext servletContext) {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`private void addMappings(ServletRegistration reg, String... mappings) {`
	`69`	`+ if (reg == null) {`
	`70`	`+ return;`
	`71`	`+ }`
`69`	`72`	`for (String mapping : mappings) {`
`70`	`73`	`reg.addMapping(mapping);`
`71`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ private void setReferenceRangeErrorsWithValue(BindException errors, long index,`
`209`	`209`	`Double value, Double thresholdValue) {`
`210`	`210`	`errors.pushNestedPath("referenceRanges[" + index + "]");`
`211`	`211`	`errors.rejectValue(field,`
`212`		`- Context.getMessageSourceService().getMessage(errorCode, new Object[] { value, thresholdValue }, null),`
	`212`	`+ Context.getMessageSourceService().getMessage(errorCode, new Object[] { value, thresholdValue }, Context.getLocale()),`
`213`	`213`	`"Concept.referenceRanges.error.absolute.value.invalid");`
`214`	`214`	`errors.popNestedPath();`
`215`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ protected Map<String, Object> referenceData(HttpServletRequest request) throws E`
`378`	`378`	`//ignore`
`379`	`379`	`}`
`380`	`380`
`381`		`- hints.add(mss.getMessage("options.login.password.minCharacterCount", new Object[] { minChar }, null));`
	`381`	`+ hints.add(mss.getMessage("options.login.password.minCharacterCount", new Object[] { minChar }, Context.getLocale()));`
`382`	`382`	`addHint(hints, as.getGlobalProperty(OpenmrsConstants.GP_PASSWORD_CANNOT_MATCH_USERNAME_OR_SYSTEMID),`
`383`	`383`	`mss.getMessage("options.login.password.cannotMatchUsername"));`
`384`	`384`	`addHint(hints, as.getGlobalProperty(OpenmrsConstants.GP_PASSWORD_REQUIRES_UPPER_AND_LOWER_CASE),`