RESTWS-716: Orders resource returns no results when only status is specified #585
Conversation
...ava/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java
Outdated
Show resolved
Hide resolved
IamMujuziMoses
force-pushed
the
RESTWS-716
branch
2 times, most recently
from
92c0c08
to
20ee5a5
Compare
|
@IamMujuziMoses can you add a test in the OrderController1_10Test? |
|
@dkayiwa, I have added a test in OrderController1_10Test, is that the test you required, or something else?! |
|
@IamMujuziMoses the test should deal with what you are fixing. In other words, a test which would fail if your fix is not in. |
| ); | ||
| SimpleObject orders = deserialize(handle(req)); | ||
| ArrayList<Object> resp = (ArrayList<Object>) PropertyUtils.getProperty(orders, "results"); | ||
| assertEquals(activeTestOrderCount + activeDrugOrderCount, resp.size()); |
There was a problem hiding this comment.
@IamMujuziMoses we can use activeDrugOrders.size() + activeTestOrders.size() without creating two variables.
| assertEquals(activeTestOrderCount + activeDrugOrderCount, resp.size()); | |
| assertEquals( activeDrugOrders.size() + activeTestOrders.size(), resp.size()); |
IamMujuziMoses
force-pushed
the
RESTWS-716
branch
from
19d1e28
to
0f4083f
Compare
| @@ -273,9 +274,10 @@ protected PageableResult doSearch(RequestContext context) throws ResponseExcepti | |||
| else { | |||
| return new NeedsPaging<Order>(orders, context); | |||
| } | |||
| } else { | |||
| throw new InvalidSearchException("Please specify patient parameter with valid patientUuid"); | |||
There was a problem hiding this comment.
The error message reads as if one specified a patient parameter but with an invalid uuid.
IamMujuziMoses
force-pushed
the
RESTWS-716
branch
from
0f4083f
to
4d82900
Compare
| @@ -589,4 +590,36 @@ public void invalidCareCenterShouldThrowException() throws Exception { | |||
| ); | |||
| handle(req); | |||
| } | |||
|
|
|||
| @Test(expected = InvalidSearchException.class) | |||
| public void doSearch_shouldReturnExceptionNotNullSetIfNoPatientUuidIsSpecified() throws Exception { | |||
There was a problem hiding this comment.
I do not seem to understand the meaning of this method name.
| null, null); | ||
|
|
||
| // get all test orders | ||
| List<Order> activeTestOrders = orderService.getActiveOrders(patient, orderService.getOrderTypeByName("Test order"), |
There was a problem hiding this comment.
How many active test orders do you expect?
| } | ||
|
|
||
| @Test | ||
| public void shouldGetOrdersByPatientUuid() throws Exception { |
There was a problem hiding this comment.
Do you mind explaining how this test is related to the ticket?
IamMujuziMoses
force-pushed
the
RESTWS-716
branch
from
4d82900
to
8cf5655
Compare
Issue I worked on
see https://issues.openmrs.org/browse/RESTWS-716
Checklist: I completed these to help reviewers :)
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amendI have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amendI ran
mvn clean packageright before creating this pull request andadded all formatting changes to my commit.
No? -> execute above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master