diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF index 4ec7e3a71c5..1cb1884bb49 100644 --- a/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.ui.tests.css.swt; singleton:=true -Bundle-Version: 0.12.700.qualifier +Bundle-Version: 0.12.800.qualifier Require-Bundle: org.eclipse.e4.ui.css.core, org.eclipse.e4.ui.css.swt, org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1", diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/forms/SectionTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/forms/SectionTest.java index c20bc502771..81d687f44aa 100644 --- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/forms/SectionTest.java +++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/forms/SectionTest.java @@ -57,9 +57,13 @@ protected Section createTestSection(String styleSheet) { @Test void testSectionColors() { Section section = createTestSection( - "Section { swt-titlebar-color: #FF0000;" + "tb-toggle-color: #FF0000; " - + "tb-toggle-hover-color: #00FF00; " + "background-color-gradient-titlebar: #00FF00; " - + "background-color-titlebar: #0000FF; " + "border-color-titlebar: #00FF00}"); + """ + Section { swt-titlebar-color: #FF0000;\ + tb-toggle-color: #FF0000; \ + tb-toggle-hover-color: #00FF00; \ + background-color-gradient-titlebar: #00FF00; \ + background-color-titlebar: #0000FF; \ + border-color-titlebar: #00FF00}"""); assertNotNull(section.getTitleBarForeground()); assertEquals(RED, section.getTitleBarForeground().getRGB()); assertNotNull(section.getTitleBarBackground()); @@ -79,9 +83,13 @@ void testSectionColors() { @Test void testSectionResetColors() throws Exception { Section section = createTestSection( - "Section { swt-titlebar-color: #FF0000;" + "tb-toggle-color: #FF0000; " - + "tb-toggle-hover-color: #00FF00; " + "background-color-gradient-titlebar: #00FF00; " - + "background-color-titlebar: #0000FF; " + "border-color-titlebar: #00FF00}"); + """ + Section { swt-titlebar-color: #FF0000;\ + tb-toggle-color: #FF0000; \ + tb-toggle-hover-color: #00FF00; \ + background-color-gradient-titlebar: #00FF00; \ + background-color-titlebar: #0000FF; \ + border-color-titlebar: #00FF00}"""); engine.reset(); diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java index 989ce7146f6..ccd2e666cda 100644 --- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java +++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java @@ -295,10 +295,11 @@ void testRetrievePropertyNull() { @Test void testTopRightAsDescendentChild() { ToolBar[] toolBars = createTestToolBars( - "CTabFolder.special ToolBar { background: #FF0000}\n" + - "CTabFolder ToolBar { background: #00FF00}\n" + - "CTabFolder.extraordinary ToolBar { background: #FFFFFF}\n" + - "ToolBar { background: #0000FF}"); + """ + CTabFolder.special ToolBar { background: #FF0000} + CTabFolder ToolBar { background: #00FF00} + CTabFolder.extraordinary ToolBar { background: #FFFFFF} + ToolBar { background: #0000FF}"""); ToolBar barA = toolBars[0]; ToolBar barB = toolBars[1]; diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java index 17da5dff916..74e7d625bd8 100644 --- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java +++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java @@ -250,9 +250,11 @@ void testFontsEditorStackClass() { CTabFolder folder2 = createFolder(folder.getShell()); WidgetElement.setCSSClass(folder2, "editorStack"); - engine = createEngine("CTabItem { font-size: 10 }" + "CTabItem:selected { font-size: 14; font-weight: bold }" - + "CTabFolder.editorStack CTabItem { font-size: 11; }" - + "CTabFolder.editorStack CTabItem:selected { font-size: 13; font-style: italic }", folder.getDisplay()); + engine = createEngine(""" + CTabItem { font-size: 10 }\ + CTabItem:selected { font-size: 14; font-weight: bold }\ + CTabFolder.editorStack CTabItem { font-size: 11; }\ + CTabFolder.editorStack CTabItem:selected { font-size: 13; font-style: italic }""", folder.getDisplay()); engine.applyStyles(folder.getShell(), true); folder.getShell().open(); @@ -305,10 +307,11 @@ void testFontsEditorStackClass2() { WidgetElement.setCSSClass(folder2, "editorStack"); engine = createEngine( - "CTabItem { font-size: 10 }" - + "CTabItem:selected { font-size: 14; font-weight: bold }" - + "CTabFolder.editorStack CTabItem { font-size: 11; }" - + "CTabFolder.editorStack CTabItem:selected { font-size: 13; font-weight: normal; font-style: italic }", + """ + CTabItem { font-size: 10 }\ + CTabItem:selected { font-size: 14; font-weight: bold }\ + CTabFolder.editorStack CTabItem { font-size: 11; }\ + CTabFolder.editorStack CTabItem:selected { font-size: 13; font-weight: normal; font-style: italic }""", folder.getDisplay()); engine.applyStyles(folder.getShell(), true); @@ -361,8 +364,10 @@ void testShowCloseEditorStack() { CTabFolder folder2 = createFolder(folder.getShell()); WidgetElement.setCSSClass(folder2, "editorStack"); - engine = createEngine("CTabItem { show-close: false }" + "CTabItem:selected { show-close: true }" - + "CTabFolder.editorStack CTabItem { show-close: true }", folder.getDisplay()); + engine = createEngine(""" + CTabItem { show-close: false }\ + CTabItem:selected { show-close: true }\ + CTabFolder.editorStack CTabItem { show-close: true }""", folder.getDisplay()); engine.applyStyles(folder.getShell(), true); folder.getShell().open(); @@ -400,9 +405,11 @@ void testShowCloseViewStack() { CTabFolder folder2 = createFolder(folder.getShell()); WidgetElement.setCSSClass(folder2, "viewStack"); - engine = createEngine("CTabItem { show-close: false }" + "CTabItem:selected { show-close: true }" - + "CTabFolder.viewStack CTabItem { show-close: false }" - + "CTabFolder.viewStack CTabItem.selected { show-close: true }", folder.getDisplay()); + engine = createEngine(""" + CTabItem { show-close: false }\ + CTabItem:selected { show-close: true }\ + CTabFolder.viewStack CTabItem { show-close: false }\ + CTabFolder.viewStack CTabItem.selected { show-close: true }""", folder.getDisplay()); engine.applyStyles(folder.getShell(), true); folder.getShell().open(); diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/IEclipsePreferencesTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/IEclipsePreferencesTest.java index cf71a54cbbd..e0ede18b14d 100644 --- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/IEclipsePreferencesTest.java +++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/IEclipsePreferencesTest.java @@ -28,11 +28,13 @@ void testIEclipsePreferences() { IEclipsePreferences preferences = new EclipsePreferences(null, "org.eclipse.jdt.ui") {}; engine = createEngine( - "IEclipsePreferences#org-eclipse-jdt-ui{preferences:" - + "'semanticHighlighting.abstractClass.color=128,255,0'," - + "'java_bracket=0,255,255'," - + "'java_bracket_italic=true'," - + "'java_bracket_underline='" + "}", display); + """ + IEclipsePreferences#org-eclipse-jdt-ui{preferences:\ + 'semanticHighlighting.abstractClass.color=128,255,0',\ + 'java_bracket=0,255,255',\ + 'java_bracket_italic=true',\ + 'java_bracket_underline='\ + }""", display); // when engine.applyStyles(preferences, false); diff --git a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InheritTest.java b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InheritTest.java index 309bb8926e1..729b1338823 100644 --- a/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InheritTest.java +++ b/tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InheritTest.java @@ -67,9 +67,10 @@ void testBackgroundNoInherit() { @Test void testBackgroundInherit() throws Exception { Label labelToTest = createTestLabel( - "Label { background-color: #00FF00; }\n" - + "Composite { background-color: #FF0000; } \n" - + "Composite Label { background-color: inherit; color: #0000FF; }", + """ + Label { background-color: #00FF00; } + Composite { background-color: #FF0000; }\s + Composite Label { background-color: inherit; color: #0000FF; }""", false); assertEquals(BLUE, labelToTest.getForeground().getRGB()); assertEquals(RED, labelToTest.getBackground().getRGB());