Context Navigation

← Previous Change
Next Change →

openstreetmap

Timestamp:

2017-08-24T01:47:00+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - fix unit tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

: 37 edited

MainTest.java (modified) (1 diff)
actions/AlignInLineActionTest.java (modified) (1 diff)
actions/CreateCircleActionTest.java (modified) (1 diff)
actions/JoinAreasActionTest.java (modified) (1 diff)
actions/MergeLayerActionTest.java (modified) (1 diff)
actions/PurgeActionTest.java (modified) (1 diff)
actions/SelectByInternalPointActionTest.java (modified) (1 diff)
actions/SimplifyWayActionTest.java (modified) (1 diff)
actions/SplitWayActionTest.java (modified) (1 diff)
actions/UnGlueActionTest.java (modified) (1 diff)
actions/mapmode/AddNoteActionTest.java (modified) (1 diff)
actions/mapmode/DeleteActionTest.java (modified) (1 diff)
actions/mapmode/DrawActionTest.java (modified) (1 diff)
actions/mapmode/ExtrudeActionTest.java (modified) (1 diff)
actions/mapmode/ImproveWayAccuracyActionTest.java (modified) (1 diff)
actions/mapmode/ParallelWayActionTest.java (modified) (1 diff)
actions/mapmode/PlayHeadDragModeTest.java (modified) (1 diff)
actions/mapmode/SelectActionTest.java (modified) (1 diff)
gui/MainApplicationTest.java (modified) (1 diff)
gui/MapScalerTest.java (modified) (1 diff)
gui/TableCellRendererTest.java (modified) (1 diff)
gui/dialogs/CommandStackDialogTest.java (modified) (1 diff)
gui/dialogs/ConflictDialogTest.java (modified) (1 diff)
gui/dialogs/InspectPrimitiveDialogTest.java (modified) (1 diff)
gui/dialogs/MapPaintDialogTest.java (modified) (1 diff)
gui/dialogs/layer/LayerVisibilityActionTest.java (modified) (1 diff)
gui/layer/AbstractTileSourceLayerTest.java (modified) (1 diff)
gui/layer/GpxLayerTest.java (modified) (1 diff)
gui/layer/MarkerLayerTest.java (modified) (3 diffs)
gui/layer/TMSLayerTest.java (modified) (1 diff)
gui/layer/WMSLayerTest.java (modified) (1 diff)
gui/layer/gpx/DownloadWmsAlongTrackActionTest.java (modified) (1 diff)
gui/layer/markerlayer/MarkerLayerTest.java (modified) (1 diff)
gui/preferences/imagery/ImageryPreferenceTest.java (modified) (1 diff)
io/remotecontrol/handler/ImportHandlerTest.java (modified) (1 diff)
io/session/SessionWriterTest.java (modified) (1 diff)
testutils/JOSMTestRules.java (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/test/unit/org/openstreetmap/josm/MainTest.java

r12620	r12632
47	47	@Rule
48	48	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
49		public JOSMTestRules test = new JOSMTestRules().platform().https().devAPI().main~~Menu~~().projection();
	49	public JOSMTestRules test = new JOSMTestRules().platform().https().devAPI().main().projection();
50	50
51	51	/**

trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java

r12562	r12632
31	31	@Rule
32	32	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
33		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~().projection();
	33	public JOSMTestRules test = new JOSMTestRules().main().projection();
34	34
35	35	/** Class under test. */

trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java

r12563	r12632
38	38	@Rule
39	39	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
40		public JOSMTestRules test = new JOSMTestRules().platform().projection().main~~Menu~~();
	40	public JOSMTestRules test = new JOSMTestRules().platform().projection().main();
41	41
42	42	/**

trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

r12562	r12632
47	47	@Rule
48	48	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
49		public JOSMTestRules test = new JOSMTestRules().platform().main~~Menu~~().projection();
	49	public JOSMTestRules test = new JOSMTestRules().platform().main().projection();
50	50
51	51	/**

trunk/test/unit/org/openstreetmap/josm/actions/MergeLayerActionTest.java

r12563	r12632
26	26	@Rule
27	27	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
28		public JOSMTestRules test = new JOSMTestRules().platform().main~~Menu~~();
	28	public JOSMTestRules test = new JOSMTestRules().platform().main();
29	29
30	30	private MergeLayerAction action;

trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java

r12563	r12632
32	32	@Rule
33	33	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
34		public JOSMTestRules test = new JOSMTestRules().platform().main~~Menu~~();
	34	public JOSMTestRules test = new JOSMTestRules().platform().main();
35	35
36	36	/**

trunk/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java

r11921	r12632
33	33	@Rule
34	34	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
35		public JOSMTestRules rules = new JOSMTestRules().preferences().projection();
	35	public JOSMTestRules rules = new JOSMTestRules().preferences().projection().main();
36	36
37	37	/**

trunk/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java

r12562	r12632
39	39	@Rule
40	40	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
41		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~();
	41	public JOSMTestRules test = new JOSMTestRules().main();
42	42
43	43	/**

trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java

r12562	r12632
42	42	@Rule
43	43	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
44		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~().projection();
	44	public JOSMTestRules test = new JOSMTestRules().main().projection();
45	45
46	46	/**

trunk/test/unit/org/openstreetmap/josm/actions/UnGlueActionTest.java

r12562	r12632
31	31	@Rule
32	32	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
33		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~();
	33	public JOSMTestRules test = new JOSMTestRules().main();
34	34
35	35	/**

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java

r12630	r12632
30	30	@Rule
31	31	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
32		public JOSMTestRules test = new JOSMTestRules().platform().main~~Menu~~().projection();
	32	public JOSMTestRules test = new JOSMTestRules().platform().main().projection();
33	33
34	34	/**

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.java

r12630	r12632
28	28	@Rule
29	29	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
30		public JOSMTestRules test = new JOSMTestRules().platform().main~~Menu~~().projection();
	30	public JOSMTestRules test = new JOSMTestRules().platform().main().projection();
31	31
32	32	/**

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java

r12630	r12632
41	41	@Rule
42	42	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
43		public JOSMTestRules test = new JOSMTestRules().platform().main~~Menu~~().projection();
	43	public JOSMTestRules test = new JOSMTestRules().platform().main().projection();
44	44
45	45	/**

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.java

r12630	r12632
28	28	@Rule
29	29	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
30		public JOSMTestRules test = new JOSMTestRules().platform().platform().main~~Menu~~().projection();
	30	public JOSMTestRules test = new JOSMTestRules().platform().platform().main().projection();
31	31
32	32	/**

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java

r12630	r12632
28	28	@Rule
29	29	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
30		public JOSMTestRules test = new JOSMTestRules().platform().platform().main~~Menu~~().projection();
	30	public JOSMTestRules test = new JOSMTestRules().platform().platform().main().projection();
31	31
32	32	/**

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java

r12630	r12632
29	29	@Rule
30	30	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
31		public JOSMTestRules test = new JOSMTestRules().platform().platform().main~~Menu~~().projection();
	31	public JOSMTestRules test = new JOSMTestRules().platform().platform().main().projection();
32	32
33	33	/**

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/PlayHeadDragModeTest.java

r12630	r12632
27	27	@Rule
28	28	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
29		public JOSMTestRules test = new JOSMTestRules().platform().platform().main~~Menu~~().projection();
	29	public JOSMTestRules test = new JOSMTestRules().platform().platform().main().projection();
30	30
31	31	/**

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java

r12630	r12632
60	60	@Rule
61	61	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
62		public JOSMTestRules test = new JOSMTestRules().platform().projection().main~~Menu~~();
	62	public JOSMTestRules test = new JOSMTestRules().platform().projection().main();
63	63
64	64	/**

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

r12564	r12632
36	36	@Rule
37	37	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
38		public JOSMTestRules test = new JOSMTestRules().platform().main~~Menu~~();
	38	public JOSMTestRules test = new JOSMTestRules().platform().main();
39	39
40	40	@SuppressFBWarnings(value = "DM_DEFAULT_ENCODING")

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

r12630	r12632
29	29	@Rule
30	30	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
31		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~().platform().projection();
	31	public JOSMTestRules test = new JOSMTestRules().main().platform().projection();
32	32
33	33	/**

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

r12564	r12632
51	51	@Rule
52	52	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
53		public JOSMTestRules test = new JOSMTestRules().platform().main~~Menu~~();
	53	public JOSMTestRules test = new JOSMTestRules().platform().main();
54	54
55	55	/**

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java

r12630	r12632
28	28	@Rule
29	29	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
30		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~().platform().projection();
	30	public JOSMTestRules test = new JOSMTestRules().main().platform().projection();
31	31
32	32	/**

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java

r12630	r12632
34	34	@Rule
35	35	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
36		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~().platform().projection();
	36	public JOSMTestRules test = new JOSMTestRules().main().platform().projection();
37	37
38	38	/**

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java

r12568	r12632
31	31	@Rule
32	32	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
33		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~().platform().projection().mapStyles();
	33	public JOSMTestRules test = new JOSMTestRules().main().platform().projection().mapStyles();
34	34
35	35	/**

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MapPaintDialogTest.java

r12630	r12632
22	22	@Rule
23	23	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
24		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~().platform().projection();
	24	public JOSMTestRules test = new JOSMTestRules().main().platform().projection();
25	25
26	26	/**

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

r12564	r12632
26	26	@Rule
27	27	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
28		public JOSMTestRules test = new JOSMTestRules().preferences().projection().platform().main~~Menu~~();
	28	public JOSMTestRules test = new JOSMTestRules().preferences().projection().platform().main();
29	29
30	30	/**

trunk/test/unit/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayerTest.java

r12564	r12632
46	46	@Rule
47	47	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
48		public JOSMTestRules test = new JOSMTestRules().platform().projection().main~~Menu~~();
	48	public JOSMTestRules test = new JOSMTestRules().platform().projection().main();
49	49
50	50	private static final class TMSTileStubSource extends AbstractTMSTileSource {

trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java

r12630	r12632
42	42	@Rule
43	43	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
44		public JOSMTestRules test = new JOSMTestRules().platform().main~~Menu~~().projection().i18n();
	44	public JOSMTestRules test = new JOSMTestRules().platform().main().projection().i18n();
45	45
46	46	private static String getHtml(GpxLayer layer) {

trunk/test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java

-              r12630
+              r12632
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().mainMenu().platform().projection();
+    public JOSMTestRules test = new JOSMTestRules().main().projection();
     /**
 …
     @Test
     public void testPlayHeadMarker() {
-        MapFrame map = MainApplication.getMap();
         try {
             Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null));
+            MapFrame map = MainApplication.getMap();
             MarkerLayer layer = new MarkerLayer(new GpxData(), null, null, null);
             assertNull(map.mapView.playHeadMarker);
 …
             Main.getLayerManager().removeLayer(layer);
         } finally {
+            map.mapView.playHeadMarker = null;
+            if (MainApplication.isDisplayingMapView()) {
+                MainApplication.getMap().mapView.playHeadMarker = null;
+            }
+        }
+    }

trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java

r12564	r12632
23	23	@Rule
24	24	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
25		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~().platform().projection();
	25	public JOSMTestRules test = new JOSMTestRules().main().platform().projection();
26	26
27	27	/**

trunk/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java

r12564	r12632
23	23	@Rule
24	24	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
25		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~().platform().projection();
	25	public JOSMTestRules test = new JOSMTestRules().main().platform().projection();
26	26
27	27	/**

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java

r12564	r12632
29	29	@Rule
30	30	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
31		public JOSMTestRules test = new JOSMTestRules().platform().main~~Menu~~().projection();
	31	public JOSMTestRules test = new JOSMTestRules().platform().main().projection();
32	32
33	33	/**

trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java

r12564	r12632
32	32	@Rule
33	33	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
34		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~().platform().preferences().projection();
	34	public JOSMTestRules test = new JOSMTestRules().main().platform().preferences().projection();
35	35
36	36	/**

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTest.java

r12557	r12632
26	26	@Rule
27	27	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
28		public JOSMTestRules test = new JOSMTestRules().platform().main~~Menu~~();
	28	public JOSMTestRules test = new JOSMTestRules().platform().main();
29	29
30	30	/**

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java

r12558	r12632
34	34	@Rule
35	35	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
36		public JOSMTestRules test = new JOSMTestRules().main~~Menu~~();
	36	public JOSMTestRules test = new JOSMTestRules().main();
37	37
38	38	private static ImportHandler newHandler(String url) throws RequestHandlerBadRequestException {

trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java

r12564	r12632
88	88	@Rule
89	89	@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
90		public JOSMTestRules test = new JOSMTestRules().platform().projection().main~~Menu~~();
	90	public JOSMTestRules test = new JOSMTestRules().platform().projection().main();
91	91
92	92	/**

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

-              r12568
+              r12632
     private boolean rlTraffic;
     private boolean main;
-    private boolean mainMenu;
     /**
 …
     /**
+     * Use the {@link Main#main}, {@code Main.contentPanePrivate}, {@code Main.mainPanel}, {@link Main#toolbar} global variables in this test.
+     * Use the {@link Main#main}, {@code Main.contentPanePrivate}, {@code Main.mainPanel},
+     *         {@link Main#menu}, {@link Main#toolbar} global variables in this test.
      * @return this instance, for easy chaining
      * @since 12557
      */
     public JOSMTestRules main() {
+        platform();
         main = true;
-        return this;
+    }
-    /**
-     * Use the {@link Main#menu} in this test.
-     * @return this instance, for easy chaining
-     * @since 12557
-     */
-    public JOSMTestRules mainMenu() {
-        main();
-        platform();
-        mainMenu = true;
         return this;
+    }
 …
                 JOSMFixture.initMainPanel(true);
                 JOSMFixture.initToolbar();
+            }
-            if (mainMenu) {
                 Main.main.menu = new MainMenu();
+            }

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

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

Legend:

Download in other formats: