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

Timestamp:

2021-07-14T18:30:55+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21104 - see #20659 - Image viewer: fix tooltips and icon size, hide layer-specific visibility checkbox

File:

• trunk/test/unit/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityActionTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityActionTest.java

@@ -6 +6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
+import org.openstreetmap.josm.gui.dialogs.layer.LayerVisibilityAction.OpacitySlider;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.layer.TMSLayerTest;
@@ -52 +53 @@
         // now check values
         action.updateValues();
-        assertEquals(1.0, action.opacitySlider.getRealValue(), 1e-15);
-        assertEquals("OpacitySlider [getRealValue()=1.0]", action.opacitySlider.toString());
+        OpacitySlider opacitySlider = action.sliders.stream()
+                .filter(x -> x instanceof OpacitySlider).map(x -> (OpacitySlider) x).findFirst().get();
 
-        action.opacitySlider.setRealValue(.5);
+        assertEquals(1.0, opacitySlider.getRealValue(), 1e-15);
+        assertEquals("OpacitySlider [getRealValue()=1.0]", opacitySlider.toString());
+
+        opacitySlider.setRealValue(.5);
         action.updateValues();
 
-        assertEquals(0.5, action.opacitySlider.getRealValue(), 1e-15);
-        assertEquals("OpacitySlider [getRealValue()=0.5]", action.opacitySlider.toString());
+        assertEquals(0.5, opacitySlider.getRealValue(), 1e-15);
+        assertEquals("OpacitySlider [getRealValue()=0.5]", opacitySlider.toString());
 
         action.setVisibleFlag(false);
@@ -70 +74 @@
 
         // layer stays visible during adjust
-        action.opacitySlider.slider.setValueIsAdjusting(true);
-        action.opacitySlider.setRealValue(0);
+        opacitySlider.slider.setValueIsAdjusting(true);
+        opacitySlider.setRealValue(0);
         assertEquals(0, layer.getOpacity(), 1e-15);
         layer.setOpacity(.1); // to make layer.isVisible work
@@ -77 +81 @@
         layer.setOpacity(0);
 
-        action.opacitySlider.slider.setValueIsAdjusting(false);
-        action.opacitySlider.setRealValue(0);
+        opacitySlider.slider.setValueIsAdjusting(false);
+        opacitySlider.setRealValue(0);
         assertEquals(0, layer.getOpacity(), 1e-15);
         layer.setOpacity(.1); // to make layer.isVisible work
@@ -88 +92 @@
         action.setVisibleFlag(true);
         action.updateValues();
-        assertEquals(1.0, action.opacitySlider.getRealValue(), 1e-15);
+        assertEquals(1.0, opacitySlider.getRealValue(), 1e-15);
         assertEquals(1.0, layer.getOpacity(), 1e-15);
     }