Skip to content

TRUNK-6598: Add missing unit test for containingAnyFormField in HibernateFormDAO #5983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ShrutiSocrates wants to merge 6 commits into
base: master
Choose a base branch
from
+69 −6
Open

TRUNK-6598: Add missing unit test for containingAnyFormField in HibernateFormDAO #5983

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a75bcdc
Update HibernateFormDAOTest.java
ShrutiSocrates Mar 28, 2026
3c85a2f
Update HibernateFormDAOTest.java
ShrutiSocrates Mar 30, 2026
fa6220e
Update api/src/test/java/org/openmrs/api/db/hibernate/HibernateFormDA…
ShrutiSocrates Mar 30, 2026
292b455
Update HibernateFormDAOTest.java
ShrutiSocrates Mar 30, 2026
9b5650d
Merge branch 'master' into TRUNK-add-containingAnyFormField-test
ShrutiSocrates Mar 30, 2026
767618a
Merge branch 'master' into TRUNK-add-containingAnyFormField-test
ShrutiSocrates Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 69 additions & 6 deletions api/src/test/java/org/openmrs/api/db/hibernate/HibernateFormDAOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -49,19 +50,81 @@ public void shouldFilterAgainstFormFields() {
.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
@@ -64,4 +66,43 @@
assertEquals(form.getFormId(), formField.getForm().getFormId());
}
}

@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);

// 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);

final int EXPECTED_SIZE = 2;
assertEquals(EXPECTED_SIZE, formFields.size());
for (FormField formField : formFields) {
assertEquals(form.getFormId(), formField.getForm().getFormId());
}
// 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());
}

}
Copy link
Copy Markdown

@VarshithReddy2006 VarshithReddy2006 Mar 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any edge cases where multiple form fields exist but none match? It might be useful to include such scenarios in the tests.

Copy link
Copy Markdown

@EDSONZ-WASSWA EDSONZ-WASSWA Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. You're right—we should cover the scenario with multiple
non-existent fields

Copy link
Copy Markdown
Author

@ShrutiSocrates ShrutiSocrates Mar 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the suggestion! I have committed it directly.

Copy link
Copy Markdown

@EDSONZ-WASSWA EDSONZ-WASSWA Mar 31, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! @ShrutiSocrates .. I see there is thorough test coverage for the containingAnyFormField functionality as the ticket required....Looks good
Just one thing the comment "//A would-be fix for that" should be removed before merge

Copy link
Copy Markdown
Author

@ShrutiSocrates ShrutiSocrates Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the approval and feedback! The "//A would-be fix for that" comment
has been removed.

//A would-be fix for that
List<FormField> multipleInvalidFields = Arrays.asList(
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());