(t *testing.T)
| 2697 | } |
| 2698 | |
| 2699 | func TestMergeNote(t *testing.T) { |
| 2700 | b1UUID := "b1-uuid" |
| 2701 | b2UUID := "b2-uuid" |
| 2702 | conflictBookUUID := testutils.MustGenerateUUID(t) |
| 2703 | |
| 2704 | testCases := []struct { |
| 2705 | addedOn int64 |
| 2706 | clientUSN int |
| 2707 | clientEditedOn int64 |
| 2708 | clientBody string |
| 2709 | clientDeleted bool |
| 2710 | clientBookUUID string |
| 2711 | clientDirty bool |
| 2712 | serverUSN int |
| 2713 | serverEditedOn int64 |
| 2714 | serverBody string |
| 2715 | serverDeleted bool |
| 2716 | serverBookUUID string |
| 2717 | expectedUSN int |
| 2718 | expectedAddedOn int64 |
| 2719 | expectedEditedOn int64 |
| 2720 | expectedBody string |
| 2721 | expectedDeleted bool |
| 2722 | expectedBookUUID string |
| 2723 | expectedDirty bool |
| 2724 | }{ |
| 2725 | // local copy is not dirty |
| 2726 | { |
| 2727 | clientDirty: false, |
| 2728 | clientUSN: 1, |
| 2729 | clientEditedOn: 0, |
| 2730 | clientBody: "n1 body", |
| 2731 | clientDeleted: false, |
| 2732 | clientBookUUID: b1UUID, |
| 2733 | addedOn: 1541232118, |
| 2734 | serverUSN: 21, |
| 2735 | serverEditedOn: 1541219321, |
| 2736 | serverBody: "n1 body edited", |
| 2737 | serverDeleted: false, |
| 2738 | serverBookUUID: b1UUID, |
| 2739 | expectedUSN: 21, |
| 2740 | expectedAddedOn: 1541232118, |
| 2741 | expectedEditedOn: 1541219321, |
| 2742 | expectedBody: "n1 body edited", |
| 2743 | expectedDeleted: false, |
| 2744 | expectedBookUUID: b1UUID, |
| 2745 | expectedDirty: false, |
| 2746 | }, |
| 2747 | // local copy is dirty and needs conflict resolution |
| 2748 | { |
| 2749 | clientDirty: true, |
| 2750 | clientUSN: 1, |
| 2751 | clientEditedOn: 1541219320, |
| 2752 | clientBody: "n1 body", |
| 2753 | clientDeleted: false, |
| 2754 | clientBookUUID: b1UUID, |
| 2755 | addedOn: 1541232118, |
| 2756 | serverUSN: 21, |
nothing calls this directly
no test coverage detected