You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

DefaultNoteMergerTest.java 3.1KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116
  1. /*
  2. * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com> and others
  3. *
  4. * This program and the accompanying materials are made available under the
  5. * terms of the Eclipse Distribution License v. 1.0 which is available at
  6. * https://www.eclipse.org/org/documents/edl-v10.php.
  7. *
  8. * SPDX-License-Identifier: BSD-3-Clause
  9. */
  10. package org.eclipse.jgit.notes;
  11. import static org.junit.Assert.assertEquals;
  12. import static org.junit.Assert.assertNull;
  13. import static org.junit.Assert.assertSame;
  14. import org.eclipse.jgit.junit.RepositoryTestCase;
  15. import org.eclipse.jgit.junit.TestRepository;
  16. import org.eclipse.jgit.lib.ObjectInserter;
  17. import org.eclipse.jgit.lib.ObjectReader;
  18. import org.eclipse.jgit.lib.Repository;
  19. import org.eclipse.jgit.revwalk.RevBlob;
  20. import org.junit.After;
  21. import org.junit.Before;
  22. import org.junit.Test;
  23. public class DefaultNoteMergerTest extends RepositoryTestCase {
  24. private TestRepository<Repository> tr;
  25. private ObjectReader reader;
  26. private ObjectInserter inserter;
  27. private DefaultNoteMerger merger;
  28. private Note baseNote;
  29. private RevBlob noteOn;
  30. @Override
  31. @Before
  32. public void setUp() throws Exception {
  33. super.setUp();
  34. tr = new TestRepository<>(db);
  35. reader = db.newObjectReader();
  36. inserter = db.newObjectInserter();
  37. merger = new DefaultNoteMerger();
  38. noteOn = tr.blob("a");
  39. baseNote = newNote("data");
  40. }
  41. @Override
  42. @After
  43. public void tearDown() throws Exception {
  44. reader.close();
  45. inserter.close();
  46. super.tearDown();
  47. }
  48. @Test
  49. public void testDeleteDelete() throws Exception {
  50. assertNull(merger.merge(baseNote, null, null, null, null));
  51. }
  52. @Test
  53. public void testEditDelete() throws Exception {
  54. Note edit = newNote("edit");
  55. assertSame(merger.merge(baseNote, edit, null, null, null), edit);
  56. assertSame(merger.merge(baseNote, null, edit, null, null), edit);
  57. }
  58. @Test
  59. public void testIdenticalEdit() throws Exception {
  60. Note edit = newNote("edit");
  61. assertSame(merger.merge(baseNote, edit, edit, null, null), edit);
  62. }
  63. @Test
  64. public void testEditEdit() throws Exception {
  65. Note edit1 = newNote("edit1");
  66. Note edit2 = newNote("edit2");
  67. Note result = merger.merge(baseNote, edit1, edit2, reader, inserter);
  68. assertEquals(result, noteOn); // same note
  69. assertEquals(result.getData(), tr.blob("edit1edit2"));
  70. result = merger.merge(baseNote, edit2, edit1, reader, inserter);
  71. assertEquals(result, noteOn); // same note
  72. assertEquals(result.getData(), tr.blob("edit2edit1"));
  73. }
  74. @Test
  75. public void testIdenticalAdd() throws Exception {
  76. Note add = newNote("add");
  77. assertSame(merger.merge(null, add, add, null, null), add);
  78. }
  79. @Test
  80. public void testAddAdd() throws Exception {
  81. Note add1 = newNote("add1");
  82. Note add2 = newNote("add2");
  83. Note result = merger.merge(null, add1, add2, reader, inserter);
  84. assertEquals(result, noteOn); // same note
  85. assertEquals(result.getData(), tr.blob("add1add2"));
  86. result = merger.merge(null, add2, add1, reader, inserter);
  87. assertEquals(result, noteOn); // same note
  88. assertEquals(result.getData(), tr.blob("add2add1"));
  89. }
  90. private Note newNote(String data) throws Exception {
  91. return new Note(noteOn, tr.blob(data));
  92. }
  93. }