Skip to content

Commit

Permalink
TRUNK-4443 Fixed failing integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@rkorytkowski
rkorytkowski committed Aug 4, 2014
1 parent b8da381 commit ee12c7c
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion api/src/main/java/org/openmrs/util/databasechange/CreateDiscontinueOrders.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private void createDiscontinueOrders(JdbcConnection connection, List<Discontinue
insertStatement = connection
.prepareStatement("Insert into orders(previous_order_id, concept_id, patient_id, encounter_id, "
+ "creator, date_created, discontinued_reason, discontinued_reason_non_coded, "
+ "uuid, order_action, orderer, order_number, order_type_id, date_activated, auto_expire_date) "
+ "uuid, order_action, orderer, order_number, order_type_id, start_date, auto_expire_date) "
+ "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
for (DiscontinuedOrder discontinuedOrder : discontinuedOrders) {
insertStatement.setInt(1, discontinuedOrder.previousOrderId);
Expand Down
3 changes: 2 additions & 1 deletion api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,8 @@ public void shouldCreateDiscontinuationOrderForStoppedOrders() throws IOExceptio

List<List<Object>> newer = DatabaseUtil.executeSQL(upgradeTestUtil.getConnection(),
"SELECT count(*) FROM orders WHERE order_action = 'DISCONTINUE' AND "
+ "(start_date IS NULL OR orderer IS NULL OR encounter_id IS NULL OR previous_order_id IS NULL)", true);
+ "(date_activated IS NULL OR orderer IS NULL OR encounter_id IS NULL OR previous_order_id IS NULL)",
true);
assertEquals(0L, newer.get(0).get(0));
}

Expand Down
4 changes: 2 additions & 2 deletions .../resources/org/openmrs/util/databasechange/UpgradeTest-orderWithBlankUnitsOrFrequency.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='UTF-8'?>
<dataset>
<orders order_id="6" order_type_id="2" urgency="ROUTINE" concept_id="88" orderer="1" instructions="1x minutely" date_activated="2008-08-19 00:00:00.0" encounter_id="6" discontinued="false" creator="1" date_created="2008-08-19 12:24:10.0" voided="false" patient_id="2"/>
<orders order_id="6" order_type_id="2" urgency="ROUTINE" concept_id="88" orderer="1" instructions="1x minutely" start_date="2008-08-19 00:00:00.0" encounter_id="6" discontinued="false" creator="1" date_created="2008-08-19 12:24:10.0" voided="false" patient_id="2"/>
<drug_order order_id="6" drug_inventory_id="3" dose="325.0" frequency=" " prn="false" complex="false"/>

<orders order_id="7" order_type_id="2" urgency="ROUTINE" concept_id="88" orderer="1" instructions="1x minutely" date_activated="2008-08-19 00:00:00.0" encounter_id="6" discontinued="false" creator="1" date_created="2008-08-19 12:24:10.0" voided="false" patient_id="2"/>
<orders order_id="7" order_type_id="2" urgency="ROUTINE" concept_id="88" orderer="1" instructions="1x minutely" start_date="2008-08-19 00:00:00.0" encounter_id="6" discontinued="false" creator="1" date_created="2008-08-19 12:24:10.0" voided="false" patient_id="2"/>
<drug_order order_id="7" drug_inventory_id="3" dose="325.0" units=" " prn="false" complex="false"/>
</dataset>
2 changes: 1 addition & 1 deletion ...ources/org/openmrs/util/databasechange/UpgradeTest-orderWithOrdererThatIsNotAProvider.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<dataset>
<person person_id="101" gender="M" birthdate="1948-01-01 00:00:00.0" birthdate_estimated="0" dead="0" creator="1" date_created="2005-01-01 00:00:00.0" voided="0" uuid="ca1b19c2-3ed6-4f63-b8c0-f762dc8d7563"/>
<users user_id="101" person_id="101" system_id="9-8" username="user1" password="rr6d1655327d385e11a04e1632b4f33ceb8fafd2" salt="6d32c5fd9fde391c755f1f4dfd5e1d6e3debe6" creator="1" date_created="2008-08-15 15:46:47.0" uuid="d1d8f5c2-e131-11de-babe-001e378eb67d"/>
<orders order_id="8" order_type_id="2" urgency="ROUTINE" concept_id="5497" orderer="101" date_activated="2009-06-08 00:00:00.0" encounter_id="6" creator="1" date_created="2009-06-08 00:00:00.0" discontinued="0" voided="0" patient_id="2" uuid="321de0a3-05c4-444a-be03-e01b4c4b914c" />
<orders order_id="8" order_type_id="2" urgency="ROUTINE" concept_id="5497" orderer="101" start_date="2009-06-08 00:00:00.0" encounter_id="6" creator="1" date_created="2009-06-08 00:00:00.0" discontinued="0" voided="0" patient_id="2" uuid="321de0a3-05c4-444a-be03-e01b4c4b914c" />
</dataset>
10 changes: 5 additions & 5 deletions api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,11 +267,11 @@
<obs obs_id="14" person_id="7" concept_id="20" encounter_id="4" obs_datetime="2008-08-15 00:00:00.0" location_id="1" value_datetime="2008-08-14 00:00:00.0" comments="" creator="1" date_created="2008-08-19 12:32:38.0" voided="false" uuid="99b92980-db62-40cd-8bca-733357c48126"/>
<obs obs_id="15" person_id="7" concept_id="21" encounter_id="4" obs_datetime="2008-08-15 00:00:00.0" location_id="1" comments="" creator="1" date_created="2008-08-19 12:32:59.0" voided="false" uuid="1ce473c8-3fac-440d-9f92-e10facab194f"/>
<obs obs_id="16" person_id="7" concept_id="5089" encounter_id="5" obs_datetime="2008-08-19 00:00:00.0" location_id="2" value_numeric="61.0" comments="" creator="1" date_created="2008-08-19 12:35:30.0" voided="false" uuid="2ed1e57d-9f18-41d3-b067-2eeaf4b30fb0"/>
<orders order_id="1" order_type_id="2" urgency="ROUTINE" concept_id="88" orderer="1" instructions="2x daily" date_activated="2008-08-08 00:00:00.0" encounter_id="3" discontinued="true" discontinued_date="2008-08-15 00:00:00.0" discontinued_by="1" creator="1" date_created="2008-08-19 12:20:22.0" voided="false" patient_id="7" uuid="921de0a3-05c4-444a-be03-e01b4c4b9142"/>
<orders order_id="2" order_type_id="2" urgency="ROUTINE" concept_id="792" orderer="1" instructions="3x daily" date_activated="2008-08-01 00:00:00.0" encounter_id="6" discontinued="true" discontinued_date="2008-08-08 00:00:00.0" discontinued_by="1" creator="1" date_created="2008-08-19 12:21:59.0" voided="false" patient_id="2" uuid="dfca4077-493c-496b-8312-856ee5d1cc26"/>
<orders order_id="3" order_type_id="2" urgency="ROUTINE" concept_id="792" orderer="1" instructions="1x daily with food" date_activated="2008-08-08 00:00:00.0" encounter_id="6" discontinued="false" creator="1" date_created="2008-08-19 12:22:45.0" voided="false" patient_id="2" uuid="e3d621f0-a4d5-47d1-a4e1-5ace3f66d43a"/>
<orders order_id="4" order_type_id="2" urgency="ROUTINE" concept_id="88" instructions="10x daily" date_activated="2007-12-03 00:00:00.0" encounter_id="6" discontinued="true" discontinued_date="2007-12-25 00:00:00.0" discontinued_by="1" creator="1" date_created="2008-08-19 12:23:21.0" voided="false" patient_id="2" uuid="047b7424-6f33-4357-823c-420f316bb039"/>
<orders order_id="5" order_type_id="2" urgency="ROUTINE" concept_id="88" instructions="1x minutely" date_activated="2008-08-19 00:00:00.0" encounter_id="6" discontinued="false" creator="1" date_created="2008-08-19 12:24:10.0" voided="false" patient_id="2" uuid="0c96f25c-4949-4f72-9931-d808fbc226db"/>
<orders order_id="1" order_type_id="2" urgency="ROUTINE" concept_id="88" orderer="1" instructions="2x daily" start_date="2008-08-08 00:00:00.0" encounter_id="3" discontinued="true" discontinued_date="2008-08-15 00:00:00.0" discontinued_by="1" creator="1" date_created="2008-08-19 12:20:22.0" voided="false" patient_id="7" uuid="921de0a3-05c4-444a-be03-e01b4c4b9142"/>
<orders order_id="2" order_type_id="2" urgency="ROUTINE" concept_id="792" orderer="1" instructions="3x daily" start_date="2008-08-01 00:00:00.0" encounter_id="6" discontinued="true" discontinued_date="2008-08-08 00:00:00.0" discontinued_by="1" creator="1" date_created="2008-08-19 12:21:59.0" voided="false" patient_id="2" uuid="dfca4077-493c-496b-8312-856ee5d1cc26"/>
<orders order_id="3" order_type_id="2" urgency="ROUTINE" concept_id="792" orderer="1" instructions="1x daily with food" start_date="2008-08-08 00:00:00.0" encounter_id="6" discontinued="false" creator="1" date_created="2008-08-19 12:22:45.0" voided="false" patient_id="2" uuid="e3d621f0-a4d5-47d1-a4e1-5ace3f66d43a"/>
<orders order_id="4" order_type_id="2" urgency="ROUTINE" concept_id="88" instructions="10x daily" start_date="2007-12-03 00:00:00.0" encounter_id="6" discontinued="true" discontinued_date="2007-12-25 00:00:00.0" discontinued_by="1" creator="1" date_created="2008-08-19 12:23:21.0" voided="false" patient_id="2" uuid="047b7424-6f33-4357-823c-420f316bb039"/>
<orders order_id="5" order_type_id="2" urgency="ROUTINE" concept_id="88" instructions="1x minutely" start_date="2008-08-19 00:00:00.0" encounter_id="6" discontinued="false" creator="1" date_created="2008-08-19 12:24:10.0" voided="false" patient_id="2" uuid="0c96f25c-4949-4f72-9931-d808fbc226db"/>
<drug_order order_id="1" drug_inventory_id="3" dose="325.0" units="mg" frequency="1/day x 7 days/week" prn="false" complex="false"/>
<drug_order order_id="2" drug_inventory_id="2" dose="1.0" units="tab(s)" frequency="1/day x 7 days/week" prn="false" complex="false"/>
<drug_order order_id="3" drug_inventory_id="2" dose="2.0" units="tab(s)" frequency="2/day x 7 days/week" prn="false" complex="false"/>
Expand Down

0 comments on commit ee12c7c

Please sign in to comment.