diff --git a/omod/pom.xml b/omod/pom.xml
index 5d4d95871..da289e7bf 100755
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -113,6 +113,20 @@
+
+
+
+ org.junit.platform
+ junit-platform-suite-engine
+ 6.0.3
+ test
+
+
+ org.junit.platform
+ junit-platform-launcher
+ 6.0.3
+ test
+
org.openmrs.contrib
diff --git a/omod/src/test/java/org/openmrs/layout/AddressSupportTest.java b/omod/src/test/java/org/openmrs/layout/AddressSupportTest.java
index 0d7e6665f..3788ec17b 100644
--- a/omod/src/test/java/org/openmrs/layout/AddressSupportTest.java
+++ b/omod/src/test/java/org/openmrs/layout/AddressSupportTest.java
@@ -12,14 +12,14 @@
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.api.context.Context;
import org.openmrs.layout.address.AddressSupport;
import org.openmrs.layout.address.AddressTemplate;
import org.openmrs.test.Verifies;
import org.openmrs.util.OpenmrsConstants;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
public class AddressSupportTest extends BaseModuleWebContextSensitiveTest {
@@ -41,12 +41,12 @@ public void getAddressTemplate_shouldSucceedEvenIfDBAddressTemplateClassHasChang
//(in the 'web' package differs from the updated classname in the DB
String newAddressTemplateClass = "org.openmrs.layout.address.AddressTemplate";
String xml = Context.getAdministrationService().getGlobalProperty(OpenmrsConstants.GLOBAL_PROPERTY_ADDRESS_TEMPLATE);
- Assert.assertTrue(StringUtils.contains(xml, newAddressTemplateClass));
- Assert.assertEquals(newAddressTemplateClass, AddressTemplate.class.getName());
+ Assertions.assertTrue(StringUtils.contains(xml, newAddressTemplateClass));
+ Assertions.assertEquals(newAddressTemplateClass, AddressTemplate.class.getName());
AddressSupport addressSupport = AddressSupport.getInstance();
List addressTemplates = addressSupport.getAddressTemplate();
- Assert.assertNotNull(addressTemplates.get(0));
+ Assertions.assertNotNull(addressTemplates.get(0));
}
}
diff --git a/omod/src/test/java/org/openmrs/layout/NameSupportTest.java b/omod/src/test/java/org/openmrs/layout/NameSupportTest.java
index 9649abb47..3a55a3040 100644
--- a/omod/src/test/java/org/openmrs/layout/NameSupportTest.java
+++ b/omod/src/test/java/org/openmrs/layout/NameSupportTest.java
@@ -9,11 +9,11 @@
*/
package org.openmrs.layout;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.layout.name.NameSupport;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
public class NameSupportTest extends BaseModuleWebContextSensitiveTest {
@@ -28,10 +28,10 @@ public class NameSupportTest extends BaseModuleWebContextSensitiveTest {
@Verifies(value = "getInstance() should return a layout.web.name.NameSupport instance", method = "getInstance()")
public void getInstance_shouldFindNameSupportBean() throws Exception {
NameSupport nameSupport = NameSupport.getInstance();
- Assert.assertNotNull(nameSupport);
- Assert.assertNotNull(nameSupport.getDefaultLayoutFormat());
+ Assertions.assertNotNull(nameSupport);
+ Assertions.assertNotNull(nameSupport.getDefaultLayoutFormat());
//make sure that all 5 layout templates defined at the time of the package change continue to work
- Assert.assertTrue(nameSupport.getLayoutTemplates().size() >= 5);
+ Assertions.assertTrue(nameSupport.getLayoutTemplates().size() >= 5);
}
}
diff --git a/omod/src/test/java/org/openmrs/module/web/controller/ModuleListControllerTest.java b/omod/src/test/java/org/openmrs/module/web/controller/ModuleListControllerTest.java
index 04a1623ed..86ab7d463 100644
--- a/omod/src/test/java/org/openmrs/module/web/controller/ModuleListControllerTest.java
+++ b/omod/src/test/java/org/openmrs/module/web/controller/ModuleListControllerTest.java
@@ -12,9 +12,9 @@
import java.util.Arrays;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openmrs.module.Module;
public class ModuleListControllerTest {
@@ -34,10 +34,10 @@ public void sortStartupOrder_shouldSortModulesCorrectly() throws Exception {
List list = new ModuleListController().sortStartupOrder(Arrays.asList(appframework, kenyaemr, kenyaemr,
uilibrary));
- Assert.assertSame(uilibrary, list.get(0));
- Assert.assertSame(appframework, list.get(1));
- Assert.assertSame(kenyaemr, list.get(2));
- Assert.assertSame(kenyaemr, list.get(3));
+ Assertions.assertSame(uilibrary, list.get(0));
+ Assertions.assertSame(appframework, list.get(1));
+ Assertions.assertSame(kenyaemr, list.get(2));
+ Assertions.assertSame(kenyaemr, list.get(3));
}
/**
diff --git a/omod/src/test/java/org/openmrs/module/web/extension/ExtensionUtilTest.java b/omod/src/test/java/org/openmrs/module/web/extension/ExtensionUtilTest.java
index ea55a4318..840120464 100644
--- a/omod/src/test/java/org/openmrs/module/web/extension/ExtensionUtilTest.java
+++ b/omod/src/test/java/org/openmrs/module/web/extension/ExtensionUtilTest.java
@@ -9,9 +9,9 @@
*/
package org.openmrs.module.web.extension;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.when;
@@ -21,7 +21,7 @@
import java.util.List;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.MockedStatic;
import org.mockito.junit.jupiter.MockitoExtension;
diff --git a/omod/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java b/omod/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java
index 01a42c488..52956375a 100644
--- a/omod/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java
@@ -9,8 +9,8 @@
*/
package org.openmrs.scheduler.web.controller;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -19,15 +19,15 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openmrs.api.context.Context;
import org.openmrs.scheduler.SchedulerService;
import org.openmrs.scheduler.Task;
import org.openmrs.scheduler.TaskDefinition;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -56,7 +56,7 @@ public class SchedulerFormControllerTest extends BaseModuleWebContextSensitiveTe
// in applicationContext-service.xml at the time of coding (Jan 2013)
private SchedulerService service;
- @Before
+ @BeforeEach
public void setUpSchedulerService() throws Exception {
executeDataSet(INITIAL_SCHEDULER_TASK_CONFIG_XML);
@@ -86,7 +86,7 @@ public void onSubmit_shouldRescheduleACurrentlyScheduledTask() throws Exception
assertNotNull(mav);
assertTrue(mav.getModel().isEmpty());
- Assert.assertNotSame(oldTaskInstance, task.getTaskInstance());
+ Assertions.assertNotSame(oldTaskInstance, task.getTaskInstance());
}
/**
@@ -106,7 +106,7 @@ public void onSubmit_shouldNotRescheduleATaskThatIsNotCurrentlyScheduled() throw
assertNotNull(mav);
assertTrue(mav.getModel().isEmpty());
- Assert.assertSame(oldTaskInstance, task.getTaskInstance());
+ Assertions.assertSame(oldTaskInstance, task.getTaskInstance());
}
/**
@@ -126,7 +126,7 @@ public void onSubmit_shouldNotRescheduleATaskIfTheStartTimeHasPassed() throws Ex
assertNotNull(mav);
assertTrue(mav.getModel().isEmpty());
- Assert.assertSame(oldTaskInstance, task.getTaskInstance());
+ Assertions.assertSame(oldTaskInstance, task.getTaskInstance());
}
/**
@@ -148,7 +148,7 @@ public void onSubmit_shouldNotRescheduleAnExecutingTask() throws Exception {
assertNotNull(mav);
assertTrue(mav.getModel().isEmpty());
- Assert.assertSame(oldTaskInstance, task.getTaskInstance());
+ Assertions.assertSame(oldTaskInstance, task.getTaskInstance());
deleteAllData();
}
@@ -167,9 +167,9 @@ public void processFormSubmission_shouldNotThrowNullPointerExceptionIfRepeatInte
ModelAndView mav = controller.handleRequest(mockRequest, new MockHttpServletResponse());
assertNotNull(mav);
- Assert.assertNotNull(task.getRepeatInterval());
+ Assertions.assertNotNull(task.getRepeatInterval());
Long interval = 0L;
- Assert.assertEquals(interval, task.getRepeatInterval());
+ Assertions.assertEquals(interval, task.getRepeatInterval());
}
}
diff --git a/omod/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormTest.java b/omod/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormTest.java
index 982a3783d..2152c49bd 100644
--- a/omod/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormTest.java
+++ b/omod/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormTest.java
@@ -9,12 +9,12 @@
*/
package org.openmrs.scheduler.web.controller;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import jakarta.servlet.http.HttpServletRequest;
-import org.junit.Test;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.junit.jupiter.api.Test;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
diff --git a/omod/src/test/java/org/openmrs/scheduler/web/controller/TaskHelperTest.java b/omod/src/test/java/org/openmrs/scheduler/web/controller/TaskHelperTest.java
index 2f636fdff..4918ed1e4 100644
--- a/omod/src/test/java/org/openmrs/scheduler/web/controller/TaskHelperTest.java
+++ b/omod/src/test/java/org/openmrs/scheduler/web/controller/TaskHelperTest.java
@@ -13,14 +13,14 @@
import java.util.Date;
import java.util.concurrent.TimeoutException;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openmrs.api.context.Context;
import org.openmrs.scheduler.SchedulerException;
import org.openmrs.scheduler.SchedulerService;
import org.openmrs.scheduler.TaskDefinition;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
public class TaskHelperTest extends BaseModuleWebContextSensitiveTest {
@@ -32,7 +32,7 @@ public class TaskHelperTest extends BaseModuleWebContextSensitiveTest {
private TaskHelper taskHelper;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
executeDataSet(INITIAL_SCHEDULER_TASK_CONFIG_XML);
@@ -47,7 +47,7 @@ public void setUp() throws Exception {
@Test
public void getTime_shouldGetATimeInTheFuture() throws Exception {
Date then = taskHelper.getTime(Calendar.SECOND, 123);
- Assert.assertTrue(then.after(new Date()));
+ Assertions.assertTrue(then.after(new Date()));
}
/**
@@ -57,7 +57,7 @@ public void getTime_shouldGetATimeInTheFuture() throws Exception {
@Test
public void getTime_shouldGetATimeInThePast() throws Exception {
Date then = taskHelper.getTime(Calendar.SECOND, -123);
- Assert.assertTrue(then.before(new Date()));
+ Assertions.assertTrue(then.before(new Date()));
}
/**
@@ -68,7 +68,7 @@ public void getTime_shouldGetATimeInThePast() throws Exception {
public void getScheduledTaskDefinition_shouldReturnATaskThatHasBeenStarted() throws Exception {
Date time = taskHelper.getTime(Calendar.SECOND, 1);
TaskDefinition task = taskHelper.getScheduledTaskDefinition(time);
- Assert.assertTrue(task.getStarted());
+ Assertions.assertTrue(task.getStarted());
}
/**
@@ -79,7 +79,7 @@ public void getScheduledTaskDefinition_shouldReturnATaskThatHasBeenStarted() thr
public void getUnscheduledTaskDefinition_shouldReturnATaskThatHasNotBeenStarted() throws Exception {
Date time = taskHelper.getTime(Calendar.SECOND, 1);
TaskDefinition task = taskHelper.getUnscheduledTaskDefinition(time);
- Assert.assertFalse(task.getStarted());
+ Assertions.assertFalse(task.getStarted());
}
/**
@@ -92,7 +92,7 @@ public void waitUntilTaskIsExecuting_shouldWaitUntilTaskIsExecuting() throws Exc
TaskDefinition task = taskHelper.getScheduledTaskDefinition(time);
taskHelper.waitUntilTaskIsExecuting(task, MAX_WAIT_TIME_IN_MILLISECONDS);
- Assert.assertTrue(task.getTaskInstance().isExecuting());
+ Assertions.assertTrue(task.getTaskInstance().isExecuting());
deleteAllData();
}
@@ -100,11 +100,13 @@ public void waitUntilTaskIsExecuting_shouldWaitUntilTaskIsExecuting() throws Exc
* @verifies raise a timeout exception when the timeout is exceeded
* @see TaskHelper#waitUntilTaskIsExecuting(org.openmrs.scheduler.TaskDefinition, long)
*/
- @Test(expected = TimeoutException.class)
+ @Test
public void waitUntilTaskIsExecuting_shouldRaiseATimeoutExceptionWhenTheTimeoutIsExceeded() throws SchedulerException,
- TimeoutException, InterruptedException {
- Date time = taskHelper.getTime(Calendar.MINUTE, 1);
- TaskDefinition task = taskHelper.getScheduledTaskDefinition(time);
- taskHelper.waitUntilTaskIsExecuting(task, 10);
+ InterruptedException {
+ Assertions.assertThrows(TimeoutException.class, () -> {
+ Date time = taskHelper.getTime(Calendar.MINUTE, 1);
+ TaskDefinition task = taskHelper.getScheduledTaskDefinition(time);
+ taskHelper.waitUntilTaskIsExecuting(task, 10);
+ });
}
}
diff --git a/omod/src/test/java/org/openmrs/web/attribute/handler/BaseMetadataFieldGenDatatypeHandlerTest.java b/omod/src/test/java/org/openmrs/web/attribute/handler/BaseMetadataFieldGenDatatypeHandlerTest.java
index 45694a0c9..732fa4b99 100644
--- a/omod/src/test/java/org/openmrs/web/attribute/handler/BaseMetadataFieldGenDatatypeHandlerTest.java
+++ b/omod/src/test/java/org/openmrs/web/attribute/handler/BaseMetadataFieldGenDatatypeHandlerTest.java
@@ -9,14 +9,14 @@
*/
package org.openmrs.web.attribute.handler;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openmrs.Location;
import org.openmrs.customdatatype.CustomDatatype;
import org.openmrs.customdatatype.datatype.MockLocationDatatype;
diff --git a/omod/src/test/java/org/openmrs/web/attribute/handler/RegexValidatedTextDatatypeHandlerTest.java b/omod/src/test/java/org/openmrs/web/attribute/handler/RegexValidatedTextDatatypeHandlerTest.java
index f1cee9fc4..62f913386 100644
--- a/omod/src/test/java/org/openmrs/web/attribute/handler/RegexValidatedTextDatatypeHandlerTest.java
+++ b/omod/src/test/java/org/openmrs/web/attribute/handler/RegexValidatedTextDatatypeHandlerTest.java
@@ -9,16 +9,15 @@
*/
package org.openmrs.web.attribute.handler;
+import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.hamcrest.MatcherAssert.assertThat;
import jakarta.servlet.http.HttpServletRequest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
import org.openmrs.customdatatype.CustomDatatype;
import org.openmrs.customdatatype.InvalidCustomValueException;
import org.openmrs.customdatatype.datatype.RegexValidatedTextDatatype;
@@ -29,9 +28,6 @@
*/
public class RegexValidatedTextDatatypeHandlerTest {
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
private final RegexValidatedTextDatatypeHandler handler = new RegexValidatedTextDatatypeHandler();
/**
@@ -71,9 +67,9 @@ public void getValue_shouldThrowInvalidCustomValueExceptionIfAttributeValueFromR
RegexValidatedTextDatatype datatype = new RegexValidatedTextDatatype();
datatype.setConfiguration("^[012]$");
- expectedException.expect(InvalidCustomValueException.class);
- expectedException.expectMessage("Invalid value: " + invalidFieldValue);
- handler.getValue(datatype, request, fieldName);
+ InvalidCustomValueException ex = org.junit.jupiter.api.Assertions.assertThrows(InvalidCustomValueException.class,
+ () -> handler.getValue(datatype, request, fieldName));
+ assertThat(ex.getMessage(), containsString("Invalid value: " + invalidFieldValue));
}
/**
diff --git a/omod/src/test/java/org/openmrs/web/attribute/handler/SerializingFieldGenDatatypeHandlerTest.java b/omod/src/test/java/org/openmrs/web/attribute/handler/SerializingFieldGenDatatypeHandlerTest.java
index fabba219c..55222da48 100644
--- a/omod/src/test/java/org/openmrs/web/attribute/handler/SerializingFieldGenDatatypeHandlerTest.java
+++ b/omod/src/test/java/org/openmrs/web/attribute/handler/SerializingFieldGenDatatypeHandlerTest.java
@@ -9,15 +9,15 @@
*/
package org.openmrs.web.attribute.handler;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.Concept;
import org.openmrs.Location;
import org.openmrs.Program;
@@ -28,7 +28,7 @@
import org.openmrs.customdatatype.datatype.MockLocationDatatype;
import org.openmrs.customdatatype.datatype.ProgramDatatype;
import org.openmrs.customdatatype.datatype.ProviderDatatype;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
public class SerializingFieldGenDatatypeHandlerTest extends BaseModuleWebContextSensitiveTest {
@@ -48,7 +48,7 @@ public void getValue_shouldReturnTheCorrectTypedValue() throws Exception {
MockLocationDatatype datatype = mock(MockLocationDatatype.class);
when(datatype.deserialize(eq(locationUuid))).thenReturn(expectedLocation);
SerializingFieldGenDatatypeHandler handler = new MockLocationFieldGenDatatypeHandler();
- Assert.assertEquals(expectedLocation, handler.getValue(datatype, request, formFieldName));
+ Assertions.assertEquals(expectedLocation, handler.getValue(datatype, request, formFieldName));
}
@Test
@@ -58,10 +58,8 @@ public void getValue_givenEmptyValue_shouldReturnNull() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest();
request.setParameter(formFieldName, locationUuid);
MockLocationDatatype datatype = mock(MockLocationDatatype.class);
- Location expectedLocation = mock(Location.class);
- when(datatype.deserialize(eq(locationUuid))).thenReturn(expectedLocation);
SerializingFieldGenDatatypeHandler handler = new MockLocationFieldGenDatatypeHandler();
- Assert.assertNull(handler.getValue(datatype, request, formFieldName));
+ Assertions.assertNull(handler.getValue(datatype, request, formFieldName));
}
@Test
diff --git a/omod/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
index 042f400ed..fa93bf792 100644
--- a/omod/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
@@ -13,11 +13,11 @@
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Collection;
import java.util.Locale;
@@ -25,9 +25,9 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openmrs.Concept;
import org.openmrs.ConceptAnswer;
import org.openmrs.ConceptAttribute;
@@ -49,7 +49,7 @@
import org.openmrs.util.LocaleUtility;
import org.openmrs.util.OpenmrsConstants;
import org.openmrs.web.controller.ConceptFormController.ConceptFormBackingObject;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.openmrs.web.test.WebTestHelper;
import org.openmrs.web.test.WebTestHelper.Response;
import org.springframework.beans.factory.ObjectFactory;
@@ -81,7 +81,7 @@ public class ConceptFormControllerTest extends BaseModuleWebContextSensitiveTest
protected static final String CONCEPT_ATTRIBUTES_XML = "org/openmrs/api/include/ConceptServiceTest-conceptAttributeType.xml";
- @Before
+ @BeforeEach
public void updateSearchIndex() {
super.updateSearchIndex();
if (britishEn == null) {
@@ -108,7 +108,7 @@ public void shouldGetConcept() throws Exception {
// make sure there is an "conceptId" filled in on the concept
ConceptFormBackingObject command = (ConceptFormBackingObject) modelAndView.getModel().get("command");
- Assert.assertNotNull(command.getConcept().getConceptId());
+ Assertions.assertNotNull(command.getConcept().getConceptId());
}
@@ -145,8 +145,8 @@ public void shouldNotDeleteConceptsWhenConceptsAreLocked() throws Exception {
// send the parameters to the controller
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertNotSame("The purge attempt should have failed!", "index.htm", mav.getViewName());
- Assert.assertNotNull(cs.getConcept(3));
+ Assertions.assertNotSame("index.htm", mav.getViewName(), "The purge attempt should have failed!");
+ Assertions.assertNotNull(cs.getConcept(3));
}
@@ -652,12 +652,12 @@ public void onSubmit_shouldCopyNumericValuesIntoNumericConcepts() throws Excepti
assertTrue(mav.getModel().isEmpty());
ConceptNumeric concept = (ConceptNumeric) cs.getConcept(5089);
- Assert.assertEquals(EXPECTED_LOW_NORMAL, concept.getLowNormal());
- Assert.assertEquals(EXPECTED_HI_NORMAL, concept.getHiNormal());
- Assert.assertEquals(EXPECTED_LOW_ABSOLUTE, concept.getLowAbsolute());
- Assert.assertEquals(EXPECTED_HI_ABSOLUTE, concept.getHiAbsolute());
- Assert.assertEquals(EXPECTED_LOW_CRITICAL, concept.getLowCritical());
- Assert.assertEquals(EXPECTED_HI_CRITICAL, concept.getHiCritical());
+ Assertions.assertEquals(EXPECTED_LOW_NORMAL, concept.getLowNormal());
+ Assertions.assertEquals(EXPECTED_HI_NORMAL, concept.getHiNormal());
+ Assertions.assertEquals(EXPECTED_LOW_ABSOLUTE, concept.getLowAbsolute());
+ Assertions.assertEquals(EXPECTED_HI_ABSOLUTE, concept.getHiAbsolute());
+ Assertions.assertEquals(EXPECTED_LOW_CRITICAL, concept.getLowCritical());
+ Assertions.assertEquals(EXPECTED_HI_CRITICAL, concept.getHiCritical());
}
/**
@@ -684,12 +684,12 @@ public void onSubmit_shouldDisplayNumericValuesFromTable() throws Exception {
assertNotNull(mav);
ConceptFormBackingObject formBackingObject = (ConceptFormBackingObject) mav.getModel().get("command");
- Assert.assertEquals(EXPECTED_LOW_NORMAL, formBackingObject.getLowNormal());
- Assert.assertEquals(EXPECTED_HI_NORMAL, formBackingObject.getHiNormal());
- Assert.assertEquals(EXPECTED_LOW_ABSOLUTE, formBackingObject.getLowAbsolute());
- Assert.assertEquals(EXPECTED_HI_ABSOLUTE, formBackingObject.getHiAbsolute());
- Assert.assertEquals(EXPECTED_LOW_CRITICAL, formBackingObject.getLowCritical());
- Assert.assertEquals(EXPECTED_HI_CRITICAL, formBackingObject.getHiCritical());
+ Assertions.assertEquals(EXPECTED_LOW_NORMAL, formBackingObject.getLowNormal());
+ Assertions.assertEquals(EXPECTED_HI_NORMAL, formBackingObject.getHiNormal());
+ Assertions.assertEquals(EXPECTED_LOW_ABSOLUTE, formBackingObject.getLowAbsolute());
+ Assertions.assertEquals(EXPECTED_HI_ABSOLUTE, formBackingObject.getHiAbsolute());
+ Assertions.assertEquals(EXPECTED_LOW_CRITICAL, formBackingObject.getLowCritical());
+ Assertions.assertEquals(EXPECTED_HI_CRITICAL, formBackingObject.getHiCritical());
}
/**
@@ -840,7 +840,7 @@ public void onSubmit_shouldSetTheLocalPreferredName() throws Exception {
ConceptService cs = Context.getConceptService();
Concept concept = cs.getConcept(5497);
//sanity check, the current preferred Name should be different from what will get set in the form
- Assert.assertNotSame("CD3+CD4+ABS CNT", concept.getPreferredName(britishEn).getName());
+ Assertions.assertNotSame("CD3+CD4+ABS CNT", concept.getPreferredName(britishEn).getName());
ConceptFormController conceptFormController = conceptFormProvider.getObject();
MockHttpServletRequest mockRequest = new MockHttpServletRequest();
@@ -853,9 +853,9 @@ public void onSubmit_shouldSetTheLocalPreferredName() throws Exception {
assertNotNull(mav);
assertTrue(mav.getModel().isEmpty());
- Assert.assertEquals("CD3+CD4+ABS CNT", concept.getPreferredName(britishEn).getName());
+ Assertions.assertEquals("CD3+CD4+ABS CNT", concept.getPreferredName(britishEn).getName());
//preferred name should be the new one that has been set from the form
- Assert.assertEquals(true, concept.getPreferredName(britishEn).isLocalePreferred());
+ Assertions.assertEquals(true, concept.getPreferredName(britishEn).isLocalePreferred());
}
/**
@@ -884,7 +884,7 @@ public void onSubmit_shouldVoidASynonymMarkedAsPreferredWhenItIsRemoved() throws
assertNotNull(mav);
assertTrue(mav.getModel().isEmpty());
- Assert.assertEquals(true, preferredName.isVoided());
+ Assertions.assertEquals(true, preferredName.isVoided());
}
/**
@@ -950,7 +950,7 @@ public void onSubmit_shouldAddANewConceptMapWhenCreatingAConcept() throws Except
Concept createdConcept = cs.getConceptByName(conceptName);
assertNotNull(createdConcept);
- Assert.assertEquals(1, createdConcept.getConceptMappings().size());
+ Assertions.assertEquals(1, createdConcept.getConceptMappings().size());
}
/**
@@ -1032,8 +1032,8 @@ public void validateConceptReferenceTermUsesPersistedObjects_shouldAddErrorIfMap
concept.addConceptMapping(new ConceptMap(term, new ConceptMapType(1)));
BindException errors = new BindException(concept, "concept");
new ConceptFormController().validateConceptUsesPersistedObjects(concept, errors);
- Assert.assertEquals(1, errors.getErrorCount());
- Assert.assertEquals(true,
+ Assertions.assertEquals(1, errors.getErrorCount());
+ Assertions.assertEquals(true,
errors.hasFieldErrors("conceptMappings[0].conceptReferenceTerm.conceptReferenceTermMaps[0].conceptMapType"));
}
@@ -1052,8 +1052,8 @@ public void validateConceptReferenceTermUsesPersistedObjects_shouldAddErrorIfSou
concept.addConceptMapping(new ConceptMap(term, new ConceptMapType(1)));
BindException errors = new BindException(concept, "concept");
new ConceptFormController().validateConceptUsesPersistedObjects(concept, errors);
- Assert.assertEquals(1, errors.getErrorCount());
- Assert.assertEquals(true, errors.hasFieldErrors("conceptMappings[0].conceptReferenceTerm.conceptSource"));
+ Assertions.assertEquals(1, errors.getErrorCount());
+ Assertions.assertEquals(true, errors.hasFieldErrors("conceptMappings[0].conceptReferenceTerm.conceptSource"));
}
/**
@@ -1071,8 +1071,8 @@ public void validateConceptReferenceTermUsesPersistedObjects_shouldAddErrorIfTer
concept.addConceptMapping(new ConceptMap(term, new ConceptMapType(1)));
BindException errors = new BindException(concept, "concept");
new ConceptFormController().validateConceptUsesPersistedObjects(concept, errors);
- Assert.assertEquals(1, errors.getErrorCount());
- Assert.assertEquals(true,
+ Assertions.assertEquals(1, errors.getErrorCount());
+ Assertions.assertEquals(true,
errors.hasFieldErrors("conceptMappings[0].conceptReferenceTerm.conceptReferenceTermMaps[0].termB"));
}
@@ -1304,9 +1304,9 @@ public void shouldNotVoidOrChangeAttributeListIfTheAttributeValuesAreSame() thro
ConceptFormController conceptFormController = conceptFormProvider.getObject();
conceptFormController.handleRequest(mockHttpServletRequest, new MockHttpServletResponse());
- Assert.assertEquals(1, concept.getAttributes().size());
- Assert.assertFalse(((ConceptAttribute) (concept.getAttributes().toArray()[0])).getVoided());
- Assert.assertFalse(errors.hasErrors());
+ Assertions.assertEquals(1, concept.getAttributes().size());
+ Assertions.assertFalse(((ConceptAttribute) (concept.getAttributes().toArray()[0])).getVoided());
+ Assertions.assertFalse(errors.hasErrors());
}
/**
@@ -1331,9 +1331,9 @@ public void shouldSetAttributesToVoidIfTheValueIsNotSet() throws Exception {
ConceptFormController conceptFormController = conceptFormProvider.getObject();
conceptFormController.handleRequest(mockHttpServletRequest, new MockHttpServletResponse());
- Assert.assertEquals(1, concept.getAttributes().size());
- Assert.assertTrue(((ConceptAttribute) (concept.getAttributes().toArray()[0])).getVoided());
- Assert.assertFalse(errors.hasErrors());
+ Assertions.assertEquals(1, concept.getAttributes().size());
+ Assertions.assertTrue(((ConceptAttribute) (concept.getAttributes().toArray()[0])).getVoided());
+ Assertions.assertFalse(errors.hasErrors());
}
/**
@@ -1381,7 +1381,7 @@ public void shouldSetAttributesToVoidIfTheValueIsNotSet() throws Exception {
* Class.forName("org.openmrs.ConceptReferenceRange"); Method getReferenceRangesMethod =
* ConceptNumeric.class.getMethod("getReferenceRanges", referenceRangeClass); Set
* listOfReferenceRanges = (Set) getReferenceRangesMethod.invoke(createdConcept, null);
- * Assert.assertEquals(1, listOfReferenceRanges.size()); } // /** // * @see
+ * Assertions.assertEquals(1, listOfReferenceRanges.size()); } // /** // * @see
* ConceptFormController#onSubmit(HttpServletRequest, HttpServletResponse, Object, // *
* BindException) // /
* @Test public void onSubmit_shouldIgnoreNewConceptReferenceRowIfTheUserDidNotEnterAnyData()
@@ -1430,7 +1430,7 @@ public void shouldSetAttributesToVoidIfTheValueIsNotSet() throws Exception {
* updateConceptReferenceRange(referenceRange, conceptNumeric); BindException errors = new
* BindException(conceptNumeric, "conceptNumeric"); new
* ConceptFormValidator().validateConceptReferenceRange(conceptNumeric, errors);
- * Assert.assertEquals(1, errors.getErrorCount());
+ * Assertions.assertEquals(1, errors.getErrorCount());
* assertTrue(errors.hasFieldErrors("referenceRanges[0].hiAbsolute"));
* assertTrue(errors.hasFieldErrors("referenceRanges[0].lowAbsolute")); } private void
* updateConceptReferenceRange( ConceptReferenceRange webReferenceRange, ConceptNumeric
diff --git a/omod/src/test/java/org/openmrs/web/controller/ForgotPasswordFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/ForgotPasswordFormControllerTest.java
index e5021dd5a..6577fd08b 100644
--- a/omod/src/test/java/org/openmrs/web/controller/ForgotPasswordFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/ForgotPasswordFormControllerTest.java
@@ -14,12 +14,12 @@
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openmrs.api.context.Context;
import org.openmrs.web.WebConstants;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.web.servlet.ModelAndView;
@@ -33,7 +33,7 @@ public class ForgotPasswordFormControllerTest extends BaseModuleWebContextSensit
protected static final String TEST_DATA = "org/openmrs/web/controller/include/ForgotPasswordFormControllerTest.xml";
- @Before
+ @BeforeEach
public void runBeforeEachTest() throws Exception {
executeDataSet(TEST_DATA);
Context.logout();
@@ -58,7 +58,7 @@ public void shouldSetARandomSecretQuestionWhenTheUsernameIsInvalid() throws Exce
controller.handleRequest(request, response);
- Assert.assertEquals("invaliduser", request.getAttribute("uname"));
+ Assertions.assertEquals("invaliduser", request.getAttribute("uname"));
List questions = new ArrayList();
@@ -71,7 +71,7 @@ public void shouldSetARandomSecretQuestionWhenTheUsernameIsInvalid() throws Exce
questions.add(Context.getMessageSourceService().getMessage("Which city were you born in?"));
//Check that one of the fake questions is assigned to the invalid username
- Assert.assertTrue(questions.contains(request.getAttribute("secretQuestion")));
+ Assertions.assertTrue(questions.contains(request.getAttribute("secretQuestion")));
}
@Test
@@ -87,8 +87,8 @@ public void shouldAcceptAsUserWithValidSecretQuestion() throws Exception {
HttpServletResponse response = new MockHttpServletResponse();
ModelAndView mv = controller.handleRequest(request, response);
- Assert.assertEquals("/options.form#Change Login Info", ((RedirectView) mv.getView()).getUrl());
- Assert.assertEquals(2, Context.getAuthenticatedUser().getId().intValue());
+ Assertions.assertEquals("/options.form#Change Login Info", ((RedirectView) mv.getView()).getUrl());
+ Assertions.assertEquals(2, Context.getAuthenticatedUser().getId().intValue());
}
/**
@@ -109,10 +109,10 @@ public void shouldFailForAValidUsernameAndInvalidSecretQuestion() throws Excepti
HttpServletResponse response = new MockHttpServletResponse();
controller.handleRequest(request, response);
- Assert.assertEquals("valid secret question", request.getAttribute("secretQuestion"));
- Assert.assertEquals("auth.answer.invalid", request.getSession().getAttribute(WebConstants.OPENMRS_ERROR_ATTR));
- Assert.assertEquals("auth.question.fill", request.getSession().getAttribute(WebConstants.OPENMRS_MSG_ATTR));
- Assert.assertFalse(Context.isAuthenticated());
+ Assertions.assertEquals("valid secret question", request.getAttribute("secretQuestion"));
+ Assertions.assertEquals("auth.answer.invalid", request.getSession().getAttribute(WebConstants.OPENMRS_ERROR_ATTR));
+ Assertions.assertEquals("auth.question.fill", request.getSession().getAttribute(WebConstants.OPENMRS_MSG_ATTR));
+ Assertions.assertFalse(Context.isAuthenticated());
}
/**
@@ -141,7 +141,7 @@ public void shouldLockOutAfterFiveFailedInvalidUsernames() throws Exception {
request.addParameter("uname", "validuser");
controller.handleRequest(request, new MockHttpServletResponse());
- Assert.assertNull(request.getAttribute("secretQuestion"));
+ Assertions.assertNull(request.getAttribute("secretQuestion"));
}
/**
@@ -172,7 +172,7 @@ public void shouldNotAcceptAfterFiveFailedInvalidUsernames() throws Exception {
request.addParameter("secretAnswer", "valid secret answer");
controller.handleRequest(request, new MockHttpServletResponse());
- Assert.assertFalse(Context.isAuthenticated());
+ Assertions.assertFalse(Context.isAuthenticated());
}
/**
@@ -205,7 +205,7 @@ public void shouldLockOutAfterFiveFailedInvalidSecretAnswers() throws Exception
controller.handleRequest(request, new MockHttpServletResponse());
- Assert.assertFalse(Context.isAuthenticated());
+ Assertions.assertFalse(Context.isAuthenticated());
}
/**
@@ -235,7 +235,7 @@ public void shouldGiveUserFiveSecretAnswerAttemptsAfterLessThanFiveFailedUsernam
controller.handleRequest(request, new MockHttpServletResponse());
- Assert.assertNotNull(request.getAttribute("secretQuestion"));
+ Assertions.assertNotNull(request.getAttribute("secretQuestion"));
// now the user has 5 chances at the secret answer
@@ -246,7 +246,7 @@ public void shouldGiveUserFiveSecretAnswerAttemptsAfterLessThanFiveFailedUsernam
request5.addParameter("uname", "validuser");
request5.addParameter("secretAnswer", "invalid answer");
controller.handleRequest(request5, new MockHttpServletResponse());
- Assert.assertNotNull(request5.getAttribute("secretQuestion"));
+ Assertions.assertNotNull(request5.getAttribute("secretQuestion"));
// sixth request (should not lock out because is after valid username)
MockHttpServletRequest request6 = new MockHttpServletRequest();
@@ -256,7 +256,7 @@ public void shouldGiveUserFiveSecretAnswerAttemptsAfterLessThanFiveFailedUsernam
request6.addParameter("secretAnswer", "invalid answer");
request.setMethod("POST");
controller.handleRequest(request6, new MockHttpServletResponse());
- Assert.assertNotNull(request6.getAttribute("secretQuestion"));
+ Assertions.assertNotNull(request6.getAttribute("secretQuestion"));
// seventh request (should Accept with valid answer)
MockHttpServletRequest request7 = new MockHttpServletRequest();
@@ -266,7 +266,7 @@ public void shouldGiveUserFiveSecretAnswerAttemptsAfterLessThanFiveFailedUsernam
request7.addParameter("secretAnswer", "valid secret answer");
controller.handleRequest(request7, new MockHttpServletResponse());
- Assert.assertTrue(Context.isAuthenticated());
+ Assertions.assertTrue(Context.isAuthenticated());
}
@Test
@@ -280,6 +280,6 @@ public void shouldNotAcceptWithInvalidSecretQuestionIfUserIsNull() throws Except
HttpServletResponse response = new MockHttpServletResponse();
controller.handleRequest(request, response);
- Assert.assertFalse(Context.isAuthenticated());
+ Assertions.assertFalse(Context.isAuthenticated());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/GlobalPropertyPortletControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/GlobalPropertyPortletControllerTest.java
index cc6569a58..519977a98 100644
--- a/omod/src/test/java/org/openmrs/web/controller/GlobalPropertyPortletControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/GlobalPropertyPortletControllerTest.java
@@ -16,13 +16,13 @@
import jakarta.servlet.http.HttpServletRequest;
-import junit.framework.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openmrs.GlobalProperty;
import org.openmrs.api.context.Context;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
public class GlobalPropertyPortletControllerTest extends BaseModuleWebContextSensitiveTest {
@@ -49,9 +49,9 @@ public void populateModel_shouldExcludeMultiplePrefixes() throws Exception {
//then
portletController.populateModel(request, model);
List properties = (List) model.get("properties");
- Assert.assertFalse(properties.contains(globalProperties[0]));
- Assert.assertFalse(properties.contains(globalProperties[1]));
- Assert.assertTrue(properties.contains(globalProperties[2]));
+ Assertions.assertFalse(properties.contains(globalProperties[0]));
+ Assertions.assertFalse(properties.contains(globalProperties[1]));
+ Assertions.assertTrue(properties.contains(globalProperties[2]));
}
/**
@@ -70,9 +70,9 @@ public void setupModelForModule_shouldChangeModelIfForModuleIsPresent() throws E
//then
portletController.setupModelForModule(model);
- Assert.assertEquals(forModule + ".", model.get("propertyPrefix"));
- Assert.assertEquals("true", model.get("hidePrefix"));
- Assert.assertEquals(forModule + ".started;" + forModule + ".mandatory", model.get("excludePrefix"));
+ Assertions.assertEquals(forModule + ".", model.get("propertyPrefix"));
+ Assertions.assertEquals("true", model.get("hidePrefix"));
+ Assertions.assertEquals(forModule + ".started;" + forModule + ".mandatory", model.get("excludePrefix"));
}
/**
@@ -89,9 +89,9 @@ public void setupModelForModule_shouldNotChangeModeIfForModuleIsNotPresent() thr
//then
portletController.setupModelForModule(model);
- Assert.assertNull(model.get("propertyPrefix"));
- Assert.assertNull(model.get("hidePrefix"));
- Assert.assertNull(model.get("excludePrefix"));
+ Assertions.assertNull(model.get("propertyPrefix"));
+ Assertions.assertNull(model.get("hidePrefix"));
+ Assertions.assertNull(model.get("excludePrefix"));
}
/**
@@ -112,7 +112,7 @@ public void setupModelForModule_shouldNotOverrideExcludePrefixButConcatenate() t
//then
portletController.setupModelForModule(model);
- Assert.assertEquals(excludePrefix + ";" + forModule + ".started;" + forModule + ".mandatory",
+ Assertions.assertEquals(excludePrefix + ";" + forModule + ".started;" + forModule + ".mandatory",
model.get("excludePrefix"));
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/LoginControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/LoginControllerTest.java
index 15e39c0af..1d7d0dc11 100644
--- a/omod/src/test/java/org/openmrs/web/controller/LoginControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/LoginControllerTest.java
@@ -9,16 +9,16 @@
*/
package org.openmrs.web.controller;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openmrs.web.WebConstants;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.ui.ModelMap;
import org.springframework.web.context.request.ServletWebRequest;
import org.springframework.web.context.request.WebRequest;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
*
diff --git a/omod/src/test/java/org/openmrs/web/controller/OptionsFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/OptionsFormControllerTest.java
index 049496902..ffa27e446 100644
--- a/omod/src/test/java/org/openmrs/web/controller/OptionsFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/OptionsFormControllerTest.java
@@ -11,15 +11,16 @@
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.net.BindException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
+import org.hamcrest.MatcherAssert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openmrs.GlobalProperty;
@@ -145,7 +146,7 @@ public void onSubmit_shouldAcceptEmailAddressAsUsernameIfEnabled() throws Except
testHelper.handle(post);
//then
- Assert.assertThat("ab@gmail.com", is(Context.getAuthenticatedUser().getUsername()));
+ MatcherAssert.assertThat("ab@gmail.com", is(Context.getAuthenticatedUser().getUsername()));
}
/**
@@ -164,7 +165,7 @@ public void onSubmit_shouldRejectInvalidEmailAddressAsUsernameIfEnabled() throws
testHelper.handle(post);
//then
- Assert.assertThat("ab@", is(not(Context.getAuthenticatedUser().getUsername())));
+ MatcherAssert.assertThat("ab@", is(not(Context.getAuthenticatedUser().getUsername())));
}
/**
@@ -181,7 +182,7 @@ public void onSubmit_shouldAccept2CharactersAsUsername() throws Exception {
testHelper.handle(post);
//then
- Assert.assertThat("ab", is(Context.getAuthenticatedUser().getUsername()));
+ MatcherAssert.assertThat("ab", is(Context.getAuthenticatedUser().getUsername()));
}
/**
@@ -198,7 +199,7 @@ public void onSubmit_shouldReject1CharacterAsUsername() throws Exception {
testHelper.handle(post);
//then
- Assert.assertThat("a", is(not(Context.getAuthenticatedUser().getUsername())));
+ MatcherAssert.assertThat("a", is(not(Context.getAuthenticatedUser().getUsername())));
}
@Test
@@ -216,7 +217,7 @@ public void shouldRejectInvalidNotificationAddress() throws Exception {
BeanPropertyBindingResult bindingResult = (BeanPropertyBindingResult) modelAndView.getModel().get(
"org.springframework.validation.BindingResult.opts");
- Assert.assertTrue(bindingResult.hasErrors());
+ Assertions.assertTrue(bindingResult.hasErrors());
}
@Test
@@ -248,7 +249,7 @@ public void shouldRejectEmptyNotificationAddress() throws Exception {
BeanPropertyBindingResult bindingResult = (BeanPropertyBindingResult) modelAndView.getModel().get(
"org.springframework.validation.BindingResult.opts");
- Assert.assertTrue(bindingResult.hasErrors());
+ Assertions.assertTrue(bindingResult.hasErrors());
}
@Test
@@ -263,9 +264,9 @@ public void shouldNotOverwriteUserSecretQuestionOrAnswerWhenChangingPassword() t
request.setParameter("secretAnswerConfirm", "easy answer");
controller.handleRequest(request, response);
- Assert.assertEquals("easy question", loginCredential.getSecretQuestion());
+ Assertions.assertEquals("easy question", loginCredential.getSecretQuestion());
String hashedAnswer = Security.encodeString("easy answer" + loginCredential.getSalt());
- Assert.assertEquals(hashedAnswer, loginCredential.getSecretAnswer());
+ Assertions.assertEquals(hashedAnswer, loginCredential.getSecretAnswer());
String oldPassword = loginCredential.getHashedPassword();
request.removeAllParameters();
@@ -279,7 +280,7 @@ public void shouldNotOverwriteUserSecretQuestionOrAnswerWhenChangingPassword() t
request.setParameter("secretQuestionNew", "");
mav = controller.handleRequest(request, response);
}
- Assert.assertEquals(hashedAnswer, loginCredential.getSecretAnswer());
- Assert.assertEquals("easy question", loginCredential.getSecretQuestion());
+ Assertions.assertEquals(hashedAnswer, loginCredential.getSecretAnswer());
+ Assertions.assertEquals("easy question", loginCredential.getSecretQuestion());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/PortletControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/PortletControllerTest.java
index 6d1178c0e..602cab924 100644
--- a/omod/src/test/java/org/openmrs/web/controller/PortletControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/PortletControllerTest.java
@@ -15,11 +15,11 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.test.Verifies;
import org.openmrs.web.WebConstants;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.web.servlet.ModelAndView;
@@ -59,7 +59,7 @@ private Map getModelFromController(Integer patientId) throws Exc
public void handleRequest_shouldCalculateBmiIntoPatientBmiAsString() throws Exception {
executeDataSet("org/openmrs/web/controller/include/PortletControllerTest-bmi.xml");
Map modelmap = getModelFromController(7);
- Assert.assertEquals("61.7", modelmap.get("patientBmiAsString"));
+ Assertions.assertEquals("61.7", modelmap.get("patientBmiAsString"));
}
/**
@@ -69,6 +69,6 @@ public void handleRequest_shouldCalculateBmiIntoPatientBmiAsString() throws Exce
@Verifies(value = "should not fail with empty height and weight properties", method = "handleRequest(HttpServletRequest,HttpServletResponse)")
public void handleRequest_shouldNotFailWithEmptyHeightAndWeightProperties() throws Exception {
Map modelmap = getModelFromController(7);
- Assert.assertEquals("?", modelmap.get("patientBmiAsString"));
+ Assertions.assertEquals("?", modelmap.get("patientBmiAsString"));
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/UserPropertiesTest.java b/omod/src/test/java/org/openmrs/web/controller/UserPropertiesTest.java
index d8b38739d..a31a4dd59 100644
--- a/omod/src/test/java/org/openmrs/web/controller/UserPropertiesTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/UserPropertiesTest.java
@@ -9,11 +9,11 @@
*/
package org.openmrs.web.controller;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openmrs.User;
import org.openmrs.test.Verifies;
import org.openmrs.util.OpenmrsConstants;
diff --git a/omod/src/test/java/org/openmrs/web/controller/concept/ConceptDrugFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/concept/ConceptDrugFormControllerTest.java
index 2da929326..7376076df 100644
--- a/omod/src/test/java/org/openmrs/web/controller/concept/ConceptDrugFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/concept/ConceptDrugFormControllerTest.java
@@ -9,11 +9,11 @@
*/
package org.openmrs.web.controller.concept;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openmrs.Drug;
import org.openmrs.api.ConceptService;
import org.openmrs.api.context.Context;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.validation.BindException;
@@ -37,7 +37,7 @@ public void onSubmit_shouldPurgeConceptDrug() throws Exception {
Integer drugId = new Integer(444);
Drug drug = service.getDrug(drugId);
- org.junit.Assert.assertEquals(drugId, drug.getDrugId());
+ org.junit.jupiter.api.Assertions.assertEquals(drugId, drug.getDrugId());
MockHttpServletRequest mockHttpServletRequest = new MockHttpServletRequest();
MockHttpServletResponse mockHttpServletResponse = new MockHttpServletResponse();
@@ -46,6 +46,6 @@ public void onSubmit_shouldPurgeConceptDrug() throws Exception {
controller.onSubmit(mockHttpServletRequest, mockHttpServletResponse, drug, errors);
Context.flushSession();
- org.junit.Assert.assertNull(service.getDrug(drugId));
+ org.junit.jupiter.api.Assertions.assertNull(service.getDrug(drugId));
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/concept/ConceptFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/concept/ConceptFormControllerTest.java
index d4447b41d..f7ff2aa31 100644
--- a/omod/src/test/java/org/openmrs/web/controller/concept/ConceptFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/concept/ConceptFormControllerTest.java
@@ -11,19 +11,18 @@
import java.util.ArrayList;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.openmrs.ConceptMap;
import org.openmrs.ConceptNumeric;
import org.openmrs.web.controller.ConceptFormController;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
public class ConceptFormControllerTest extends BaseModuleWebContextSensitiveTest {
@Test
public void ConceptFormBackingObject_shouldCopyNumericAttributes() {
ConceptNumeric concept = Mockito.mock(ConceptNumeric.class);
- Mockito.when(concept.isNumeric()).thenReturn(Boolean.TRUE);
Mockito.when(concept.getHiAbsolute()).thenReturn(5.2);
Mockito.when(concept.getLowAbsolute()).thenReturn(1.0);
@@ -43,18 +42,18 @@ public void ConceptFormBackingObject_shouldCopyNumericAttributes() {
ConceptFormController.ConceptFormBackingObject conceptFormBackingObject = controller.new ConceptFormBackingObject(
concept);
- org.junit.Assert.assertEquals(Double.valueOf(5.2), conceptFormBackingObject.getHiAbsolute());
- org.junit.Assert.assertEquals(Double.valueOf(1.0), conceptFormBackingObject.getLowAbsolute());
+ org.junit.jupiter.api.Assertions.assertEquals(Double.valueOf(5.2), conceptFormBackingObject.getHiAbsolute());
+ org.junit.jupiter.api.Assertions.assertEquals(Double.valueOf(1.0), conceptFormBackingObject.getLowAbsolute());
- org.junit.Assert.assertEquals(Double.valueOf(4.1), conceptFormBackingObject.getHiCritical());
- org.junit.Assert.assertEquals(Double.valueOf(2.1), conceptFormBackingObject.getLowCritical());
+ org.junit.jupiter.api.Assertions.assertEquals(Double.valueOf(4.1), conceptFormBackingObject.getHiCritical());
+ org.junit.jupiter.api.Assertions.assertEquals(Double.valueOf(2.1), conceptFormBackingObject.getLowCritical());
- org.junit.Assert.assertEquals(Double.valueOf(3.1), conceptFormBackingObject.getLowNormal());
- org.junit.Assert.assertEquals(Double.valueOf(3.9), conceptFormBackingObject.getHiNormal());
+ org.junit.jupiter.api.Assertions.assertEquals(Double.valueOf(3.1), conceptFormBackingObject.getLowNormal());
+ org.junit.jupiter.api.Assertions.assertEquals(Double.valueOf(3.9), conceptFormBackingObject.getHiNormal());
- org.junit.Assert.assertEquals(Integer.valueOf(42), conceptFormBackingObject.getDisplayPrecision());
+ org.junit.jupiter.api.Assertions.assertEquals(Integer.valueOf(42), conceptFormBackingObject.getDisplayPrecision());
- org.junit.Assert.assertEquals("ml", conceptFormBackingObject.getUnits());
+ org.junit.jupiter.api.Assertions.assertEquals("ml", conceptFormBackingObject.getUnits());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java
index 28a75f879..483d9c6fc 100644
--- a/omod/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java
@@ -9,8 +9,8 @@
*/
package org.openmrs.web.controller.concept;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import java.util.Locale;
@@ -18,16 +18,16 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import junit.framework.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openmrs.Concept;
import org.openmrs.ConceptProposal;
import org.openmrs.api.ConceptService;
import org.openmrs.api.ObsService;
import org.openmrs.api.context.Context;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockHttpSession;
@@ -52,12 +52,12 @@ public void onSubmit_shouldCreateASingleUniqueSynonymAndObsForAllSimilarProposal
Concept conceptToMap = cs.getConcept(5);
Locale locale = Locale.ENGLISH;
//sanity checks
- Assert.assertFalse(conceptToMap.hasName(cp.getOriginalText(), locale));
- Assert.assertEquals(0, os.getObservationsByPersonAndConcept(cp.getEncounter().getPatient(), obsConcept).size());
+ Assertions.assertFalse(conceptToMap.hasName(cp.getOriginalText(), locale));
+ Assertions.assertEquals(0, os.getObservationsByPersonAndConcept(cp.getEncounter().getPatient(), obsConcept).size());
List proposals = cs.getConceptProposals(cp.getOriginalText());
- Assert.assertEquals(5, proposals.size());
+ Assertions.assertEquals(5, proposals.size());
for (ConceptProposal conceptProposal : proposals) {
- Assert.assertNull(conceptProposal.getObs());
+ Assertions.assertNull(conceptProposal.getObs());
}
// set up the controller
@@ -80,16 +80,16 @@ public void onSubmit_shouldCreateASingleUniqueSynonymAndObsForAllSimilarProposal
assertNotNull(mav);
assertTrue(mav.getModel().isEmpty());
- Assert.assertEquals(cp.getOriginalText(), cp.getFinalText());
- Assert.assertTrue(conceptToMap.hasName(cp.getOriginalText(), locale));
- Assert.assertNotNull(cp.getObs());
+ Assertions.assertEquals(cp.getOriginalText(), cp.getFinalText());
+ Assertions.assertTrue(conceptToMap.hasName(cp.getOriginalText(), locale));
+ Assertions.assertNotNull(cp.getObs());
//Obs should have been created for the 2 proposals with same text, obsConcept but different encounters
- Assert.assertEquals(2, os.getObservationsByPersonAndConcept(cp.getEncounter().getPatient(), obsConcept).size());
+ Assertions.assertEquals(2, os.getObservationsByPersonAndConcept(cp.getEncounter().getPatient(), obsConcept).size());
//The proposal with a different obs concept should have been skipped
proposals = cs.getConceptProposals(cp.getFinalText());
- Assert.assertEquals(1, proposals.size());
- Assert.assertEquals(21, proposals.get(0).getObsConcept().getConceptId().intValue());
+ Assertions.assertEquals(1, proposals.size());
+ Assertions.assertEquals(21, proposals.get(0).getObsConcept().getConceptId().intValue());
}
/**
@@ -107,7 +107,7 @@ public void onSubmit_shouldWorkProperlyForCountryLocales() throws Exception {
Concept conceptToMap = cs.getConcept(4);
Locale locale = new Locale("en", "GB");
- Assert.assertFalse(conceptToMap.hasName(cp.getOriginalText(), locale));
+ Assertions.assertFalse(conceptToMap.hasName(cp.getOriginalText(), locale));
ConceptProposalFormController controller = (ConceptProposalFormController) applicationContext
.getBean("conceptProposalForm");
@@ -128,7 +128,7 @@ public void onSubmit_shouldWorkProperlyForCountryLocales() throws Exception {
assertNotNull(mav);
assertTrue(mav.getModel().isEmpty());
- Assert.assertEquals(cp.getOriginalText(), cp.getFinalText());
- Assert.assertTrue(conceptToMap.hasName(cp.getOriginalText(), locale));
+ Assertions.assertEquals(cp.getOriginalText(), cp.getFinalText());
+ Assertions.assertTrue(conceptToMap.hasName(cp.getOriginalText(), locale));
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/concept/ConceptSourceFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/concept/ConceptSourceFormControllerTest.java
index c7bb7d233..e673bb69c 100644
--- a/omod/src/test/java/org/openmrs/web/controller/concept/ConceptSourceFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/concept/ConceptSourceFormControllerTest.java
@@ -14,13 +14,13 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.ConceptSource;
import org.openmrs.api.ConceptService;
import org.openmrs.api.context.Context;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -48,8 +48,8 @@ public void onSubmit_shouldRetireConceptSource() throws Exception {
controller.handleRequest(mockRequest, new MockHttpServletResponse());
ConceptSource conceptSource = cs.getConceptSource(3);
- Assert.assertTrue(conceptSource.isRetired());
- Assert.assertEquals("dummy reason for retirement", conceptSource.getRetireReason());
+ Assertions.assertTrue(conceptSource.isRetired());
+ Assertions.assertEquals("dummy reason for retirement", conceptSource.getRetireReason());
}
/**
@@ -70,7 +70,7 @@ public void onSubmit_shouldDeleteConceptSource() throws Exception {
controller.handleRequest(mockRequest, new MockHttpServletResponse());
ConceptSource nullConceptSource = cs.getConceptSource(3);
- Assert.assertNull(nullConceptSource);
+ Assertions.assertNull(nullConceptSource);
}
/**
@@ -92,8 +92,8 @@ public void onSubmit_shouldRestoreRetiredConceptSource() throws Exception {
controller.handleRequest(mockRequest, new MockHttpServletResponse());
ConceptSource conceptSource = cs.getConceptSource(3);
- Assert.assertTrue(conceptSource.isRetired());
- Assert.assertEquals("dummy reason for retirement", conceptSource.getRetireReason());
+ Assertions.assertTrue(conceptSource.isRetired());
+ Assertions.assertEquals("dummy reason for retirement", conceptSource.getRetireReason());
MockHttpServletRequest restoreMockRequest = new MockHttpServletRequest();
restoreMockRequest.setMethod("POST");
@@ -103,7 +103,7 @@ public void onSubmit_shouldRestoreRetiredConceptSource() throws Exception {
controller.handleRequest(restoreMockRequest, new MockHttpServletResponse());
ConceptSource newConceptSource = cs.getConceptSource(3);
- Assert.assertNotNull("Error, Object is null", newConceptSource);
- Assert.assertTrue(!newConceptSource.isRetired());
+ Assertions.assertNotNull(newConceptSource, "Error, Object is null");
+ Assertions.assertTrue(!newConceptSource.isRetired());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/concept/ConceptStopWordFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/concept/ConceptStopWordFormControllerTest.java
index e6e852fce..27ce28626 100644
--- a/omod/src/test/java/org/openmrs/web/controller/concept/ConceptStopWordFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/concept/ConceptStopWordFormControllerTest.java
@@ -13,12 +13,12 @@
import jakarta.servlet.http.HttpSession;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.ConceptStopWord;
import org.openmrs.test.Verifies;
import org.openmrs.web.WebConstants;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpSession;
import org.springframework.validation.BindException;
import org.springframework.validation.ObjectError;
@@ -45,8 +45,8 @@ public void handleSubmission_shouldAddNewConceptStopWord() throws Exception {
controller.handleSubmission(mockSession, new ConceptStopWord("As", Locale.ENGLISH), errors);
- Assert.assertEquals("ConceptStopWord.saved", mockSession.getAttribute(WebConstants.OPENMRS_MSG_ATTR));
- Assert.assertNull(mockSession.getAttribute(WebConstants.OPENMRS_ERROR_ATTR));
+ Assertions.assertEquals("ConceptStopWord.saved", mockSession.getAttribute(WebConstants.OPENMRS_MSG_ATTR));
+ Assertions.assertNull(mockSession.getAttribute(WebConstants.OPENMRS_ERROR_ATTR));
}
/**
@@ -69,8 +69,8 @@ public void handleSubmission_shouldReturnErrorMessageForAnEmptyConceptStopWord()
controller.handleSubmission(mockSession, conceptStopWord, errors);
ObjectError objectError = (ObjectError) errors.getAllErrors().get(0);
- Assert.assertTrue(errors.hasErrors());
- Assert.assertEquals(1, errors.getErrorCount());
- Assert.assertEquals("ConceptStopWord.error.value.empty", objectError.getCode());
+ Assertions.assertTrue(errors.hasErrors());
+ Assertions.assertEquals(1, errors.getErrorCount());
+ Assertions.assertEquals("ConceptStopWord.error.value.empty", objectError.getCode());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/concept/ConceptStopWordListControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/concept/ConceptStopWordListControllerTest.java
index 9b7e8e3e8..ecf05849f 100644
--- a/omod/src/test/java/org/openmrs/web/controller/concept/ConceptStopWordListControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/concept/ConceptStopWordListControllerTest.java
@@ -13,12 +13,12 @@
import jakarta.servlet.http.HttpSession;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.ConceptStopWord;
import org.openmrs.test.Verifies;
import org.openmrs.web.WebConstants;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpSession;
@@ -41,8 +41,8 @@ public void showForm_shouldReturnConceptStopWordListView() throws Exception {
String showFormResult = controller.showForm(mockRequest.getSession());
- Assert.assertNotNull(showFormResult);
- Assert.assertEquals("admin/concepts/conceptStopWordList", showFormResult);
+ Assertions.assertNotNull(showFormResult);
+ Assertions.assertEquals("admin/concepts/conceptStopWordList", showFormResult);
}
/**
@@ -62,8 +62,8 @@ public void showForm_shouldAddAllConceptStopWordsInSessionAttribute() throws Exc
List conceptStopWordList = (List) mockRequest.getSession().getAttribute(
"conceptStopWordList");
- Assert.assertNotNull(conceptStopWordList);
- Assert.assertEquals(4, conceptStopWordList.size());
+ Assertions.assertNotNull(conceptStopWordList);
+ Assertions.assertEquals(4, conceptStopWordList.size());
}
/**
@@ -82,8 +82,8 @@ public void handleSubmission_shouldDeleteGivenConceptStopWordFromDB() throws Exc
controller.handleSubmission(mockSession, new String[] { "1" });
List conceptStopWordList = (List) mockSession.getAttribute("conceptStopWordList");
- Assert.assertNotNull(conceptStopWordList);
- Assert.assertEquals(3, conceptStopWordList.size());
+ Assertions.assertNotNull(conceptStopWordList);
+ Assertions.assertEquals(3, conceptStopWordList.size());
}
/**
@@ -103,9 +103,9 @@ public void handleSubmission_shouldAddTheDeleteSuccessMessageInSession() throws
String successMessage = (String) mockSession.getAttribute(WebConstants.OPENMRS_MSG_ATTR);
String errorMessage = (String) mockSession.getAttribute(WebConstants.OPENMRS_ERROR_ATTR);
- Assert.assertNotNull(successMessage);
- Assert.assertNull(errorMessage);
- Assert.assertEquals("general.deleted", successMessage);
+ Assertions.assertNotNull(successMessage);
+ Assertions.assertNull(errorMessage);
+ Assertions.assertEquals("general.deleted", successMessage);
}
/**
@@ -125,8 +125,8 @@ public void handleSubmission_shouldAddTheDeleteErrorMessageInSession() throws Ex
String successMessage = (String) mockSession.getAttribute(WebConstants.OPENMRS_MSG_ATTR);
String errorMessage = (String) mockSession.getAttribute(WebConstants.OPENMRS_ERROR_ATTR);
- Assert.assertNotNull(successMessage);
- Assert.assertNotNull(errorMessage);
- Assert.assertEquals("ConceptStopWord.error.notfound", errorMessage);
+ Assertions.assertNotNull(successMessage);
+ Assertions.assertNotNull(errorMessage);
+ Assertions.assertEquals("ConceptStopWord.error.notfound", errorMessage);
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterFormControllerTest.java
index c5d0b645a..8c7df0a4e 100644
--- a/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterFormControllerTest.java
@@ -9,13 +9,13 @@
*/
package org.openmrs.web.controller.encounter;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.Encounter;
import org.openmrs.Patient;
import org.openmrs.api.context.Context;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.validation.BindException;
@@ -49,18 +49,18 @@ public void onSubmit_shouldSaveANewEncounterRoleObject() throws Exception {
Patient oldPatient = encounter.getPatient();
Patient newPatient = Context.getPatientService().getPatient(201);
- Assert.assertNotEquals(oldPatient, newPatient);
+ Assertions.assertNotEquals(oldPatient, newPatient);
List newEncounter = Context.getEncounterService().getEncountersByPatientId(newPatient.getPatientId());
- Assert.assertEquals(0, newEncounter.size());
+ Assertions.assertEquals(0, newEncounter.size());
BindException errors = new BindException(encounter, "encounterRole");
controller.onSubmit(request, response, encounter, errors);
- Assert.assertEquals(true, encounter.isVoided());
+ Assertions.assertEquals(true, encounter.isVoided());
newEncounter = Context.getEncounterService().getEncountersByPatientId(newPatient.getPatientId());
- Assert.assertEquals(1, newEncounter.size());
- Assert.assertEquals(false, newEncounter.get(0).isVoided());
+ Assertions.assertEquals(1, newEncounter.size());
+ Assertions.assertEquals(false, newEncounter.get(0).isVoided());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterRoleFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterRoleFormControllerTest.java
index 4d4471aff..b7b7a946f 100644
--- a/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterRoleFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterRoleFormControllerTest.java
@@ -13,12 +13,12 @@
import jakarta.servlet.http.HttpSession;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.EncounterRole;
import org.openmrs.api.context.Context;
import org.openmrs.web.WebConstants;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.ui.ModelMap;
import org.springframework.validation.BindException;
@@ -42,7 +42,7 @@ public void saveEncounterRole_shouldSaveANewEncounterRoleObject() throws Excepti
encounterRole.setDescription("person in charge");
BindException errors = new BindException(encounterRole, "encounterRole");
controller.save(session, encounterRole, errors);
- Assert.assertNotNull(encounterRole.getId());
+ Assertions.assertNotNull(encounterRole.getId());
}
@@ -60,8 +60,8 @@ public void saveEncounterRole_shouldRaiseAnErrorIfValidationOfEncounterRoleFails
encounterRole.setDescription("person in charge");
BindException errors = new BindException(encounterRole, "encounterRole");
controller.save(session, encounterRole, errors);
- Assert.assertNull(encounterRole.getId());
- Assert.assertEquals(1, errors.getErrorCount());
+ Assertions.assertNull(encounterRole.getId());
+ Assertions.assertEquals(1, errors.getErrorCount());
}
/**
@@ -82,9 +82,9 @@ public void saveEncounterRole_shouldEditAndSaveAnExistingEncounter() throws Exce
encounterRole.setDescription(description);
BindException errors = new BindException(encounterRole, "encounterRole");
controller.save(session, encounterRole, errors);
- Assert.assertNotNull(encounterRole.getId());
- Assert.assertEquals(roleName, encounterRole.getName());
- Assert.assertEquals(description, encounterRole.getDescription());
+ Assertions.assertNotNull(encounterRole.getId());
+ Assertions.assertEquals(roleName, encounterRole.getName());
+ Assertions.assertEquals(description, encounterRole.getDescription());
}
/**
@@ -102,9 +102,9 @@ public void retire_shouldRetireAnExistingEncounter() throws Exception {
encounterRole.setRetireReason("this role is no more existing");
BindException errors = new BindException(encounterRole, "encounterRole");
controller.retire(session, encounterRole, errors);
- Assert.assertNotNull(encounterRole.getId());
- Assert.assertTrue(encounterRole.isRetired());
- Assert.assertEquals("EncounterRole.retiredSuccessfully", session.getAttribute(WebConstants.OPENMRS_MSG_ATTR));
+ Assertions.assertNotNull(encounterRole.getId());
+ Assertions.assertTrue(encounterRole.isRetired());
+ Assertions.assertEquals("EncounterRole.retiredSuccessfully", session.getAttribute(WebConstants.OPENMRS_MSG_ATTR));
}
/**
@@ -121,8 +121,8 @@ public void unretire_shouldRetireAnExistingEncounter() throws Exception {
EncounterRole encounterRole = Context.getEncounterService().getEncounterRole(2);
BindException errors = new BindException(encounterRole, "encounterRole");
controller.unretire(session, encounterRole, errors);
- Assert.assertFalse(encounterRole.isRetired());
- Assert.assertEquals("EncounterRole.unretired", session.getAttribute(WebConstants.OPENMRS_MSG_ATTR));
+ Assertions.assertFalse(encounterRole.isRetired());
+ Assertions.assertEquals("EncounterRole.unretired", session.getAttribute(WebConstants.OPENMRS_MSG_ATTR));
}
/**
@@ -139,7 +139,7 @@ public void purge_shouldPurgeAnExistingEncounter() throws Exception {
EncounterRole encounterRole = Context.getEncounterService().getEncounterRole(1);
BindException errors = new BindException(encounterRole, "encounterRole");
controller.purge(session, encounterRole, errors);
- Assert.assertEquals("EncounterRole.purgedSuccessfully", session.getAttribute(WebConstants.OPENMRS_MSG_ATTR));
+ Assertions.assertEquals("EncounterRole.purgedSuccessfully", session.getAttribute(WebConstants.OPENMRS_MSG_ATTR));
}
/**
@@ -152,8 +152,8 @@ public void showEncounterList_shouldAddListOfEncounterRoleObjectsToTheModel() th
executeDataSet(ENC_INITIAL_DATA_XML);
EncounterRoleFormController controller = new EncounterRoleFormController();
String viewName = controller.getEncounterList(modelMap);
- Assert.assertEquals("/module/legacyui/admin/encounters/encounterRoleList", viewName);
- Assert.assertEquals(3, ((List) modelMap.get("encounterRoles")).size());
+ Assertions.assertEquals("/module/legacyui/admin/encounters/encounterRoleList", viewName);
+ Assertions.assertEquals(3, ((List) modelMap.get("encounterRoles")).size());
}
/**
@@ -171,7 +171,7 @@ public void retire_shouldRaiseAnErrorIfRetireReasonIsNotFilled() throws Exceptio
encounterRole.setRetireReason(""); //setting empty retire reason so that it will raise an error.
BindException errors = new BindException(encounterRole, "encounterRole");
controller.retire(session, encounterRole, errors);
- Assert.assertEquals(1, errors.getErrorCount());
+ Assertions.assertEquals(1, errors.getErrorCount());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterTypeFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterTypeFormControllerTest.java
index a190473cd..859c0da8d 100644
--- a/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterTypeFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterTypeFormControllerTest.java
@@ -11,11 +11,11 @@
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.api.EncounterService;
import org.openmrs.api.context.Context;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockHttpSession;
@@ -51,9 +51,9 @@ public void shouldNotDeleteEncounterTypeWhenEncounterTypesAreLocked() throws Exc
// send the parameters to the controller
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertEquals("The purge attempt should have failed!", "EncounterType.form", mav.getViewName());
- Assert.assertSame(controller.getFormView(), mav.getViewName());
- Assert.assertNotNull(es.getEncounterType(1));
+ Assertions.assertEquals("EncounterType.form", mav.getViewName(), "The purge attempt should have failed!");
+ Assertions.assertSame(controller.getFormView(), mav.getViewName());
+ Assertions.assertNotNull(es.getEncounterType(1));
}
@Test
@@ -78,8 +78,8 @@ public void shouldSaveEncounterTypeWhenEncounterTypesAreNotLocked() throws Excep
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertSame(controller.getFormView(), mav.getViewName());
- Assert.assertNotEquals("The save attempt should have passed!", "index.htm", mav.getViewName());
- Assert.assertNotNull(es.getEncounterType(1));
+ Assertions.assertSame(controller.getFormView(), mav.getViewName());
+ Assertions.assertNotEquals("index.htm", mav.getViewName(), "The save attempt should have passed!");
+ Assertions.assertNotNull(es.getEncounterType(1));
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterTypeListControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterTypeListControllerTest.java
index bc7962b46..8b61c0b8c 100644
--- a/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterTypeListControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/encounter/EncounterTypeListControllerTest.java
@@ -12,9 +12,9 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.validation.BindException;
diff --git a/omod/src/test/java/org/openmrs/web/controller/encounter/LocationFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/encounter/LocationFormControllerTest.java
index 68620bc39..d66955b0d 100644
--- a/omod/src/test/java/org/openmrs/web/controller/encounter/LocationFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/encounter/LocationFormControllerTest.java
@@ -12,12 +12,12 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.Location;
import org.openmrs.api.context.Context;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.validation.BeanPropertyBindingResult;
@@ -60,7 +60,7 @@ public void onSubmit_shouldNotRetireLocationIfReasonIsEmpty() throws Exception {
// make sure an error is returned because of the empty retire reason
BeanPropertyBindingResult bindingResult = (BeanPropertyBindingResult) modelAndView.getModel().get(
"org.springframework.validation.BindingResult.location");
- Assert.assertTrue(bindingResult.hasFieldErrors("retireReason"));
+ Assertions.assertTrue(bindingResult.hasFieldErrors("retireReason"));
}
/**
@@ -79,7 +79,7 @@ public void onSubmit_shouldRetireLocation() throws Exception {
((SimpleFormController) getLocationFormController()).handleRequest(request, response);
Location retiredLocation = Context.getLocationService().getLocation(1);
- Assert.assertTrue(retiredLocation.isRetired());
+ Assertions.assertTrue(retiredLocation.isRetired());
}
/**
@@ -99,6 +99,6 @@ public void formBackingObject_shouldReturnValidLocationGivenValidLocationId() th
// make sure there is an "locationId" filled in on the concept
Location command = (Location) modelAndView.getModel().get("location");
- Assert.assertNotNull(command.getLocationId());
+ Assertions.assertNotNull(command.getLocationId());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/form/FieldFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/form/FieldFormControllerTest.java
index bf968ece4..7ca62e5b3 100644
--- a/omod/src/test/java/org/openmrs/web/controller/form/FieldFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/form/FieldFormControllerTest.java
@@ -12,12 +12,12 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.Field;
import org.openmrs.api.context.Context;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.transaction.annotation.Transactional;
@@ -48,7 +48,7 @@ public void formBackingObject_shouldGetField() throws Exception {
// make sure there is a "userId" filled in on the concept
Field command = (Field) modelAndView.getModel().get("field");
- Assert.assertNotNull(command.getFieldId());
+ Assertions.assertNotNull(command.getFieldId());
}
/**
@@ -103,6 +103,6 @@ public void onSubmit_shouldPurgeField() throws Exception {
controller.handleRequest(request, response);
- Assert.assertNull(Context.getFormService().getField(Integer.valueOf(FIELD_ID)));
+ Assertions.assertNull(Context.getFormService().getField(Integer.valueOf(FIELD_ID)));
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/form/FieldTypeListControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/form/FieldTypeListControllerTest.java
index 7e6f2f533..381e12b6c 100644
--- a/omod/src/test/java/org/openmrs/web/controller/form/FieldTypeListControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/form/FieldTypeListControllerTest.java
@@ -12,10 +12,10 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.web.WebConstants;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.openmrs.web.test.WebTestHelper;
import org.openmrs.web.test.WebTestHelper.Response;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +43,6 @@ public void onSubmit_shouldDisplayAUserFriendlyErrorMessage() throws Exception {
post.addParameter("fieldTypeId", "1");
Response response = webTestHelper.handle(post);
- Assert.assertNotNull(response.session.getAttribute(WebConstants.OPENMRS_ERROR_ATTR));
+ Assertions.assertNotNull(response.session.getAttribute(WebConstants.OPENMRS_ERROR_ATTR));
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/form/FormFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/form/FormFormControllerTest.java
index d619fd5ee..d96ab8266 100644
--- a/omod/src/test/java/org/openmrs/web/controller/form/FormFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/form/FormFormControllerTest.java
@@ -11,12 +11,12 @@
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openmrs.api.FormService;
import org.openmrs.api.context.Context;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockHttpSession;
@@ -31,7 +31,7 @@ public class FormFormControllerTest extends BaseModuleWebContextSensitiveTest {
private FormFormController controller;
- @Before
+ @BeforeEach
public void setup() throws Exception {
if (formService == null) {
formService = Context.getFormService();
@@ -59,10 +59,10 @@ public void shouldNotSaveAFormWhenFormsAreLocked() throws Exception {
request.setContentType("application/x-www-form-urlencoded");
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertEquals("The save attempt should have failed!", "index.htm", mav.getViewName());
- Assert.assertNotEquals("formEdit.form", mav.getViewName());
- Assert.assertSame(controller.getFormView(), mav.getViewName());
- Assert.assertNotNull(formService.getForm(1));
+ Assertions.assertEquals("index.htm", mav.getViewName(), "The save attempt should have failed!");
+ Assertions.assertNotEquals("formEdit.form", mav.getViewName());
+ Assertions.assertSame(controller.getFormView(), mav.getViewName());
+ Assertions.assertNotNull(formService.getForm(1));
}
@Test
@@ -79,9 +79,9 @@ public void shouldNotDuplicateAFormWhenFormsAreLocked() throws Exception {
request.setContentType("application/x-www-form-urlencoded");
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertEquals("The duplicate attempt should have failed!", "index.htm", mav.getViewName());
- Assert.assertNotEquals("formEdit.form", mav.getViewName());
- Assert.assertSame(controller.getFormView(), mav.getViewName());
- Assert.assertNotNull(formService.getForm(1));
+ Assertions.assertEquals("index.htm", mav.getViewName(), "The duplicate attempt should have failed!");
+ Assertions.assertNotEquals("formEdit.form", mav.getViewName());
+ Assertions.assertSame(controller.getFormView(), mav.getViewName());
+ Assertions.assertNotNull(formService.getForm(1));
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/maintenance/GlobalPropertyControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/maintenance/GlobalPropertyControllerTest.java
index 76e0c7fd0..da2644470 100644
--- a/omod/src/test/java/org/openmrs/web/controller/maintenance/GlobalPropertyControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/maintenance/GlobalPropertyControllerTest.java
@@ -14,13 +14,13 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openmrs.GlobalProperty;
import org.openmrs.api.AdministrationService;
import org.openmrs.api.context.Context;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.MessageSource;
@@ -37,7 +37,7 @@ public class GlobalPropertyControllerTest extends BaseModuleWebContextSensitiveT
private AdministrationService administrationService;
- @Before
+ @BeforeEach
public void before() {
messageSource = Context.getMessageSourceService();
administrationService = Context.getAdministrationService();
@@ -65,14 +65,14 @@ public void onSubmit_shouldPurgeNotIncludedProperties() throws Exception {
controller.handleRequest(request, response);
- Assert.assertEquals(2, administrationService.getAllGlobalProperties().size());
+ Assertions.assertEquals(2, administrationService.getAllGlobalProperties().size());
for (GlobalProperty globalProperty : administrationService.getAllGlobalProperties()) {
if (globalProperty.getProperty().equals("test2")) {
- Assert.assertEquals("test2_value", globalProperty.getPropertyValue());
+ Assertions.assertEquals("test2_value", globalProperty.getPropertyValue());
} else if (globalProperty.getProperty().equals("test3")) {
- Assert.assertEquals("test3_value", globalProperty.getPropertyValue());
+ Assertions.assertEquals("test3_value", globalProperty.getPropertyValue());
} else {
- Assert.fail("Should be either test2 or test3");
+ Assertions.fail("Should be either test2 or test3");
}
}
}
@@ -99,14 +99,14 @@ public void onSubmit_shouldSaveOrUpdateIncludedProperties() throws Exception {
controller.handleRequest(request, response);
- Assert.assertEquals(2, administrationService.getAllGlobalProperties().size());
+ Assertions.assertEquals(2, administrationService.getAllGlobalProperties().size());
for (GlobalProperty globalProperty : administrationService.getAllGlobalProperties()) {
if (globalProperty.getProperty().equals("test1")) {
- Assert.assertEquals(globalProperty.getPropertyValue(), "test1_new_value");
+ Assertions.assertEquals(globalProperty.getPropertyValue(), "test1_new_value");
} else if (globalProperty.getProperty().equals("test2")) {
- Assert.assertEquals("test2_value", globalProperty.getPropertyValue());
+ Assertions.assertEquals("test2_value", globalProperty.getPropertyValue());
} else {
- Assert.fail("Should be either test1 or test2");
+ Assertions.fail("Should be either test1 or test2");
}
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/maintenance/SearchIndexControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/maintenance/SearchIndexControllerTest.java
index 86af392b2..591408771 100755
--- a/omod/src/test/java/org/openmrs/web/controller/maintenance/SearchIndexControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/maintenance/SearchIndexControllerTest.java
@@ -9,10 +9,8 @@
*/
package org.openmrs.web.controller.maintenance;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
@@ -20,15 +18,15 @@
import org.openmrs.api.context.Context;
import org.openmrs.api.context.UserContext;
import org.openmrs.api.db.ContextDAO;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import java.util.Map;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.doThrow;
@@ -46,13 +44,11 @@ public class SearchIndexControllerTest extends BaseModuleWebContextSensitiveTest
@Mock
private UserContext userContext;
- @Before
+ @BeforeEach
public void before() {
controller = new SearchIndexController();
}
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
/**
* @verifies return the search index view
@@ -105,7 +101,6 @@ public void rebuildSearchIndex_shouldReturnFalseForSuccessIfAUnAuthenticatedUser
when(userContext.isAuthenticated()).thenReturn(false);
assertFalse(Context.getUserContext().isAuthenticated());
- when(contextDao.updateSearchIndexAsync()).thenReturn(null);
Map response = controller.rebuildSearchIndex();
assertEquals(false, response.get("success"));
}
@@ -166,8 +161,8 @@ public void getStatus_shouldReturnErrorForStatusIfRebuildSearchIndexIsCompletedU
*/
@Test
public void getStatus_shouldThrowApiExceptionWhenRebuildSearchIndexNotHaveBeenCalledBefore() throws Exception {
- expectedException.expect(APIException.class);
- expectedException.expectMessage("There was a problem rebuilding the search index");
- controller.getStatus();
+ APIException ex = org.junit.jupiter.api.Assertions.assertThrows(APIException.class,
+ () -> controller.getStatus());
+ assertTrue(ex.getMessage().contains("There was a problem rebuilding the search index"));
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/maintenance/SystemInformationControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/maintenance/SystemInformationControllerTest.java
index ada1d7c04..dcba4150a 100644
--- a/omod/src/test/java/org/openmrs/web/controller/maintenance/SystemInformationControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/maintenance/SystemInformationControllerTest.java
@@ -11,12 +11,12 @@
import java.util.Map;
-import junit.framework.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.ui.ModelMap;
/**
@@ -26,7 +26,7 @@ public class SystemInformationControllerTest extends BaseModuleWebContextSensiti
private ModelMap model = null;
- @Before
+ @BeforeEach
public void before() throws Exception {
createController();
}
@@ -47,7 +47,7 @@ private void createController() {
@Test
@Verifies(value = "should add openmrs information attribute to the model map", method = "showPage()")
public void showPage_shouldReturnOpenmrsInformation() {
- Assert.assertTrue(((Map>) model.get("systemInfo"))
+ Assertions.assertTrue(((Map>) model.get("systemInfo"))
.containsKey("SystemInfo.title.openmrsInformation"));
}
@@ -57,7 +57,7 @@ public void showPage_shouldReturnOpenmrsInformation() {
@Test
@Verifies(value = "should add java runtime information attribute to the model map", method = "showPage()")
public void showPage_shouldReturnUserInformation() {
- Assert.assertTrue(((Map>) model.get("systemInfo"))
+ Assertions.assertTrue(((Map>) model.get("systemInfo"))
.containsKey("SystemInfo.title.javaRuntimeEnvironmentInformation"));
}
@@ -67,7 +67,7 @@ public void showPage_shouldReturnUserInformation() {
@Test
@Verifies(value = "should add module information attribute to the model map", method = "showPage()")
public void showPage_shouldReturnAllJavaRuntimeInformation() {
- Assert.assertTrue(((Map>) model.get("systemInfo"))
+ Assertions.assertTrue(((Map>) model.get("systemInfo"))
.containsKey("SystemInfo.title.moduleInformation"));
}
@@ -77,7 +77,7 @@ public void showPage_shouldReturnAllJavaRuntimeInformation() {
@Test
@Verifies(value = "should add database information attribute to the model map", method = "showPage()")
public void showPage_shouldReturnAllDatabaseInformation() {
- Assert.assertTrue(((Map>) model.get("systemInfo"))
+ Assertions.assertTrue(((Map>) model.get("systemInfo"))
.containsKey("SystemInfo.title.dataBaseInformation"));
}
@@ -87,7 +87,7 @@ public void showPage_shouldReturnAllDatabaseInformation() {
@Test
@Verifies(value = "should add memory information attribute to the model map", method = "getMemoryInformation()")
public void getMemoryInformation_shouldReturnMemoryInformation() {
- Assert.assertTrue(((Map>) model.get("systemInfo"))
+ Assertions.assertTrue(((Map>) model.get("systemInfo"))
.containsKey("SystemInfo.title.memoryInformation"));
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/observation/ObsFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/observation/ObsFormControllerTest.java
index ae375f192..16be5e1af 100644
--- a/omod/src/test/java/org/openmrs/web/controller/observation/ObsFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/observation/ObsFormControllerTest.java
@@ -9,19 +9,19 @@
*/
package org.openmrs.web.controller.observation;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.Obs;
import org.openmrs.Person;
import org.openmrs.api.ObsService;
import org.openmrs.api.context.Context;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockHttpSession;
@@ -50,7 +50,7 @@ public void shouldGetObsFormWithEncounterFilledIn() throws Exception {
// make sure there is an "encounterId" element on the obs
Obs commandObs = (Obs) modelAndView.getModel().get("command");
- Assert.assertNotNull(commandObs.getEncounter());
+ Assertions.assertNotNull(commandObs.getEncounter());
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/patient/PatientDashboardControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/patient/PatientDashboardControllerTest.java
index dfcaa92cf..a39f119a1 100644
--- a/omod/src/test/java/org/openmrs/web/controller/patient/PatientDashboardControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/patient/PatientDashboardControllerTest.java
@@ -11,18 +11,18 @@
import static org.hamcrest.collection.IsMapContaining.hasKey;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.lang.reflect.Method;
import jakarta.servlet.http.HttpServletRequest;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openmrs.Patient;
import org.openmrs.web.WebConstants;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.ui.ModelMap;
@@ -49,7 +49,7 @@ public class PatientDashboardControllerTest extends BaseModuleWebContextSensitiv
private Method getPatientMethod;
- @Before
+ @BeforeEach
public void setUp() throws NoSuchMethodException, SecurityException {
getPatientMethod = PatientDashboardController.class.getDeclaredMethod("getPatient", new Class[] { String.class });
getPatientMethod.setAccessible(true);
diff --git a/omod/src/test/java/org/openmrs/web/controller/patient/PatientFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/patient/PatientFormControllerTest.java
index 07a94b35b..2ccb80e28 100644
--- a/omod/src/test/java/org/openmrs/web/controller/patient/PatientFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/patient/PatientFormControllerTest.java
@@ -9,15 +9,15 @@
*/
package org.openmrs.web.controller.patient;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.Patient;
import org.openmrs.api.context.Context;
import org.openmrs.test.Verifies;
import org.openmrs.web.WebConstants;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
-import org.openmrs.web.test.BaseWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.validation.BindException;
@@ -54,7 +54,7 @@ public void onSubmit_shouldVoidPatientWhenVoidReasonIsNotEmpty() throws Exceptio
BindException errors = new BindException(p, "patient");
ModelAndView modelAndview = controller.onSubmit(request, response, p, errors);
- Assert.assertTrue(p.isVoided());
+ Assertions.assertTrue(p.isVoided());
}
/**
@@ -78,8 +78,8 @@ public void onSubmit_shouldNotVoidPatientWhenVoidReasonIsEmpty() throws Exceptio
BindException errors = new BindException(p, "patient");
ModelAndView modelAndview = controller.onSubmit(request, response, p, errors);
- Assert.assertTrue(!p.isVoided());
+ Assertions.assertTrue(!p.isVoided());
String tmp = request.getSession().getAttribute(WebConstants.OPENMRS_ERROR_ATTR).toString();
- Assert.assertEquals(tmp, "Patient.error.void.reasonEmpty");
+ Assertions.assertEquals(tmp, "Patient.error.void.reasonEmpty");
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/patient/PatientIdentifierTypeFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/patient/PatientIdentifierTypeFormControllerTest.java
index 82ac5831d..31f795275 100644
--- a/omod/src/test/java/org/openmrs/web/controller/patient/PatientIdentifierTypeFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/patient/PatientIdentifierTypeFormControllerTest.java
@@ -11,11 +11,11 @@
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openmrs.api.context.Context;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockHttpSession;
@@ -32,7 +32,7 @@ public class PatientIdentifierTypeFormControllerTest extends BaseModuleWebContex
private PatientIdentifierTypeFormController controller;
- @Before
+ @BeforeEach
public void setup() throws Exception {
executeDataSet("org/openmrs/web/patient/include/PatientIdentifierTypeFormControllerTest.xml");
controller = (PatientIdentifierTypeFormController) applicationContext.getBean("patientIdentifierTypeForm");
@@ -51,9 +51,9 @@ public void shouldNotSavePatientIdentifierTypeWhenPatientIdentifierTypesAreLocke
request.addParameter("save", "Save Identifier Type");
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertEquals("The save attempt should have failed!", "index.htm", mav.getViewName());
- Assert.assertNotEquals("patientIdentifierType.form", mav.getViewName());
- Assert.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
+ Assertions.assertEquals("index.htm", mav.getViewName(), "The save attempt should have failed!");
+ Assertions.assertNotEquals("patientIdentifierType.form", mav.getViewName());
+ Assertions.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
}
@Test
@@ -62,9 +62,9 @@ public void shouldNotRetirePatientIdentifierTypeWhenPatientIdentifierTypesAreLoc
request.addParameter("retireReason", "Same reason");
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertEquals("The retire attempt should have failed!", "index.htm", mav.getViewName());
- Assert.assertNotEquals("patientIdentifierType.form", mav.getViewName());
- Assert.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
+ Assertions.assertEquals("index.htm", mav.getViewName(), "The retire attempt should have failed!");
+ Assertions.assertNotEquals("patientIdentifierType.form", mav.getViewName());
+ Assertions.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
}
@Test
@@ -72,9 +72,9 @@ public void shouldNotUnretirePatientIdentifierTypeWhenPatientIdentifierTypesAreL
request.addParameter("unretire", "Unretire Identifier Type");
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertEquals("The unretire attempt should have failed!", "index.htm", mav.getViewName());
- Assert.assertNotEquals("patientIdentifierType.form", mav.getViewName());
- Assert.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
+ Assertions.assertEquals("index.htm", mav.getViewName(), "The unretire attempt should have failed!");
+ Assertions.assertNotEquals("patientIdentifierType.form", mav.getViewName());
+ Assertions.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
}
@Test
@@ -82,8 +82,8 @@ public void shouldNotDeletePatientIdentifierTypeWhenPatientIdentifierTypesAreLoc
request.addParameter("purge", "Delete Identifier Type");
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertEquals("The delete attempt should have failed!", "index.htm", mav.getViewName());
- Assert.assertNotEquals("patientIdentifierType.form", mav.getViewName());
- Assert.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
+ Assertions.assertEquals("index.htm", mav.getViewName(), "The delete attempt should have failed!");
+ Assertions.assertNotEquals("patientIdentifierType.form", mav.getViewName());
+ Assertions.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormControllerTest.java
index 1b9cc03b3..6b02cce96 100644
--- a/omod/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormControllerTest.java
@@ -9,9 +9,9 @@
*/
package org.openmrs.web.controller.patient;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.Date;
@@ -19,8 +19,8 @@
import java.util.Map;
import org.apache.commons.beanutils.BeanUtils;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.GlobalProperty;
import org.openmrs.Patient;
import org.openmrs.PatientIdentifier;
@@ -35,8 +35,8 @@
import org.openmrs.util.OpenmrsConstants;
import org.openmrs.util.OpenmrsUtil;
import org.openmrs.web.WebConstants;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
-import org.openmrs.web.test.BaseWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseWebContextSensitiveTest;
import org.openmrs.web.test.WebTestHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -78,10 +78,10 @@ public void saveShortPatient_shouldPassIfAllTheFormDataIsValid() throws Exceptio
(PersonAddress) mockWebRequest.getAttribute("personAddressCache", WebRequest.SCOPE_SESSION), null,
(ShortPatientModel) mockWebRequest.getAttribute("patientModel", WebRequest.SCOPE_SESSION), errors);
- Assert.assertTrue("Should pass with no validation errors", !errors.hasErrors());
- Assert.assertEquals("Patient.saved",
+ Assertions.assertTrue(!errors.hasErrors(), "Should pass with no validation errors");
+ Assertions.assertEquals("Patient.saved",
mockWebRequest.getAttribute(WebConstants.OPENMRS_MSG_ATTR, WebRequest.SCOPE_SESSION));
- Assert.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
+ Assertions.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
}
/**
@@ -112,15 +112,15 @@ public void saveShortPatient_shouldCreateANewPatient() throws Exception {
String redirectUrl = controller.saveShortPatient(mockWebRequest, new PersonName(), new PersonAddress(), null,
patientModel, errors);
- Assert.assertTrue("Should pass with no validation errors", !errors.hasErrors());
- Assert.assertNotNull(p.getId());
- Assert.assertNotNull(p.getPersonName());
- Assert.assertNotNull(p.getPersonName().getId());// the name was create
+ Assertions.assertTrue(!errors.hasErrors(), "Should pass with no validation errors");
+ Assertions.assertNotNull(p.getId());
+ Assertions.assertNotNull(p.getPersonName());
+ Assertions.assertNotNull(p.getPersonName().getId());// the name was create
// and added
- Assert.assertEquals(patientCount + 1, Context.getPatientService().getAllPatients().size());
- Assert.assertEquals("Patient.saved",
+ Assertions.assertEquals(patientCount + 1, Context.getPatientService().getAllPatients().size());
+ Assertions.assertEquals("Patient.saved",
mockWebRequest.getAttribute(WebConstants.OPENMRS_MSG_ATTR, WebRequest.SCOPE_SESSION));
- Assert.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
+ Assertions.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
}
/**
@@ -144,8 +144,8 @@ public void saveShortPatient_shouldSendTheUserBackToTheFormInCaseOfValidationErr
String formUrl = controller.saveShortPatient(mockWebRequest, new PersonName(), new PersonAddress(), null,
patientModel, errors);
- Assert.assertTrue("Should report validation errors", errors.hasErrors());
- Assert.assertEquals("module/legacyui/admin/patients/shortPatientForm", formUrl);
+ Assertions.assertTrue(errors.hasErrors(), "Should report validation errors");
+ Assertions.assertEquals("module/legacyui/admin/patients/shortPatientForm", formUrl);
}
/**
@@ -172,15 +172,15 @@ public void saveShortPatient_shouldVoidANameAndReplaceItWithANewOneIfItIsChanged
String redirectUrl = controller.saveShortPatient(mockWebRequest, personNameCache, (PersonAddress) p
.getPersonAddress().clone(), null, patientModel, errors);
- Assert.assertEquals(nameCount + 1, p.getNames().size());
- Assert.assertTrue("The old name should be voided", oldPersonName.isVoided());
- Assert.assertNotNull("The void reason should be set", oldPersonName.getVoidReason());
- Assert.assertTrue("The old name should have remained un changed",
- oldGivenName.equalsIgnoreCase(oldPersonName.getGivenName()));
- Assert.assertEquals("Changed", p.getGivenName());// the changes should
+ Assertions.assertEquals(nameCount + 1, p.getNames().size());
+ Assertions.assertTrue(oldPersonName.isVoided(), "The old name should be voided");
+ Assertions.assertNotNull(oldPersonName.getVoidReason(), "The void reason should be set");
+ Assertions.assertTrue(oldGivenName.equalsIgnoreCase(oldPersonName.getGivenName()),
+ "The old name should have remained un changed");
+ Assertions.assertEquals("Changed", p.getGivenName());// the changes should
// have taken effect
- Assert.assertTrue("Should pass with no validation errors", !errors.hasErrors());
- Assert.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
+ Assertions.assertTrue(!errors.hasErrors(), "Should pass with no validation errors");
+ Assertions.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
}
/**
@@ -195,7 +195,7 @@ public void saveShortPatient_shouldAddANewNameIfThePersonHadNoNames() throws Exc
//to have at least one non voided name.
/*p.getPersonName().setVoided(true);
Context.getPatientService().savePatient(p);
- Assert.assertNull(p.getPersonName());// make sure all names are voided*/
+ Assertions.assertNull(p.getPersonName());// make sure all names are voided*/
// add a name that will used as a duplicate for testing purposes
PersonName newName = new PersonName("new", null, "name");
@@ -211,9 +211,9 @@ public void saveShortPatient_shouldAddANewNameIfThePersonHadNoNames() throws Exc
String redirectUrl = controller.saveShortPatient(mockWebRequest, new PersonName(), (PersonAddress) p
.getPersonAddress().clone(), null, patientModel, errors);
- Assert.assertTrue("Should pass with no validation errors", !errors.hasErrors());
- Assert.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
- Assert.assertNotNull(newName.getId());// name should have been added to
+ Assertions.assertTrue(!errors.hasErrors(), "Should pass with no validation errors");
+ Assertions.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
+ Assertions.assertNotNull(newName.getId());// name should have been added to
// DB
}
@@ -240,18 +240,18 @@ public void saveShortPatient_shouldVoidAnAddressAndReplaceItWithANewOneIfItIsCha
.getBean("shortPatientFormController");
String redirectUrl = controller.saveShortPatient(mockWebRequest,
(PersonName) BeanUtils.cloneBean(p.getPersonName()), personAddressCache, null, patientModel, errors);
- Assert.assertEquals(addressCount + 1, p.getAddresses().size());
- Assert.assertTrue("The old address should be voided", oldPersonAddress.isVoided());
- Assert.assertNotNull("The void reason should be set", oldPersonAddress.getVoidReason());
- Assert.assertTrue("The old address should have remained the same",
- oldAddress1.equalsIgnoreCase(oldPersonAddress.getAddress1()));
- Assert.assertEquals("Kampala", p.getPersonAddress().getAddress1());// the
+ Assertions.assertEquals(addressCount + 1, p.getAddresses().size());
+ Assertions.assertTrue(oldPersonAddress.isVoided(), "The old address should be voided");
+ Assertions.assertNotNull(oldPersonAddress.getVoidReason(), "The void reason should be set");
+ Assertions.assertTrue(oldAddress1.equalsIgnoreCase(oldPersonAddress.getAddress1()),
+ "The old address should have remained the same");
+ Assertions.assertEquals("Kampala", p.getPersonAddress().getAddress1());// the
// changes
// should
// have
// taken
// effect
- Assert.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
+ Assertions.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
}
/**
@@ -264,7 +264,7 @@ public void saveShortPatient_shouldAddANewAddressIfThePersonHadNone() throws Exc
Patient p = Context.getPatientService().getPatient(2);
p.getPersonAddress().setVoided(true);
Context.getPatientService().savePatient(p);
- Assert.assertNull(p.getPersonAddress());// make sure all addresses are
+ Assertions.assertNull(p.getPersonAddress());// make sure all addresses are
// voided
// add a name that will used as a duplicate for testing purposes
@@ -282,9 +282,9 @@ public void saveShortPatient_shouldAddANewAddressIfThePersonHadNone() throws Exc
String redirectUrl = controller.saveShortPatient(mockWebRequest,
(PersonName) BeanUtils.cloneBean(p.getPersonName()), new PersonAddress(), null, patientModel, errors);
- Assert.assertTrue("Should pass with no validation errors", !errors.hasErrors());
- Assert.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
- Assert.assertNotNull(newAddress.getId());// name should have been added
+ Assertions.assertTrue(!errors.hasErrors(), "Should pass with no validation errors");
+ Assertions.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
+ Assertions.assertNotNull(newAddress.getId());// name should have been added
// to DB
}
@@ -299,7 +299,7 @@ public void saveShortPatient_shouldIgnoreANewAddressThatWasAddedAndVoidedAtSameT
Context.getPatientService().savePatient(p);
// make sure all addresses are voided so that whatever is entered a new
// address
- Assert.assertNull(p.getPersonAddress());
+ Assertions.assertNull(p.getPersonAddress());
// add the new address
PersonAddress newAddress = new PersonAddress();
@@ -317,10 +317,10 @@ public void saveShortPatient_shouldIgnoreANewAddressThatWasAddedAndVoidedAtSameT
String redirectUrl = controller.saveShortPatient(mockWebRequest,
(PersonName) BeanUtils.cloneBean(p.getPersonName()), new PersonAddress(), null, patientModel, errors);
- Assert.assertTrue("Should pass with no validation errors", !errors.hasErrors());
- Assert.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
+ Assertions.assertTrue(!errors.hasErrors(), "Should pass with no validation errors");
+ Assertions.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
// address should have been ignored
- Assert.assertNull(p.getPersonAddress());
+ Assertions.assertNull(p.getPersonAddress());
}
/**
@@ -353,15 +353,15 @@ public void saveShortPatient_shouldAddANewPersonAttributeWithANonEmptyValue() th
(PersonName) mockWebRequest.getAttribute("personNameCache", WebRequest.SCOPE_SESSION),
(PersonAddress) mockWebRequest.getAttribute("personAddressCache", WebRequest.SCOPE_SESSION), null,
(ShortPatientModel) mockWebRequest.getAttribute("patientModel", WebRequest.SCOPE_SESSION), errors);
- Assert.assertTrue("Should pass with no validation errors", !errors.hasErrors());
+ Assertions.assertTrue(!errors.hasErrors(), "Should pass with no validation errors");
- Assert.assertEquals("Patient.saved",
+ Assertions.assertEquals("Patient.saved",
mockWebRequest.getAttribute(WebConstants.OPENMRS_MSG_ATTR, WebRequest.SCOPE_SESSION));
- Assert.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
+ Assertions.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
//The new person attribute should have been added and saved
- Assert.assertNotNull(p.getAttribute(2).getPersonAttributeId());
- Assert.assertEquals(birthPlace, p.getAttribute(2).getValue());
- Assert.assertEquals(originalAttributeCount + 1, p.getAttributes().size());
+ Assertions.assertNotNull(p.getAttribute(2).getPersonAttributeId());
+ Assertions.assertEquals(birthPlace, p.getAttribute(2).getValue());
+ Assertions.assertEquals(originalAttributeCount + 1, p.getAttributes().size());
}
/**
@@ -391,12 +391,12 @@ public void saveShortPatient_shouldNotAddANewPersonAttributeWithAnEmptyValue() t
(PersonAddress) mockWebRequest.getAttribute("personAddressCache", WebRequest.SCOPE_SESSION), null,
(ShortPatientModel) mockWebRequest.getAttribute("patientModel", WebRequest.SCOPE_SESSION), errors);
- Assert.assertTrue("Should pass with no validation errors", !errors.hasErrors());
- Assert.assertEquals("Patient.saved",
+ Assertions.assertTrue(!errors.hasErrors(), "Should pass with no validation errors");
+ Assertions.assertEquals("Patient.saved",
mockWebRequest.getAttribute(WebConstants.OPENMRS_MSG_ATTR, WebRequest.SCOPE_SESSION));
- Assert.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
+ Assertions.assertEquals("redirect:/patientDashboard.form?patientId=" + p.getPatientId(), redirectUrl);
//The new blank person attribute should have been ignored
- Assert.assertEquals(originalAttributeCount, p.getAttributes().size());
+ Assertions.assertEquals(originalAttributeCount, p.getAttributes().size());
}
/**
@@ -434,8 +434,8 @@ public void saveShortPatient_shouldVoidAnExistingPersonAttributeWithAnEmptyValue
}
}
//ensure we found and edited it
- Assert.assertNotNull(attributeToEdit);
- Assert.assertNotNull(oldValue);
+ Assertions.assertNotNull(attributeToEdit);
+ Assertions.assertNotNull(oldValue);
WebRequest mockWebRequest = new ServletWebRequest(new MockHttpServletRequest());
BindException errors = new BindException(patientModel, "patientModel");
@@ -450,12 +450,12 @@ public void saveShortPatient_shouldVoidAnExistingPersonAttributeWithAnEmptyValue
(PersonAddress) mockWebRequest.getAttribute("personAddressCache", WebRequest.SCOPE_SESSION), null,
(ShortPatientModel) mockWebRequest.getAttribute("patientModel", WebRequest.SCOPE_SESSION), errors);
- Assert.assertTrue("Should pass with no validation errors", !errors.hasErrors());
- Assert.assertEquals("Patient.saved",
+ Assertions.assertTrue(!errors.hasErrors(), "Should pass with no validation errors");
+ Assertions.assertEquals("Patient.saved",
mockWebRequest.getAttribute(WebConstants.OPENMRS_MSG_ATTR, WebRequest.SCOPE_SESSION));
//the attribute should have been voided
- Assert.assertEquals(originalActiveAttributeCount - 1, p.getActiveAttributes().size());
+ Assertions.assertEquals(originalActiveAttributeCount - 1, p.getActiveAttributes().size());
}
/**
@@ -493,8 +493,8 @@ public void saveShortPatient_shouldShouldReplaceAnExistingAttributeWithANewOneWh
}
}
//ensure we found and edited it
- Assert.assertNotNull(attributeToEdit);
- Assert.assertNotNull(oldValue);
+ Assertions.assertNotNull(attributeToEdit);
+ Assertions.assertNotNull(oldValue);
WebRequest mockWebRequest = new ServletWebRequest(new MockHttpServletRequest());
BindException errors = new BindException(patientModel, "patientModel");
@@ -509,14 +509,14 @@ public void saveShortPatient_shouldShouldReplaceAnExistingAttributeWithANewOneWh
(PersonAddress) mockWebRequest.getAttribute("personAddressCache", WebRequest.SCOPE_SESSION), null,
(ShortPatientModel) mockWebRequest.getAttribute("patientModel", WebRequest.SCOPE_SESSION), errors);
- Assert.assertTrue("Should pass with no validation errors", !errors.hasErrors());
- Assert.assertEquals("Patient.saved",
+ Assertions.assertTrue(!errors.hasErrors(), "Should pass with no validation errors");
+ Assertions.assertEquals("Patient.saved",
mockWebRequest.getAttribute(WebConstants.OPENMRS_MSG_ATTR, WebRequest.SCOPE_SESSION));
//a new replacement attribute should have been created with the new value
PersonAttribute newAttribute = p.getAttribute(attributeTypeId);
- Assert.assertEquals(originalAttributeCount + 1, p.getAttributes().size());
- Assert.assertEquals(newValue, newAttribute.getValue());
+ Assertions.assertEquals(originalAttributeCount + 1, p.getAttributes().size());
+ Assertions.assertEquals(newValue, newAttribute.getValue());
PersonAttribute oldAttribute = null;
//find the voided attribute
@@ -531,9 +531,9 @@ public void saveShortPatient_shouldShouldReplaceAnExistingAttributeWithANewOneWh
}
//The old attribute should have been voided and maintained its old value
- Assert.assertNotNull(oldAttribute);
- Assert.assertEquals(oldValue, oldAttribute.getValue());
- Assert.assertTrue(oldAttribute.isVoided());
+ Assertions.assertNotNull(oldAttribute);
+ Assertions.assertEquals(oldValue, oldAttribute.getValue());
+ Assertions.assertTrue(oldAttribute.isVoided());
}
/**
diff --git a/omod/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormValidatorTest.java b/omod/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormValidatorTest.java
index 063c83865..025707c6e 100644
--- a/omod/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormValidatorTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormValidatorTest.java
@@ -9,9 +9,9 @@
*/
package org.openmrs.web.controller.patient;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openmrs.Concept;
import org.openmrs.Location;
import org.openmrs.Patient;
@@ -22,7 +22,7 @@
import org.openmrs.api.PatientService;
import org.openmrs.api.context.Context;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.validation.BindException;
import org.springframework.validation.Errors;
import org.springframework.validation.ObjectError;
@@ -42,7 +42,7 @@ public class ShortPatientFormValidatorTest extends BaseModuleWebContextSensitive
*
* @throws Exception
*/
- @Before
+ @BeforeEach
public void runBeforeAllTests() throws Exception {
validator = new ShortPatientFormValidator();
ps = Context.getPatientService();
@@ -60,7 +60,7 @@ public void validate_shouldFailIfAllIdentifiersHaveBeenVoided() throws Exception
ShortPatientModel model = new ShortPatientModel(p);
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasGlobalErrors());
+ Assertions.assertEquals(true, errors.hasGlobalErrors());
}
/**
@@ -75,7 +75,7 @@ public void validate_shouldFailIfAllNameFieldsAreEmptyOrWhiteSpaceCharacters() t
ShortPatientModel model = new ShortPatientModel(p);
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasGlobalErrors());
+ Assertions.assertEquals(true, errors.hasGlobalErrors());
}
/**
@@ -90,7 +90,7 @@ public void validate_shouldFailIfAnyNameHasMoreThan50Characters() throws Excepti
ShortPatientModel model = new ShortPatientModel(p);
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasErrors());
+ Assertions.assertEquals(true, errors.hasErrors());
}
/**
@@ -110,7 +110,7 @@ public void validate_shouldFailIfNoIdentifiersAreAdded() throws Exception {
ShortPatientModel model = new ShortPatientModel(p);
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasGlobalErrors());
+ Assertions.assertEquals(true, errors.hasGlobalErrors());
}
/**
@@ -128,7 +128,7 @@ public void validate_shouldFailIfTheDeathdateIsBeforeTheBirthdateIncaseThePatien
ShortPatientModel model = new ShortPatientModel(p);
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasFieldErrors());
+ Assertions.assertEquals(true, errors.hasFieldErrors());
}
/**
@@ -145,7 +145,7 @@ public void validate_shouldFailValidationIfBirthdateIsAFutureDate() throws Excep
ShortPatientModel model = new ShortPatientModel(p);
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasFieldErrors());
+ Assertions.assertEquals(true, errors.hasFieldErrors());
}
/**
@@ -159,7 +159,7 @@ public void validate_shouldFailValidationIfBirthdateIsBlank() throws Exception {
ShortPatientModel model = new ShortPatientModel(p);
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasFieldErrors());
+ Assertions.assertEquals(true, errors.hasFieldErrors());
}
/**
@@ -175,7 +175,7 @@ public void validate_shouldFailValidationIfCauseOfDeathIsBlankWhenPatientIsDead(
ShortPatientModel model = new ShortPatientModel(p);
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasFieldErrors());
+ Assertions.assertEquals(true, errors.hasFieldErrors());
}
/**
@@ -194,7 +194,7 @@ public void validate_shouldFailValidationIfDeathdateIsAFutureDate() throws Excep
ShortPatientModel model = new ShortPatientModel(p);
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasFieldErrors());
+ Assertions.assertEquals(true, errors.hasFieldErrors());
}
/**
@@ -208,7 +208,7 @@ public void validate_shouldFailValidationIfGenderIsBlank() throws Exception {
ShortPatientModel model = new ShortPatientModel(p);
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasFieldErrors());
+ Assertions.assertEquals(true, errors.hasFieldErrors());
}
/**
@@ -228,7 +228,7 @@ public void validate_shouldPassIfTheMinimumRequiredFieldsAreProvidedAndAreValid(
model.setPersonAddress(new PersonAddress());
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(false, errors.hasErrors());
+ Assertions.assertEquals(false, errors.hasErrors());
}
@@ -245,7 +245,7 @@ public void validate_shouldFailValidationIfBirthdateMakesPatient120YearsOldOrOld
ShortPatientModel model = new ShortPatientModel(p);
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasFieldErrors());
+ Assertions.assertEquals(true, errors.hasFieldErrors());
}
/**
@@ -256,16 +256,16 @@ public void validate_shouldFailValidationIfBirthdateMakesPatient120YearsOldOrOld
public void validate_shouldRejectADuplicateName() throws Exception {
Patient patient = ps.getPatient(7);
PersonName oldName = patient.getPersonName();
- Assert.assertEquals(1, patient.getNames().size());//sanity check
+ Assertions.assertEquals(1, patient.getNames().size());//sanity check
//add a name for testing purposes
PersonName name = new PersonName("my", "duplicate", "name");
patient.addName(name);
Context.getPatientService().savePatient(patient);
- Assert.assertNotNull(name.getId());//should have been added
+ Assertions.assertNotNull(name.getId());//should have been added
ShortPatientModel model = new ShortPatientModel(patient);
//should still be the preferred name for the test to pass
- Assert.assertEquals(oldName.getId(), model.getPersonName().getId());
+ Assertions.assertEquals(oldName.getId(), model.getPersonName().getId());
//change to a duplicate name
model.getPersonName().setGivenName("My");//should be case insensitive
model.getPersonName().setMiddleName("duplicate");
@@ -273,7 +273,7 @@ public void validate_shouldRejectADuplicateName() throws Exception {
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasErrors());
+ Assertions.assertEquals(true, errors.hasErrors());
}
/**
@@ -284,7 +284,7 @@ public void validate_shouldRejectADuplicateName() throws Exception {
public void validate_shouldRejectADuplicateAddress() throws Exception {
Patient patient = ps.getPatient(2);
PersonAddress oldAddress = patient.getPersonAddress();
- Assert.assertEquals(1, patient.getAddresses().size());//sanity check
+ Assertions.assertEquals(1, patient.getAddresses().size());//sanity check
//add a name for testing purposes
PersonAddress address = (PersonAddress) oldAddress.clone();
address.setPersonAddressId(null);
@@ -293,18 +293,18 @@ public void validate_shouldRejectADuplicateAddress() throws Exception {
address.setAddress2("address2");
patient.addAddress(address);
Context.getPatientService().savePatient(patient);
- Assert.assertNotNull(address.getId());//should have been added
+ Assertions.assertNotNull(address.getId());//should have been added
ShortPatientModel model = new ShortPatientModel(patient);
//should still be the preferred address for the test to pass
- Assert.assertEquals(oldAddress.getId(), model.getPersonAddress().getId());
+ Assertions.assertEquals(oldAddress.getId(), model.getPersonAddress().getId());
//change to a duplicate name
model.getPersonAddress().setAddress1("Address1");//should be case insensitive
model.getPersonAddress().setAddress2("address2");
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasErrors());
+ Assertions.assertEquals(true, errors.hasErrors());
}
/**
@@ -320,7 +320,7 @@ public void validate_shouldNotRejectAgainstVoidedName() throws Exception {
name.setVoided(true);
patient.addName(name);
Context.getPatientService().savePatient(patient);
- Assert.assertNotNull(name.getId());//should have been added
+ Assertions.assertNotNull(name.getId());//should have been added
ShortPatientModel model = new ShortPatientModel(patient);
@@ -332,9 +332,9 @@ public void validate_shouldNotRejectAgainstVoidedName() throws Exception {
//Check validator has errors
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(true, errors.hasErrors());
+ Assertions.assertEquals(true, errors.hasErrors());
ObjectError error = errors.getAllErrors().get(0);
- Assert.assertTrue(error.getDefaultMessage().contains("Please restore the existing name"));
+ Assertions.assertTrue(error.getDefaultMessage().contains("Please restore the existing name"));
}
@Test
@@ -342,7 +342,7 @@ public void validate_shouldNotRejectAgainstVoidedName() throws Exception {
public void validate_shouldIgnoreDuplicateVoidedAddress() throws Exception {
Patient patient = ps.getPatient(2);
PersonAddress oldAddress = patient.getPersonAddress();
- Assert.assertEquals(1, patient.getAddresses().size());//sanity check
+ Assertions.assertEquals(1, patient.getAddresses().size());//sanity check
oldAddress.setAddress1("Address1");
oldAddress.setAddress2("address1");
Context.getPatientService().savePatient(patient);
@@ -354,7 +354,7 @@ public void validate_shouldIgnoreDuplicateVoidedAddress() throws Exception {
address.setAddress2("address2");
patient.addAddress(address);
Context.getPatientService().savePatient(patient);
- Assert.assertNotNull(address.getId());//should have been added
+ Assertions.assertNotNull(address.getId());//should have been added
//void the first address
oldAddress.setVoided(true);
oldAddress.setVoidReason("test duplicate address");
@@ -362,13 +362,13 @@ public void validate_shouldIgnoreDuplicateVoidedAddress() throws Exception {
ShortPatientModel model = new ShortPatientModel(patient);
//the second address should be now the active address
- Assert.assertEquals(address.getId(), model.getPersonAddress().getId());
+ Assertions.assertEquals(address.getId(), model.getPersonAddress().getId());
//change to a duplicate name
model.getPersonAddress().setAddress1("address1");//should be case insensitive
model.getPersonAddress().setAddress2("address1");
Errors errors = new BindException(model, "patientModel");
validator.validate(model, errors);
- Assert.assertEquals(false, errors.hasErrors());
+ Assertions.assertEquals(false, errors.hasErrors());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/person/AddPersonControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/person/AddPersonControllerTest.java
index 42641af33..7be37adb9 100644
--- a/omod/src/test/java/org/openmrs/web/controller/person/AddPersonControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/person/AddPersonControllerTest.java
@@ -9,15 +9,15 @@
*/
package org.openmrs.web.controller.person;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Test;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.junit.jupiter.api.Test;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.web.servlet.ModelAndView;
diff --git a/omod/src/test/java/org/openmrs/web/controller/person/PersonAttributeTypeFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/person/PersonAttributeTypeFormControllerTest.java
index 64bdbb87b..8edf2f59a 100644
--- a/omod/src/test/java/org/openmrs/web/controller/person/PersonAttributeTypeFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/person/PersonAttributeTypeFormControllerTest.java
@@ -11,11 +11,11 @@
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openmrs.api.context.Context;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockHttpSession;
@@ -32,7 +32,7 @@ public class PersonAttributeTypeFormControllerTest extends BaseModuleWebContextS
private PersonAttributeTypeFormController controller;
- @Before
+ @BeforeEach
public void setup() throws Exception {
executeDataSet("org/openmrs/web/controller/include/PersonAttributeTypeFormControllerTest.xml");
controller = (PersonAttributeTypeFormController) applicationContext.getBean("personAttributeTypeForm");
@@ -52,9 +52,9 @@ public void shouldNotSavePersonAttributeTypeWhenPersonAttributeTypesAreLocked()
request.addParameter("save", "Save Person Attribute Type");
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertEquals("The save attempt should have failed!", "index.htm", mav.getViewName());
- Assert.assertNotEquals("PersonAttributeType.form", mav.getViewName());
- Assert.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
+ Assertions.assertEquals("index.htm", mav.getViewName(), "The save attempt should have failed!");
+ Assertions.assertNotEquals("PersonAttributeType.form", mav.getViewName());
+ Assertions.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
}
@Test
@@ -62,9 +62,9 @@ public void shouldNotDeletePersonAttributeTypeWhenPersonAttributeTypesAreLocked(
request.addParameter("purge", "Delete Person Attribute Type");
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertEquals("The delete attempt should have failed!", "index.htm", mav.getViewName());
- Assert.assertNotEquals("PersonAttributeType.form", mav.getViewName());
- Assert.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
+ Assertions.assertEquals("index.htm", mav.getViewName(), "The delete attempt should have failed!");
+ Assertions.assertNotEquals("PersonAttributeType.form", mav.getViewName());
+ Assertions.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
}
@Test
@@ -73,9 +73,9 @@ public void shouldNotRetirePersonAttributeTypeWhenPersonAttributeTypesAreLocked(
request.addParameter("retireReason", "Same reason");
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertEquals("The retire attempt should have failed!", "index.htm", mav.getViewName());
- Assert.assertNotEquals("PersonAttributeType.form", mav.getViewName());
- Assert.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
+ Assertions.assertEquals("index.htm", mav.getViewName(), "The retire attempt should have failed!");
+ Assertions.assertNotEquals("PersonAttributeType.form", mav.getViewName());
+ Assertions.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
}
@Test
@@ -83,8 +83,8 @@ public void shouldNotUnretirePersonAttributeTypeWhenPersonAttributeTypesAreLocke
request.addParameter("unretire", "Unretire Person Attribute Type");
ModelAndView mav = controller.handleRequest(request, response);
- Assert.assertEquals("The unretire attempt should have failed!", "index.htm", mav.getViewName());
- Assert.assertNotEquals("PersonAttributeType.form", mav.getViewName());
- Assert.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
+ Assertions.assertEquals("index.htm", mav.getViewName(), "The unretire attempt should have failed!");
+ Assertions.assertNotEquals("PersonAttributeType.form", mav.getViewName());
+ Assertions.assertNotNull(Context.getPersonService().getPersonAttributeType(1));
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/person/PersonAttributeTypeListControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/person/PersonAttributeTypeListControllerTest.java
index b589f4caf..58d527ccc 100644
--- a/omod/src/test/java/org/openmrs/web/controller/person/PersonAttributeTypeListControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/person/PersonAttributeTypeListControllerTest.java
@@ -13,13 +13,13 @@
import jakarta.servlet.http.HttpSession;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.PersonAttributeType;
import org.openmrs.api.context.Context;
import org.openmrs.test.Verifies;
import org.openmrs.util.OpenmrsConstants;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpSession;
import org.springframework.ui.ModelMap;
@@ -48,7 +48,7 @@ public void displayPage_shouldPutAllAttributeTypesIntoMap() throws Exception {
ModelMap map = new ModelMap();
new PersonAttributeTypeListController().displayPage(map);
List alltypes = (List) map.get("personAttributeTypeList");
- Assert.assertEquals(3, alltypes.size());
+ Assertions.assertEquals(3, alltypes.size());
}
/**
@@ -59,13 +59,13 @@ public void displayPage_shouldPutAllAttributeTypesIntoMap() throws Exception {
public void moveDown_shouldMoveSelectedIdsDownInTheList() throws Exception {
// sanity check
List allTypes = Context.getPersonService().getAllPersonAttributeTypes();
- Assert.assertEquals(1, allTypes.get(0).getId().intValue());
+ Assertions.assertEquals(1, allTypes.get(0).getId().intValue());
// the test
Integer[] ids = new Integer[] { 1 };
new PersonAttributeTypeListController().moveDown(ids, new MockHttpSession());
allTypes = Context.getPersonService().getAllPersonAttributeTypes();
- Assert.assertEquals("The types didn't move correctly", 8, allTypes.get(0).getId().intValue());
+ Assertions.assertEquals(8, allTypes.get(0).getId().intValue(), "The types didn't move correctly");
}
/**
@@ -76,13 +76,13 @@ public void moveDown_shouldMoveSelectedIdsDownInTheList() throws Exception {
public void moveDown_shouldNotFailIfGivenLastId() throws Exception {
// sanity check
List allTypes = Context.getPersonService().getAllPersonAttributeTypes();
- Assert.assertEquals(2, allTypes.get(allTypes.size() - 1).getId().intValue());
+ Assertions.assertEquals(2, allTypes.get(allTypes.size() - 1).getId().intValue());
// the test
Integer[] ids = new Integer[] { 2 };
new PersonAttributeTypeListController().moveDown(ids, new MockHttpSession());
allTypes = Context.getPersonService().getAllPersonAttributeTypes();
- Assert.assertEquals(2, allTypes.get(allTypes.size() - 1).getId().intValue());
+ Assertions.assertEquals(2, allTypes.get(allTypes.size() - 1).getId().intValue());
}
/**
@@ -104,13 +104,13 @@ public void moveUp_shouldMoveSelectedIdsUpOneInTheList() throws Exception {
// sanity check
List allTypes = Context.getPersonService().getAllPersonAttributeTypes();
- Assert.assertEquals(8, allTypes.get(1).getId().intValue());
+ Assertions.assertEquals(8, allTypes.get(1).getId().intValue());
// the test
Integer[] ids = new Integer[] { 8 };
new PersonAttributeTypeListController().moveUp(ids, new MockHttpSession());
allTypes = Context.getPersonService().getAllPersonAttributeTypes();
- Assert.assertEquals("The types didn't move correctly", 8, allTypes.get(0).getId().intValue());
+ Assertions.assertEquals(8, allTypes.get(0).getId().intValue(), "The types didn't move correctly");
}
/**
@@ -121,7 +121,7 @@ public void moveUp_shouldMoveSelectedIdsUpOneInTheList() throws Exception {
public void moveUp_shouldNotFailIfGivenFirstId() throws Exception {
// sanity check
List allTypes = Context.getPersonService().getAllPersonAttributeTypes();
- Assert.assertEquals(1, allTypes.get(0).getId().intValue());
+ Assertions.assertEquals(1, allTypes.get(0).getId().intValue());
// the test
new PersonAttributeTypeListController().moveUp(new Integer[] { 1 }, new MockHttpSession());
@@ -146,6 +146,6 @@ public void updateGlobalProperties_shouldSaveGivenPersonListingAttributeTypes()
new PersonAttributeTypeListController().updateGlobalProperties("asdf", "", "", "", "", new MockHttpSession());
String attr = Context.getAdministrationService().getGlobalProperty(
OpenmrsConstants.GLOBAL_PROPERTY_PATIENT_LISTING_ATTRIBUTES);
- Assert.assertEquals("asdf", attr);
+ Assertions.assertEquals("asdf", attr);
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/program/ProgramFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/program/ProgramFormControllerTest.java
index 71eaec5cb..1f0b90a5d 100644
--- a/omod/src/test/java/org/openmrs/web/controller/program/ProgramFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/program/ProgramFormControllerTest.java
@@ -12,11 +12,11 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.api.context.Context;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.transaction.annotation.Transactional;
@@ -36,7 +36,7 @@ public class ProgramFormControllerTest extends BaseModuleWebContextSensitiveTest
public void onSubmit_shouldSaveWorkflowsWithProgram() throws Exception {
// sanity check to make sure that program #3 doesn't have any workflows already:
- Assert.assertEquals(0, Context.getProgramWorkflowService().getProgram(3).getAllWorkflows().size());
+ Assertions.assertEquals(0, Context.getProgramWorkflowService().getProgram(3).getAllWorkflows().size());
MockHttpServletRequest request = new MockHttpServletRequest("POST", "");
request.setParameter("programId", "3");
@@ -45,8 +45,8 @@ public void onSubmit_shouldSaveWorkflowsWithProgram() throws Exception {
ProgramFormController controller = (ProgramFormController) applicationContext.getBean("programForm");
controller.handleRequest(request, new MockHttpServletResponse());
- Assert.assertNotSame(0, Context.getProgramWorkflowService().getProgram(3).getAllWorkflows().size());
- Assert.assertEquals(1, Context.getProgramWorkflowService().getProgram(3).getAllWorkflows().size());
+ Assertions.assertNotSame(0, Context.getProgramWorkflowService().getProgram(3).getAllWorkflows().size());
+ Assertions.assertEquals(1, Context.getProgramWorkflowService().getProgram(3).getAllWorkflows().size());
}
/**
@@ -65,7 +65,7 @@ public void onSubmit_shouldEditExistingWorkflowsWithinPrograms() throws Exceptio
Context.clearSession();
- Assert.assertEquals(2, Context.getProgramWorkflowService().getProgram(3).getWorkflows().size());
+ Assertions.assertEquals(2, Context.getProgramWorkflowService().getProgram(3).getWorkflows().size());
request = new MockHttpServletRequest("POST", "");
request.setParameter("programId", "3");
@@ -73,8 +73,8 @@ public void onSubmit_shouldEditExistingWorkflowsWithinPrograms() throws Exceptio
controller.handleRequest(request, new MockHttpServletResponse());
- Assert.assertEquals(1, Context.getProgramWorkflowService().getProgram(3).getWorkflows().size());
- Assert.assertEquals(5, Context.getProgramWorkflowService().getProgram(3).getWorkflows().iterator().next()
+ Assertions.assertEquals(1, Context.getProgramWorkflowService().getProgram(3).getWorkflows().size());
+ Assertions.assertEquals(5, Context.getProgramWorkflowService().getProgram(3).getWorkflows().iterator().next()
.getConcept().getConceptId().intValue());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/program/WorkflowFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/program/WorkflowFormControllerTest.java
index 8b0d77847..57e32a86a 100644
--- a/omod/src/test/java/org/openmrs/web/controller/program/WorkflowFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/program/WorkflowFormControllerTest.java
@@ -9,11 +9,11 @@
*/
package org.openmrs.web.controller.program;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.ProgramWorkflow;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.web.servlet.ModelAndView;
@@ -43,7 +43,7 @@ public void formBackingObject_shouldReturnValidProgramWorkflowGivenValidProgramI
ModelAndView modelAndView = controller.handleRequest(request, response);
ProgramWorkflow command = (ProgramWorkflow) modelAndView.getModel().get("workflow");
- Assert.assertNotNull(command.getProgramWorkflowId());
+ Assertions.assertNotNull(command.getProgramWorkflowId());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/provider/ProviderFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/provider/ProviderFormControllerTest.java
index 73464de33..5061b5352 100644
--- a/omod/src/test/java/org/openmrs/web/controller/provider/ProviderFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/provider/ProviderFormControllerTest.java
@@ -11,15 +11,15 @@
import java.util.Arrays;
-import junit.framework.Assert;
+import org.junit.jupiter.api.Assertions;
import org.hibernate.ObjectNotFoundException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openmrs.Provider;
import org.openmrs.ProviderAttribute;
import org.openmrs.ProviderAttributeType;
import org.openmrs.api.context.Context;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.ui.ModelMap;
import org.springframework.validation.BindException;
@@ -54,8 +54,8 @@ public void onSubmit_shouldNotVoidOrChangeAttributeListIfTheAttributeValuesAreSa
.getBean("providerFormController");
providerFormController.onSubmit(mockHttpServletRequest, "save", null, null, null, provider, errors,
createModelMap(providerAttributeType));
- Assert.assertFalse(((ProviderAttribute) (provider.getAttributes().toArray()[0])).getVoided());
- Assert.assertEquals(1, provider.getAttributes().size());
+ Assertions.assertFalse(((ProviderAttribute) (provider.getAttributes().toArray()[0])).getVoided());
+ Assertions.assertEquals(1, provider.getAttributes().size());
}
@@ -79,8 +79,8 @@ public void onSubmit_shouldSetAttributesToVoidIfTheValueIsNotSet() throws Except
.getBean("providerFormController");
providerFormController.onSubmit(mockHttpServletRequest, "save", null, null, null, provider, errors,
createModelMap(providerAttributeType));
- Assert.assertEquals(1, provider.getAttributes().size());
- Assert.assertTrue(((ProviderAttribute) (provider.getAttributes().toArray()[0])).isVoided());
+ Assertions.assertEquals(1, provider.getAttributes().size());
+ Assertions.assertTrue(((ProviderAttribute) (provider.getAttributes().toArray()[0])).isVoided());
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/user/ChangePasswordFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/user/ChangePasswordFormControllerTest.java
index 0496658b4..e6e7ed420 100644
--- a/omod/src/test/java/org/openmrs/web/controller/user/ChangePasswordFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/user/ChangePasswordFormControllerTest.java
@@ -9,18 +9,18 @@
*/
package org.openmrs.web.controller.user;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import jakarta.servlet.http.HttpSession;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openmrs.User;
import org.openmrs.api.UserService;
import org.openmrs.api.context.Context;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.openmrs.web.user.UserProperties;
import org.springframework.mock.web.MockHttpSession;
import org.springframework.validation.BindException;
diff --git a/omod/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java
index b63742f3d..4432c5301 100644
--- a/omod/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java
@@ -11,12 +11,12 @@
import java.util.HashSet;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.Role;
import org.openmrs.api.UserService;
import org.openmrs.api.context.Context;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.openmrs.web.test.WebTestHelper;
import org.openmrs.web.test.WebTestHelper.Response;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +54,7 @@ public void shouldUpdateRoleWithParent() throws Exception {
wth.handle(requestPOST);
- Assert.assertEquals("updated child", getUS().getRole("child").getDescription());
+ Assertions.assertEquals("updated child", getUS().getRole("child").getDescription());
deleteAllData();
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/user/UserFormControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/user/UserFormControllerTest.java
index e10a9e813..7633a18c4 100644
--- a/omod/src/test/java/org/openmrs/web/controller/user/UserFormControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/user/UserFormControllerTest.java
@@ -9,14 +9,14 @@
*/
package org.openmrs.web.controller.user;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.mockito.Mock;
import org.openmrs.PersonName;
import org.openmrs.User;
import org.openmrs.api.context.Context;
import org.openmrs.test.Verifies;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -64,7 +64,7 @@ public void handleSubmission_createUserProviderAccountWhenProviderAccountCheckbo
WebRequest request = new ServletWebRequest(new MockHttpServletRequest());
//A user with userId=2 is preset in the Test DataSet and the relevant details are passed
User user = Context.getUserService().getUser(2);
- Assert.assertTrue(Context.getProviderService().getProvidersByPerson(user.getPerson()).isEmpty());
+ Assertions.assertTrue(Context.getProviderService().getProvidersByPerson(user.getPerson()).isEmpty());
ModelMap model = new ModelMap();
model.addAttribute("isProvider", false);
MockHttpServletResponse response = new MockHttpServletResponse();
@@ -72,8 +72,8 @@ public void handleSubmission_createUserProviderAccountWhenProviderAccountCheckbo
controller.handleSubmission(request, new MockHttpSession(), new ModelMap(), "", null, "Test1234",
"valid secret question", "valid secret answer", "Test1234", false, new String[] { "Provider" }, "true",
"addToProviderTable", user, new BindException(user, "user"), response);
- Assert.assertFalse(Context.getProviderService().getProvidersByPerson(user.getPerson()).isEmpty());
- Assert.assertEquals(200, response.getStatus());
+ Assertions.assertFalse(Context.getProviderService().getProvidersByPerson(user.getPerson()).isEmpty());
+ Assertions.assertEquals(200, response.getStatus());
}
@Test
@@ -86,7 +86,7 @@ public void shouldSetResponseStatusToBadRequestOnError() throws Exception {
controller.handleSubmission(request, new MockHttpSession(), new ModelMap(), "", null, "Test123",
"valid secret question", "valid secret answer", "Test1234", false, new String[] { "Provider" }, "true",
"addToProviderTable", user, new BindException(user, "user"), response);
- Assert.assertEquals(400, response.getStatus());
+ Assertions.assertEquals(400, response.getStatus());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/controller/user/UserListControllerTest.java b/omod/src/test/java/org/openmrs/web/controller/user/UserListControllerTest.java
index 03c006d67..d27088d33 100644
--- a/omod/src/test/java/org/openmrs/web/controller/user/UserListControllerTest.java
+++ b/omod/src/test/java/org/openmrs/web/controller/user/UserListControllerTest.java
@@ -11,11 +11,11 @@
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.openmrs.Role;
import org.openmrs.User;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
import org.springframework.ui.ModelMap;
/**
@@ -31,7 +31,7 @@ public class UserListControllerTest extends BaseModuleWebContextSensitiveTest {
public void displayUsers_shouldGetAllUsersIfNoNameGiven() {
UserListController controller = new UserListController();
List users = controller.getUsers("Search", "", null, false);
- Assert.assertEquals(2, users.size());
+ Assertions.assertEquals(2, users.size());
}
/**
@@ -42,7 +42,7 @@ public void displayUsers_shouldGetAllUsersIfNoNameGiven() {
public void displayUsers_shouldGetUsersJustGivenActionParameter() {
UserListController controller = new UserListController();
List users = controller.getUsers("Search", null, null, null);
- Assert.assertEquals(2, users.size());
+ Assertions.assertEquals(2, users.size());
}
/**
@@ -53,7 +53,7 @@ public void displayUsers_shouldGetUsersJustGivenActionParameter() {
public void displayUsers_shouldGetUsersWithAGivenRole() {
UserListController controller = new UserListController();
List users = controller.getUsers("Search", null, new Role("Provider"), null);
- Assert.assertEquals(1, users.size());
+ Assertions.assertEquals(1, users.size());
}
/**
@@ -64,6 +64,6 @@ public void displayUsers_shouldGetUsersWithAGivenRole() {
public void displayUsers_shouldIncludeDisabledUsersIfRequested() {
UserListController controller = new UserListController();
List users = controller.getUsers("Search", "", new Role(""), true);
- Assert.assertEquals(3, users.size());
+ Assertions.assertEquals(3, users.size());
}
}
diff --git a/omod/src/test/java/org/openmrs/web/dwr/ConceptListItemTest.java b/omod/src/test/java/org/openmrs/web/dwr/ConceptListItemTest.java
index 139b41de1..d0a4db3f0 100644
--- a/omod/src/test/java/org/openmrs/web/dwr/ConceptListItemTest.java
+++ b/omod/src/test/java/org/openmrs/web/dwr/ConceptListItemTest.java
@@ -9,11 +9,11 @@
*/
package org.openmrs.web.dwr;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Locale;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.openmrs.Concept;
import org.openmrs.ConceptClass;
import org.openmrs.ConceptDatatype;
diff --git a/omod/src/test/java/org/openmrs/web/dwr/DWRConceptServiceTest.java b/omod/src/test/java/org/openmrs/web/dwr/DWRConceptServiceTest.java
index 836286bf2..05052406e 100644
--- a/omod/src/test/java/org/openmrs/web/dwr/DWRConceptServiceTest.java
+++ b/omod/src/test/java/org/openmrs/web/dwr/DWRConceptServiceTest.java
@@ -15,9 +15,9 @@
import java.util.Locale;
import org.hibernate.Hibernate;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.openmrs.Concept;
import org.openmrs.ConceptName;
import org.openmrs.GlobalProperty;
@@ -25,13 +25,13 @@
import org.openmrs.api.context.Context;
import org.openmrs.util.OpenmrsConstants;
import org.openmrs.util.OpenmrsUtil;
-import org.openmrs.web.test.BaseModuleWebContextSensitiveTest;
+import org.openmrs.web.test.jupiter.BaseModuleWebContextSensitiveTest;
public class DWRConceptServiceTest extends BaseModuleWebContextSensitiveTest {
private DWRConceptService dwrConceptService = new DWRConceptService();
- @Before
+ @BeforeEach
public void before() throws Exception {
executeDataSet("org/openmrs/web/dwr/include/DWRConceptServiceTest-coded-concept-with-no-answers.xml");
updateSearchIndex();
@@ -59,8 +59,8 @@ public void findBatchOfConcepts_shouldReturnConceptByGivenIdIfExclusionAndInclus
Concept expected = Context.getConceptService().getConcept(phrase);
List