TRUNK-3944: Responded to more review comments

(cherry picked from commit bf40931) Conflicts: api/src/test/java/org/openmrs/api/ConceptServiceTest.java
openmrs · Jun 5, 2013 · 171f0cf · 171f0cf
1 parent 788f17b
commit 171f0cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/api/src/test/java/org/openmrs/api/ConceptServiceTest.java b/api/src/test/java/org/openmrs/api/ConceptServiceTest.java
@@ -13,7 +13,9 @@
  */
 package org.openmrs.api;
 
+import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.hasItem;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -1413,9 +1415,9 @@ 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(Locale.US);
-		assertEquals(1, conceptStopWords.size());
+
+		List<String> conceptStopWords = conceptService.getConceptStopWords(Context.getLocale());
+		assertThat(conceptStopWords, hasItem("THE"));
 	}
 
 	/**

diff --git a/api/src/test/java/org/openmrs/test/StartModuleAnnotatioTest.java b/api/src/test/java/org/openmrs/test/StartModuleAnnotatioTest.java
@@ -20,7 +20,7 @@
 import org.openmrs.api.context.Context;
 
 @StartModule( { "org/openmrs/module/include/dssmodule-1.44.omod", "org/openmrs/module/include/atd-0.51.omod" })
-public class StartModuleAnnotatioTest extends BaseContextSensitiveTest {
+public class StartModuleAnnotatioTest extends BaseModuleContextSensitiveTest {
 
 	@Test
 	public void shouldStartModules() throws Exception {