Build #343

Plan branch:

Build: #343 was successful Changes by Wyclif Luyima

Code commits

Git

  • Wyclif Luyima

    Wyclif Luyima 2bff2a82a6b666e76e18a49ff934973ac762d843

    Follow up to clean up unit tests - TRUNK-4436
    Follow up to clean up unit tests - TRUNK-4436

    Follow up to clean up unit tests - TRUNK-4436

    • api/src/main/java/org/openmrs/DrugOrder.java (version 2bff2a82a6b666e76e18a49ff934973ac762d843)
    • api/src/main/java/org/openmrs/Order.java (version 2bff2a82a6b666e76e18a49ff934973ac762d843)
    • api/src/test/java/org/openmrs/DrugOrderTest.java (version 2bff2a82a6b666e76e18a49ff934973ac762d843)
    • api/src/test/java/org/openmrs/OrderTest.java (version 2bff2a82a6b666e76e18a49ff934973ac762d843)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 2bff2a82a6b666e76e18a49ff934973ac762d843)
  • Wyclif Luyima

    Wyclif Luyima ac269cad5d49261d06c39e204f5e552a76aa4ba4

    Drug order is not allowed without a drug - TRUNK-4437
    Conflicts:
            api/src/main/resources/liquibase-update-to-latest.xml

    • api/src/main/java/org/openmrs/DrugOrder.java (version ac269cad5d49261d06c39e204f5e552a76aa4ba4)
    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version ac269cad5d49261d06c39e204f5e552a76aa4ba4)
    • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version ac269cad5d49261d06c39e204f5e552a76aa4ba4)
    • api/src/main/resources/liquibase-update-to-latest.xml (version ac269cad5d49261d06c39e204f5e552a76aa4ba4)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version ac269cad5d49261d06c39e204f5e552a76aa4ba4)
    • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version ac269cad5d49261d06c39e204f5e552a76aa4ba4)
  • Wyclif Luyima

    Wyclif Luyima 881c3ea4bfb0fe95ca9fccbaf310dd3b37385c1f

    Drug orders for different formulations of the same concept should be allowed - TRUNK-4436
    TRUNK-4436: Improve the order service test and use nullSafeEquals

    TRUNK-4436: Use nullSafeEquals in Order

    • api/src/main/java/org/openmrs/DrugOrder.java (version 881c3ea4bfb0fe95ca9fccbaf310dd3b37385c1f)
    • api/src/main/java/org/openmrs/Order.java (version 881c3ea4bfb0fe95ca9fccbaf310dd3b37385c1f)
    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 881c3ea4bfb0fe95ca9fccbaf310dd3b37385c1f)
    • api/src/test/java/org/openmrs/DrugOrderTest.java (version 881c3ea4bfb0fe95ca9fccbaf310dd3b37385c1f)
    • api/src/test/java/org/openmrs/OrderTest.java (version 881c3ea4bfb0fe95ca9fccbaf310dd3b37385c1f)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 881c3ea4bfb0fe95ca9fccbaf310dd3b37385c1f)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersWitSameConceptAndDifferentFormAndStrength.xml (version 881c3ea4bfb0fe95ca9fccbaf310dd3b37385c1f)