Skip to content

Replace "expected" parameter in browser tests with assertThrows #1796

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
merged 1 commit into from
Feb 4, 2025
Merged

Replace "expected" parameter in browser tests with assertThrows #1796

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
68 changes: 34 additions & 34 deletions ...t.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,14 +514,14 @@ public void test_CloseWindowListener_closeShell() {
shell.close();
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_CloseWindowListener_addWithNullArg() {
browser.addCloseWindowListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.addCloseWindowListener(null));
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_CloseWindowListener_removeWithNullArg() {
browser.removeCloseWindowListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.removeCloseWindowListener(null));
}

@Test
Expand Down Expand Up @@ -554,14 +554,14 @@ public void test_LocationListener_adapter_closeShell() {
shell.close();
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_LocationListener_addWithNullArg() {
browser.addLocationListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.addLocationListener(null));
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_LocationListener_removeWithNullArg() {
browser.removeLocationListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.removeLocationListener(null));
}

@Test
Expand Down Expand Up @@ -806,14 +806,14 @@ public void test_OpenWindowListener_closeShell() {
shell.close();
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_OpenWindowListener_addWithNulArg() {
browser.addOpenWindowListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.addOpenWindowListener(null));
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_OpenWindowListener_removeWithNullArg() {
browser.removeOpenWindowListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.removeOpenWindowListener(null));
}

@Test
Expand Down Expand Up @@ -967,14 +967,14 @@ public void completed(ProgressEvent event) {
shell.close();
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_ProgressListener_addWithNullArg() {
browser.addProgressListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.addProgressListener(null));
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_ProgressListener_removeWithNullArg() {
browser.removeProgressListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.removeProgressListener(null));
}

@Test
Expand Down Expand Up @@ -1013,14 +1013,14 @@ public void changed(ProgressEvent event) {
assertTrue(passed);
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_StatusTextListener_addWithNull() {
browser.addStatusTextListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.addStatusTextListener(null));
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_StatusTextListener_removeWithNullArg() {
browser.removeStatusTextListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.removeStatusTextListener(null));
}

@Test
Expand Down Expand Up @@ -1104,14 +1104,14 @@ public void test_TitleListener_addListener_closeShell() {
shell.close();
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_TitleListener_addwithNull() {
browser.addTitleListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.addTitleListener(null));
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_TitleListener_removeWithNullArg() {
browser.removeTitleListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.removeTitleListener(null));
}

@Test
Expand Down Expand Up @@ -1298,14 +1298,14 @@ public void show(WindowEvent event) {
shell.close();
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_VisibilityWindowListener_addWithNull() {
browser.addVisibilityWindowListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.addVisibilityWindowListener(null));
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_VisibilityWindowListener_removeWithNullArg() {
browser.removeVisibilityWindowListener(null);
assertThrows(IllegalArgumentException.class, () -> browser.removeVisibilityWindowListener(null));
}

@Test
Expand Down Expand Up @@ -1457,14 +1457,14 @@ public void test_back() {
assertFalse(result);
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_setTextNull() {
browser.setText(null);
assertThrows(IllegalArgumentException.class, () -> browser.setText(null));
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_setUrlWithNullArg() {
browser.setUrl(null);
assertThrows(IllegalArgumentException.class, () -> browser.setUrl(null));
}


Expand Down Expand Up @@ -1831,9 +1831,9 @@ public void test_stop() {
browser.stop();
}

@Test(expected = IllegalArgumentException.class)
@Test
public void test_execute_withNullArg() {
browser.execute(null);
assertThrows(IllegalArgumentException.class, () -> browser.execute(null));
}

/**
Expand Down
Loading