diff --git a/api/pom.xml b/api/pom.xml index b6cbc81..624baed 100755 --- a/api/pom.xml +++ b/api/pom.xml @@ -51,7 +51,13 @@ org.mockito - mockito-all + mockito-core + test + + + + org.powermock + powermock-api-mockito2 test diff --git a/api/src/main/resources/moduleApplicationContext.xml b/api/src/main/resources/moduleApplicationContext.xml index 5132f7d..a244ce2 100755 --- a/api/src/main/resources/moduleApplicationContext.xml +++ b/api/src/main/resources/moduleApplicationContext.xml @@ -30,7 +30,7 @@ - + diff --git a/api/src/test/java/org/openmrs/module/auditlog/model/AuditLogTest.java b/api/src/test/java/org/openmrs/module/auditlog/model/AuditLogTest.java index 561be8c..a4285bc 100644 --- a/api/src/test/java/org/openmrs/module/auditlog/model/AuditLogTest.java +++ b/api/src/test/java/org/openmrs/module/auditlog/model/AuditLogTest.java @@ -9,6 +9,7 @@ import org.openmrs.User; import org.openmrs.module.auditlog.util.DateUtil; import org.openmrs.module.webservices.rest.SimpleObject; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.modules.junit4.PowerMockRunner; import java.util.Date; @@ -17,6 +18,7 @@ import static org.junit.Assert.assertNull; import static org.powermock.api.mockito.PowerMockito.when; +@PowerMockIgnore("javax.management.*") @RunWith(PowerMockRunner.class) public class AuditLogTest { @Mock diff --git a/api/src/test/java/org/openmrs/module/auditlog/service/impl/AuditLogServiceImplTest.java b/api/src/test/java/org/openmrs/module/auditlog/service/impl/AuditLogServiceImplTest.java index 707627c..aa1e294 100644 --- a/api/src/test/java/org/openmrs/module/auditlog/service/impl/AuditLogServiceImplTest.java +++ b/api/src/test/java/org/openmrs/module/auditlog/service/impl/AuditLogServiceImplTest.java @@ -20,6 +20,7 @@ import org.openmrs.module.auditlog.model.AuditLog; import org.openmrs.module.auditlog.util.DateUtil; import org.openmrs.module.webservices.rest.SimpleObject; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -31,6 +32,7 @@ import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.when; +@PowerMockIgnore("javax.management.*") @RunWith(PowerMockRunner.class) @PrepareForTest(Context.class) public class AuditLogServiceImplTest { @@ -130,7 +132,7 @@ public void shouldCreateAuditLog() throws Exception { AuditLogPayload log = new AuditLogPayload(patientUuid, "message", "eventType", "registration"); mockStatic(Context.class); User user = new User(); - user.setName("auditlogger"); + user.setUsername("auditlogger"); when(Context.getAuthenticatedUser()).thenReturn(user); when(Context.getPatientService()).thenReturn(patientService); Patient patient = new Patient(); @@ -153,7 +155,7 @@ public void shouldCreateAuditLogWithParams() throws Exception { String patientUuid = "patientUuid"; mockStatic(Context.class); User user = new User(); - user.setName("auditlogger"); + user.setUsername("auditlogger"); when(Context.getAuthenticatedUser()).thenReturn(user); when(Context.getPatientService()).thenReturn(patientService); Patient patient = new Patient(); @@ -178,7 +180,7 @@ public void shouldIgnoreParamsIfIsEmptyWhenCreateAuditLogWithParams() throws Exc String patientUuid = "patientUuid"; mockStatic(Context.class); User user = new User(); - user.setName("auditlogger"); + user.setUsername("auditlogger"); when(Context.getAuthenticatedUser()).thenReturn(user); when(Context.getPatientService()).thenReturn(patientService); Patient patient = new Patient(); diff --git a/omod/pom.xml b/omod/pom.xml index e559a5d..75600e8 100755 --- a/omod/pom.xml +++ b/omod/pom.xml @@ -81,6 +81,11 @@ test-jar + + org.powermock + powermock-api-mockito2 + test + diff --git a/omod/src/main/resources/webModuleApplicationContext.xml b/omod/src/main/resources/webModuleApplicationContext.xml index 3caf5cd..37f09ea 100755 --- a/omod/src/main/resources/webModuleApplicationContext.xml +++ b/omod/src/main/resources/webModuleApplicationContext.xml @@ -22,12 +22,11 @@ - + - - + - + + - diff --git a/omod/src/test/java/org/openmrs/module/auditlog/web/BaseWebControllerTest.java b/omod/src/test/java/org/openmrs/module/auditlog/web/BaseWebControllerTest.java index aebfe7d..99e8265 100644 --- a/omod/src/test/java/org/openmrs/module/auditlog/web/BaseWebControllerTest.java +++ b/omod/src/test/java/org/openmrs/module/auditlog/web/BaseWebControllerTest.java @@ -10,8 +10,8 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.HandlerExecutionChain; -import org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter; -import org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -22,10 +22,10 @@ public class BaseWebControllerTest extends BaseModuleWebContextSensitiveTest { @Autowired - private AnnotationMethodHandlerAdapter handlerAdapter; + private RequestMappingHandlerAdapter handlerAdapter; @Autowired - private List handlerMappings; + private List handlerMappings; private ObjectMapper objectMapper = new ObjectMapper(); @@ -124,7 +124,7 @@ public MockHttpServletResponse handle(HttpServletRequest request) throws Excepti MockHttpServletResponse response = new MockHttpServletResponse(); HandlerExecutionChain handlerExecutionChain = null; - for (DefaultAnnotationHandlerMapping handlerMapping : handlerMappings) { + for (RequestMappingHandlerMapping handlerMapping : handlerMappings) { handlerExecutionChain = handlerMapping.getHandler(request); if (handlerExecutionChain != null) { break; diff --git a/omod/src/test/java/org/openmrs/module/auditlog/web/controller/AuditLogControllerTest.java b/omod/src/test/java/org/openmrs/module/auditlog/web/controller/AuditLogControllerTest.java index af80d83..0105a72 100644 --- a/omod/src/test/java/org/openmrs/module/auditlog/web/controller/AuditLogControllerTest.java +++ b/omod/src/test/java/org/openmrs/module/auditlog/web/controller/AuditLogControllerTest.java @@ -16,6 +16,7 @@ import org.openmrs.module.auditlog.util.DateUtil; import org.openmrs.module.webservices.rest.SimpleObject; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -29,6 +30,7 @@ import static org.mockito.MockitoAnnotations.initMocks; import static org.powermock.api.mockito.PowerMockito.when; +@PowerMockIgnore("javax.management.*") @PrepareForTest({Context.class}) @RunWith(PowerMockRunner.class) public class AuditLogControllerTest { diff --git a/pom.xml b/pom.xml index 14e9306..d3a928f 100755 --- a/pom.xml +++ b/pom.xml @@ -116,12 +116,12 @@ - 2.1.0 + 2.5.0 - 4.12 - 1.6.5 - 1.3 - 1.10.19 + 4.13 + 2.0.7 + 2.2 + 3.5.11 0.10.4 1.3-SNAPSHOT 0.2.12 @@ -138,7 +138,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 ${powerMockVersion} test @@ -208,18 +208,6 @@ ${hamcrestVersion} test - - org.mockito - mockito-all - ${mockitoVersion} - - - org.hamcrest - hamcrest-core - - - test - org.mockito