Merge pull request openmrs#356 from isha-tripathi/TRUNK-3736

modified Provider.toString() to return provider id with name
aidanbebbington · Jul 31, 2013 · 249b805 · 249b805
2 parents 571f23a + 24e631e
commit 249b805
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/api/src/main/java/org/openmrs/Provider.java b/api/src/main/java/org/openmrs/Provider.java
@@ -17,11 +17,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.google.common.base.Objects;
-
 /**
  * Represents a person who may provide care to a patient during an encounter
- * 
+ *
  * @since 1.9
  */
 public class Provider extends BaseCustomizableMetadata<ProviderAttribute> {
@@ -107,8 +105,10 @@ public String getIdentifier() {
 
 	@Override
 	public String toString() {
-		return Objects.toStringHelper(getClass()).add("providerId", providerId).add("identifier", identifier).add("person",
-		    person).toString();
+		StringBuilder sb = new StringBuilder();
+		sb.append(providerId);
+		sb.append((person != null) ? person.getNames() : "");
+		return "[Provider: providerId: " + sb.toString() + " ]";
 	}
 
 	/**

diff --git a/api/src/test/java/org/openmrs/ProviderTest.java b/api/src/test/java/org/openmrs/ProviderTest.java
@@ -60,4 +60,23 @@ public void getName_shouldReturnPersonFullNameIfPersonIsNotNull() throws Excepti
 		provider.setPerson(person);
 		Assert.assertEquals(person.getPersonName().getFullName(), provider.getName());
 	}
+
+	/**
+	 * @see {@link Provider#toString()}
+	 */
+	@Test
+	@Verifies(value = "return person all names of person with specific format", method = "toString()")
+	public void toString_shouldReturnPersonAllNamesWithSpecificFormat() throws Exception {
+		final String providerName = "Provider Name";
+
+		Provider provider = new Provider();
+		provider.setName(providerName);
+		provider.setProviderId(1);
+
+		Person person = new Person(1);
+		person.addName(new PersonName("givenName", "middleName", "familyName"));
+		provider.setPerson(person);
+		Assert.assertEquals(provider.toString(), "[Provider: providerId: 1[givenName middleName familyName] ]");
+	}
+
 }