HTML-715 EnrollInProgramTag to support program attributes from 2.2. #167
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @OpenmrsProfile(openmrsPlatformVersion = "2.2.*") | ||
| public class EnrollInPogramTagHandlerSupport2_2 implements EnrollInPogramTagHandlerSupport { | ||
|
|
||
| @Override |
There was a problem hiding this comment.
Maybe javadocs could be added here too?
ssmusoke
reviewed
May 26, 2020
|
|
||
| public void setPatientProgrmAttributes(FormEntryContext context, Map<String, String> parameters) { | ||
|
|
||
| if ("true".equalsIgnoreCase(parameters.get("patientprogramattributes"))) { |
mks-d
changed the title
mks-d
changed the title
mks-d
changed the title
mks-d
requested changes
May 28, 2020
Comment on lines
1
to
129
|
|
||
| @RunWith(PowerMockRunner.class) | ||
| @PrepareForTest(Context.class) | ||
| public class EnrollInProgramTagTest2_2 { | ||
|
|
||
| EnrollInProgramElement2_2 element; | ||
|
|
||
| private MockHttpServletRequest request; | ||
|
|
||
| private Map<String, String> parameters; | ||
|
|
||
|
|
||
| private TextFieldWidget patientprogramattrWidget; | ||
|
|
||
|
|
||
| @Mock | ||
| private FormEntrySession session; | ||
|
|
||
| @Mock | ||
| private FormEntryContext context; | ||
|
|
||
| @Mock | ||
| private ProgramWorkflowService programWorkflowService; | ||
|
|
||
| @Mock | ||
| private PatientService ps; | ||
|
|
||
| @Before | ||
| public void setup() { | ||
| // Stub services | ||
| mockStatic(Context.class); | ||
| when(Context.getProgramWorkflowService()).thenReturn(programWorkflowService); | ||
|
|
||
| // Setup html form session context | ||
| when(context.getMode()).thenReturn(Mode.ENTER); | ||
| request = new MockHttpServletRequest(); | ||
| when(session.getContext()).thenReturn(context); | ||
|
|
||
|
|
||
| // setup condition element | ||
| element = spy(new EnrollInProgramElement2_2(context, parameters)); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void enrollInProgram_shouldGetPatientProgrmAttribute() throws Exception { | ||
| //set up | ||
| when(patientprogramattrWidget.getValue(context, request)).thenReturn("d7477c21-bfc3-4922-9591-e89d8b9c8efb"); | ||
|
|
||
| //replay | ||
| element.setPatientProgrmAttributes(context, parameters); | ||
|
|
||
| Assert.assertNotNull( | ||
| programWorkflowService.getPatientProgramAttributeByUuid("d7477c21-bfc3-4922-9591-e89d8b9c8efb")); | ||
|
|
||
| //verify | ||
| verify(programWorkflowService, times(1)) | ||
| .getPatientProgramAttributeByUuid("d7477c21-bfc3-4922-9591-e89d8b9c8efb"); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void enrollInProgram_shouldGetPatientProgrmAttributeWithAnInvalidUuid() throws Exception { | ||
| // set up | ||
| when(patientprogramattrWidget.getValue(context, request)).thenReturn("sjnjfrjvjnwejnfjsbdladmojervje"); | ||
|
|
||
| // replay | ||
| element.setPatientProgrmAttributes(context, parameters); | ||
|
|
||
| Assert.assertNull(programWorkflowService.getPatientProgramAttributeByUuid("sjnjfrjvjnwejnfjsbdladmojervje")); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void handleSubmission_shouldNotCreatePatientProgramAttributeInViewMode() { | ||
| // setup | ||
| when(context.getMode()).thenReturn(Mode.VIEW); | ||
|
|
||
| // replay | ||
| element.handleSubmission(session, request); | ||
|
|
||
| // verify | ||
| verify(programWorkflowService, never()) | ||
| .getPatientProgramAttributeByUuid("d7477c21-bfc3-4922-9591-e89d8b9c8efb"); | ||
| } | ||
|
|
||
| @Test | ||
| public void handleSubmission_shouldNotAddPatientProgramAttributeToAPatientWhoIsNull() { | ||
| // setup | ||
| when(context.getExistingPatient()).thenReturn(null); | ||
|
|
||
| // replay | ||
| element.handleSubmission(session, request); | ||
|
|
||
| // verify | ||
| verify(ps, never()).savePatient(any(Patient.class)); | ||
|
|
||
| } | ||
|
|
||
| } |
There was a problem hiding this comment.
@mks-d thanks,,let me adopt that
mks-d
changed the title
mks-d
changed the title
mks-d
requested changes
May 28, 2020
| import org.openmrs.module.htmlformentry.element.EnrollInProgramElement; | ||
|
|
||
| @OpenmrsProfile(openmrsPlatformVersion = "2.2.*") | ||
| public class EnrollInPogramTagHandlerSupport2_2 implements EnrollInPogramTagHandlerSupport { |
There was a problem hiding this comment.
Typo → EnrollInProgramTagHandlerSupport2_2 (the typo is "Pogram").
gitcliff
force-pushed
the
HTML-715
branch
2 times, most recently
from
7e5133e
to
646c762
Compare
gitcliff
force-pushed
the
HTML-715
branch
2 times, most recently
from
f5e5373
to
b0195ce
Compare
|
@gitcliff we would like to finish up this work. Can you address the conflicts, and then ask for a reviewer? (You're also welcome to unassign yourself if you have too much other work right now, or ask for help.) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://issues.openmrs.org/browse/HTML-715