Changeset 9334 in josm for trunk/test/unit

Timestamp:

2016-01-07T01:53:58+01:00 (8 years ago)

Author:

Don-vip

Message:

see #12282 - handle warnings for mappaint styles:

• Log warnings that occur when loading style
• Display them in Mappaint dialog (Info action)
• Drop redundant error icon
• Ignore XML styles in styles validation test
• Make styles validation test fail if at least a warning occur

Location:

trunk/test/unit/org/openstreetmap/josm/gui

Files:

• layer/geoimage/ImageEntryTest.java (modified) (2 diffs)
• preferences/map/MapPaintPreferenceTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageEntryTest.java

@@ -5 +5 @@
 
 import java.io.File;
-import java.io.IOException;
 
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.io.IllegalDataException;
-import org.xml.sax.SAXException;
 
 /**
@@ -19 +16 @@
     /**
      * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/12255">#12255</a>.
-     * @throws IllegalDataException if an error was found while parsing the data from the source
-     * @throws IOException if any I/O error occurs
-     * @throws SAXException if any XML error occurs
      */
     @Test
-    public void testTicket12255() throws IllegalDataException, IOException, SAXException {
+    public void testTicket12255() {
         ImageEntry e = new ImageEntry(new File(TestUtils.getRegressionDataFile(12255, "G0016941.JPG")));
         e.extractExif();

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java

@@ -14 +14 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
 import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
@@ -41 +42 @@
         assertFalse(sources.isEmpty());
         Map<String, Collection<Throwable>> allErrors = new HashMap<>();
+        Map<String, Collection<String>> allWarnings = new HashMap<>();
         for (ExtendedSourceEntry source : sources) {
-            System.out.println(source.url);
-            Collection<Throwable> errors = MapPaintStyles.addStyle(source);
-            System.out.println(errors.isEmpty() ? " => OK" : " => KO");
-            if (!errors.isEmpty()) {
-                allErrors.put(source.url, errors);
+            // Do not validate XML styles
+            if (!"xml".equalsIgnoreCase(source.styleType)) {
+                System.out.println(source.url);
+                StyleSource style = MapPaintStyles.addStyle(source);
+                System.out.println(style.isValid() ? " => OK" : " => KO");
+                Collection<Throwable> errors = style.getErrors();
+                Collection<String> warnings = style.getWarnings();
+                if (!errors.isEmpty()) {
+                    allErrors.put(source.url, errors);
+                }
+                if (!warnings.isEmpty()) {
+                    allWarnings.put(source.url, warnings);
+                }
             }
         }
-        assertTrue(allErrors.toString(), allErrors.isEmpty());
+        assertTrue(allErrors.toString()+"\n"+allWarnings.toString(), allErrors.isEmpty() && allWarnings.isEmpty());
     }
 }