This repository was archived by the owner on Jun 21, 2019. It is now read-only.
Wiremock #5
Merged
Wiremock #5
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
added 14 commits
September 28, 2017 21:01
|
The regex fix in the class MatrixHttpContent, we've talked about yesterday, is also included. |
maxidorius
suggested changes
Oct 5, 2017
| @@ -45,7 +45,7 @@ | |||
|
|
|||
| private Logger log = LoggerFactory.getLogger(MatrixHttpContent.class); | |||
|
|
|||
| private final Pattern filenamePattern = Pattern.compile("filename=\"?(?<filename>.+)\"?;?"); | |||
| private final Pattern filenamePattern = Pattern.compile("filename=\"?(?<filename>.+[^\";])"); | |||
There was a problem hiding this comment.
Shouldn't the pattern be filename=\"?(?<filename>[^\";]+) instead?
| public class MatrixHttpContentTest extends MatrixHttpTest { | ||
| private URI address = new URI("mxc://localhost/testAddress.txt"); | ||
|
|
||
| public MatrixHttpContentTest() throws URISyntaxException { |
| // checkErrorInfo403(e); | ||
| return; | ||
| } | ||
| fail("In this case, an exception has to be thrown."); |
| // checkErrorInfo429(e); | ||
| return; | ||
| } | ||
| fail("In this case, an exception has to be thrown."); |
| checkErrorInfo403(e); | ||
| return; | ||
| } | ||
| fail("In this case, an exception has to be thrown."); |
There was a problem hiding this comment.
This should go after createRoomObject()... in the try {}.
| createRoomObject().getTopic(); | ||
| } catch (MatrixClientRequestException e) { | ||
| checkErrorInfo403(e); | ||
| return; |
There was a problem hiding this comment.
Not needed if we refactor the fail() (see next comment)
maxidorius
approved these changes
Oct 7, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
I've added test cases, which cover most of the http calls of the classes, which extend from AMatrixHttpClient.
Could you please have a look at it and tell me, if this can be merged or if I should make some adjustments, first?