diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2016-06-23 22:02:39 -0700 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2016-06-23 22:03:07 -0700 |
commit | 02cef2da23b022cf2703fdf856fdf00b452d67fb (patch) | |
tree | 57639bdb9c83210421184d082b13e29872987a88 /src/fish_tests.cpp | |
parent | 9c53019d95c7b73f14c8bb39cddadacab16d0bf9 (diff) |
history --merge to properly interleave items
Fixes #2312
Diffstat (limited to 'src/fish_tests.cpp')
-rw-r--r-- | src/fish_tests.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp index b234fa03..4c15f498 100644 --- a/src/fish_tests.cpp +++ b/src/fish_tests.cpp @@ -2721,6 +2721,17 @@ void history_tests_t::test_history_merge(void) { for (size_t i = 0; i < count; i++) { hists[i]->incorporate_external_changes(); } + + // Everyone should also have items in the same order (#2312) + wcstring string_rep; + hists[0]->get_string_representation(&string_rep, L"\n"); + for (size_t i = 0; i < count; i++) { + wcstring string_rep2; + hists[i]->get_string_representation(&string_rep2, L"\n"); + do_test(string_rep == string_rep2); + } + + // Add some more per-history items. for (size_t i = 0; i < count; i++) { hists[i]->add(alt_texts[i]); |