Migrate to org.openmrs.test.jupiter.BaseModuleContextSensitiveTest

Author: wikumChamith

api-tests/src/test/java/org/openmrs/module/reporting/data/converter/PrivilegedDataConverterTest.java

@@ -12,11 +12,11 @@
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openmrs.api.context.Context;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.openmrs.test.SkipBaseSetup;
+import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest;
 
 @SkipBaseSetup
 public class PrivilegedDataConverterTest extends BaseModuleContextSensitiveTest {
@@ -27,7 +27,7 @@ public class PrivilegedDataConverterTest extends BaseModuleContextSensitiveTest
     public static final String HAS_PRIV = "A privilege I have";
     public static final String DOES_NOT_HAVE_PRIV = "A privilege I do not have";
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         initializeInMemoryDatabase();
         executeDataSet("org/openmrs/module/reporting/include/PrivilegeTest.xml");

api-tests/src/test/java/org/openmrs/module/reporting/data/patient/service/PatientDataServiceImplTest.java

@@ -10,8 +10,8 @@
 package org.openmrs.module.reporting.data.patient.service;
 
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openmrs.Cohort;
 import org.openmrs.Patient;
 import org.openmrs.PersonAttribute;
@@ -31,7 +31,7 @@
 import org.openmrs.module.reporting.definition.library.DocumentedDefinition;
 import org.openmrs.module.reporting.evaluation.EvaluationContext;
 import org.openmrs.test.BaseContextSensitiveTest;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Collections;
@@ -59,7 +59,7 @@ public class PatientDataServiceImplTest extends BaseModuleContextSensitiveTest {
 	 * 
 	 * @throws Exception
 	 */
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
 	}

api-tests/src/test/java/org/openmrs/module/reporting/data/visit/evaluator/VisitIdDataEvaluatorTest.java

@@ -10,8 +10,8 @@
 package org.openmrs.module.reporting.data.visit.evaluator;
 
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openmrs.Cohort;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.reporting.common.TestUtil;
@@ -21,11 +21,11 @@
 import org.openmrs.module.reporting.evaluation.EvaluationContext;
 import org.openmrs.module.reporting.evaluation.context.VisitEvaluationContext;
 import org.openmrs.module.reporting.query.visit.VisitIdSet;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.openmrs.test.SkipBaseSetup;
+import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest;
 
 @SkipBaseSetup
-public class VisitIdDataEvaluatorTest extends BaseModuleContextSensitiveTest{
+public class VisitIdDataEvaluatorTest extends BaseModuleContextSensitiveTest {
 
     protected static final String XML_DATASET_PATH = "org/openmrs/module/reporting/include/";
 
@@ -37,7 +37,7 @@ public class VisitIdDataEvaluatorTest extends BaseModuleContextSensitiveTest{
      *
      * @throws Exception
      */
-    @Before
+    @BeforeEach
     public void setup() throws Exception {
         initializeInMemoryDatabase();
         authenticate();

api-tests/src/test/java/org/openmrs/module/reporting/evaluation/EvaluationProfilerTest.java

@@ -9,25 +9,23 @@
  */
 package org.openmrs.module.reporting.evaluation;
 
-import static org.junit.Assume.assumeTrue;
-
 import org.apache.log4j.Appender;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
 import org.apache.log4j.WriterAppender;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.reporting.cohort.definition.GenderCohortDefinition;
 import org.openmrs.module.reporting.indicator.CohortIndicator;
 import org.openmrs.module.reporting.indicator.service.IndicatorService;
 import org.openmrs.module.reporting.test.OpenmrsVersionTestListener;
 import org.openmrs.module.reporting.test.RequiresVersion;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest;
 import org.springframework.test.context.TestExecutionListeners;
 
 import java.io.StringWriter;
@@ -52,7 +50,7 @@ public class EvaluationProfilerTest extends BaseModuleContextSensitiveTest {
 	/**
 	 * Setup each test by configuring AOP on the relevant services and logging for the profiler class
 	 */
-	@Before
+	@BeforeEach
 	public void setup() {
 		profiler1 = new EvaluationProfiler(new EvaluationContext());
 		profiler2 = new EvaluationProfiler(new EvaluationContext());
@@ -70,7 +68,7 @@ public void setup() {
 	/**
 	 * Cleanup after tests by removing AOP and resetting logging
 	 */
-	@After
+	@AfterEach
 	public void cleanup() {
 		logger.setLevel(startingLevel);
 		for (Appender appender : startingAppenders) {

api-tests/src/test/java/org/openmrs/module/reporting/evaluation/EvaluationProfilerTest24On.java

@@ -12,8 +12,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openmrs.Cohort;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.reporting.common.TestUtil;
@@ -23,8 +23,8 @@
 import org.openmrs.module.reporting.query.obs.ObsQueryResult;
 import org.openmrs.module.reporting.query.obs.definition.SqlObsQuery;
 import org.openmrs.module.reporting.query.obs.service.ObsQueryService;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.openmrs.test.SkipBaseSetup;
+import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest;
 
 /**
  * Test the evaluation of the SqlObsQuery
@@ -34,7 +34,7 @@ public class SqlObsQueryEvaluatorTest extends BaseModuleContextSensitiveTest {
 
 	protected static Log log = LogFactory.getLog(SqlObsQueryEvaluatorTest.class);
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		initializeInMemoryDatabase();
 		authenticate();