-
Notifications
You must be signed in to change notification settings - Fork 61
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
johan12345
requested changes
Nov 1, 2020
There was a problem hiding this 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!
opacclient/libopac/src/main/java/de/geeksfactory/opacclient/apis/SLUB.kt
Outdated
Show resolved
Hide resolved
opacclient/libopac/src/main/java/de/geeksfactory/opacclient/apis/SLUB.kt
Outdated
Show resolved
Hide resolved
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.
johan12345
approved these changes
Nov 3, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This resolves items 3 and 4 of #595.