Build #20

Plan branch:
Plan for OpenMRS Core 1.11.x

Build: #20 failed Changes by Rafal Korytkowski

Code commits

Git

  • Rafal Korytkowski

    Rafal Korytkowski 460d4b75112f82888c919c1d9c67c4ecfe59e54c

    TRUNK-4389 Fixed tests and formatting
    (cherry picked from commit 108d2bfd4d619ed861a36709bb2775763ed6b9ab)

    Conflicts:
            api/src/main/java/org/openmrs/module/Module.java
            api/src/main/java/org/openmrs/util/DoubleRange.java

    • api/src/main/java/org/openmrs/OrderType.java (version 460d4b75112f82888c919c1d9c67c4ecfe59e54c)
    • api/src/main/java/org/openmrs/api/OrderService.java (version 460d4b75112f82888c919c1d9c67c4ecfe59e54c)
    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 460d4b75112f82888c919c1d9c67c4ecfe59e54c)
    • api/src/main/java/org/openmrs/util/DoubleRange.java (version 460d4b75112f82888c919c1d9c67c4ecfe59e54c)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 460d4b75112f82888c919c1d9c67c4ecfe59e54c)
  • Rafal Korytkowski

    Rafal Korytkowski f3a1f5af37d6d22c7aad47bbd30dc4f4ff704100

    TRUNK-4389: Added DRUG_ORDER_TYPE_UUID & TEST_ORDER_TYPE_UUID constants to OrderType class, Added unit test method saveOrder_shouldSetOrderTypeOfDrugOrderToDrugOrderIfNotSetAndConceptNotMapped to OrderServiceTest, Added unit tests and code to set order type of drug/test order to drug/test order respectively if not set and concept not mapped in saveOrder() method
    (cherry picked from commit cdb90e75c2fae11492fba94121c05ea3968143f5)

    • api/src/main/java/org/openmrs/OrderType.java (version f3a1f5af37d6d22c7aad47bbd30dc4f4ff704100)
    • api/src/main/java/org/openmrs/api/OrderService.java (version f3a1f5af37d6d22c7aad47bbd30dc4f4ff704100)
    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version f3a1f5af37d6d22c7aad47bbd30dc4f4ff704100)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version f3a1f5af37d6d22c7aad47bbd30dc4f4ff704100)