diff options
| author | Thomas Wolf | 2021-10-12 20:36:20 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2021-10-13 04:36:16 +0000 |
| commit | 5b82a4c47745846a2261c07376d6ee03d2a68cac (patch) | |
| tree | dc6b46d9efdd105971a293d8b48be374bcd870cf /tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests | |
| parent | 84293c1be588cc1101b555f6a9626222d49af70c (diff) | |
| download | eclipse.platform.swt-5b82a4c47745846a2261c07376d6ee03d2a68cac.tar.gz eclipse.platform.swt-5b82a4c47745846a2261c07376d6ee03d2a68cac.tar.xz eclipse.platform.swt-5b82a4c47745846a2261c07376d6ee03d2a68cac.zip | |
Bug 575393 - Normalize line endings to LF
Some files in SWT were checked-in with CR-LF line endings; one even
had mixed line endings (Test_org_eclipse_swt_browser_Browser.java).
Normalize them all to use LF as line endings like all the other source
files.
Change-Id: I45cbfc332d1fd9a2192b7733b86c7ce79c732285
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/186410
Reviewed-by: Jörg Kubitz <jkubitz-eclipse@gmx.de>
Reviewed-by: Lars Vogel <Lars.Vogel@vogella.com>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
Tested-by: Platform Bot <platform-bot@eclipse.org>
Diffstat (limited to 'tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests')
| -rw-r--r-- | tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java index ad5b814c58..e03b7eafd6 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java @@ -86,7 +86,7 @@ public class Test_org_eclipse_swt_browser_Browser extends Test_org_eclipse_swt_w public TestName name = new TestName(); Browser browser; - boolean isEdge = false;
+ boolean isEdge = false; static int[] webkitGtkVersionInts = new int[3]; @@ -175,7 +175,7 @@ public void test_ClearAllSessionCookies () { // Using JavaScript Cookie API on local (file) URL gives DOM Exception 18 browser.setUrl("http://www.eclipse.org/swt"); - shell.open();
+ shell.open(); waitForPassCondition(loaded::get); // Set the cookies @@ -206,7 +206,7 @@ public void test_get_set_Cookies() { // Using JavaScript Cookie API on local (file) URL gives DOM Exception 18 browser.setUrl("http://www.eclipse.org/swt"); - shell.open();
+ shell.open(); waitForPassCondition(loaded::get); // Set the cookies @@ -225,7 +225,7 @@ public void test_get_set_Cookies() { public void test_getChildren() { // Win32's Browser is a special case. It has 1 child by default, the OleFrame. // See Bug 499387 and Bug 511874 - if (SwtTestUtil.isWindows && !isEdge) {
+ if (SwtTestUtil.isWindows && !isEdge) { int childCount = composite.getChildren().length; String msg = "Browser on Win32 is a special case, the first child is an OleFrame (ActiveX control). Actual child count is: " + childCount; assertTrue(msg, childCount == 1); @@ -1242,10 +1242,10 @@ public void test_LocationListener_evaluateInCallback() { } }); - shell.open();
+ shell.open(); browser.setText("<body>Hello <b>World</b></body>"); // Wait till both listeners were fired. - if (SwtTestUtil.isWindows) {
+ if (SwtTestUtil.isWindows) { waitForPassCondition(changingFinished::get); // Windows doesn't reach changedFinished.get(); } else waitForPassCondition(() -> (changingFinished.get() && changedFinished.get())); @@ -1417,7 +1417,7 @@ public void test_getText_script() { @Test public void test_getText_doctype() { String testString = "<!DOCTYPE html><html><head></head><body>hello World</body></html>"; - if (SwtTestUtil.isWindows) {
+ if (SwtTestUtil.isWindows) { // Windows' Browser implementation returns the processed HTML rather than the original one. // The processed page strips out DOCTYPE. getText_helper(testString, "<html><head></head><body>hello World</body></html>"); |