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:
Move ID change logic to model: This allows us to reuse the code within model and at the same time simplify the logic in IDChanges.
Change UniqueKey & activate Equals methods for some models.
Add method Database{}.Equals(), so we are able to compare two Database structs, which simplifies testing.
Coverage increased (+0.5%) to 81.355% when pulling 986897ac345ce2dee7609310980c4e6daaf5e384 on merge_cmd_testing into 9894659d9ffb5247c431ee97e2732fc78f064630 on master.
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.