Test WIP

Author: amartya4256

.github/workflows/maven.yml

@@ -8,7 +8,7 @@ concurrency:
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, bug/fix_edge_tests ]
   pull_request:
     branches: [ master ]
     types: [opened, reopened, synchronize, labeled]
@@ -32,10 +32,7 @@ jobs:
       matrix:
         java: [ '21' ]
         config: 
-          - { name: Linux, os: ubuntu-latest, native: gtk.linux.x86_64 }
           - { name: Windows, os: windows-latest, native: win32.win32.x86_64 }
-          - { name: MacOS x86, os: macos-13, native: cocoa.macosx.x86_64 }
-          - { name: MacOS ARM, os: macos-latest, native: cocoa.macosx.aarch64 }
     name: Verify ${{ matrix.config.name }} with Java-${{ matrix.java }}
     runs-on: ${{ matrix.config.os }}
     steps:
@@ -54,7 +51,7 @@ jobs:
       run: |
         git lfs pull --include='/binaries/org.eclipse.swt.win32.win32.x86_64/WebView2Loader.dll'
     - name: Set up Java ${{ matrix.java }}
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.1
       with:
         java-version: ${{ matrix.java }}
         distribution: 'temurin'

binaries/pom.xml

@@ -32,13 +32,6 @@
 	</properties>
 
 	<modules>
-		<module>org.eclipse.swt.cocoa.macosx.x86_64</module>
-		<module>org.eclipse.swt.cocoa.macosx.aarch64</module>
-		<module>org.eclipse.swt.gtk.linux.aarch64</module>
-		<module>org.eclipse.swt.gtk.linux.ppc64le</module>
-		<module>org.eclipse.swt.gtk.linux.riscv64</module>
-		<module>org.eclipse.swt.gtk.linux.x86_64</module>
-		<module>org.eclipse.swt.win32.win32.aarch64</module>
 		<module>org.eclipse.swt.win32.win32.x86_64</module>
 	</modules>
 

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

@@ -30,7 +30,8 @@ abstract class WebBrowser {
 	StatusTextListener[] statusTextListeners = new StatusTextListener[0];
 	TitleListener[] titleListeners = new TitleListener[0];
 	VisibilityWindowListener[] visibilityWindowListeners = new VisibilityWindowListener[0];
-	boolean jsEnabledOnNextPage = true, jsEnabled = true;
+	boolean jsEnabledOnNextPage = true;
+	boolean jsEnabled = true;
 	int nextFunctionIndex = 1;
 	Object evaluateResult;
 

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

@@ -638,6 +638,7 @@ private String getDataDir(Display display) {
 
 @Override
 public void create(Composite parent, int style) {
+	// test
 	createInstance(0);
 }
 
@@ -1161,6 +1162,7 @@ int handleDOMContentLoaded(long pView, long pArgs) {
 	if (startEvent != null && startEvent.top) {
 		if (lastCustomText != null && getUrl().equals(ABOUT_BLANK)) {
 			IUnknown postExecute = newCallback((long result, long json) -> {
+				System.err.println(getText());
 				sendProgressCompleted();
 				return COM.S_OK;
 			});

pom.xml

@@ -226,12 +226,6 @@
     <module>bundles</module>
     <module>binaries</module>
     <module>local-build/org.eclipse.swt.fragments.localbuild</module>
-    <module>examples/org.eclipse.swt.examples</module>
-    <module>examples/org.eclipse.swt.examples.browser.demos</module>
-    <module>examples/org.eclipse.swt.examples.launcher</module>
-    <module>examples/org.eclipse.swt.examples.ole.win32</module>
-    <module>examples/org.eclipse.swt.examples.views</module>
     <module>tests/org.eclipse.swt.tests</module>
-    <module>features/org.eclipse.swt.tools.feature</module>
   </modules>
 </project>

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

@@ -22,7 +22,6 @@
  */
 @Suite
 @SelectClasses({
-	AllNonBrowserTests.class,
 	AllBrowserTests.class
 })
 public class AllTests {

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

@@ -152,7 +152,9 @@ private void testLogAppend(String msg) {
 @Parameters(name = "browser flags: {0}")
 public static Collection<Object[]> browserFlagsToTest() {
 	List<Object[]> browserFlags = new ArrayList<>();
-	browserFlags.add(new Object[] {SWT.NONE});
+	for(int i=0; i < 20; i++) {
+		browserFlags.add(new Object[] {SWT.NONE});
+	}
 	if (SwtTestUtil.isWindows) {
 		// Execute IE tests after Edge, because IE starts some OS timer that conflicts with Edge event handling
 		browserFlags.add(new Object[] {SWT.IE});
@@ -1141,7 +1143,7 @@ public void test_setText() {
  */
 @Test
 public void test_setTextContainingScript_applicationLayerProgressListenerMustSeeUpToDateDom() {
-	assumeFalse("Toggling on Edge since I20250216-1800, see https://github.com/eclipse-platform/eclipse.platform.swt/issues/1843", isEdge);
+//	assumeFalse("Toggling on Edge since I20250216-1800, see https://github.com/eclipse-platform/eclipse.platform.swt/issues/1843", isEdge);
 	AtomicBoolean completed = new AtomicBoolean();
 	browser.addProgressListener(ProgressListener.completedAdapter(event -> {
 		String script = """
@@ -1150,6 +1152,7 @@ public void test_setTextContainingScript_applicationLayerProgressListenerMustSee
 				// since getText() afterwards does not necessarily return the updated DOM (platform-dependent)
 				document.title = "ProgressListener: Found " + h1s.length + " h1 tag(s)";
 				""";
+		System.err.println("gotten: " + browser.getText());
 		browser.execute(script);
 		completed.set(true);
 	}));
@@ -1159,20 +1162,24 @@ public void test_setTextContainingScript_applicationLayerProgressListenerMustSee
 			title.set(event.title);
 		}
 	});
-	browser.setText("""
+	String content = """
 			<html>
-				<head>
-					<script src=\"file:///does/not/really/needs/to/exist.js\"></script>
-				</head>
-				<body>
-					<h1>Hello, World!</h1>
-				</body>
-			</html>
-			""");
+			<head>
+				<script src=\"file:///does/not/really/needs/to/exist.js\"></script>
+			</head>
+			<body>
+				<h1>Hello, World!</h1>
+			</body>
+		</html>
+		""";
+	browser.setText(content);
+	System.err.println("original: " + content);
 	assertTrue("progress completion not reported", waitForPassCondition(completed::get));
 	assertTrue("title not set", waitForPassCondition(() -> title.get() != null));
 	assertTrue(
 			"unexpected title: " + title.get(), waitForPassCondition(() -> title.get().contains("ProgressListener: Found 1 h1 tag(s)")));
+
+	System.err.println("finally: " + browser.getText());
 }
 
 @Test