ShortcutTest: Determine if HTML is supported before asserting against an HTML string

taylor.smock · taylor.smock · commit 4601c53f6ccd · 2024-10-03T12:32:10.000Z
This does a few things: * Ensures that the test will work properly if the default LaF is *not* Aqua (the default macOS LaF) * If Aqua ever supports HTML in menu tooltips, we will only have to change one location * Fewer locations to worry about in unit tests if we change the default LaF for mac to something else git-svn-id: https://josm.openstreetmap.de/svn/trunk@19231 0c6e7542-c601-0410-84e7-c038aed88b3b
diff --git a/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java b/test/unit/org/openstreetmap/josm/tools/ShortcutTest.java
@@ -20,10 +20,11 @@ class ShortcutTest {
     @Test
     void testMakeTooltip() {
         final String tooltip = Shortcut.makeTooltip("Foo Bar", KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.SHIFT_DOWN_MASK));
-        if (Platform.determinePlatform() == Platform.OSX) {
-            assertEquals("Foo Bar (⇧+J)", tooltip);
+        final String shift = Platform.determinePlatform() == Platform.OSX ? "⇧" : "Shift";
+        if (PlatformManager.getPlatform().isHtmlSupportedInMenuTooltips()) {
+            assertEquals("<html>Foo Bar <font size='-2'>(" + shift + "+J)</font>&nbsp;</html>", tooltip);
         } else {
-            assertEquals("<html>Foo Bar <font size='-2'>(Shift+J)</font>&nbsp;</html>", tooltip);
+            assertEquals("Foo Bar (" + shift + "+J)", tooltip);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,11 @@ class ShortcutTest {`
`20`	`20`	`@Test`
`21`	`21`	`void testMakeTooltip() {`
`22`	`22`	`final String tooltip = Shortcut.makeTooltip("Foo Bar", KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.SHIFT_DOWN_MASK));`
`23`		`- if (Platform.determinePlatform() == Platform.OSX) {`
`24`		`- assertEquals("Foo Bar (⇧+J)", tooltip);`
	`23`	`+ final String shift = Platform.determinePlatform() == Platform.OSX ? "⇧" : "Shift";`
	`24`	`+ if (PlatformManager.getPlatform().isHtmlSupportedInMenuTooltips()) {`
	`25`	`+ assertEquals("<html>Foo Bar <font size='-2'>(" + shift + "+J)</font> </html>", tooltip);`
`25`	`26`	`} else {`
`26`		`- assertEquals("<html>Foo Bar <font size='-2'>(Shift+J)</font> </html>", tooltip);`
	`27`	`+ assertEquals("Foo Bar (" + shift + "+J)", tooltip);`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`