From 98ad856371dad7fdd81e87e95d503fd0f514a8b0 Mon Sep 17 00:00:00 2001 From: binduak Date: Fri, 7 Oct 2022 09:23:17 +0530 Subject: [PATCH 1/3] Fix typo --- .../advice/BahmniEncounterTransactionUpdateAdviceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bahmni-emr-api/src/test/java/org/openmrs/module/bahmniemrapi/encountertransaction/advice/BahmniEncounterTransactionUpdateAdviceTest.java b/bahmni-emr-api/src/test/java/org/openmrs/module/bahmniemrapi/encountertransaction/advice/BahmniEncounterTransactionUpdateAdviceTest.java index 046f7f6fb2..127d2734ef 100644 --- a/bahmni-emr-api/src/test/java/org/openmrs/module/bahmniemrapi/encountertransaction/advice/BahmniEncounterTransactionUpdateAdviceTest.java +++ b/bahmni-emr-api/src/test/java/org/openmrs/module/bahmniemrapi/encountertransaction/advice/BahmniEncounterTransactionUpdateAdviceTest.java @@ -35,7 +35,7 @@ public void shouldExecuteObsValueCalculatorFromApplicationDataDirectory() throws } @Test - public void shouldLoadpplicationDataDirectoryPath() throws Throwable { + public void shouldLoadApplicationDataDirectoryPath() throws Throwable { PowerMockito.mockStatic(OpenmrsUtil.class); String path = getClass().getClassLoader().getResource("").getPath(); // remove the trailing "/" From 2c31ed037d63724227495c557bdafde84ca86024 Mon Sep 17 00:00:00 2001 From: binduak Date: Tue, 11 Oct 2022 16:32:54 +0530 Subject: [PATCH 2/3] Revert "Bindu | BAH-2450 | ignore test class to fix build failure" This reverts commit fcac8ce5104bc7481df3aa49ce642e978fe79684. --- .../advice/BahmniEncounterTransactionUpdateAdviceTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/bahmni-emr-api/src/test/java/org/openmrs/module/bahmniemrapi/encountertransaction/advice/BahmniEncounterTransactionUpdateAdviceTest.java b/bahmni-emr-api/src/test/java/org/openmrs/module/bahmniemrapi/encountertransaction/advice/BahmniEncounterTransactionUpdateAdviceTest.java index 127d2734ef..18dd3f461a 100644 --- a/bahmni-emr-api/src/test/java/org/openmrs/module/bahmniemrapi/encountertransaction/advice/BahmniEncounterTransactionUpdateAdviceTest.java +++ b/bahmni-emr-api/src/test/java/org/openmrs/module/bahmniemrapi/encountertransaction/advice/BahmniEncounterTransactionUpdateAdviceTest.java @@ -1,6 +1,5 @@ package org.openmrs.module.bahmniemrapi.encountertransaction.advice; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.openmrs.module.bahmniemrapi.encountertransaction.contract.BahmniEncounterTransaction; @@ -19,7 +18,6 @@ @RunWith(PowerMockRunner.class) @PrepareForTest(OpenmrsUtil.class) -@Ignore public class BahmniEncounterTransactionUpdateAdviceTest { private static String DEFAULT_ENCOUNTER_UUID = "defaultEncounterUuid"; From 57948a9ace3072605d7dc33a8b0e1b1e550d2123 Mon Sep 17 00:00:00 2001 From: binduak Date: Wed, 12 Oct 2022 13:26:55 +0530 Subject: [PATCH 3/3] Bindu | Add powermock ignore to fix the testcase --- .../advice/BahmniEncounterTransactionUpdateAdviceTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bahmni-emr-api/src/test/java/org/openmrs/module/bahmniemrapi/encountertransaction/advice/BahmniEncounterTransactionUpdateAdviceTest.java b/bahmni-emr-api/src/test/java/org/openmrs/module/bahmniemrapi/encountertransaction/advice/BahmniEncounterTransactionUpdateAdviceTest.java index 18dd3f461a..dd55d5bb23 100644 --- a/bahmni-emr-api/src/test/java/org/openmrs/module/bahmniemrapi/encountertransaction/advice/BahmniEncounterTransactionUpdateAdviceTest.java +++ b/bahmni-emr-api/src/test/java/org/openmrs/module/bahmniemrapi/encountertransaction/advice/BahmniEncounterTransactionUpdateAdviceTest.java @@ -5,6 +5,7 @@ import org.openmrs.module.bahmniemrapi.encountertransaction.contract.BahmniEncounterTransaction; import org.openmrs.util.OpenmrsUtil; 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; @@ -18,6 +19,7 @@ @RunWith(PowerMockRunner.class) @PrepareForTest(OpenmrsUtil.class) +@PowerMockIgnore({"javax.management.*", "javax.xml.*", "org.xml.sax.*", "org.w3c.dom.*", "org.springframework.context.*", "org.apache.log4j.*", "org.apache.commons.logging.*", "org.jacoco.*", "jdk.internal.reflect.*"}) public class BahmniEncounterTransactionUpdateAdviceTest { private static String DEFAULT_ENCOUNTER_UUID = "defaultEncounterUuid";