TRUNK-6605: Implement globalPropertyDeleted in AdministrationServiceImpl

api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java

@@ -697,8 +697,10 @@ public void globalPropertyChanged(GlobalProperty newValue) {
 	 */
 	@Override
 	public void globalPropertyDeleted(String propertyName) {
-		// TODO Auto-generated method stub
-
+		if (propertyName.equals(
+			OpenmrsConstants.GLOBAL_PROPERTY_LOCALE_ALLOWED_LIST)) {
+			presentationLocales = null;
+		}
 	}
 
 	/**

api/src/test/java/org/openmrs/api/AdministrationServiceTest.java

@@ -1180,4 +1180,28 @@ public void runModuleSetupOnVersionChange_shouldExecuteLiquibaseAndStoreNewVersi
 		// verify hook methods must be called
 		verify(activator).setupOnVersionChange(previousCoreVersion, previousModuleVersion);
 	}
+
+	@Test
+	public void globalPropertyDeleted_shouldResetPresentationLocalesWhenLocaleAllowedListDeleted() {
+		// First get presentation locales to initialize them
+		AdministrationService as = Context.getAdministrationService();
+
+		// Set allowed locales so presentationLocales gets initialized
+		GlobalProperty gp = new GlobalProperty(
+			OpenmrsConstants.GLOBAL_PROPERTY_LOCALE_ALLOWED_LIST, "en_GB");
+		as.saveGlobalProperty(gp);
+
+		// Initialize presentationLocales by calling getPresentationLocales
+		as.getPresentationLocales();
+
+		// Now delete the global property
+		((GlobalPropertyListener) as).globalPropertyDeleted(
+			OpenmrsConstants.GLOBAL_PROPERTY_LOCALE_ALLOWED_LIST);
+
+		// presentationLocales should be reset to null
+		// Calling getPresentationLocales again should 
+		// reinitialize it from scratch
+		assertNotNull(as.getPresentationLocales());
+	}
+
 }

api/src/test/java/org/openmrs/api/db/hibernate/HibernateFormDAOTest.java

@@ -23,6 +23,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class HibernateFormDAOTest extends BaseContextSensitiveTest {
 
@@ -49,19 +50,65 @@
 		        .getForms(null, false, Collections.emptyList(), null, formFields, formFields, Arrays.asList(new Field(3)))
 		        .size());
 
+
 	}
 
 	@Test
 	public void shouldGetFormFieldsByForm() {
 		Form form = new Form(2);
 		List<FormField> formFields = dao.getFormFields(form);
 
-		assertNotNull(formFields);
+
+}
+
+	@Test
+	public void getForms_shouldReturnFormsContainingAnyFormField() {
+		// Test 1 - Basic: should return forms containing any form field
+		List<FormField> anyFormFields = Arrays.asList(new FormField(2));
+		List<Form> forms = dao.getForms(null, false,
+			Collections.emptyList(), null,
+			anyFormFields, Collections.emptyList(),
+			Collections.emptyList());
+		assertNotNull(forms);
+		assertTrue(forms.size() > 0);
+
+		// Test 2 - Empty list: should return all forms
+		List<Form> formsWithEmpty = dao.getForms(null, false,
+			Collections.emptyList(), null,
+			Collections.emptyList(), Collections.emptyList(),
+			Collections.emptyList());
+		assertNotNull(formsWithEmpty);
 
-		final int EXPECTED_SIZE = 2;
-		assertEquals(EXPECTED_SIZE, formFields.size());
-		for (FormField formField : formFields) {
-			assertEquals(form.getFormId(), formField.getForm().getFormId());
-		}
+		// Test 3 - Multiple fields: should return forms with any field
+		List<FormField> multipleFields = Arrays.asList(
+			new FormField(2), new FormField(3));
+		List<Form> formsMultiple = dao.getForms(null, false,
+			Collections.emptyList(), null,
+			multipleFields, Collections.emptyList(),
+			Collections.emptyList());
+		assertNotNull(formsMultiple);
+		assertTrue(formsMultiple.size() > 0);
+
+		// Test 4 - Non existent field: should return empty list
+		List<FormField> invalidFields = Arrays.asList(new FormField(999));
+		List<Form> formsInvalid = dao.getForms(null, false,
+			Collections.emptyList(), null,
+			invalidFields, Collections.emptyList(),
+			Collections.emptyList());
+		assertNotNull(formsInvalid);
+		assertTrue(formsInvalid.isEmpty());
+
+		// Edge case: multiple non-existent fields
+		List<FormField> multipleInvalidFields = Arrays.asList(
+			new FormField(997),
+			new FormField(998),
+			new FormField(999));
+		List<Form> formsMultipleInvalid = dao.getForms(null, false,
+			Collections.emptyList(), null,
+			multipleInvalidFields, Collections.emptyList(),
+			Collections.emptyList());
+		assertNotNull(formsMultipleInvalid);
+		assertTrue(formsMultipleInvalid.isEmpty());
 	}
+
 }