Changeset 9569 in josm

Timestamp:

2016-01-22T22:31:36+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12393 - Fix parsing note hiding events (patch by ToeBee) + add non-regression unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/notes/NoteComment.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/NoteReader.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/NoteReaderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java

@@ -28 +28 @@
         closed,
         reopened,
-        commented
+        commented,
+        hidden
     }
 

trunk/src/org/openstreetmap/josm/io/NoteReader.java

@@ -130 +130 @@
         @Override
         public void endElement(String namespaceURI, String localName, String qName) {
-            if ("note".equals(qName)) {
+            if (notes != null && "note".equals(qName)) {
                 notes.add(thisNote);
             }

trunk/test/unit/org/openstreetmap/josm/io/NoteReaderTest.java

@@ -83 +83 @@
         assertEquals("", c2.getText());
     }
+
+    /**
+     * Non-regression test for bug #12393.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testTicket12393() throws Exception {
+        // CHECKSTYLE.OFF: LineLength
+        new NoteReader(
+            "<note id=\"233775\" lat=\"48.2411985\" lon=\"-122.3744820\" created_at=\"2014-08-31T17:13:29Z\" closed_at=\"2015-09-06T23:35:14Z\">"+
+            "<comment action=\"opened\" timestamp=\"2014-08-31T17:13:29Z\" uid=\"7247\" user=\"goldfndr\">Jump Start Espresso | 26930</comment>"+
+            "<comment action=\"hidden\" timestamp=\"2015-09-06T23:34:26Z\" uid=\"355617\" user=\"pnorman\"></comment>"+
+            "<comment action=\"reopened\" timestamp=\"2015-09-06T23:34:38Z\" uid=\"355617\" user=\"pnorman\"></comment>"+
+            "<comment action=\"closed\" timestamp=\"2015-09-06T23:35:14Z\" uid=\"355617\" user=\"pnorman\">mapped, but inadvertently hid the note</comment>"+
+            "</note>").parse();
+        // CHECKSTYLE.ON: LineLength
+    }
 }