Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SLUB: Get Results by Id for Lent and Reserved Items #598

Merged
merged 6 commits into from
Nov 3, 2020

Conversation

StefRe
Copy link
Contributor

@StefRe StefRe commented Oct 23, 2020

This resolves items 3 and 4 of #595.

to prepare for different kinds of identifiers
This test is not ideal as the test should just verify that parseResultById
will be called with correct id but not actually call it. So it should be

Mockito.doReturn(DetailedItem()).`when`(slub).parseResultById(Matchers.any(), Matchers.any())
...
verify(slub).parseResultById("id/123", JSONObject(response))

but this throws an IllegalStateException: Mockito.any() must not be null because of
the not nullable Kotlin function signature of parseResultById. None of the solutions
from  https://stackoverflow.com/questions/30305217/is-it-possible-to-use-mockito-in-kotlin
work. See also mockito/mockito#1255.
The only possible solution seems to be switching to MockK.
to call of getResultById and hence parseResultById as the actual identifier
obtained in the process may differ from the one used to call the method.
Get id identifier from bc identifier by intercepting redirect from bc to id. This requires
to unset client's followRedirections property by building a new client based on the client
of OkHttpBaseApi.
- remove empty primary constructor
- remove redundant qualifier name
- optimize imports
@StefRe StefRe mentioned this pull request Oct 23, 2020
7 tasks
Copy link
Collaborator

@johan12345 johan12345 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, except the two comments added above. Thanks!

which could result from items added to favorites list before commit 31d6006.
Also add final '/' to identifier when checking (in case a legacy identifier
starts with the characters 'id' which are not a prefix in this case).
Make implicit support for 'rsn' identifiers (currently not used) explicit.
Copy link
Collaborator

@johan12345 johan12345 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@johan12345 johan12345 merged commit c36c0f4 into opacapp:master Nov 3, 2020
@StefRe StefRe deleted the feat/id branch November 3, 2020 07:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants