Skip to content

Commit ebcbf51

Browse files
committed
Test WIP
1 parent 65a88c6 commit ebcbf51

File tree

8 files changed

+10
-132
lines changed

8 files changed

+10
-132
lines changed

.github/workflows/maven.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88

99
on:
1010
push:
11-
branches: [ master ]
11+
branches: [ master, bug/fix_edge_tests ]
1212
pull_request:
1313
branches: [ master ]
1414
types: [opened, reopened, synchronize, labeled]
@@ -32,10 +32,7 @@ jobs:
3232
matrix:
3333
java: [ '21' ]
3434
config:
35-
- { name: Linux, os: ubuntu-latest, native: gtk.linux.x86_64 }
3635
- { name: Windows, os: windows-latest, native: win32.win32.x86_64 }
37-
- { name: MacOS x86, os: macos-13, native: cocoa.macosx.x86_64 }
38-
- { name: MacOS ARM, os: macos-latest, native: cocoa.macosx.aarch64 }
3936
name: Verify ${{ matrix.config.name }} with Java-${{ matrix.java }}
4037
runs-on: ${{ matrix.config.os }}
4138
steps:
@@ -54,7 +51,7 @@ jobs:
5451
run: |
5552
git lfs pull --include='/binaries/org.eclipse.swt.win32.win32.x86_64/WebView2Loader.dll'
5653
- name: Set up Java ${{ matrix.java }}
57-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
54+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.1
5855
with:
5956
java-version: ${{ matrix.java }}
6057
distribution: 'temurin'

binaries/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,6 @@
3232
</properties>
3333

3434
<modules>
35-
<module>org.eclipse.swt.cocoa.macosx.x86_64</module>
36-
<module>org.eclipse.swt.cocoa.macosx.aarch64</module>
37-
<module>org.eclipse.swt.gtk.linux.aarch64</module>
38-
<module>org.eclipse.swt.gtk.linux.ppc64le</module>
39-
<module>org.eclipse.swt.gtk.linux.riscv64</module>
40-
<module>org.eclipse.swt.gtk.linux.x86_64</module>
41-
<module>org.eclipse.swt.win32.win32.aarch64</module>
4235
<module>org.eclipse.swt.win32.win32.x86_64</module>
4336
</modules>
4437

bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/WebBrowser.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ abstract class WebBrowser {
3030
StatusTextListener[] statusTextListeners = new StatusTextListener[0];
3131
TitleListener[] titleListeners = new TitleListener[0];
3232
VisibilityWindowListener[] visibilityWindowListeners = new VisibilityWindowListener[0];
33-
boolean jsEnabledOnNextPage = true, jsEnabled = true;
33+
boolean jsEnabledOnNextPage = true;
34+
boolean jsEnabled = true;
3435
int nextFunctionIndex = 1;
3536
Object evaluateResult;
3637

bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/Edge.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,7 @@ private String getDataDir(Display display) {
638638

639639
@Override
640640
public void create(Composite parent, int style) {
641+
// test
641642
createInstance(0);
642643
}
643644

pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,6 @@
226226
<module>bundles</module>
227227
<module>binaries</module>
228228
<module>local-build/org.eclipse.swt.fragments.localbuild</module>
229-
<module>examples/org.eclipse.swt.examples</module>
230-
<module>examples/org.eclipse.swt.examples.browser.demos</module>
231-
<module>examples/org.eclipse.swt.examples.launcher</module>
232-
<module>examples/org.eclipse.swt.examples.ole.win32</module>
233-
<module>examples/org.eclipse.swt.examples.views</module>
234229
<module>tests/org.eclipse.swt.tests</module>
235-
<module>features/org.eclipse.swt.tools.feature</module>
236230
</modules>
237231
</project>

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java

Lines changed: 0 additions & 110 deletions
This file was deleted.

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
*/
2323
@Suite
2424
@SelectClasses({
25-
AllNonBrowserTests.class,
2625
AllBrowserTests.class
2726
})
2827
public class AllTests {

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,9 @@ private void testLogAppend(String msg) {
152152
@Parameters(name = "browser flags: {0}")
153153
public static Collection<Object[]> browserFlagsToTest() {
154154
List<Object[]> browserFlags = new ArrayList<>();
155-
browserFlags.add(new Object[] {SWT.NONE});
155+
for(int i=0; i < 20; i++) {
156+
browserFlags.add(new Object[] {SWT.NONE});
157+
}
156158
if (SwtTestUtil.isWindows) {
157159
// Execute IE tests after Edge, because IE starts some OS timer that conflicts with Edge event handling
158160
browserFlags.add(new Object[] {SWT.IE});
@@ -1141,7 +1143,7 @@ public void test_setText() {
11411143
*/
11421144
@Test
11431145
public void test_setTextContainingScript_applicationLayerProgressListenerMustSeeUpToDateDom() {
1144-
assumeFalse("Toggling on Edge since I20250216-1800, see https://github.com/eclipse-platform/eclipse.platform.swt/issues/1843", isEdge);
1146+
// assumeFalse("Toggling on Edge since I20250216-1800, see https://github.com/eclipse-platform/eclipse.platform.swt/issues/1843", isEdge);
11451147
AtomicBoolean completed = new AtomicBoolean();
11461148
browser.addProgressListener(ProgressListener.completedAdapter(event -> {
11471149
String script = """
@@ -1150,6 +1152,7 @@ public void test_setTextContainingScript_applicationLayerProgressListenerMustSee
11501152
// since getText() afterwards does not necessarily return the updated DOM (platform-dependent)
11511153
document.title = "ProgressListener: Found " + h1s.length + " h1 tag(s)";
11521154
""";
1155+
System.err.println(browser.getText());
11531156
browser.execute(script);
11541157
completed.set(true);
11551158
}));

0 commit comments

Comments
 (0)