✅ Test merge command #22
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
AndreasSko
force-pushed
the
merge_cmd_testing
branch
4 times, most recently
from
2174294
to
1311ac7
Compare
This enables to send the output to different files, which we can later use to test the commands. For this the terminal.Stdio struct is used.
AndreasSko
force-pushed
the
merge_cmd_testing
branch
2 times, most recently
from
9a41107
to
fa29a13
Compare
This allows us to reuse the code within model and at the same time simplify the logic in IDChanges.
* UniqueKey for BlockRange contains the UserMarkID now, as there could be multiple BlockRanges that are similar except of the UserMarkID. As the UniqueKey is used in the Equals function of UserMarkBlockRange, changed it there to strip the UserMarkID again (in that case, they BRs are already joined, so we should ignore the UserMarkID). * Added TagID and Position to UniqueKey of TagMap * Enabled Equals() for BlockRange, Location, and TagMap
This method might be helpful to test the result of a merge.
The test will check, if merging against an empty file results in no loss of data. It also tests solving conflicts by choosing all left or all right and checking its result. Windows is not tested, as it does not support psuedoterminals.
AndreasSko
force-pushed
the
merge_cmd_testing
branch
from
fa29a13
to
986897a
Compare
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.
The test will check, if merging against an empty file results in no loss of data. It also tests solving conflicts by choosing all left or all right and checking its result. Windows is not tested, as it does not support psuedoterminals.
Other changes:
Database{}.Equals(), so we are able to compare two Database structs, which simplifies testing.