Skip to content

Multi-line string in css tests #2711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vogella merged 2 commits into from
Jan 16, 2025
Merged

Multi-line string in css tests #2711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
531ae49
Multi-line string in css tests
vogella Jan 16, 2025
d7f1671
Version bump(s) for 4.35 stream
eclipse-platform-bot Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
20 changes: 14 additions & 6 deletions tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/forms/SectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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();

Expand Down
9 changes: 5 additions & 4 deletions ...s/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabFolderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
31 changes: 19 additions & 12 deletions tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/CTabItemTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
12 changes: 7 additions & 5 deletions ...ipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/IEclipsePreferencesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
7 changes: 4 additions & 3 deletions tests/org.eclipse.e4.ui.tests.css.swt/src/org/eclipse/e4/ui/tests/css/swt/InheritTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Loading