Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java	(revision 7040)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java	(revision 7051)
@@ -33,4 +33,5 @@
     /**
      * Setup test.
+     * @throws Exception if test cannot be initialized
      */
     @Before
@@ -40,6 +41,9 @@
     }
 
+    /**
+     * Test #1 of opening_hours syntax.
+     */
     @Test
-    public void testCheckOpeningHourSyntax1() throws Exception {
+    public void testCheckOpeningHourSyntax1() {
         final String key = "opening_hours";
         // frequently used tags according to https://taginfo.openstreetmap.org/keys/opening_hours#values
@@ -53,27 +57,36 @@
     }
 
+    /**
+     * Test #2 of opening_hours syntax.
+     */
     @Test
-    public void testCheckOpeningHourSyntax2() throws Exception {
+    public void testCheckOpeningHourSyntax2() {
         final String key = "opening_hours";
         final List<OpeningHourTest.OpeningHoursTestError> errors = OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo-Tue");
         assertThat(errors, hasSize(1));
-        assertThat(errors.get(0).getMessage(), is("Mo-Tue <--- (Please use the abbreviation \"Tu\" for \"tue\".)"));
+        assertThat(errors.get(0).getMessage(), is(key + " - Mo-Tue <--- (Please use the abbreviation \"Tu\" for \"tue\".)"));
         assertThat(errors.get(0).getSeverity(), is(Severity.WARNING));
     }
 
+    /**
+     * Test #3 of opening_hours syntax.
+     */
     @Test
-    public void testCheckOpeningHourSyntax3() throws Exception {
+    public void testCheckOpeningHourSyntax3() {
         final String key = "opening_hours";
         final List<OpeningHourTest.OpeningHoursTestError> errors = OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Sa-Su 10.00-20.00");
         assertThat(errors, hasSize(2));
-        assertThat(errors.get(0).getMessage(), is("Sa-Su 10. <--- (Please use \":\" as hour/minute-separator)"));
+        assertThat(errors.get(0).getMessage(), is(key + " - Sa-Su 10. <--- (Please use \":\" as hour/minute-separator)"));
         assertThat(errors.get(0).getSeverity(), is(Severity.WARNING));
         assertThat(errors.get(0).getPrettifiedValue(), is("Sa-Su 10:00-20:00"));
-        assertThat(errors.get(1).getMessage(), is("Sa-Su 10.00-20. <--- (Please use \":\" as hour/minute-separator)"));
+        assertThat(errors.get(1).getMessage(), is(key + " - Sa-Su 10.00-20. <--- (Please use \":\" as hour/minute-separator)"));
         assertThat(errors.get(1).getSeverity(), is(Severity.WARNING));
     }
 
+    /**
+     * Test #4 of opening_hours syntax.
+     */
     @Test
-    public void testCheckOpeningHourSyntax4() throws Exception {
+    public void testCheckOpeningHourSyntax4() {
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(null, null), isEmpty());
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(null, ""), isEmpty());
@@ -81,23 +94,32 @@
     }
 
+    /**
+     * Test #5 of opening_hours syntax.
+     */
     @Test
-    public void testCheckOpeningHourSyntax5() throws Exception {
+    public void testCheckOpeningHourSyntax5() {
         final String key = "opening_hours";
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "badtext"), hasSize(1));
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "badtext").get(0).getMessage(),
-                is("opening_hours - ba <--- (Unexpected token: \"b\" This means that the syntax is not valid at that point or it is currently not supported.)"));
+                is(key + " - ba <--- (Unexpected token: \"b\" Invalid/unsupported syntax.)"));
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "5.00 p.m-11.00 p.m"), hasSize(1));
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "5.00 p.m-11.00 p.m").get(0).getMessage(),
-                is("opening_hours - 5.00 p <--- (hyphen (-) or open end (+) in time range expected. For working with points in time, the mode for opening_hours.js has to be altered. Maybe wrong tag?)"));
+                is(key + " - 5.00 p <--- (hyphen (-) or open end (+) in time range expected. For working with points in time, the mode for opening_hours.js has to be altered. Maybe wrong tag?)"));
     }
 
+    /**
+     * Test #6 of opening_hours syntax.
+     */
     @Test
-    public void testCheckOpeningHourSyntax6() throws Exception {
+    public void testCheckOpeningHourSyntax6() {
         final String key = "opening_hours";
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "PH open \"always open on public holidays\""), isEmpty());
     }
 
+    /**
+     * Test #7 of opening_hours syntax.
+     */
     @Test
-    public void testCheckOpeningHourSyntax7() throws Exception {
+    public void testCheckOpeningHourSyntax7() {
         final String key = "opening_hours";
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "9:00-18:00"), hasSize(1));
@@ -106,14 +128,21 @@
     }
 
+    /**
+     * Non-regression Test of opening_hours syntax for bug #9367.
+     */
     @Test
-    public void testCheckOpeningHourSyntaxTicket9367() throws Exception {
+    public void testCheckOpeningHourSyntaxTicket9367() {
         final String key = "opening_hours";
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getSeverity(), is(Severity.WARNING));
-        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getMessage(), is("Mo,Tu 04-17 <--- (Time range without minutes specified. Not very explicit! Please use this syntax instead e.g. \"12:00-14:00\".)"));
+        assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getMessage(), 
+                is(key + " - Mo,Tu 04-17 <--- (Time range without minutes specified. Not very explicit! Please use this syntax instead e.g. \"12:00-14:00\".)"));
         assertThat(OPENING_HOUR_TEST.checkOpeningHourSyntax(key, "Mo,Tu 04-17").get(0).getPrettifiedValue(), is("Mo,Tu 04:00-17:00"));
     }
 
+    /**
+     * Test #1 of service_times syntax.
+     */
     @Test
-    public void testCheckServiceTimeSyntax1() throws Exception {
+    public void testCheckServiceTimeSyntax1() {
         final String key = "service_times";
         // frequently used tags according to https://taginfo.openstreetmap.org/keys/service_times#values
@@ -128,6 +157,9 @@
     }
 
+    /**
+     * Test #1 of collection_times syntax.
+     */
     @Test
-    public void testCheckCollectionTimeSyntax1() throws Exception {
+    public void testCheckCollectionTimeSyntax1() {
         final String key = "collection_times";
         // frequently used tags according to https://taginfo.openstreetmap.org/keys/collection_times#values
@@ -141,6 +173,9 @@
     }
 
+    /**
+     * Tests that predefined values in presets are correct.
+     */
     @Test
-    public void testPresetValues() throws Exception {
+    public void testPresetValues() {
         final Collection<TaggingPreset> presets = TaggingPresetReader.readFromPreferences(false, false);
         final Set<Tag> values = new LinkedHashSet<>();