Skip to content

Execute tests with non-default autoscaling settings in I-Build #2967

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
HeikoKlare merged 1 commit into from
Jan 15, 2026
Merged

Execute tests with non-default autoscaling settings in I-Build #2967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
117 changes: 66 additions & 51 deletions tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.ArrayList;
import java.util.List;

import org.eclipse.swt.graphics.Resource;
import org.eclipse.swt.tests.junit.AllNonBrowserTests.NonBrowserTestSuite;
import org.junit.platform.suite.api.AfterSuite;
import org.junit.platform.suite.api.BeforeSuite;
import org.junit.platform.suite.api.SelectClasses;
Expand All @@ -26,58 +31,68 @@
/**
* Suite for running most SWT test cases (all except for browser tests).
*/
@Suite(failIfNoTests = false)
@SelectClasses({ //
// Basic tests
Test_org_eclipse_swt_SWT.class, //
Test_org_eclipse_swt_SWTException.class, //
Test_org_eclipse_swt_SWTError.class, //
Test_org_eclipse_swt_widgets_Display.class, //
// Groups of tests
AllGraphicsTests.class, //
AllWidgetTests.class, //
// Rest of tests alphabetically
DPIUtilTests.class, //
JSVGRasterizerTest.class, //
Test_org_eclipse_swt_accessibility_Accessible.class, //
Test_org_eclipse_swt_accessibility_AccessibleControlEvent.class, //
Test_org_eclipse_swt_accessibility_AccessibleEvent.class, //
Test_org_eclipse_swt_accessibility_AccessibleTextEvent.class, //
Test_org_eclipse_swt_dnd_ByteArrayTransfer.class, //
Test_org_eclipse_swt_dnd_Clipboard.class, //
Test_org_eclipse_swt_dnd_FileTransfer.class, //
Test_org_eclipse_swt_dnd_HTMLTransfer.class, //
Test_org_eclipse_swt_dnd_ImageTransfer.class, //
Test_org_eclipse_swt_dnd_RTFTransfer.class, //
Test_org_eclipse_swt_dnd_TextTransfer.class, //
Test_org_eclipse_swt_dnd_URLTransfer.class, //
Test_org_eclipse_swt_events_ArmEvent.class, //
Test_org_eclipse_swt_events_ControlEvent.class, //
Test_org_eclipse_swt_events_DisposeEvent.class, //
Test_org_eclipse_swt_events_FocusEvent.class, //
Test_org_eclipse_swt_events_HelpEvent.class, //
Test_org_eclipse_swt_events_KeyEvent.class, //
Test_org_eclipse_swt_events_MenuEvent.class, //
Test_org_eclipse_swt_events_ModifyEvent.class, //
Test_org_eclipse_swt_events_MouseEvent.class, //
Test_org_eclipse_swt_events_PaintEvent.class, //
Test_org_eclipse_swt_events_SelectionEvent.class, //
Test_org_eclipse_swt_events_ShellEvent.class, //
Test_org_eclipse_swt_events_TraverseEvent.class, //
Test_org_eclipse_swt_events_TreeEvent.class, //
Test_org_eclipse_swt_events_TypedEvent.class, //
Test_org_eclipse_swt_events_VerifyEvent.class, //
Test_org_eclipse_swt_internal_SVGRasterizer.class, //
Test_org_eclipse_swt_layout_BorderLayout.class, //
Test_org_eclipse_swt_layout_FormAttachment.class, //
Test_org_eclipse_swt_layout_GridData.class, //
Test_org_eclipse_swt_printing_PDFDocument.class, //
Test_org_eclipse_swt_printing_PrintDialog.class, //
Test_org_eclipse_swt_printing_Printer.class, //
Test_org_eclipse_swt_printing_PrinterData.class, //
Test_org_eclipse_swt_program_Program.class, //
})
@NonBrowserTestSuite
public class AllNonBrowserTests {

// Combine the test annotations with the test classes in a wrapper annotation
// such that it can be reused for derived test suites
@Suite(failIfNoTests = false)
@SelectClasses({ //
// Basic tests
Test_org_eclipse_swt_SWT.class, //
Test_org_eclipse_swt_SWTException.class, //
Test_org_eclipse_swt_SWTError.class, //
Test_org_eclipse_swt_widgets_Display.class, //
// Groups of tests
AllGraphicsTests.class, //
AllWidgetTests.class, //
// Rest of tests alphabetically
DPIUtilTests.class, //
JSVGRasterizerTest.class, //
Test_org_eclipse_swt_accessibility_Accessible.class, //
Test_org_eclipse_swt_accessibility_AccessibleControlEvent.class, //
Test_org_eclipse_swt_accessibility_AccessibleEvent.class, //
Test_org_eclipse_swt_accessibility_AccessibleTextEvent.class, //
Test_org_eclipse_swt_dnd_ByteArrayTransfer.class, //
Test_org_eclipse_swt_dnd_Clipboard.class, //
Test_org_eclipse_swt_dnd_FileTransfer.class, //
Test_org_eclipse_swt_dnd_HTMLTransfer.class, //
Test_org_eclipse_swt_dnd_ImageTransfer.class, //
Test_org_eclipse_swt_dnd_RTFTransfer.class, //
Test_org_eclipse_swt_dnd_TextTransfer.class, //
Test_org_eclipse_swt_dnd_URLTransfer.class, //
Test_org_eclipse_swt_events_ArmEvent.class, //
Test_org_eclipse_swt_events_ControlEvent.class, //
Test_org_eclipse_swt_events_DisposeEvent.class, //
Test_org_eclipse_swt_events_FocusEvent.class, //
Test_org_eclipse_swt_events_HelpEvent.class, //
Test_org_eclipse_swt_events_KeyEvent.class, //
Test_org_eclipse_swt_events_MenuEvent.class, //
Test_org_eclipse_swt_events_ModifyEvent.class, //
Test_org_eclipse_swt_events_MouseEvent.class, //
Test_org_eclipse_swt_events_PaintEvent.class, //
Test_org_eclipse_swt_events_SelectionEvent.class, //
Test_org_eclipse_swt_events_ShellEvent.class, //
Test_org_eclipse_swt_events_TraverseEvent.class, //
Test_org_eclipse_swt_events_TreeEvent.class, //
Test_org_eclipse_swt_events_TypedEvent.class, //
Test_org_eclipse_swt_events_VerifyEvent.class, //
Test_org_eclipse_swt_internal_SVGRasterizer.class, //
Test_org_eclipse_swt_layout_BorderLayout.class, //
Test_org_eclipse_swt_layout_FormAttachment.class, //
Test_org_eclipse_swt_layout_GridData.class, //
Test_org_eclipse_swt_printing_PDFDocument.class, //
Test_org_eclipse_swt_printing_PrintDialog.class, //
Test_org_eclipse_swt_printing_Printer.class, //
Test_org_eclipse_swt_printing_PrinterData.class, //
Test_org_eclipse_swt_program_Program.class, //
})
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@interface NonBrowserTestSuite {
//
}

private static List<Error> leakedResources;

@BeforeSuite
Expand Down
37 changes: 37 additions & 0 deletions ...ts/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests_AutoscaleOsNonDefaults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*******************************************************************************
* Copyright (c) 2026 Vector Informatik and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.swt.tests.junit;

import org.eclipse.swt.tests.junit.AllNonBrowserTests.NonBrowserTestSuite;
import org.junit.platform.suite.api.AfterSuite;
import org.junit.platform.suite.api.BeforeSuite;

/**
* Suite for running most SWT test cases (all except for browser tests) with non-default autoscaling settings.
* It is currently executed in I-Build tests (via test.xml) and may be executed for local testing.
*/
@NonBrowserTestSuite
public class AllNonBrowserTests_AutoscaleOsNonDefaults extends AllNonBrowserTests {

@BeforeSuite
static void setNonDefaultAutoscale() {
System.setProperty("swt.autoScale", "quarter");
System.setProperty("swt.autoScale.updateOnRuntime", "true");
}

@AfterSuite
static void restoreDefaultAutoscale() {
System.clearProperty("swt.autoScale");
System.clearProperty("swt.autoScale.updateOnRuntime");
}


}
1 change: 0 additions & 1 deletion tests/org.eclipse.swt.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
<systemPropertyVariables>
<user.home>${project.build.directory}</user.home> <!-- used as cache directory for SWT native libraries -->
<org.eclipse.swt.internal.enableStrictChecks>true</org.eclipse.swt.internal.enableStrictChecks> <!-- see bug 532632 -->
<swt.autoScale>quarter</swt.autoScale>
</systemPropertyVariables>
<!-- Trim does not only remove the entries before entering the test method but
also every entry which is not part of the test class. See bug 558848 for example. -->
Expand Down
18 changes: 16 additions & 2 deletions tests/org.eclipse.swt.tests/test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<!-- This target defines the tests that need to be run. -->
<target name="suite" unless="performance">
<property name="data" value="${eclipse-home}/swt_sniff_folder"/>
<delete dir="${location1}" quiet="true"/>
<delete dir="${data}" quiet="true"/>
<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${data}"/>
<property name="plugin-name" value="${plugin-name}"/>
Expand All @@ -34,9 +34,23 @@
</ant>
</target>

<!-- This target defines the tests that need to be run. -->
<target name="suite-non-default-autoscale" unless="performance">
<property name="data" value="${eclipse-home}/swt_sniff_folder"/>
<delete dir="${data}" quiet="true"/>
<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${data}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname" value="org.eclipse.swt.tests.junit.AllNonBrowserTests_AutoscaleOsNonDefaults"/>
<!-- workaround for https://bugs.eclipse.org/502410 and checks for bug 532632 -->
<property name="vmargs" value="-Dorg.eclipse.swt.internal.gtk.disablePrinting -Dorg.eclipse.swt.internal.enableStrictChecks"/>
</ant>
</target>

<!-- This target defines the browser tests. -->
<target name="browser-suite" unless="performance">
<property name="data" value="${eclipse-home}/swt_sniff_folder"/>
<delete dir="${data}" quiet="true"/>
<ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="timeout" value="900000"/>
<property name="data-dir" value="${data}"/>
Expand Down Expand Up @@ -71,7 +85,7 @@

<!-- This target runs the test suite. Any actions that need to happen after all -->
<!-- the tests have been run should go here. -->
<target name="run" depends="init,suite,browser-suite,cleanup">
<target name="run" depends="init,suite,suite-non-default-autoscale,browser-suite,cleanup">
<ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
<property name="includes" value="org*.xml"/>
<property name="output-file" value="${plugin-name}.xml"/>
Expand Down
Loading