Skip to content

Commit 39be2c3

Browse files
wluyimawluyima
committedDec 17, 2013
Revert "Fix failing unit tests on 1.10.x - TRUNK-4182"
This reverts commit 62d6759.
·
latest1.10.0-alpha
1 parent 62d6759 commit 39be2c3

File tree

5 files changed

+90
-25
lines changed

5 files changed

+90
-25
lines changed
 

‎api/src/main/java/org/openmrs/validator/OrderValidator.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,7 @@ public void validate(Object obj, Errors errors) {
7575
ValidationUtils.rejectIfEmpty(errors, "voided", "error.null");
7676
ValidationUtils.rejectIfEmpty(errors, "concept", "Concept.noConceptSelected");
7777
ValidationUtils.rejectIfEmpty(errors, "patient", "error.null");
78-
79-
//TODO commented out because of this commit:
80-
//https://github.com/openmrs/openmrs-core/commit/6360b0e78ee98f75eef10bf37d7cbda2e67d5ce9
81-
//ValidationUtils.rejectIfEmpty(errors, "orderType", "error.null");
78+
ValidationUtils.rejectIfEmpty(errors, "orderType", "error.null");
8279

8380
Date startDate = order.getStartDate();
8481
if (startDate != null) {

‎api/src/test/java/org/openmrs/propertyeditor/OrderEditorTest.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ public class OrderEditorTest extends BaseContextSensitiveTest {
1414
public void setAsText_shouldSetUsingId() throws Exception {
1515
OrderEditor editor = new OrderEditor();
1616
editor.setAsText("2");
17-
18-
//TODO commented out because of this commit:
19-
//https://github.com/openmrs/openmrs-core/commit/6360b0e78ee98f75eef10bf37d7cbda2e67d5ce9
20-
//Assert.assertNotNull(editor.getValue());
17+
Assert.assertNotNull(editor.getValue());
2118
}
2219

2320
/**
@@ -28,9 +25,6 @@ public void setAsText_shouldSetUsingId() throws Exception {
2825
public void setAsText_shouldSetUsingUuid() throws Exception {
2926
OrderEditor editor = new OrderEditor();
3027
editor.setAsText("dfca4077-493c-496b-8312-856ee5d1cc26");
31-
32-
//TODO commented out because of this commit:
33-
//https://github.com/openmrs/openmrs-core/commit/6360b0e78ee98f75eef10bf37d7cbda2e67d5ce9
34-
//Assert.assertNotNull(editor.getValue());
28+
Assert.assertNotNull(editor.getValue());
3529
}
3630
}

‎api/src/test/java/org/openmrs/propertyeditor/OrderTypeEditorTest.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ public class OrderTypeEditorTest extends BaseContextSensitiveTest {
1414
public void setAsText_shouldSetUsingId() throws Exception {
1515
OrderTypeEditor editor = new OrderTypeEditor();
1616
editor.setAsText("1");
17-
18-
//TODO commented out because of this commit:
19-
//https://github.com/openmrs/openmrs-core/commit/6360b0e78ee98f75eef10bf37d7cbda2e67d5ce9
20-
//Assert.assertNotNull(editor.getValue());
17+
Assert.assertNotNull(editor.getValue());
2118
}
2219

2320
/**
@@ -28,9 +25,6 @@ public void setAsText_shouldSetUsingId() throws Exception {
2825
public void setAsText_shouldSetUsingUuid() throws Exception {
2926
OrderTypeEditor editor = new OrderTypeEditor();
3027
editor.setAsText("84ce45a8-5e7c-48f7-a581-ca1d17d63a62");
31-
32-
//TODO commented out because of this commit:
33-
//https://github.com/openmrs/openmrs-core/commit/6360b0e78ee98f75eef10bf37d7cbda2e67d5ce9
34-
//Assert.assertNotNull(editor.getValue());
28+
Assert.assertNotNull(editor.getValue());
3529
}
3630
}

‎api/src/test/java/org/openmrs/validator/OrderValidatorTest.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,7 @@ public void validate_shouldFailValidationIfOrderTypeIsNull() throws Exception {
146146
Assert.assertFalse(errors.hasFieldErrors("discontinued"));
147147
Assert.assertFalse(errors.hasFieldErrors("concept"));
148148
Assert.assertFalse(errors.hasFieldErrors("patient"));
149-
150-
//TODO commented out because of this commit:
151-
//https://github.com/openmrs/openmrs-core/commit/6360b0e78ee98f75eef10bf37d7cbda2e67d5ce9
152-
//Assert.assertTrue(errors.hasFieldErrors("orderType"));
149+
Assert.assertTrue(errors.hasFieldErrors("orderType"));
153150
}
154151

155152
/**

‎web/src/main/resources/openmrs-servlet.xml

+84-1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,13 @@
130130
<property name="order"><value>99</value></property>
131131
<property name="mappings">
132132
<props>
133+
<prop key="/admin/orders/order.list">orderList</prop>
134+
<prop key="/admin/orders/orderDrug.list">orderListByPatient</prop>
135+
<prop key="/admin/orders/orderDrug.form">orderDrugForm</prop>
136+
<prop key="/admin/orders/order.form">orderForm</prop>
137+
<prop key="/admin/orders/orderType.list">orderTypeList</prop>
138+
<prop key="/admin/orders/orderType.form">orderTypeForm</prop>
139+
133140
<prop key="admin/patients/patient.form">patientForm</prop>
134141
<prop key="admin/patients/mergePatients.form">mergePatientsForm</prop>
135142

@@ -304,8 +311,81 @@
304311
<property name="successView"><value>personObs.form</value></property>
305312
</bean>
306313

314+
<!-- ====== /Observation Sector ====== -->
315+
316+
<!-- ========================== -->
317+
<!-- ====== Order Sector ====== -->
318+
<!-- ========================== -->
319+
320+
<!-- ** Order Type ** -->
321+
<!--this is the optional method of declaring values in the constructor-->
322+
<!--<bean id="orderTypeList" class="org.openmrs.web.controller.OrderTypeListController" />-->
323+
<!--<bean id="orderTypeForm" class="org.openmrs.web.controller.OrderTypeFormController" />-->
324+
325+
<bean id="orderTypeList" class="org.openmrs.web.controller.order.OrderTypeListController">
326+
<property name="commandName"><value>orderTypeList</value></property>
327+
<property name="formView"><value>/admin/orders/orderTypeList</value></property>
328+
<property name="successView"><value>orderType.list</value></property>
329+
</bean>
330+
307331
<!-- Form Controller for the add/edit order types page -->
308-
332+
<bean id="orderTypeForm" class="org.openmrs.web.controller.order.OrderTypeFormController">
333+
<property name="commandName"><value>orderType</value></property>
334+
<property name="validator">
335+
<ref bean="orderTypeValidator" />
336+
</property>
337+
<property name="formView"><value>/admin/orders/orderTypeForm</value></property>
338+
<property name="successView"><value>orderType.list</value></property>
339+
</bean>
340+
<!-- ** /Order Type ** -->
341+
<!-- ====== /Order Sector ====== -->
342+
343+
344+
<!-- ** Order ** -->
345+
<bean id="orderList" class="org.openmrs.web.controller.order.OrderListController">
346+
<property name="commandName"><value>orderList</value></property>
347+
<property name="formView"><value>/admin/orders/orderList</value></property>
348+
<property name="successView"><value>order.list</value></property>
349+
</bean>
350+
351+
<!-- Form Controller for the add/edit order types page -->
352+
<bean id="orderForm" class="org.openmrs.web.controller.order.OrderFormController">
353+
<property name="commandName"><value>order</value></property>
354+
<property name="validator">
355+
<ref bean="orderValidator" />
356+
</property>
357+
<property name="formView"><value>/admin/orders/orderForm</value></property>
358+
<property name="successView"><value>order.list</value></property>
359+
</bean>
360+
361+
<bean id="orderDrugList" class="org.openmrs.web.controller.order.OrderDrugListController">
362+
<property name="commandName"><value>orderDrugList</value></property>
363+
<property name="formView"><value>/admin/orders/orderDrugList</value></property>
364+
<property name="successView"><value>orderDrug.list</value></property>
365+
</bean>
366+
367+
<!-- Form Controller for the add/edit order types page -->
368+
<bean id="orderDrugForm" class="org.openmrs.web.controller.order.OrderDrugFormController">
369+
<property name="commandName"><value>order</value></property>
370+
<property name="validator">
371+
<ref bean="drugOrderValidator" />
372+
</property>
373+
<property name="formView"><value>/admin/orders/orderDrugForm</value></property>
374+
<property name="successView"><value>../../patientDashboard.form</value></property>
375+
</bean>
376+
<!-- ** /Order ** -->
377+
378+
<!-- ** Order Placement ** -->
379+
<bean id="orderListByPatient"
380+
class="org.openmrs.web.controller.order.OrderListByPatientController">
381+
<property name="commandName"><value>orderDrugList</value></property>
382+
<property name="formView"><value>/admin/orders/orderListByPatient</value></property>
383+
<property name="successView"><value>orderDrug.list</value></property>
384+
</bean>
385+
386+
<!-- ** /Order Placement ** -->
387+
<!-- ====== /Order Sector ====== -->
388+
309389
<!-- ** Patient ** -->
310390
<bean id="patientForm" class="org.openmrs.web.controller.patient.PatientFormController">
311391
<property name="commandName"><value>patient</value></property>
@@ -993,6 +1073,9 @@
9931073
<prop key="org.openmrs.Concept">
9941074
org.openmrs.web.taglib.fieldgen.ConceptHandler
9951075
</prop>
1076+
<prop key="org.openmrs.OrderType">
1077+
org.openmrs.web.taglib.fieldgen.OrderTypeHandler
1078+
</prop>
9961079
<prop key="org.openmrs.Encounter">
9971080
org.openmrs.web.taglib.fieldgen.EncounterHandler
9981081
</prop>

0 commit comments

Comments
 (0)
Please sign in to comment.