Skip to content

Commit 4c57a8c

Browse files
jnerlichjnerlich
committed
Use Multi-line strings in CSS tests
Improves readability
1 parent 792c54d commit 4c57a8c

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
@@ -56,9 +56,13 @@ protected Section createTestSection(String styleSheet) {
5656
@Test
5757
void testSectionColors() {
5858
Section section = createTestSection(
59-
"Section { swt-titlebar-color: #FF0000;" + "tb-toggle-color: #FF0000; "
60-
+ "tb-toggle-hover-color: #00FF00; " + "background-color-gradient-titlebar: #00FF00; "
61-
+ "background-color-titlebar: #0000FF; " + "border-color-titlebar: #00FF00}");
59+
"""
60+
Section { swt-titlebar-color: #FF0000;\
61+
tb-toggle-color: #FF0000; \
62+
tb-toggle-hover-color: #00FF00; \
63+
background-color-gradient-titlebar: #00FF00; \
64+
background-color-titlebar: #0000FF; \
65+
border-color-titlebar: #00FF00}""");
6266
assertNotNull(section.getTitleBarForeground());
6367
assertEquals(RED, section.getTitleBarForeground().getRGB());
6468
assertNotNull(section.getTitleBarBackground());
@@ -78,9 +82,13 @@ void testSectionColors() {
7882
@Test
7983
void testSectionResetColors() throws Exception {
8084
Section section = createTestSection(
81-
"Section { swt-titlebar-color: #FF0000;" + "tb-toggle-color: #FF0000; "
82-
+ "tb-toggle-hover-color: #00FF00; " + "background-color-gradient-titlebar: #00FF00; "
83-
+ "background-color-titlebar: #0000FF; " + "border-color-titlebar: #00FF00}");
85+
"""
86+
Section { swt-titlebar-color: #FF0000;\
87+
tb-toggle-color: #FF0000; \
88+
tb-toggle-hover-color: #00FF00; \
89+
background-color-gradient-titlebar: #00FF00; \
90+
background-color-titlebar: #0000FF; \
91+
border-color-titlebar: #00FF00}""");
8492

8593
engine.reset();
8694

‎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
@@ -251,9 +251,11 @@ void testFontsEditorStackClass() {
251251
CTabFolder folder2 = createFolder(folder.getShell());
252252

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

259261
folder.getShell().open();
@@ -306,10 +308,11 @@ void testFontsEditorStackClass2() {
306308

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

@@ -362,8 +365,10 @@ void testShowCloseEditorStack() {
362365
CTabFolder folder2 = createFolder(folder.getShell());
363366

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

369374
folder.getShell().open();
@@ -401,9 +406,11 @@ void testShowCloseViewStack() {
401406
CTabFolder folder2 = createFolder(folder.getShell());
402407

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

409416
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)