Skip to content

Commit 7926275

Browse files
wikumChamithwikumChamith
committed
Fix tests
1 parent 3222e60 commit 7926275

File tree

1 file changed

+21
-10
lines changed

1 file changed

+21
-10
lines changed

‎omod/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ public void shouldAddConceptWithOnlyNameSpecified() throws Exception {
175175
mockRequest.setParameter("namesByLocale[en_GB].name", EXPECTED_PREFERRED_NAME);
176176
mockRequest.setParameter("descriptionsByLocale[en_GB].description", "some description");
177177
mockRequest.setParameter("concept.datatype", "1");
178-
178+
mockRequest.setParameter("concept.conceptClass", "1");
179+
179180
ModelAndView mav = conceptFormController.handleRequest(mockRequest, new MockHttpServletResponse());
180181
assertNotNull(mav);
181182
assertTrue(mav.getModel().isEmpty());
@@ -215,7 +216,8 @@ public void shouldAddConceptWithNameAndShortNameSpecified() throws Exception {
215216
mockRequest.setParameter("namesByLocale[en_GB].name", EXPECTED_PREFERRED_NAME);
216217
mockRequest.setParameter("descriptionsByLocale[en_GB].description", "some description");
217218
mockRequest.setParameter("concept.datatype", "1");
218-
219+
mockRequest.setParameter("concept.conceptClass", "1");
220+
219221
ModelAndView mav = conceptFormController.handleRequest(mockRequest, new MockHttpServletResponse());
220222
assertNotNull(mav);
221223
assertTrue(mav.getModel().isEmpty());
@@ -258,7 +260,8 @@ public void shouldAddConceptWithNameAndShortNameAndDescriptionSpecifiedToCodeCon
258260
mockRequest.setParameter("descriptionsByLocale[en_GB].description", EXPECTED_DESCRIPTION);
259261
mockRequest.setParameter("namesByLocale[en_GB].name", EXPECTED_PREFERRED_NAME);
260262
mockRequest.setParameter("concept.datatype", "4");
261-
263+
mockRequest.setParameter("concept.conceptClass", "1");
264+
262265
ModelAndView mav = conceptFormController.handleRequest(mockRequest, response);
263266
assertNotNull(mav);
264267
assertTrue(mav.getModel().isEmpty());
@@ -303,7 +306,8 @@ public void shouldAddConceptWithNameAndShortNameAndDescriptionSpecifiedToNumeric
303306
mockRequest.setParameter("descriptionsByLocale[en_GB].description", EXPECTED_DESCRIPTION);
304307
mockRequest.setParameter("namesByLocale[en_GB].name", EXPECTED_PREFERRED_NAME);
305308
mockRequest.setParameter("concept.datatype", "1");
306-
309+
mockRequest.setParameter("concept.conceptClass", "1");
310+
307311
ModelAndView mav = conceptFormController.handleRequest(mockRequest, response);
308312
assertNotNull(mav);
309313
assertTrue(mav.getModel().isEmpty());
@@ -359,7 +363,8 @@ public void shouldAddConceptWithAllNamingSpecified() throws Exception {
359363
mockRequest.setParameter("descriptionsByLocale[en_GB].description", EXPECTED_DESCRIPTION);
360364
mockRequest.setParameter("namesByLocale[en_GB].name", EXPECTED_PREFERRED_NAME);
361365
mockRequest.setParameter("concept.datatype", "1");
362-
366+
mockRequest.setParameter("concept.conceptClass", "1");
367+
363368
ModelAndView mav = conceptFormController.handleRequest(mockRequest, response);
364369
assertNotNull(mav);
365370
assertTrue(mav.getModel().isEmpty());
@@ -411,7 +416,8 @@ public void shouldUpdateConceptWithNameAlreadyInSynonymList() throws Exception {
411416
mockRequest.setParameter("descriptionsByLocale[en_GB].description", EXPECTED_DESCRIPTION);
412417
mockRequest.setParameter("namesByLocale[en_GB].name", EXPECTED_PREFERRED_NAME);
413418
mockRequest.setParameter("concept.datatype", "1");
414-
419+
mockRequest.setParameter("concept.conceptClass", "1");
420+
415421
ModelAndView mav = conceptFormController.handleRequest(mockRequest, response);
416422
assertNotNull(mav);
417423
assertTrue(mav.getModel().isEmpty());
@@ -460,6 +466,7 @@ public void shouldUpdateConceptWithShortNameAlreadyInSynonymList() throws Except
460466
mockRequest.setParameter("descriptionsByLocale[en_GB].description", EXPECTED_DESCRIPTION);
461467
mockRequest.setParameter("namesByLocale[en_GB].name", EXPECTED_PREFERRED_NAME);
462468
mockRequest.setParameter("concept.datatype", "1");
469+
mockRequest.setParameter("concept.conceptClass", "1");
463470

464471
ModelAndView mav = conceptFormController.handleRequest(mockRequest, response);
465472
assertNotNull(mav);
@@ -596,7 +603,8 @@ public void shouldReplacePreviousDescription() throws Exception {
596603
mockRequest.setParameter("descriptionsByLocale[en_GB].description", EXPECTED_DESCRIPTION);
597604
mockRequest.setParameter("namesByLocale[en_GB].name", EXPECTED_PREFERRED_NAME);
598605
mockRequest.setParameter("concept.datatype", "1");
599-
606+
mockRequest.setParameter("concept.conceptClass", "1");
607+
600608
ModelAndView mav = conceptFormController.handleRequest(mockRequest, response);
601609
assertNotNull(mav);
602610
assertTrue(mav.getModel().isEmpty());
@@ -614,12 +622,12 @@ public void shouldReplacePreviousDescription() throws Exception {
614622
@Test
615623
@Verifies(value = "should copy numeric values into numeric concepts", method = "onSubmit(HttpServletRequest,HttpServletResponse,Object,BindException)")
616624
public void onSubmit_shouldCopyNumericValuesIntoNumericConcepts() throws Exception {
617-
final Double EXPECTED_LOW_ABSOLUTE = 100.0;
625+
final Double EXPECTED_LOW_ABSOLUTE = 50.0;
618626
final Double EXPECTED_LOW_CRITICAL = 103.0;
619627
final Double EXPECTED_LOW_NORMAL = 105.0;
620628
final Double EXPECTED_HI_NORMAL = 110.0;
621629
final Double EXPECTED_HI_CRITICAL = 117.0;
622-
final Double EXPECTED_HI_ABSOLUTE = 120.0;
630+
final Double EXPECTED_HI_ABSOLUTE = 150.0;
623631

624632
ConceptService cs = Context.getConceptService();
625633

@@ -632,6 +640,7 @@ public void onSubmit_shouldCopyNumericValuesIntoNumericConcepts() throws Excepti
632640
mockRequest.setParameter("namesByLocale[en_GB].name", "WEIGHT (KG)");
633641
mockRequest.setParameter("conceptId", "5089");
634642
mockRequest.setParameter("concept.datatype", "1");
643+
mockRequest.setParameter("concept.conceptClass", "1");
635644
mockRequest.setParameter("lowAbsolute", EXPECTED_LOW_ABSOLUTE.toString());
636645
mockRequest.setParameter("lowCritical", EXPECTED_LOW_CRITICAL.toString());
637646
mockRequest.setParameter("lowNormal", EXPECTED_LOW_NORMAL.toString());
@@ -932,6 +941,7 @@ public void onSubmit_shouldAddANewConceptMapWhenCreatingAConcept() throws Except
932941
mockRequest.setParameter("namesByLocale[en_GB].name", conceptName);
933942
mockRequest.setParameter("descriptionsByLocale[en_GB].description", "some description");
934943
mockRequest.setParameter("concept.datatype", "1");
944+
mockRequest.setParameter("concept.conceptClass", "1");
935945
mockRequest.setParameter("conceptMappings[0].conceptReferenceTerm", "1");
936946
mockRequest.setParameter("conceptMappings[0].conceptMapType", "3");
937947

@@ -1254,7 +1264,8 @@ public void shouldSaveConceptAttributeOnCreatingConcept() throws Exception {
12541264
mockRequest.setParameter("descriptionsByLocale[en_GB].description", "some description");
12551265
mockRequest.setParameter("concept.datatype", "1");
12561266
mockRequest.setParameter("attribute.1.new[0]", "2011-04-25");
1257-
1267+
mockRequest.setParameter("concept.conceptClass", "1");
1268+
12581269
ModelAndView mav = conceptFormController.handleRequest(mockRequest, new MockHttpServletResponse());
12591270
assertNotNull(mav);
12601271
assertTrue(mav.getModel().isEmpty());

0 commit comments

Comments
 (0)