Changeset 14126 in josm

Timestamp:

2018-08-11T19:08:26+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16590 - fix unit tests (patch by ris)

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/ExitActionTest.java (modified) (4 diffs)
• gui/layer/gpx/DownloadWmsAlongTrackActionTest.java (modified) (1 diff)

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

@@ -8 +8 @@
 import org.junit.contrib.java.lang.system.ExpectedSystemExit;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.cache.JCSCacheManager;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.swing.ProgressMonitorExecutor;
@@ -46 +47 @@
         boolean[] workerShutdownCalled = {false};
         boolean[] workerShutdownNowCalled = {false};
-        boolean[] imageProviderShutdownCalled = {false};
+        boolean[] imageProviderShutdownCalledNowFalse = {false};
+        boolean[] imageProviderShutdownCalledNowTrue = {false};
+        boolean[] jcsCacheManagerShutdownCalled = {false};
 
         // critically we don't proceed into the actual implementation in any of these mock methods -
@@ -70 +73 @@
         new MockUp<ImageProvider>() {
             @Mock
+            private void shutdown(Invocation invocation, boolean now) {
+                if (now) {
+                    // should have already been called with now = false
+                    assertTrue(imageProviderShutdownCalledNowFalse[0]);
+                    imageProviderShutdownCalledNowTrue[0] = true;
+                } else {
+                    imageProviderShutdownCalledNowFalse[0] = true;
+                }
+            }
+        };
+        new MockUp<JCSCacheManager>() {
+            @Mock
             private void shutdown(Invocation invocation) {
-                imageProviderShutdownCalled[0] = true;
+                jcsCacheManagerShutdownCalled[0] = true;
             }
         };
@@ -77 +92 @@
         // No layer
 
-        new ExitAction().actionPerformed(null);
-
-        assertTrue(workerShutdownCalled[0]);
-        assertTrue(workerShutdownNowCalled[0]);
-        assertTrue(imageProviderShutdownCalled[0]);
+        try {
+            new ExitAction().actionPerformed(null);
+        } finally {
+            // ExpectedSystemExit presumably works using an exception, so executing anything after the
+            // previous line requires it to be put in a finally block
+            assertTrue(workerShutdownCalled[0]);
+            assertTrue(workerShutdownNowCalled[0]);
+            assertTrue(imageProviderShutdownCalledNowFalse[0]);
+            assertTrue(imageProviderShutdownCalledNowTrue[0]);
+            assertTrue(jcsCacheManagerShutdownCalled[0]);
+        }
     }
 }

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

@@ -46 +46 @@
      */
     @Test
-    @Ignore("Test fails since r14052 - see #16590")
     public void testTMSLayer() throws Exception {
         final TileSourceRule tileSourceRule = this.test.getTileSourceRule();