Follow up to fix failing unit tests

openmrs · Mar 20, 2014 · 3723e8c · 3723e8c
1 parent 30fe90d
commit 3723e8c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -66,6 +66,8 @@ public class OrderServiceTest extends BaseContextSensitiveTest {
 
 	private static final String OTHER_ENCOUNTERS_XML = "org/openmrs/api/include/OrderServiceTest-otherEncounters.xml";
 
+	private static final String OTHER_ORDER_FREQUENCIES_XML = "org/openmrs/api/include/OrderServiceTest-otherOrderFrequencies.xml";
+
 	private ConceptService conceptService;
 
 	private OrderService orderService;
@@ -1113,6 +1115,7 @@ public void purgeOrderFrequency_shouldDeleteGivenOrderFrequency() throws Excepti
 	public void saveOrderFrequency_shouldAddANewOrderFrequencyToTheDatabase() throws Exception {
 		Concept concept = new Concept();
 		concept.addName(new ConceptName("new name", Context.getLocale()));
+		concept.setConceptClass(conceptService.getConceptClassByName("Frequency"));
 		concept = conceptService.saveConcept(concept);
 		OrderService os = Context.getOrderService();
 		Integer originalSize = os.getOrderFrequencies(true).size();
@@ -1135,7 +1138,8 @@ public void saveOrderFrequency_shouldAddANewOrderFrequencyToTheDatabase() throws
 	@Test
 	@Verifies(value = "should edit an existing order frequency that is not in use", method = "saveOrderFrequency(OrderFrequency)")
 	public void saveOrderFrequency_shouldEditAnExistingOrderFrequencyThatIsNotInUse() throws Exception {
-		OrderFrequency orderFrequency = Context.getOrderService().getOrderFrequency(2);
+		executeDataSet(OTHER_ORDER_FREQUENCIES_XML);
+		OrderFrequency orderFrequency = Context.getOrderService().getOrderFrequency(100);
 		assertNotNull(orderFrequency);
 
 		orderFrequency.setFrequencyPerDay(4d);

diff --git a/api/src/test/resources/org/openmrs/api/include/OrderServiceTest-otherOrderFrequencies.xml b/api/src/test/resources/org/openmrs/api/include/OrderServiceTest-otherOrderFrequencies.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <dataset>
-    <concept_class concept_class_id="19" name="Frequency" description="Frequency" creator="1" date_created="2008-08-15 13:56:55.0" retired="0" uuid="cc3feb09-e120-4d8c-97ee-f7544720efb8"/>
     <concept concept_id="1000" retired="0" datatype_id="4" class_id="19" is_set="0" creator="1" date_created="2004-08-12 00:00:00.0" version="" uuid="8e02d1a0-7869-11e3-981f-0800200c9a76"/>
     <concept concept_id="1001" retired="0" datatype_id="4" class_id="19" is_set="0" creator="1" date_created="2004-08-12 00:00:00.0" uuid="7e02d1a0-7869-11e4-981f-0800200c9a75"/>
     <concept concept_id="1002" retired="0" datatype_id="4" class_id="1" is_set="0" creator="1" date_created="2004-08-12 00:00:00.0" uuid="8e02d1a0-7869-11e4-981f-0800200c9a74"/>