TRUNK-3586 Slightly improved and prepared for backporting

openmrs · Aug 8, 2014 · bd5a8b0 · bd5a8b0
1 parent 018000e
commit bd5a8b0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/api/src/test/java/org/openmrs/EncounterTest.java b/api/src/test/java/org/openmrs/EncounterTest.java
@@ -17,7 +17,6 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
@@ -35,7 +34,6 @@
 import org.mockito.Mock;
 import org.openmrs.api.EncounterService;
 import org.openmrs.api.ProviderService;
-import org.openmrs.api.context.Context;
 import org.openmrs.test.BaseContextMockTest;
 import org.openmrs.test.Verifies;
 

diff --git a/api/src/test/java/org/openmrs/api/context/ContextMockHelper.java b/api/src/test/java/org/openmrs/api/context/ContextMockHelper.java
@@ -52,7 +52,7 @@
  * {@link org.openmrs.test.BaseContextSensitiveTest}.
  *
  * @deprecated Avoid using this by not calling Context.get...Service() in your code.
- * @since 1.11
+ * @since 1.11, 1.10, 1.9.9
  */
 @Deprecated
 public class ContextMockHelper {
@@ -118,7 +118,7 @@ public void authenticateMockUser() {
 		Calendar calendar = Calendar.getInstance();
 		calendar.set(1980, 01, 01);
 		person.setBirthdate(calendar.getTime());
-		person.setGender("male");
+		person.setGender("M");
 		user.setPerson(person);
 
 		when(userContext.getAuthenticatedUser()).thenReturn(user);
@@ -252,6 +252,7 @@ public void setUserContext(UserContext userContext) {
 
 		Context.setUserContext(userContext);
 		this.userContext = userContext;
+		authenticateMockUser();
 	}
 
 }
diff --git a/api/src/test/java/org/openmrs/test/BaseContextMockTest.java b/api/src/test/java/org/openmrs/test/BaseContextMockTest.java
@@ -23,11 +23,11 @@
 import org.openmrs.module.ModuleUtilTest;
 
 /**
- * Tests extending this class have a mocked UserContext and User. In addition you can mock
+ * Tests extending this class have a mocked authenticated UserContext. In addition you can mock
  * Context.get...Service() calls by annotating fields with {@link Mock}.
  * 
  * @see ModuleUtilTest
- * @since 1.11
+ * @since 1.11, 1.10, 1.9.9
  */
 public abstract class BaseContextMockTest {
 
@@ -43,8 +43,6 @@ public abstract class BaseContextMockTest {
 	@Before
 	public void initMocks() {
 		MockitoAnnotations.initMocks(this);
-
-		contextMockHelper.authenticateMockUser();
 	}
 
 	@After

diff --git a/api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java b/api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
@@ -156,7 +156,7 @@ public abstract class BaseContextSensitiveTest extends AbstractJUnit4SpringConte
 	/**
 	 * Allows mocking services returned by Context. See {@link ContextMockHelper}
 	 * 
-	 * @since 1.11
+	 * @since 1.11, 1.10, 1.9.9
 	 */
 	@InjectMocks
 	protected ContextMockHelper contextMockHelper;
@@ -186,15 +186,15 @@ public BaseContextSensitiveTest() {
 	/**
 	 * Initializes fields annotated with {@link Mock}.
 	 * 
-	 * @since 1.10
+	 * @since 1.11, 1.10, 1.9.9
 	 */
 	@Before
 	public void initMocks() {
 		MockitoAnnotations.initMocks(this);
 	}
 
 	/**
-	 * @since 1.10
+	 * @since 1.11, 1.10, 1.9.9
 	 */
 	@After
 	public void revertContextMocks() {