Changeset 17277 in josm for trunk

Timestamp:

2020-10-28T23:52:47+01:00 (4 years ago)

Author:

Don-vip

Message:

see #16567 - fix more obvious test errors

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/ExitActionTest.java (modified) (3 diffs)
• data/osm/search/SearchCompilerTest.java (modified) (1 diff)

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

@@ -3 +3 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.awt.GraphicsEnvironment;
 
 import org.junit.jupiter.api.Test;
@@ -86 +88 @@
             }
         };
-        new MockUp<SaveLayersDialog>() {
-            @Mock
-            private void closeDialog(Invocation invocation) {
-                saveLayersDialogCloseDialogCalled[0] = true;
-            }
-        };
+        if (!GraphicsEnvironment.isHeadless()) {
+            new MockUp<SaveLayersDialog>() {
+                @Mock
+                private void closeDialog(Invocation invocation) {
+                    saveLayersDialogCloseDialogCalled[0] = true;
+                }
+            };
+        }
 
         // No layer
@@ -105 +109 @@
             assertTrue(imageProviderShutdownCalledNowTrue[0]);
             assertTrue(jcsCacheManagerShutdownCalled[0]);
-            assertTrue(saveLayersDialogCloseDialogCalled[0]);
+            if (!GraphicsEnvironment.isHeadless()) {
+                assertTrue(saveLayersDialogCloseDialogCalled[0]);
+            }
         }
     }

trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java

@@ -604 +604 @@
         TaggingPresets.readFromPreferences();
 
-        assertThrows(IllegalArgumentException.class, () -> SearchCompiler.compile(settings));
+        assertThrows(SearchParseError.class, () -> SearchCompiler.compile(settings));
     }