Skip to content

Commit 531ae49

Browse files
vogellavogella
committed
Multi-line string in css tests
1 parent d4aa37b commit 531ae49

File tree

5 files changed

+49
-30
lines changed

5 files changed

+49
-30
lines changed

‎tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/forms/SectionTest.java‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,13 @@ protected Section createTestSection(String styleSheet) {
5757
@Test
5858
void testSectionColors() {
5959
Section section = createTestSection(
60-
"Section { swt-titlebar-color: #FF0000;" + "tb-toggle-color: #FF0000; "
61-
+ "tb-toggle-hover-color: #00FF00; " + "background-color-gradient-titlebar: #00FF00; "
62-
+ "background-color-titlebar: #0000FF; " + "border-color-titlebar: #00FF00}");
60+
"""
61+
Section { swt-titlebar-color: #FF0000;\
62+
tb-toggle-color: #FF0000; \
63+
tb-toggle-hover-color: #00FF00; \
64+
background-color-gradient-titlebar: #00FF00; \
65+
background-color-titlebar: #0000FF; \
66+
border-color-titlebar: #00FF00}""");
6367
assertNotNull(section.getTitleBarForeground());
6468
assertEquals(RED, section.getTitleBarForeground().getRGB());
6569
assertNotNull(section.getTitleBarBackground());
@@ -79,9 +83,13 @@ void testSectionColors() {
7983
@Test
8084
void testSectionResetColors() throws Exception {
8185
Section section = createTestSection(
82-
"Section { swt-titlebar-color: #FF0000;" + "tb-toggle-color: #FF0000; "
83-
+ "tb-toggle-hover-color: #00FF00; " + "background-color-gradient-titlebar: #00FF00; "
84-
+ "background-color-titlebar: #0000FF; " + "border-color-titlebar: #00FF00}");
86+
"""
87+
Section { swt-titlebar-color: #FF0000;\
88+
tb-toggle-color: #FF0000; \
89+
tb-toggle-hover-color: #00FF00; \
90+
background-color-gradient-titlebar: #00FF00; \
91+
background-color-titlebar: #0000FF; \
92+
border-color-titlebar: #00FF00}""");
8593

8694
engine.reset();
8795

‎tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,11 @@ void testRetrievePropertyNull() {
295295
@Test
296296
void testTopRightAsDescendentChild() {
297297
ToolBar[] toolBars = createTestToolBars(
298-
"CTabFolder.special ToolBar { background: #FF0000}\n" +
299-
"CTabFolder ToolBar { background: #00FF00}\n" +
300-
"CTabFolder.extraordinary ToolBar { background: #FFFFFF}\n" +
301-
"ToolBar { background: #0000FF}");
298+
"""
299+
CTabFolder.special ToolBar { background: #FF0000}
300+
CTabFolder ToolBar { background: #00FF00}
301+
CTabFolder.extraordinary ToolBar { background: #FFFFFF}
302+
ToolBar { background: #0000FF}""");
302303

303304
ToolBar barA = toolBars[0];
304305
ToolBar barB = toolBars[1];

‎tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,11 @@ void testFontsEditorStackClass() {
250250
CTabFolder folder2 = createFolder(folder.getShell());
251251

252252
WidgetElement.setCSSClass(folder2, "editorStack");
253-
engine = createEngine("CTabItem { font-size: 10 }" + "CTabItem:selected { font-size: 14; font-weight: bold }"
254-
+ "CTabFolder.editorStack CTabItem { font-size: 11; }"
255-
+ "CTabFolder.editorStack CTabItem:selected { font-size: 13; font-style: italic }", folder.getDisplay());
253+
engine = createEngine("""
254+
CTabItem { font-size: 10 }\
255+
CTabItem:selected { font-size: 14; font-weight: bold }\
256+
CTabFolder.editorStack CTabItem { font-size: 11; }\
257+
CTabFolder.editorStack CTabItem:selected { font-size: 13; font-style: italic }""", folder.getDisplay());
256258
engine.applyStyles(folder.getShell(), true);
257259

258260
folder.getShell().open();
@@ -305,10 +307,11 @@ void testFontsEditorStackClass2() {
305307

306308
WidgetElement.setCSSClass(folder2, "editorStack");
307309
engine = createEngine(
308-
"CTabItem { font-size: 10 }"
309-
+ "CTabItem:selected { font-size: 14; font-weight: bold }"
310-
+ "CTabFolder.editorStack CTabItem { font-size: 11; }"
311-
+ "CTabFolder.editorStack CTabItem:selected { font-size: 13; font-weight: normal; font-style: italic }",
310+
"""
311+
CTabItem { font-size: 10 }\
312+
CTabItem:selected { font-size: 14; font-weight: bold }\
313+
CTabFolder.editorStack CTabItem { font-size: 11; }\
314+
CTabFolder.editorStack CTabItem:selected { font-size: 13; font-weight: normal; font-style: italic }""",
312315
folder.getDisplay());
313316
engine.applyStyles(folder.getShell(), true);
314317

@@ -361,8 +364,10 @@ void testShowCloseEditorStack() {
361364
CTabFolder folder2 = createFolder(folder.getShell());
362365

363366
WidgetElement.setCSSClass(folder2, "editorStack");
364-
engine = createEngine("CTabItem { show-close: false }" + "CTabItem:selected { show-close: true }"
365-
+ "CTabFolder.editorStack CTabItem { show-close: true }", folder.getDisplay());
367+
engine = createEngine("""
368+
CTabItem { show-close: false }\
369+
CTabItem:selected { show-close: true }\
370+
CTabFolder.editorStack CTabItem { show-close: true }""", folder.getDisplay());
366371
engine.applyStyles(folder.getShell(), true);
367372

368373
folder.getShell().open();
@@ -400,9 +405,11 @@ void testShowCloseViewStack() {
400405
CTabFolder folder2 = createFolder(folder.getShell());
401406

402407
WidgetElement.setCSSClass(folder2, "viewStack");
403-
engine = createEngine("CTabItem { show-close: false }" + "CTabItem:selected { show-close: true }"
404-
+ "CTabFolder.viewStack CTabItem { show-close: false }"
405-
+ "CTabFolder.viewStack CTabItem.selected { show-close: true }", folder.getDisplay());
408+
engine = createEngine("""
409+
CTabItem { show-close: false }\
410+
CTabItem:selected { show-close: true }\
411+
CTabFolder.viewStack CTabItem { show-close: false }\
412+
CTabFolder.viewStack CTabItem.selected { show-close: true }""", folder.getDisplay());
406413
engine.applyStyles(folder.getShell(), true);
407414

408415
folder.getShell().open();

‎tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/IEclipsePreferencesTest.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ void testIEclipsePreferences() {
2828
IEclipsePreferences preferences = new EclipsePreferences(null, "org.eclipse.jdt.ui") {};
2929

3030
engine = createEngine(
31-
"IEclipsePreferences#org-eclipse-jdt-ui{preferences:"
32-
+ "'semanticHighlighting.abstractClass.color=128,255,0',"
33-
+ "'java_bracket=0,255,255',"
34-
+ "'java_bracket_italic=true',"
35-
+ "'java_bracket_underline='" + "}", display);
31+
"""
32+
IEclipsePreferences#org-eclipse-jdt-ui{preferences:\
33+
'semanticHighlighting.abstractClass.color=128,255,0',\
34+
'java_bracket=0,255,255',\
35+
'java_bracket_italic=true',\
36+
'java_bracket_underline='\
37+
}""", display);
3638
// when
3739
engine.applyStyles(preferences, false);
3840

‎tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InheritTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@ void testBackgroundNoInherit() {
6767
@Test
6868
void testBackgroundInherit() throws Exception {
6969
Label labelToTest = createTestLabel(
70-
"Label { background-color: #00FF00; }\n"
71-
+ "Composite { background-color: #FF0000; } \n"
72-
+ "Composite Label { background-color: inherit; color: #0000FF; }",
70+
"""
71+
Label { background-color: #00FF00; }
72+
Composite { background-color: #FF0000; }\s
73+
Composite Label { background-color: inherit; color: #0000FF; }""",
7374
false);
7475
assertEquals(BLUE, labelToTest.getForeground().getRGB());
7576
assertEquals(RED, labelToTest.getBackground().getRGB());

0 commit comments

Comments
 (0)