Changeset 14553 in josm for trunk/test/unit/org

Timestamp:

2018-12-11T23:49:14+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16073 - avoid unnamed layers

File:

• trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -313 +313 @@
     private static List<LayerDetails> firstLeafLayer(List<LayerDetails> layers) {
         for (LayerDetails layer : layers) {
-            if (layer.getChildren().isEmpty()) {
+            boolean hasNoChildren = layer.getChildren().isEmpty();
+            if (hasNoChildren && layer.getName() != null) {
                 return Collections.singletonList(layer);
-            } else {
+            } else if (!hasNoChildren) {
                 return firstLeafLayer(layer.getChildren());
             }
         }
-        return Collections.emptyList();
+        throw new IllegalArgumentException("Unable to find a valid WMS layer");
     }