Changeset 14149 in josm for trunk/test/unit/org/openstreetmap/josm/gui/preferences
- Timestamp:
- 2018-08-12T17:24:32+02:00 (6 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/gui/preferences
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/preferences/advanced/ExportProfileActionTest.java
r14081 r14149 6 6 import org.junit.Rule; 7 7 import org.junit.Test; 8 import org.openstreetmap.josm.Main;9 8 import org.openstreetmap.josm.TestUtils; 9 import org.openstreetmap.josm.data.Preferences; 10 10 import org.openstreetmap.josm.testutils.JOSMTestRules; 11 11 import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker; … … 35 35 "All the preferences of this group are default, nothing to save", JOptionPane.OK_OPTION 36 36 )); 37 new ExportProfileAction( Main.pref, "foo", "bar").actionPerformed(null);38 new ExportProfileAction( Main.pref, "expert", "expert").actionPerformed(null);37 new ExportProfileAction(Preferences.main(), "foo", "bar").actionPerformed(null); 38 new ExportProfileAction(Preferences.main(), "expert", "expert").actionPerformed(null); 39 39 } 40 40 } -
trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java
r14138 r14149 23 23 import org.openstreetmap.josm.Main; 24 24 import org.openstreetmap.josm.TestUtils; 25 import org.openstreetmap.josm.data.Preferences; 25 26 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane; 26 27 import org.openstreetmap.josm.gui.util.GuiHelper; … … 97 98 this.referenceBazJarOld = new File(TestUtils.getTestDataRoot(), "__files/plugin/baz_plugin.v6.jar"); 98 99 this.referenceBazJarNew = new File(TestUtils.getTestDataRoot(), "__files/plugin/baz_plugin.v7.jar"); 99 this.pluginDir = Main.pref.getPluginsDirectory();100 this.pluginDir = Preferences.main().getPluginsDirectory(); 100 101 this.targetDummyJar = new File(this.pluginDir, "dummy_plugin.jar"); 101 102 this.targetDummyJarNew = new File(this.pluginDir, "dummy_plugin.jar.new");
Note:
See TracChangeset
for help on using the changeset viewer.