OpenMRS

Timestamp:

07/16/08 12:29:31 (6 months ago)

Author:

bwolfe

Message:

Merging trunk to the 1.3.x branch (sideporting) to get bug fixes into an RC5 release [4745]:[4946]

Files:

• openmrs/branches/1.3.x/test/api/org/openmrs/test/api/PersonServiceTest.java (modified) (2 diffs)

openmrs/branches/1.3.x/test/api/org/openmrs/test/api/PersonServiceTest.java

@@ -26 +26 @@
-import org.openmrs.PersonName;
-import org.openmrs.Relationship;
+import org.openmrs.RelationshipType;
-import org.openmrs.api.AdministrationService;
-import org.openmrs.api.PatientService;
@@ -118 +119 @@
-                List<Relationship> aRels = personService.getRelationshipsByPerson(p);
-                List<Relationship> bRels = personService.getRelationshipsByPerson(patient);
+                
+                //test loading relationship types real quick.
+                List<RelationshipType> rTmp = personService.getAllRelationshipTypes();
+                assertNotNull(rTmp);
+                RelationshipType rTypeTmp = personService.getRelationshipTypeByName("Doctor/Patient");
+                assertNotNull(rTypeTmp);
+                rTypeTmp = personService.getRelationshipTypeByName("booya");
+                assertNull(rTypeTmp);
+                
+
-                // Uncomment for console output.
-                //System.out.println("Relationships before voiding all:");