Concept Map Types in the standard test dataset have the wrong uuids -…

… TRUNK-3683
openmrs · Jun 11, 2013 · 20d9055 · 20d9055
1 parent 7eefb75
commit 20d9055
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/api/src/test/java/org/openmrs/api/ConceptServiceTest.java b/api/src/test/java/org/openmrs/api/ConceptServiceTest.java
@@ -1415,7 +1415,7 @@ public void saveConceptStopWord_shouldSaveConceptStopWordIntoDatabase() throws E
 	public void saveConceptStopWord_shouldSaveConceptStopWordAssignDefaultLocaleIsItNull() throws Exception {
 		ConceptStopWord conceptStopWord = new ConceptStopWord("The");
 		conceptService.saveConceptStopWord(conceptStopWord);
-
+		
 		List<String> conceptStopWords = conceptService.getConceptStopWords(Context.getLocale());
 		assertThat(conceptStopWords, hasItem("THE"));
 	}
@@ -2250,11 +2250,12 @@ public void getDefaultConceptMapType_shouldReturnSameAsByDefault() throws Except
 	 */
 	@Test
 	public void getDefaultConceptMapType_shouldReturnTypeAsSetInGp() throws Exception {
-		Context.getAdministrationService().saveGlobalProperty(new GlobalProperty("concept.defaultConceptMapType", "is-a"));
+		final String testName = "is a";
+		Context.getAdministrationService().saveGlobalProperty(new GlobalProperty("concept.defaultConceptMapType", testName));
 
 		ConceptMapType conceptMapType = conceptService.getDefaultConceptMapType();
 		Assert.assertNotNull(conceptMapType);
-		Assert.assertEquals("is-a", conceptMapType.getName());
+		Assert.assertEquals(testName, conceptMapType.getName());
 	}
 
 	/**

diff --git a/api/src/test/java/org/openmrs/validator/ConceptMapTypeValidatorTest.java b/api/src/test/java/org/openmrs/validator/ConceptMapTypeValidatorTest.java
@@ -33,7 +33,7 @@ public class ConceptMapTypeValidatorTest extends BaseContextSensitiveTest {
 	@Verifies(value = "should fail if the concept map type name is a duplicate", method = "validate(Object,Errors)")
 	public void validate_shouldFailIfTheConceptMapTypeNameIsADuplicate() throws Exception {
 		ConceptMapType mapType = new ConceptMapType();
-		mapType.setName("is-a");
+		mapType.setName("is a");
 		Errors errors = new BindException(mapType, "mapType");
 		new ConceptMapTypeValidator().validate(mapType, errors);
 		Assert.assertEquals(true, errors.hasFieldErrors("name"));

diff --git a/api/src/test/resources/org/openmrs/include/standardTestDataset.xml b/api/src/test/resources/org/openmrs/include/standardTestDataset.xml
@@ -85,9 +85,9 @@
   <concept_reference_term concept_reference_term_id="9" concept_source_id="1" code="127cd4689" name="cd4died term2" description="died" retired="0" creator="1" date_created="2004-08-12 00:00:00.0" uuid="SSTRM-127689_3"/>
   <concept_reference_term concept_reference_term_id="10" concept_source_id="1" code="454545" name="no term name3" description="" retired="0" creator="1" date_created="2004-08-12 00:00:00.0" uuid="SSTRM-454545"/>
   <concept_reference_term concept_reference_term_id="11" concept_source_id="1" code="retired code" name="retired name" description="test duplicate term that is retired" retired="1" retired_by="1" retire_reason="test reason" date_retired="2004-08-12 12:00:00" creator="1" date_created="2004-08-12 00:00:00.0" uuid="SSTRM-retired code"/>
-  <concept_map_type concept_map_type_id="1" name="is-a" is_hidden="0" retired="0" creator="1" date_created="2004-08-12 00:00:00.0" uuid="8a8baebc-49d5-11e0-8fed-18a905e044dc"/>
-  <concept_map_type concept_map_type_id="2" name="same-as" description="Indicates similarity" is_hidden="0" retired="0" creator="1" date_created="2004-08-12 00:00:00.0" uuid="f40555f0-49d5-11e0-8fed-18a905e044dc"/>
-  <concept_map_type concept_map_type_id="3" name="broader-than" is_hidden="0" retired="0" creator="1" date_created="2004-08-12 00:00:00.0" uuid="fa864d62-49d5-11e0-8fed-18a905e044dc"/>
+  <concept_map_type concept_map_type_id="1" name="is a" is_hidden="0" retired="0" creator="1" date_created="2004-08-12 00:00:00.0" uuid="1ce7a784-7d8f-11e1-909d-c80aa9edcf4e"/>
+  <concept_map_type concept_map_type_id="2" name="same-as" description="Indicates similarity" is_hidden="0" retired="0" creator="1" date_created="2004-08-12 00:00:00.0" uuid="35543629-7d8c-11e1-909d-c80aa9edcf4e"/>
+  <concept_map_type concept_map_type_id="3" name="broader-than" is_hidden="0" retired="0" creator="1" date_created="2004-08-12 00:00:00.0" uuid="4b9d9421-7d8c-11e1-909d-c80aa9edcf4e"/>
   <concept_map_type concept_map_type_id="4" name="is-parent-to" is_hidden="0" retired="0" creator="1" date_created="2004-08-12 00:00:00.0" uuid="0e7a8536-49d6-11e0-8fed-18a905e044dc"/>
   <concept_map_type concept_map_type_id="5" name="related-to" is_hidden="0" retired="0" creator="1" date_created="2004-08-12 00:00:00.0" uuid="1ccba764-49d6-11e0-8fed-18a905e044dc"/>
   <concept_map_type concept_map_type_id="6" name="testing" is_hidden="0" retired="1" retired_by="1" date_retired="2004-08-12 12:00:00" retire_reason="test reason" creator="1" date_created="2004-08-12 00:00:00.0" uuid="8ef30800-4db4-11e0-b7af-18a905e044dc"/>