Changeset 12639 in josm for trunk/test
- Timestamp:
- 2017-08-25T01:37:31+02:00 (7 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
r12637 r12639 6 6 import static org.junit.Assert.fail; 7 7 8 import java.awt.BorderLayout;9 8 import java.io.File; 10 9 import java.io.IOException; … … 15 14 import java.util.TimeZone; 16 15 17 import javax.swing.JPanel;18 19 16 import org.openstreetmap.josm.data.projection.Projections; 20 17 import org.openstreetmap.josm.gui.MainApplication; 21 18 import org.openstreetmap.josm.gui.MainApplicationTest; 22 import org.openstreetmap.josm.gui.MainPanel;23 19 import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer; 24 20 import org.openstreetmap.josm.gui.util.GuiHelper; … … 158 154 if (Main.main.panel == null) { 159 155 initMainPanel(false); 160 Main.main.panel = Main .mainPanel;156 Main.main.panel = MainApplicationTest.getMainPanel(); 161 157 } 162 158 Main.main.panel.reAddListeners(); … … 167 163 168 164 /** 169 * Make sure {@code Main .contentPanePrivate} is initialized.165 * Make sure {@code MainApplication.contentPanePrivate} is initialized. 170 166 */ 171 167 public static void initContentPane() { 172 if (Main.contentPanePrivate == null) { 173 Main.contentPanePrivate = new JPanel(new BorderLayout()); 174 } 168 MainApplicationTest.initContentPane(); 175 169 } 176 170 177 171 /** 178 * Make sure {@code Main .mainPanel} is initialized.172 * Make sure {@code MainApplication.mainPanel} is initialized. 179 173 */ 180 174 public static void initMainPanel() { … … 183 177 184 178 /** 185 * Make sure {@code Main .mainPanel} is initialized.179 * Make sure {@code MainApplication.mainPanel} is initialized. 186 180 * @param reAddListeners {@code true} to re-add listeners 187 181 */ 188 182 public static void initMainPanel(boolean reAddListeners) { 189 if (Main.mainPanel == null) { 190 Main.mainPanel = new MainPanel(MainApplication.getLayerManager()); 191 } 192 if (reAddListeners) { 193 Main.mainPanel.reAddListeners(); 194 } 195 if (Main.main != null) { 196 Main.main.panel = Main.mainPanel; 197 } 183 MainApplicationTest.initMainPanel(reAddListeners); 198 184 } 199 185 200 186 /** 201 * Make sure {@code Main .toolbar} is initialized.187 * Make sure {@code MainApplication.toolbar} is initialized. 202 188 */ 203 @SuppressWarnings("deprecation")204 189 public static void initToolbar() { 205 190 MainApplicationTest.initToolbar(); 206 if (Main.toolbar == null) {207 Main.toolbar = MainApplication.getToolbar();208 }209 191 } 210 192 } -
trunk/test/unit/org/openstreetmap/josm/MainTest.java
r12637 r12639 8 8 import static org.junit.Assert.assertTrue; 9 9 10 import java.awt.event.KeyEvent;11 10 import java.net.MalformedURLException; 12 11 import java.net.URL; … … 18 17 import org.openstreetmap.josm.Main.InitStatusListener; 19 18 import org.openstreetmap.josm.Main.InitializationTask; 20 import org.openstreetmap.josm.actions.AboutAction;21 import org.openstreetmap.josm.gui.MapFrameListener;22 19 import org.openstreetmap.josm.io.OnlineResource; 23 20 import org.openstreetmap.josm.testutils.JOSMTestRules; 24 import org.openstreetmap.josm.tools.Shortcut;25 21 26 22 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; … … 125 121 } 126 122 127 /**128 * Unit test of {@link Main#getRegisteredActionShortcut}.129 */130 @Test131 public void testGetRegisteredActionShortcut() {132 Shortcut noKeystroke = Shortcut.registerShortcut("no", "keystroke", 0, 0);133 assertNull(noKeystroke.getKeyStroke());134 assertNull(Main.getRegisteredActionShortcut(noKeystroke));135 Shortcut noAction = Shortcut.registerShortcut("foo", "bar", KeyEvent.VK_AMPERSAND, Shortcut.SHIFT);136 assertNotNull(noAction.getKeyStroke());137 assertNull(Main.getRegisteredActionShortcut(noAction));138 AboutAction about = new AboutAction();139 assertEquals(about, Main.getRegisteredActionShortcut(about.getShortcut()));140 }141 142 /**143 * Unit test of {@link Main#addMapFrameListener} and {@link Main#removeMapFrameListener}.144 */145 @Test146 public void testMapFrameListener() {147 MapFrameListener listener = (o, n) -> { };148 assertTrue(Main.addMapFrameListener(listener));149 assertFalse(Main.addMapFrameListener(null));150 assertTrue(Main.removeMapFrameListener(listener));151 assertFalse(Main.removeMapFrameListener(null));152 }153 154 123 private static class InitStatusListenerStub implements InitStatusListener { 155 124 -
trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
r12637 r12639 6 6 import static org.junit.Assert.assertNotNull; 7 7 import static org.junit.Assert.assertNull; 8 8 import static org.junit.Assert.assertTrue; 9 10 import java.awt.BorderLayout; 11 import java.awt.event.KeyEvent; 9 12 import java.io.ByteArrayOutputStream; 10 13 import java.io.IOException; … … 19 22 import java.util.concurrent.Future; 20 23 24 import javax.swing.JComponent; 25 import javax.swing.JPanel; 21 26 import javax.swing.UIManager; 22 27 … … 25 30 import org.openstreetmap.josm.Main; 26 31 import org.openstreetmap.josm.TestUtils; 32 import org.openstreetmap.josm.actions.AboutAction; 27 33 import org.openstreetmap.josm.data.Version; 28 34 import org.openstreetmap.josm.data.osm.DataSet; … … 37 43 import org.openstreetmap.josm.testutils.JOSMTestRules; 38 44 import org.openstreetmap.josm.tools.Logging; 45 import org.openstreetmap.josm.tools.Shortcut; 39 46 40 47 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; … … 53 60 54 61 /** 62 * Make sure {@link MainApplication#contentPanePrivate} is initialized. 63 */ 64 public static void initContentPane() { 65 if (MainApplication.contentPanePrivate == null) { 66 MainApplication.contentPanePrivate = new JPanel(new BorderLayout()); 67 } 68 } 69 70 /** 71 * Returns {@link MainApplication#contentPanePrivate} (not public). 72 * @return {@link MainApplication#contentPanePrivate} 73 */ 74 public static JComponent getContentPane() { 75 return MainApplication.contentPanePrivate; 76 } 77 78 /** 79 * Make sure {@code MainApplication.mainPanel} is initialized. 80 * @param reAddListeners {@code true} to re-add listeners 81 */ 82 public static void initMainPanel(boolean reAddListeners) { 83 if (MainApplication.mainPanel == null) { 84 MainApplication.mainPanel = new MainPanel(MainApplication.getLayerManager()); 85 } 86 if (reAddListeners) { 87 MainApplication.mainPanel.reAddListeners(); 88 } 89 if (Main.main != null) { 90 Main.main.panel = MainApplication.mainPanel; 91 } 92 } 93 94 /** 95 * Returns {@link MainApplication#mainPanel} (not public). 96 * @return {@link MainApplication#mainPanel} 97 */ 98 public static MainPanel getMainPanel() { 99 return MainApplication.mainPanel; 100 } 101 102 /** 55 103 * Make sure {@link MainApplication#toolbar} is initialized. 56 104 */ 105 @SuppressWarnings("deprecation") 57 106 public static void initToolbar() { 58 107 if (MainApplication.toolbar == null) { 59 108 MainApplication.toolbar = new ToolbarPreferences(); 109 } 110 if (Main.toolbar == null) { 111 Main.toolbar = MainApplication.getToolbar(); 60 112 } 61 113 } … … 236 288 237 289 /** 290 * Unit test of {@link MainApplication#getRegisteredActionShortcut}. 291 */ 292 @Test 293 public void testGetRegisteredActionShortcut() { 294 Shortcut noKeystroke = Shortcut.registerShortcut("no", "keystroke", 0, 0); 295 assertNull(noKeystroke.getKeyStroke()); 296 assertNull(MainApplication.getRegisteredActionShortcut(noKeystroke)); 297 Shortcut noAction = Shortcut.registerShortcut("foo", "bar", KeyEvent.VK_AMPERSAND, Shortcut.SHIFT); 298 assertNotNull(noAction.getKeyStroke()); 299 assertNull(MainApplication.getRegisteredActionShortcut(noAction)); 300 AboutAction about = new AboutAction(); 301 assertEquals(about, MainApplication.getRegisteredActionShortcut(about.getShortcut())); 302 } 303 304 /** 305 * Unit test of {@link MainApplication#addMapFrameListener} and {@link MainApplication#removeMapFrameListener}. 306 */ 307 @Test 308 public void testMapFrameListener() { 309 MapFrameListener listener = (o, n) -> { }; 310 assertTrue(MainApplication.addMapFrameListener(listener)); 311 assertFalse(MainApplication.addMapFrameListener(null)); 312 assertTrue(MainApplication.removeMapFrameListener(listener)); 313 assertFalse(MainApplication.removeMapFrameListener(null)); 314 } 315 316 /** 238 317 * Unit test of {@link DownloadParamType} enum. 239 318 */
Note:
See TracChangeset
for help on using the changeset viewer.