Index: trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java (revision 17834) +++ trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java (revision 17837) @@ -6,4 +6,5 @@ import java.time.Instant; +import java.util.List; import org.junit.jupiter.api.extension.RegisterExtension; @@ -11,4 +12,5 @@ import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.io.NoteReader; import org.openstreetmap.josm.testutils.JOSMTestRules; @@ -69,3 +71,54 @@ .verify(); } + + @Test + void testSorting() throws Exception { + List list = new NoteReader("" + + "\n" + + "\n" + + "\n"+ + " 4\n"+ + " http://api.openstreetmap.org/api/0.6/notes/4\n"+ + " http://api.openstreetmap.org/api/0.6/notes/4/reopen\n"+ + " 2013-04-24 08:07:02 UTC\n"+ + " closed\n"+ + " 2013-04-24 08:08:51 UTC\n"+ + " \n"+ + " \n"+ + " 2013-04-24 08:07:02 UTC\n"+ + " 1626\n"+ + " FredB\n"+ + " http://www.openstreetmap.org/user/FredB\n"+ + " opened\n"+ + " test\n"+ + " <p>test</p>\n"+ + " \n"+ + " \n"+ + " 2013-04-24 08:08:51 UTC\n"+ + " 1626\n"+ + " FredB\n"+ + " http://www.openstreetmap.org/user/FredB\n"+ + " closed\n"+ + " \n"+ + " <p></p>\n"+ + " \n"+ + " \n"+ + "\n"+ + "\n" + + " 1396945\n" + + " https://www.openstreetmap.org/api/0.6/notes/1396945\n" + + " https://www.openstreetmap.org/api/0.6/notes/1396945/comment\n" + + " https://www.openstreetmap.org/api/0.6/notes/1396945/close\n" + + " 2018-05-17 15:41:06 UTC\n" + + " open\n" + + " \n" + + " \n" + + "\n" + + "\n").parse(); + // Non-regression test for ticket #20824 + list.sort(Note.DATE_COMPARATOR); + list.sort(Note.DEFAULT_COMPARATOR); + list.sort(Note.LAST_ACTION_COMPARATOR); + list.sort(Note.USER_COMPARATOR); + } }