Minor additions for: getProviders(String query, Integer start, Integer

length, Map<ProviderAttributeType, Object> attributes) should allow the option to include or not include retired providers - TRUNK-3170
openmrs · Mar 4, 2013 · fe98f3a · fe98f3a
1 parent 5ef22ec
commit fe98f3a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/api/src/main/java/org/openmrs/api/ProviderService.java b/api/src/main/java/org/openmrs/api/ProviderService.java
@@ -174,7 +174,7 @@ public List<Provider> getProviders(String query, Integer start, Integer length,
 	 * @should get all visits with given attribute values
 	 * @should not find any visits if none have given attribute values
 	 * @should return all providers if query is empty
-	 * @should not return retired providers
+	 * @should return retired providers
 	 */
 	@Authorized( { PrivilegeConstants.VIEW_PROVIDERS })
 	public List<Provider> getProviders(String query, Integer start, Integer length,

diff --git a/api/src/test/java/org/openmrs/api/ProviderServiceTest.java b/api/src/test/java/org/openmrs/api/ProviderServiceTest.java
@@ -408,7 +408,7 @@ public void getProviders_shouldNotFindAnyProvidersIfNoneHaveGivenAttributeValues
 
 	/**
 	 * @see ProviderService#getProviders(String, Integer, Integer, java.util.Map)
-	 * @verifies finds retired providers
+	 * @verifies finds retired providers by default
 	 */
 	@Test
 	public void getProviders_shouldReturnRetiredProvidersByDefault() throws Exception {
@@ -418,10 +418,10 @@ public void getProviders_shouldReturnRetiredProvidersByDefault() throws Exceptio
 
 	/**
 	 * @see ProviderService#getProviders(String, Integer, Integer, java.util.Map, boolean)
-	 * @verifies does not find retired providers
+	 * @verifies does not find retired providers if includeRetired is false
 	 */
 	@Test
-	public void getProviders_shouldNotReturnRetiredProvidersIfIncludeRetiredFalse() throws Exception {
+	public void getProviders_shouldNotReturnRetiredProvidersIfIncludeRetiredIsFalse() throws Exception {
 		List<Provider> providers = service.getProviders(null, null, null, null, false);
 		Assert.assertEquals(7, providers.size());
 	}