diff --git a/api/src/main/java/org/openmrs/module/initializer/api/loaders/OpenConceptLabLoader.java b/api/src/main/java/org/openmrs/module/initializer/api/loaders/OpenConceptLabLoader.java
index 37f4b9a5b..2590b1344 100644
--- a/api/src/main/java/org/openmrs/module/initializer/api/loaders/OpenConceptLabLoader.java
+++ b/api/src/main/java/org/openmrs/module/initializer/api/loaders/OpenConceptLabLoader.java
@@ -11,7 +11,7 @@
import java.io.File;
import java.util.zip.ZipFile;
-@OpenmrsProfile(modules = { "openconceptlab:1.2.9" })
+@OpenmrsProfile(modules = { "openconceptlab:1.2.9 - 9.*" })
public class OpenConceptLabLoader extends BaseFileLoader {
@Override
diff --git a/api/src/test/java/org/openmrs/module/initializer/api/OpenConceptLabLoaderIntegrationTest.java b/api/src/test/java/org/openmrs/module/initializer/api/OpenConceptLabLoaderIntegrationTest.java
index f59ec18e5..d6cdb8fda 100644
--- a/api/src/test/java/org/openmrs/module/initializer/api/OpenConceptLabLoaderIntegrationTest.java
+++ b/api/src/test/java/org/openmrs/module/initializer/api/OpenConceptLabLoaderIntegrationTest.java
@@ -73,8 +73,8 @@ public void load_shouldImportOCLPackages() {
Concept c = conceptService.getConceptByUuid("1419AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
Assert.assertNotNull(c);
Assert.assertFalse(c.getRetired());
- Assert.assertEquals("VACCINE MANUFACTURER", c.getName(Locale.ENGLISH).getName());
- Assert.assertEquals("vaccine maker", c.getShortNameInLocale(Locale.ENGLISH).getName());
+ Assert.assertEquals("Vaccine manufacturer", c.getName(Locale.ENGLISH).getName());
+ Assert.assertEquals("Vaccine maker", c.getShortNameInLocale(Locale.ENGLISH).getName());
Assert.assertEquals("Fabricant du vaccin", c.getName(Locale.FRENCH).getName());
Assert.assertEquals("Kiwanda cha kutengeneza chanjo", c.getName(LOCALE_SW).getName());
Assert.assertEquals(0, c.getDescriptions().size());
@@ -100,20 +100,20 @@ public void load_shouldImportOCLPackages() {
Context.setLocale(Locale.ENGLISH);
Concept c = conceptService.getConceptByUuid("5864AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
Assert.assertNotNull(c);
- Assert.assertEquals("YELLOW FEVER VACCINATION", c.getName(Locale.ENGLISH).getName());
- Assert.assertEquals("Vaccine given for Yellow Fever.", c.getDescription().toString());
- Assert.assertEquals("Drug", c.getConceptClass().getName());
+ Assert.assertEquals("Yellow fever vaccination", c.getName(Locale.ENGLISH).getName());
+ Assert.assertEquals("Vaccination given for Yellow Fever.", c.getDescription().toString());
+ Assert.assertEquals("Procedure", c.getConceptClass().getName());
Assert.assertEquals("N/A", c.getDatatype().getName());
}
// Verify by name
{
Context.setLocale(Locale.ENGLISH);
- Concept c = conceptService.getConceptByName("VACCINE MANUFACTURER");
+ Concept c = conceptService.getConceptByName("Vaccine manufacturer");
Assert.assertNotNull(c);
Assert.assertFalse(c.getRetired());
- Assert.assertEquals("VACCINE MANUFACTURER", c.getName(Locale.ENGLISH).getName());
- Assert.assertEquals("vaccine maker", c.getShortNameInLocale(Locale.ENGLISH).getName());
+ Assert.assertEquals("Vaccine manufacturer", c.getName(Locale.ENGLISH).getName());
+ Assert.assertEquals("Vaccine maker", c.getShortNameInLocale(Locale.ENGLISH).getName());
Assert.assertEquals("Fabricant du vaccin", c.getName(Locale.FRENCH).getName());
Assert.assertEquals("Kiwanda cha kutengeneza chanjo", c.getName(LOCALE_SW).getName());
Assert.assertEquals(0, c.getDescriptions().size());
@@ -140,8 +140,8 @@ public void load_shouldImportOCLPackages() {
Concept c = conceptService.getConceptByMapping("1419", "CIEL");
Assert.assertNotNull(c);
Assert.assertFalse(c.getRetired());
- Assert.assertEquals("VACCINE MANUFACTURER", c.getName(Locale.ENGLISH).getName());
- Assert.assertEquals("vaccine maker", c.getShortNameInLocale(Locale.ENGLISH).getName());
+ Assert.assertEquals("Vaccine manufacturer", c.getName(Locale.ENGLISH).getName());
+ Assert.assertEquals("Vaccine maker", c.getShortNameInLocale(Locale.ENGLISH).getName());
Assert.assertEquals("Fabricant du vaccin", c.getName(Locale.FRENCH).getName());
Assert.assertEquals("Kiwanda cha kutengeneza chanjo", c.getName(LOCALE_SW).getName());
Assert.assertEquals(0, c.getDescriptions().size());
@@ -189,7 +189,7 @@ public void load_shouldImportOCLPackages() {
Context.setLocale(Locale.ENGLISH);
Concept c = conceptService.getConceptByName("PNEUMOCOCCAL VACCINE");
Assert.assertNotNull(c);
- Assert.assertEquals(3, c.getNames().size());
+ Assert.assertEquals(6, c.getNames().size());
Assert.assertEquals(0, c.getShortNames().size());
Assert.assertEquals(0, c.getDescriptions().size());
Assert.assertEquals("Drug", c.getConceptClass().getName());
@@ -218,7 +218,7 @@ public void load_shouldImportOCLPackages() {
Concept c = conceptService.getConceptByUuid("17AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
Assert.assertNotNull(c);
Assert.assertFalse(c.getRetired());
- Assert.assertEquals("DIPTHERIA TETANUS BOOSTER", c.getFullySpecifiedName(Locale.ENGLISH).getName());
+ Assert.assertEquals("Diptheria tetanus booster", c.getFullySpecifiedName(Locale.ENGLISH).getName());
Assert.assertEquals("Drug", c.getConceptClass().getName());
Assert.assertEquals("N/A", c.getDatatype().getName());
}
diff --git a/api/src/test/resources/testAppDataDir/configuration/ocl/test.zip b/api/src/test/resources/testAppDataDir/configuration/ocl/test.zip
index a9f1beddf..7a9fa1d18 100644
Binary files a/api/src/test/resources/testAppDataDir/configuration/ocl/test.zip and b/api/src/test/resources/testAppDataDir/configuration/ocl/test.zip differ
diff --git a/pom.xml b/pom.xml
index 6ce213114..f827fc5e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
4.6.0
1.2.2
1.3.4
- 1.2.9
+ 2.4.0
1.6.0
1.1.0
2.0.2-SNAPSHOT