Build #356

Plan branch:

Build: #356 failed

Job: Unit and Component Tests failed

Stages & jobs

  1. Build and Tests

Code commits

Git

  • Wyclif Luyima

    Wyclif Luyima 0e07d05cc1524432e02dcf97c0c758c600afdc80

    TRUNK-4445 Added support for custom dosing type for DrugOrders. Changed the current dosing type enum to a string, while keeping the support for SIMPLE and FREE_TEXT dosing types using constants
    TRUNK-4445 Made doing type of type class <? extends dosinginstructions>

    TRUNK-4445 Adding validation to the the dosing instructions class, and removing them from drugordervalidator

    TRUNK-4445 changing the shoulds and verifies in the required places, renamed dosinginstructionsobject to dosinginstructionsinstance. Catching exceptions inside the getter now. Updated the message.properties with suitable messages for dosingIntructions Free Text

    Adding java doc for DosingInstructions and removing unused import

    Follow up to clean up unit tests and the liquibase update file   - TRUNK-4445

    Conflicts:
            api/src/main/resources/liquibase-update-to-latest.xml
            api/src/test/resources/org/openmrs/include/standardTestDataset.xml

    • api/src/main/java/org/openmrs/DosingInstructions.java (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/main/java/org/openmrs/DrugOrder.java (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/main/java/org/openmrs/FreeTextDosingInstructions.java (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/main/java/org/openmrs/SimpleDosingInstructions.java (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/main/resources/liquibase-update-to-latest.xml (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/test/java/org/openmrs/CustomDosingInstructions.java (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/test/java/org/openmrs/DrugOrderTest.java (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersWitSameConceptAndDifferentFormAndStrength.xml (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-reviseDiscontinuedOrders.xml (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version 0e07d05cc1524432e02dcf97c0c758c600afdc80)