diff --git a/backend/reconcile/tests/examples/deletes.yml b/backend/reconcile/tests/examples/deletes.yml index a4fb2e4d..59eb9337 100644 --- a/backend/reconcile/tests/examples/deletes.yml +++ b/backend/reconcile/tests/examples/deletes.yml @@ -5,7 +5,6 @@ right: "|original_1 original_5" expected: "|original_1 original_5|" --- - # Both delete a range and one range contains the other parent: original_1 original_2 original_3 original_4 original_5 left: original_1 original_5 @@ -13,15 +12,13 @@ right: original_1 original_4 original_5 expected: original_1 original_5 --- - # Deleting overlapping ranges parent: original_1 original_2 original_3 original_4 original_5 left: original_1 original_4| original_5 right: original_1 original_2| original_5 -expected: original_1| original_5| +expected: original_1|| original_5 --- - parent: long text with one big delete and many small left: long small right: long with big and small diff --git a/backend/reconcile/tests/examples/deletes_and_inserts.yml b/backend/reconcile/tests/examples/deletes_and_inserts.yml index ed83604e..fe0e7c1a 100644 --- a/backend/reconcile/tests/examples/deletes_and_inserts.yml +++ b/backend/reconcile/tests/examples/deletes_and_inserts.yml @@ -5,7 +5,6 @@ right: original_1 edit_1 original_3 edit_2 original_5 expected: original_1 edit_1 edit_2 original_5 --- - # One deleted a large range, the other inserted and deleted a partially overlapping range parent: original_1 original_2 original_3 original_4 original_5 left: original_1 original_5 diff --git a/backend/reconcile/tests/examples/idempotent_inserts.yml b/backend/reconcile/tests/examples/idempotent_inserts.yml index f45792ed..a48952be 100644 --- a/backend/reconcile/tests/examples/idempotent_inserts.yml +++ b/backend/reconcile/tests/examples/idempotent_inserts.yml @@ -5,7 +5,6 @@ right: "hi there my friend " expected: "hi there my friend " --- - # The prefix of the 2nd appears on the 1st so it shouldn't get duplicatelicated parent: "hi " left: "hi there you " @@ -13,14 +12,12 @@ right: "hi there my friend " expected: "hi there my friend you " --- - parent: a left: a b c right: a b c d expected: a b c d --- - parent: a left: abc right: abcd diff --git a/backend/reconcile/tests/examples/multiline.yml b/backend/reconcile/tests/examples/multiline.yml index b2460c09..3f2d096d 100644 --- a/backend/reconcile/tests/examples/multiline.yml +++ b/backend/reconcile/tests/examples/multiline.yml @@ -20,7 +20,6 @@ expected: | How are you? --- - parent: | - my list - 2nd item @@ -50,7 +49,6 @@ expected: | - another nested list --- - parent: | a a diff --git a/backend/reconcile/tests/examples/replacing.yml b/backend/reconcile/tests/examples/replacing.yml index 97d7c897..cea57b89 100644 --- a/backend/reconcile/tests/examples/replacing.yml +++ b/backend/reconcile/tests/examples/replacing.yml @@ -5,7 +5,6 @@ right: original_1 original_2| edit_2 expected: original_1 edit_1|| edit_2 --- - # Both replace the same token with the same value parent: original_1 original_2 original_3 left: original_1 edit_1| original_3 @@ -13,7 +12,6 @@ right: original_1 edit_1 original_3| expected: original_1 edit_1| original_3| --- - # Both replace the same token with different value parent: original_1 original_2 original_3 left: original_1 edit_1| original_3 diff --git a/backend/reconcile/tests/examples/utf-8.yml b/backend/reconcile/tests/examples/utf-8.yml index 662d7a73..8aac95fe 100644 --- a/backend/reconcile/tests/examples/utf-8.yml +++ b/backend/reconcile/tests/examples/utf-8.yml @@ -4,7 +4,6 @@ right: Team meeting at 2pm in conference room| expected: Team meeting at |3pm in conference room| --- - parent: " " left: "it’|s utf-8!" right: " " diff --git a/backend/reconcile/tests/examples/various.yml b/backend/reconcile/tests/examples/various.yml index 91c12024..0b027477 100644 --- a/backend/reconcile/tests/examples/various.yml +++ b/backend/reconcile/tests/examples/various.yml @@ -4,126 +4,120 @@ right: You're Annual Savings information| is available online expected: Your| annual record information| is available online| --- - parent: Party A shall pay Party B left: Party C shall pay Party B right: Party A shall receive from Party B expected: Party C shall receive from Party B --- - parent: left: hi my friend| right: hi there| expected: hi my friend| there| --- +parent: "" +left: "" +right: "" +expected: "" +--- +parent: "" +left: "|" +right: "|" +expected: "||" + +--- parent: Buy milk and eggs left: Buy organic milk| and eggs| right: Buy milk and eggs| and bread expected: Buy organic milk| and eggs|| and bread --- - parent: Send the report to the team left: Send the |detailed report to the |entire |team right: Send the |quarterly |detailed report to the team expected: Send the |detailed |quarterly |detailed report to the |entire |team --- - parent: Ready, Set go left: Ready! Set go| right: Ready, Set, go!| expected: Ready! Set, go!|| --- - parent: "Total: $100" left: "Total: |$150" right: "Total: |€100" expected: "Total: |$150 |€100" --- - parent: Start middle end left: Start [important] middle end| right: Start middle [critical] end| expected: Start [important] middle [critical] end|| --- - parent: marketplace left: market| place right: market|space expected: market| placemarket|space --- - parent: A B C D left: A X B D| right: A B Y| expected: A X B Y|| --- - parent: Please submit your assignment by Friday left: Please submit your |completed |assignment by Friday right: Please submit your assignment |online |by Friday expected: Please submit your |completed |assignment |online |by Friday --- - parent: "a b " left: "c d " right: "a b c d " expected: "c d c d " --- - parent: a b c d e left: a e| right: a c e| expected: a e|| --- - parent: a 0 1 2 b left: a 0 1| 2 b right: a b| expected: a| b| --- - parent: a 0 1 2 b left: "|a b" right: "|a E 1 F b" expected: "||a E F b" --- - parent: a this one delete b left: a b| right: a my one change b| expected: a my change b|| --- - parent: this stays, this is one big delete, don't touch this left: this stays, don't touch this| right: this stays, my one change, don't touch this| expected: this stays, my change, don't touch this|| --- - parent: 1 2 3 4 5 6 left: 1| 6 right: 1 2 4| expected: 1|| --- - parent: hello world left: hi, world right: hello my friend!