Index: trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 12642)
+++ trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 12643)
@@ -191,3 +191,10 @@
         MainApplicationTest.initToolbar();
     }
+
+    /**
+     * Make sure {@code MainApplication.menu} is initialized.
+     */
+    public static void initMainMenu() {
+        MainApplicationTest.initMainMenu();
+    }
 }
Index: trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java	(revision 12642)
+++ trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java	(revision 12643)
@@ -8,5 +8,4 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AlignInLineAction.InvalidSelection;
 import org.openstreetmap.josm.actions.AlignInLineAction.Line;
@@ -43,5 +42,5 @@
     public void setUp() {
         // Enable "Align in line" feature.
-        action = Main.main.menu.alignInLine;
+        action = MainApplication.getMenu().alignInLine;
         action.setEnabled(true);
     }
Index: trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java	(revision 12642)
+++ trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java	(revision 12643)
@@ -17,5 +17,4 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.search.SearchAction;
@@ -88,5 +87,5 @@
                 assertEquals(2, found.size());
 
-                Main.main.menu.joinAreas.join(Utils.filteredCollection(found, Way.class));
+                MainApplication.getMenu().joinAreas.join(Utils.filteredCollection(found, Way.class));
 
                 Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:way ref="+ref, SearchAction.SearchMode.replace);
Index: trunk/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java	(revision 12642)
+++ trunk/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java	(revision 12643)
@@ -13,5 +13,4 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
@@ -48,5 +47,5 @@
     public void setUp() {
         if (action == null) {
-            action = Main.main.menu.simplifyWay;
+            action = MainApplication.getMenu().simplifyWay;
             action.setEnabled(true);
         }
Index: trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java	(revision 12642)
+++ trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java	(revision 12643)
@@ -14,5 +14,4 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.SplitWayAction.Strategy;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -51,5 +50,5 @@
     public void setUp() {
         if (action == null) {
-            action = Main.main.menu.splitWay;
+            action = MainApplication.getMenu().splitWay;
             action.setEnabled(true);
         }
Index: trunk/test/unit/org/openstreetmap/josm/actions/UnGlueActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/UnGlueActionTest.java	(revision 12642)
+++ trunk/test/unit/org/openstreetmap/josm/actions/UnGlueActionTest.java	(revision 12643)
@@ -8,5 +8,4 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -40,5 +39,5 @@
     public void setUp() {
         if (action == null) {
-            action = Main.main.menu.unglueNodes;
+            action = MainApplication.getMenu().unglueNodes;
             action.setEnabled(true);
         }
Index: trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java	(revision 12642)
+++ trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java	(revision 12643)
@@ -91,4 +91,13 @@
             Main.main.panel = MainApplication.mainPanel;
         }
+    }
+
+    /**
+     * Make sure {@code MainApplication.menu} is initialized.
+     */
+    @SuppressWarnings("deprecation")
+    public static void initMainMenu() {
+        MainApplication.menu = new MainMenu();
+        Main.main.menu = MainApplication.menu;
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 12642)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 12643)
@@ -18,5 +18,4 @@
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
@@ -351,5 +350,5 @@
                 JOSMFixture.initMainPanel(true);
                 JOSMFixture.initToolbar();
-                Main.main.menu = new MainMenu();
+                JOSMFixture.initMainMenu();
             }
         }