Changeset 10405 in josm for trunk

Timestamp:

2016-06-16T19:14:33+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12959 - Do not make unit tests rely on JFrame for headless mode (patch by michael2402) - gsoc-core

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -315 +315 @@
 
     protected void updateLocationState() {
-        if (SwingUtilities.getWindowAncestor(this) != null && isShowing()) {
+        if (isVisibleOnScreen()) {
             state = state.usingLocation(this);
         }
+    }
+
+    protected boolean isVisibleOnScreen() {
+        return SwingUtilities.getWindowAncestor(this) != null && isShowing();
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java

@@ -9 +9 @@
 import java.awt.geom.Point2D;
 
-import javax.swing.JFrame;
+import javax.swing.JPanel;
 
 import org.CustomMatchers;
@@ -32 +32 @@
 public class NavigatableComponentTest {
 
+    private final class NavigatableComponentMock extends NavigatableComponent {
+        @Override
+        public Point getLocationOnScreen() {
+            return new Point(30, 40);
+        }
+
+        @Override
+        protected boolean isVisibleOnScreen() {
+            return true;
+        }
+    }
+
     private static final int HEIGHT = 200;
     private static final int WIDTH = 300;
@@ -48 +60 @@
     @Before
     public void setUp() {
-        component = new NavigatableComponent() {
-            @Override
-            public Point getLocationOnScreen() {
-                return new Point(30, 40);
-            }
-        };
+        component = new NavigatableComponentMock();
         component.setBounds(new Rectangle(WIDTH, HEIGHT));
         // wait for the event to be propagated.
@@ -62 +69 @@
         });
         component.setVisible(true);
-        JFrame window = new JFrame();
-        window.add(component);
+        JPanel parent = new JPanel();
+        parent.add(component);
         component.updateLocationState();
     }