Skip to content

Refactor fail() calls in Cursor tests #2417

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
Aug 13, 2025
Merged

Refactor fail() calls in Cursor tests #2417

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
28 changes: 8 additions & 20 deletions ...t.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Cursor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 IBM Corporation and others.
* Copyright (c) 2000, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -16,8 +16,8 @@


import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -120,20 +120,12 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceI() {
cursor.dispose();

// illegal argument, style > SWT.CURSOR_HAND (21)
try {
cursor = new Cursor(display, 100);
cursor.dispose();
fail("No exception thrown for style > SWT.CURSOR_HAND (21)");
} catch (IllegalArgumentException e) {
}
assertThrows("No exception thrown for style > SWT.CURSOR_HAND (21)",
IllegalArgumentException.class, () -> new Cursor(display, 100));

// illegal argument, style < 0
try {
cursor = new Cursor(display, -100);
cursor.dispose();
fail("No exception thrown for style < 0");
} catch (IllegalArgumentException e) {
}
assertThrows("No exception thrown for style < 0",
IllegalArgumentException.class, () -> new Cursor(display, -100));
}

@Test
Expand Down Expand Up @@ -164,12 +156,8 @@ public void test_ConstructorWithImageDataProvider() {
cursor.dispose();
sourceImage.dispose();

try {
cursor = new Cursor(display, (ImageDataProvider) null, 0, 0);
cursor.dispose();
fail("No exception thrown when ImageDataProvider is null");
} catch (IllegalArgumentException e) {
}
assertThrows("No exception thrown when ImageDataProvider is null",
IllegalArgumentException.class, () -> new Cursor(display, (ImageDataProvider) null, 0, 0));
}

@Test
Expand Down
Loading