Changeset 9469 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2016-01-15T20:34:53+01:00 (9 years ago)

Author:

Don-vip

Message:

map paint styles unit test robustness

File:

• trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -79 +80 @@
                     }
                 }
-                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);
+                if (style != null) {
+                    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);
+                    }
+                } else {
+                    allWarnings.put(source.url, Collections.singleton("MapPaintStyles.addStyle() returned null"));
                 }
             }