From 2373c4ce98eb9d7672befb0b87d87184dd5b3bb8 Mon Sep 17 00:00:00 2001 From: Aleksandar Kurtakov Date: Fri, 22 Aug 2025 16:28:33 +0300 Subject: [PATCH] Convert some tests to JUnit 5 --- ..._custom_StyledTextLineSpacingProvider.java | 8 +- ...eclipse_swt_custom_TextChangeListener.java | 228 ++++++------------ ..._eclipse_swt_custom_VerifyKeyListener.java | 14 +- .../Test_org_eclipse_swt_graphics_Font.java | 143 ++++------- ...est_org_eclipse_swt_graphics_FontData.java | 59 ++--- ..._org_eclipse_swt_graphics_FontMetrics.java | 15 +- ..._org_eclipse_swt_graphics_PaletteData.java | 91 +++---- .../Test_org_eclipse_swt_graphics_Path.java | 44 ++-- .../Test_org_eclipse_swt_graphics_Point.java | 19 +- ...st_org_eclipse_swt_graphics_Rectangle.java | 185 +++++++------- 10 files changed, 312 insertions(+), 494 deletions(-) diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledTextLineSpacingProvider.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledTextLineSpacingProvider.java index 774ccc9133b..ed0c4325516 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledTextLineSpacingProvider.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledTextLineSpacingProvider.java @@ -13,14 +13,14 @@ */ package org.eclipse.swt.tests.junit; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.custom.StyledTextLineSpacingProvider; import org.eclipse.swt.widgets.Shell; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Automated Test Suite for class @@ -46,7 +46,7 @@ public Integer getLineSpacing(int lineIndex) { Shell shell; StyledText styledText; - @Before + @BeforeEach public void setUp() { shell = new Shell(); styledText = new StyledText(shell, SWT.NULL); diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangeListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangeListener.java index 5b23954ffdb..804bd506762 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangeListener.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangeListener.java @@ -15,7 +15,10 @@ package org.eclipse.swt.tests.junit; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; @@ -24,8 +27,8 @@ import org.eclipse.swt.custom.TextChangedEvent; import org.eclipse.swt.custom.TextChangingEvent; import org.eclipse.swt.widgets.Shell; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Automated Test Suite for class org.eclipse.swt.custom.TextChangeListener @@ -37,7 +40,7 @@ public class Test_org_eclipse_swt_custom_TextChangeListener { StyledText styledText; int verify = -1; -@Before +@BeforeEach public void setUp() { shell = new Shell(); styledText = new StyledText(shell, SWT.NULL); @@ -51,83 +54,83 @@ public void test_textChangedLorg_eclipse_swt_custom_TextChangedEvent() { public void textChanged(TextChangedEvent event) { switch (verify) { case 1 : { - assertTrue(":1:", styledText.getText().equals("\ntesting")); + assertEquals("\ntesting", styledText.getText()); break; } case 2 : { - assertTrue(":2:", styledText.getText().equals("a")); + assertEquals("a", styledText.getText()); break; } case 3 : { - assertTrue(":3:", styledText.getText().equals("\n\n")); + assertEquals("\n\n", styledText.getText()); break; } case 4: { - assertTrue(":4:", false); + fail(); break; } case 5 : { - assertTrue(":5:", styledText.getText().equals("\rLine 1\r\nLine 2")); + assertEquals("\rLine 1\r\nLine 2", styledText.getText()); break; } case 6 : { - assertTrue(":6:", styledText.getText().equals("This\nis a test\nline 3")); + assertEquals("This\nis a test\nline 3", styledText.getText()); break; } case 7 : { - assertTrue(":7:", styledText.getText().equals("This\n\r")); + assertEquals("This\n\r", styledText.getText()); break; } case 8 : { - assertTrue(":8:", styledText.getText().equals("\nL1\r\nL2")); + assertEquals("\nL1\r\nL2", styledText.getText()); break; } case 9 : { - assertTrue(":9:", styledText.getText().equals("L1test")); + assertEquals("L1test", styledText.getText()); break; } case 10:{ - assertTrue(":10:", false); + fail(); break; } case 11: { - assertTrue(":11:", false); + fail(); break; } case 12: { - assertTrue(":12:", styledText.getText().equals("L1\r\n")); + assertEquals("L1\r\n", styledText.getText()); break; } case 13: { - assertTrue(":13:", styledText.getText().equals("L1\r\n")); + assertEquals("L1\r\n", styledText.getText()); break; } case 14: { - assertTrue(":14:", false); + fail(); break; } case 15: { - assertTrue(":15:", styledText.getText().equals("L1test\n\n")); + assertEquals("L1test\n\n", styledText.getText()); break; } case 16:{ - assertTrue(":16:", false); + fail(); break; } case 17: { - assertTrue(":17:", false); + fail(); break; } case 18: { - assertTrue(":18:", styledText.getText().equals("L1\r\ntest\r\n")); + assertEquals("L1\r\ntest\r\n", styledText.getText()); break; } case 19: { - assertTrue(":19:", styledText.getText().equals("L1test\r\r\r\n")); + assertEquals("L1test\r\r\r\n", styledText.getText()); break; } case 20: { - assertTrue(":20:", false); + fail(); break; } } @@ -141,7 +144,6 @@ public void textSet(TextChangedEvent event) { }; content.addTextChangeListener(listener); - boolean exceptionHandled = false; verify = 0; styledText.setText("testing"); verify = 1; @@ -160,12 +162,7 @@ public void textSet(TextChangedEvent event) { verify = 0; styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n"); verify = 4; - try {styledText.replaceTextRange(3, 1, "test\n");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":4: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(3, 1, "test\n")); verify = 0; styledText.setText("Line 1\r\nLine 2"); @@ -195,22 +192,12 @@ public void textSet(TextChangedEvent event) { verify = 0; styledText.setText("L1\r\n"); verify = 10; - try {styledText.replaceTextRange(3, 1, "");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":10: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(3, 1, "")); verify = 0; styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n"); verify = 11; - try {styledText.replaceTextRange(1, 2, "");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":11: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(1, 2, "")); verify = 0; styledText.setText("L1\r"); @@ -225,12 +212,7 @@ public void textSet(TextChangedEvent event) { verify = 0; styledText.setText("L1\r\n"); verify = 14; - try {styledText.replaceTextRange(3, 0, "test");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":14: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(3, 0, "test")); verify = 0; styledText.setText("L1\r\n"); @@ -240,22 +222,12 @@ public void textSet(TextChangedEvent event) { verify = 0; styledText.setText("L1\r\n"); verify = 16; - try {styledText.replaceTextRange(3, 1, "test\r\n");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":16: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(3, 1, "test\r\n")); verify = 0; styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n"); verify = 17; - try {styledText.replaceTextRange(1, 2, "test\n\n");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":17: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(1, 2, "test\n\n")); verify = 0; styledText.setText("L1\r"); @@ -270,12 +242,7 @@ public void textSet(TextChangedEvent event) { verify = 0; styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n"); verify = 20; - try {styledText.replaceTextRange(3, 1, "test\n");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":20: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(3, 1, "test\n")); content.removeTextChangeListener(listener); } @@ -287,96 +254,96 @@ public void test_textChangingLorg_eclipse_swt_custom_TextChangingEvent() { public void textChanging(TextChangingEvent event) { switch(verify) { case 1 : { - assertTrue(":1a:", event.replaceLineCount == 0); - assertTrue(":1b:", event.newLineCount == 1); + assertEquals(0, event.replaceLineCount); + assertEquals(1, event.newLineCount); break; } case 2 : { - assertTrue(":2a:", event.replaceLineCount == 2); - assertTrue(":2b:", event.newLineCount == 0); + assertEquals(2, event.replaceLineCount); + assertEquals(0, event.newLineCount); break; } case 3 : { - assertTrue(":3a:", event.replaceLineCount == 0); - assertTrue(":3b:", event.newLineCount == 2); + assertEquals(0, event.replaceLineCount); + assertEquals(2, event.newLineCount); break; } case 4: { - assertTrue(":4:", false); + fail(); break; } case 5 : { - assertTrue(":5a:", event.replaceLineCount == 0); - assertTrue(":5b:", event.newLineCount == 1); + assertEquals(0, event.replaceLineCount); + assertEquals(1, event.newLineCount); break; } case 6 : { - assertTrue(":6a:", event.replaceLineCount == 1); - assertTrue(":6b:", event.newLineCount == 0); + assertEquals(1, event.replaceLineCount); + assertEquals(0, event.newLineCount); break; } case 7 : { - assertTrue(":7a:", event.replaceLineCount == 0); - assertTrue(":7b:", event.newLineCount == 0); + assertEquals(0, event.replaceLineCount); + assertEquals(0, event.newLineCount); break; } case 8 : { - assertTrue(":8a:", event.replaceLineCount == 1); - assertTrue(":8b:", event.newLineCount == 0); + assertEquals(1, event.replaceLineCount); + assertEquals(0, event.newLineCount); break; } case 9 : { - assertTrue(":9a:", event.replaceLineCount == 1); - assertTrue(":9b:", event.newLineCount == 0); + assertEquals(1, event.replaceLineCount); + assertEquals(0, event.newLineCount); break; } case 10:{ - assertTrue(":10:", false); + fail(); break; } case 11: { - assertTrue(":11:", false); + fail(); break; } case 12: { - assertTrue(":12a:", event.replaceLineCount == 0); - assertTrue(":12b:", event.newLineCount == 1); + assertEquals(0, event.replaceLineCount); + assertEquals(1, event.newLineCount); break; } case 13: { - assertTrue(":13a:", event.replaceLineCount == 0); - assertTrue(":13b:", event.newLineCount == 1); + assertEquals(0, event.replaceLineCount); + assertEquals(1, event.newLineCount); break; } case 14: { - assertTrue(":14:", false); + fail(); break; } case 15: { - assertTrue(":15a:", event.replaceLineCount == 1); - assertTrue(":15b:", event.newLineCount == 2); + assertEquals(1, event.replaceLineCount); + assertEquals(2, event.newLineCount); break; } case 16:{ - assertTrue(":16:", false); + fail(); break; } case 17: { - assertTrue(":17:", false); + fail(); break; } case 18: { - assertTrue(":18a:", event.replaceLineCount == 0); - assertTrue(":18b:", event.newLineCount == 2); + assertEquals(0, event.replaceLineCount); + assertEquals(2, event.newLineCount); break; } case 19: { - assertTrue(":19a:", event.replaceLineCount == 0); - assertTrue(":19b:", event.newLineCount == 3); + assertEquals(0, event.replaceLineCount); + assertEquals(3, event.newLineCount); break; } case 20: { - assertTrue(":20:", false); + fail(); break; } } @@ -390,7 +357,6 @@ public void textSet(TextChangedEvent event) { }; content.addTextChangeListener(listener); - boolean exceptionHandled = false; verify = 1; styledText.setText("testing"); styledText.replaceTextRange(0, 0, "\n"); @@ -405,12 +371,7 @@ public void textSet(TextChangedEvent event) { verify = 4; styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n"); - try {styledText.replaceTextRange(3, 1, "test\n");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":4: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(3, 1, "test\n")); verify = 5; styledText.setText("Line 1\r\nLine 2"); @@ -434,21 +395,11 @@ public void textSet(TextChangedEvent event) { verify = 10; styledText.setText("L1\r\n"); - try {styledText.replaceTextRange(3, 1, "");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":10: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(3, 1, "")); verify = 11; styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n"); - try {styledText.replaceTextRange(1, 2, "");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":11: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(1, 2, "")); verify = 12; styledText.setText("L1\r"); @@ -460,12 +411,7 @@ public void textSet(TextChangedEvent event) { verify = 14; styledText.setText("L1\r\n"); - try {styledText.replaceTextRange(3, 0, "test");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":14: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(3, 0, "test")); verify = 15; styledText.setText("L1\r\n"); @@ -473,21 +419,11 @@ public void textSet(TextChangedEvent event) { verify = 16; styledText.setText("L1\r\n"); - try {styledText.replaceTextRange(3, 1, "test\r\n");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":16: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(3, 1, "test\r\n")); verify = 17; styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n"); - try {styledText.replaceTextRange(1, 2, "test\n\n");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":17: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(1, 2, "test\n\n")); verify = 18; styledText.setText("L1\r"); @@ -498,12 +434,7 @@ public void textSet(TextChangedEvent event) { styledText.replaceTextRange(2, 0, "test\r\r\r"); verify = 20; styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n"); - try {styledText.replaceTextRange(3, 1, "test\n");} - catch (IllegalArgumentException ex) { - exceptionHandled = true; - } - assertTrue(":20: exception not thrown", exceptionHandled); - exceptionHandled = false; + assertThrows(IllegalArgumentException.class, ()->styledText.replaceTextRange(3, 1, "test\n")); content.removeTextChangeListener(listener); } @@ -521,19 +452,19 @@ public void textChanged(TextChangedEvent event) { public void textSet(TextChangedEvent event) { switch (verify) { case 1 : { - assertTrue(":1:", styledText.getText().equals("testing")); + assertEquals("testing", styledText.getText()); break; } case 2 : { - assertTrue(":2:", styledText.getText().equals("\n\n")); + assertEquals("\n\n",styledText.getText()); break; } case 3 : { - assertTrue(":3:", styledText.getText().equals("a")); + assertEquals("a", styledText.getText()); break; } case 4 : { - assertTrue(":4:", styledText.getText().isEmpty()); + assertTrue(styledText.getText().isEmpty()); break; } } @@ -551,8 +482,7 @@ public void textSet(TextChangedEvent event) { styledText.setText("a"); verify = 4; - try {styledText.setText(null);} - catch (IllegalArgumentException ex) {assertTrue(":4:", true);} + assertThrows(IllegalArgumentException.class, ()->styledText.setText(null)); content.removeTextChangeListener(listener); } } diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_VerifyKeyListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_VerifyKeyListener.java index fbb857dad43..aaa7ba1d05c 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_VerifyKeyListener.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_VerifyKeyListener.java @@ -15,16 +15,16 @@ package org.eclipse.swt.tests.junit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.custom.VerifyKeyListener; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Shell; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Automated Test Suite for class org.eclipse.swt.custom.VerifyKeyListener @@ -36,7 +36,7 @@ public class Test_org_eclipse_swt_custom_VerifyKeyListener { StyledText styledText; int verify = -1; -@Before +@BeforeEach public void setUp() { shell = new Shell(); styledText = new StyledText(shell, SWT.NULL); @@ -53,14 +53,14 @@ public void test_verifyKeyLorg_eclipse_swt_events_VerifyEvent() { Event e = new Event(); e.character = 'a'; styledText.notifyListeners(SWT.KeyDown, e); - assertEquals(":1:", "a", styledText.getText()); + assertEquals("a", styledText.getText()); verify = 2; styledText.setText(""); e = new Event(); e.character = 'a'; styledText.notifyListeners(SWT.KeyDown, e); - assertTrue(":2:", styledText.getText().isEmpty()); + assertTrue(styledText.getText().isEmpty()); styledText.removeVerifyKeyListener(listener); } } diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Font.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Font.java index d186e3431c7..24f2be9bbc8 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Font.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Font.java @@ -14,20 +14,20 @@ *******************************************************************************/ package org.eclipse.swt.tests.junit; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.widgets.Display; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Automated Test Suite for class org.eclipse.swt.graphics.Font @@ -38,7 +38,7 @@ public class Test_org_eclipse_swt_graphics_Font { Display display; -@Before +@BeforeEach public void setUp() { display = Display.getDefault(); } @@ -48,67 +48,23 @@ public void setUp() { // null device argument - boolean exceptionThrown = false; - try { - FontData[] data = new FontData[1]; - Font font = new Font(null,data); - font.dispose(); - } catch (IllegalArgumentException e) { - exceptionThrown = true; - } - assertTrue(exceptionThrown); + assertThrows(IllegalArgumentException.class, ()-> new Font(null,new FontData[1])); // null data argument - exceptionThrown = false; - try { - FontData[] data = null; - Font font = new Font(display,data); - font.dispose(); - } catch (IllegalArgumentException e) { - exceptionThrown = true; - } - assertTrue(exceptionThrown); + assertThrows(IllegalArgumentException.class, ()-> new Font(display,(FontData[])null)); // zero length data array - exceptionThrown = false; - try { - FontData[] data = new FontData[0]; - Font font = new Font(display,data); - font.dispose(); - } catch (IllegalArgumentException e) { - exceptionThrown = true; - } - assertTrue(exceptionThrown); + assertThrows(IllegalArgumentException.class, ()-> new Font(display,new FontData[0])); // null data element - exceptionThrown = false; - try { - FontData[] data = { - null, - new FontData() - }; - Font font = new Font(display,data); - font.dispose(); - } catch (IllegalArgumentException e) { - exceptionThrown = true; - } - assertTrue("null data element 0",exceptionThrown); + assertThrows(IllegalArgumentException.class, () -> new Font(display, new FontData[] { null, new FontData() }), + "null data element 0"); - exceptionThrown = false; - try { - FontData[] data = { - new FontData(), - null - }; - Font font = new Font(display,data); - font.dispose(); - } catch (IllegalArgumentException e) { - exceptionThrown = true; - } - assertTrue("null data element 1",exceptionThrown); + assertThrows(IllegalArgumentException.class, () -> new Font(display, new FontData[] { new FontData(), null }), + "null data element 0"); } @Test @@ -217,20 +173,12 @@ public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_StringII( font.dispose(); // illegal argument, name == null - try { - font = new Font(display, null, 10, SWT.NORMAL); - font.dispose(); - fail("No exception thrown for name == null"); - } catch (IllegalArgumentException e) { - } + assertThrows(IllegalArgumentException.class, () -> new Font(display, null, 10, SWT.NORMAL), + "No exception thrown for name == null"); // illegal argument, height < 0 - try { - font = new Font(display, SwtTestUtil.testFontName, -10, SWT.NORMAL); - font.dispose(); - fail("No exception thrown for height < 0"); - } catch (IllegalArgumentException e) { - } + assertThrows(IllegalArgumentException.class, () -> new Font(display, SwtTestUtil.testFontName, -10, SWT.NORMAL), + "No exception thrown for height < 0"); } @Test @@ -248,12 +196,12 @@ public void test_equalsLjava_lang_Object() { Font otherFont = new Font(display, SwtTestUtil.testFontName, 20, SWT.NORMAL); try { // Test Font.equals(Object) - assertFalse("!font.equals((Object)null)", font.equals((Object)null)); + assertFalse(font.equals((Object)null), "!font.equals((Object)null)"); // Test Font.equals(Font) - assertFalse("!font.equals((Font)null)", font.equals((Font)null)); - assertTrue("font.equals(font)", font.equals(font)); - assertFalse("!font.equals(otherFont)", font.equals(otherFont)); + assertFalse(font.equals((Font)null), "!font.equals((Font)null)"); + assertTrue(font.equals(font), "font.equals(font)"); + assertFalse(font.equals(otherFont), "!font.equals(otherFont)"); } finally { font.dispose(); otherFont.dispose(); @@ -267,10 +215,10 @@ public void test_getFontData() { Font font = new Font(display, SwtTestUtil.testFontName, 10, SWT.NORMAL); try { FontData fontData[] = font.getFontData(); - assertTrue("No font data", fontData != null && fontData.length > 0); - assertEquals("Wrong font name", SwtTestUtil.testFontName, fontData[0].getName()); - assertEquals("Wrong font height", 10, fontData[0].getHeight()); - assertEquals("Wrong font style", SWT.NORMAL, fontData[0].getStyle()); + assertTrue(fontData != null && fontData.length > 0, "No font data"); + assertEquals(SwtTestUtil.testFontName, fontData[0].getName(), "Wrong font name"); + assertEquals(10, fontData[0].getHeight(), "Wrong font height"); + assertEquals(SWT.NORMAL, fontData[0].getStyle(), "Wrong font style"); } finally { font.dispose(); } @@ -279,10 +227,10 @@ public void test_getFontData() { font = new Font(display, SwtTestUtil.testFontName, 20, SWT.BOLD); try { FontData fontData[] = font.getFontData(); - assertTrue("No font data", fontData != null && fontData.length > 0); - assertEquals("Wrong font name", SwtTestUtil.testFontName, fontData[0].getName()); - assertEquals("Wrong font height", 20, fontData[0].getHeight()); - assertEquals("Wrong font style", SWT.BOLD, fontData[0].getStyle()); + assertTrue(fontData != null && fontData.length > 0, "No font data"); + assertEquals(SwtTestUtil.testFontName, fontData[0].getName(), "Wrong font name"); + assertEquals(20, fontData[0].getHeight(), "Wrong font height"); + assertEquals(SWT.BOLD, fontData[0].getStyle(), "Wrong font style"); } finally { font.dispose(); } @@ -291,10 +239,9 @@ public void test_getFontData() { font = new Font(display, SwtTestUtil.testFontName, 30, SWT.ITALIC); try { FontData fontData[] = font.getFontData(); - assertTrue("No font data", fontData != null && fontData.length > 0); -// assertEquals("Wrong font name", SwtTestUtil.testFontName, fontData[0].getName()); - assertEquals("Wrong font height", 30, fontData[0].getHeight()); - assertEquals("Wrong font style", SWT.ITALIC, fontData[0].getStyle()); + assertTrue(fontData != null && fontData.length > 0, "No font data"); + assertEquals(30, fontData[0].getHeight(), "Wrong font height"); + assertEquals(SWT.ITALIC, fontData[0].getStyle(), "Wrong font style"); } finally { font.dispose(); } @@ -304,10 +251,9 @@ public void test_getFontData() { try { FontData fontData[] = font.getFontData(); font.dispose(); - assertTrue("No font data", fontData != null && fontData.length > 0); -// assertEquals("Wrong font name", SwtTestUtil.testFontName, fontData[0].getName()); - assertEquals("Wrong font height", 40, fontData[0].getHeight()); - assertEquals("Wrong font style", SWT.BOLD | SWT.ITALIC, fontData[0].getStyle()); + assertTrue(fontData != null && fontData.length > 0, "No font data"); + assertEquals(40, fontData[0].getHeight(), "Wrong font height"); + assertEquals(SWT.BOLD | SWT.ITALIC, fontData[0].getStyle(), "Wrong font style"); } finally { font.dispose(); } @@ -316,10 +262,9 @@ public void test_getFontData() { font = new Font(display, "bad-font", 10, SWT.NORMAL); try { FontData fontData[] = font.getFontData(); - assertTrue("No font data", fontData != null && fontData.length > 0); -// assertEquals("Wrong font name", "bad-font", fontData[0].getName()); - assertEquals("Wrong font height", 10, fontData[0].getHeight()); - assertEquals("Wrong font style", SWT.NORMAL, fontData[0].getStyle()); + assertTrue(fontData != null && fontData.length > 0, "No font data"); + assertEquals(10, fontData[0].getHeight(), "No font data"); + assertEquals(SWT.NORMAL, fontData[0].getStyle(), "Wrong font style"); } finally { font.dispose(); } @@ -341,11 +286,11 @@ public void test_isDisposed() { // Test Font.isDisposed() false Font font = new Font(display, SwtTestUtil.testFontName, 10, SWT.NORMAL); try { - assertFalse("Font should not be disposed", font.isDisposed()); + assertFalse(font.isDisposed(), "Font should not be disposed"); } finally { // Test Font.isDisposed() true font.dispose(); - assertTrue("Font should be disposed", font.isDisposed()); + assertTrue(font.isDisposed(), "Font should be disposed"); } } diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java index 71896a1ef03..b6c9b0d8c55 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java @@ -14,17 +14,17 @@ *******************************************************************************/ package org.eclipse.swt.tests.junit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Locale; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.FontData; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Automated Test Suite for class org.eclipse.swt.graphics.FontData @@ -76,18 +76,12 @@ public void test_ConstructorLjava_lang_StringII() { new FontData(SwtTestUtil.testFontName, 10, SWT.BOLD | SWT.ITALIC); // illegal argument, name == null - try { - new FontData(null, 10, SWT.NORMAL); - fail("No exception thrown for name == null"); - } catch (IllegalArgumentException e) { - } + assertThrows(IllegalArgumentException.class, () -> new FontData(null, 10, SWT.NORMAL), + "No exception thrown for name == null"); // illegal argument, height < 0 - try { - new FontData(SwtTestUtil.testFontName, -10, SWT.NORMAL); - fail("No exception thrown for height < 0"); - } catch (IllegalArgumentException e) { - } + assertThrows(IllegalArgumentException.class, + () -> new FontData(SwtTestUtil.testFontName, -10, SWT.NORMAL),"No exception thrown for height < 0"); } @Test @@ -124,28 +118,28 @@ public void test_setHeightI() { FontData fontData = new FontData(SwtTestUtil.testFontName, 10, SWT.NORMAL); for (int height = 0; height < 1000; height++) { fontData.setHeight(height); - assertEquals("Wrong height", fontData.getHeight(), height); + assertEquals(fontData.getHeight(), height, "Wrong height"); } // valid bold font data for various heights fontData = new FontData(SwtTestUtil.testFontName, 10, SWT.BOLD); for (int height = 0; height < 1000; height++) { fontData.setHeight(height); - assertEquals("Wrong height", fontData.getHeight(), height); + assertEquals(fontData.getHeight(), height, "Wrong height"); } // valid italic font data for various heights fontData = new FontData(SwtTestUtil.testFontName, 10, SWT.ITALIC); for (int height = 0; height < 1000; height++) { fontData.setHeight(height); - assertEquals("Wrong height", fontData.getHeight(), height); + assertEquals(fontData.getHeight(), height, "Wrong height"); } // valid bold italic font data for various heights fontData = new FontData(SwtTestUtil.testFontName, 10, SWT.BOLD | SWT.ITALIC); for (int height = 0; height < 1000; height++) { fontData.setHeight(height); - assertEquals("Wrong height", fontData.getHeight(), height); + assertEquals(fontData.getHeight(), height, "Wrong height"); } } @@ -162,28 +156,25 @@ public void test_setNameLjava_lang_String() { // Test Font.setName(String name) // valid name FontData fontData = new FontData(SwtTestUtil.testFontName, 10, SWT.NORMAL); - assertEquals("Wrong name", fontData.getName(), SwtTestUtil.testFontName); + assertEquals(fontData.getName(), SwtTestUtil.testFontName); // valid name (unknown name, but valid) fontData.setName("bad-font"); - assertEquals("Wrong name", fontData.getName(), "bad-font"); + assertEquals(fontData.getName(), "bad-font"); // valid name (empty string, but valid) // only on windows if (SwtTestUtil.isWindows) { fontData.setName(""); - assertEquals("Wrong name", fontData.getName(), ""); + assertEquals(fontData.getName(), ""); } // valid name fontData.setName(SwtTestUtil.testFontName); - assertEquals("Wrong name", fontData.getName(), SwtTestUtil.testFontName); + assertEquals(fontData.getName(), SwtTestUtil.testFontName); // illegal argument, name == null - try { - fontData.setName(null); - fail("No exception thrown for name == null"); - } catch (IllegalArgumentException e) { - } + assertThrows(IllegalArgumentException.class, ()-> + fontData.setName(null),"No exception thrown for name == null"); } @Test @@ -192,23 +183,23 @@ public void test_setStyleI() { for (int height = 0; height < 1000; height++) { // valid normal font data FontData fontData = new FontData(SwtTestUtil.testFontName, height, SWT.NORMAL); - assertEquals("Wrong style", fontData.getStyle(), SWT.NORMAL); + assertEquals(fontData.getStyle(), SWT.NORMAL, "Wrong style"); // valid bold font data fontData.setStyle(SWT.BOLD); - assertEquals("Wrong style", fontData.getStyle(), SWT.BOLD); + assertEquals(fontData.getStyle(), SWT.BOLD, "Wrong style"); // valid italic font data fontData.setStyle(SWT.ITALIC); - assertEquals("Wrong style", fontData.getStyle(), SWT.ITALIC); + assertEquals(fontData.getStyle(), SWT.ITALIC, "Wrong style"); // valid bold italic font data fontData.setStyle(SWT.ITALIC | SWT.BOLD); - assertEquals("Wrong style", fontData.getStyle(), SWT.BOLD | SWT.ITALIC); + assertEquals(fontData.getStyle(), SWT.BOLD | SWT.ITALIC, "Wrong style"); // valid normal font data fontData.setStyle(SWT.NORMAL); - assertEquals("Wrong style", fontData.getStyle(), SWT.NORMAL); + assertEquals(fontData.getStyle(), SWT.NORMAL, "Wrong style"); } } diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontMetrics.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontMetrics.java index e9de5cfc427..6a2b24ef919 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontMetrics.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontMetrics.java @@ -14,17 +14,16 @@ *******************************************************************************/ package org.eclipse.swt.tests.junit; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.eclipse.swt.graphics.FontMetrics; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Automated Test Suite for class org.eclipse.swt.graphics.FontMetrics @@ -33,14 +32,14 @@ */ public class Test_org_eclipse_swt_graphics_FontMetrics { -@Before +@BeforeEach public void setUp() { display = Display.getDefault(); shell = new Shell(display); gc = new GC(shell); } -@After +@AfterEach public void tearDown() { gc.dispose(); shell.dispose(); diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java index 2574ab1e6a5..ded8aec8245 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java @@ -14,17 +14,16 @@ *******************************************************************************/ package org.eclipse.swt.tests.junit; - -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.eclipse.swt.graphics.PaletteData; import org.eclipse.swt.graphics.RGB; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Automated Test Suite for class org.eclipse.swt.graphics.PaletteData @@ -35,91 +34,71 @@ public class Test_org_eclipse_swt_graphics_PaletteData { @Test public void test_Constructor$Lorg_eclipse_swt_graphics_RGB() { - try { - new PaletteData((RGB [])null); - fail("No exception thrown for rgb == null"); - } - catch (IllegalArgumentException e) { - } + assertThrows(IllegalArgumentException.class, ()-> + new PaletteData((RGB [])null),"No exception thrown for rgb == null"); PaletteData data = new PaletteData(new RGB[] {}); - assertFalse(":a:", data.isDirect); + assertFalse(data.isDirect); new PaletteData(new RGB[] {null, null}); - assertFalse(":b:", data.isDirect); + assertFalse(data.isDirect); new PaletteData(new RGB(0, 0, 0), new RGB(255, 255, 255)); - assertFalse(":c:", data.isDirect); + assertFalse(data.isDirect); } @Test public void test_ConstructorIII() { PaletteData data = new PaletteData(0, 0, 0); - assertTrue(":a:", data.isDirect); + assertTrue(data.isDirect); data = new PaletteData(-1, -1, -1); - assertTrue(":b:", data.isDirect); + assertTrue(data.isDirect); data = new PaletteData(0xff0000, 0x00ff00, 0x0000ff); - assertTrue(":c:", data.isDirect); + assertTrue(data.isDirect); } @Test public void test_getPixelLorg_eclipse_swt_graphics_RGB() { // indexed palette tests - RGB[] rgbs = {new RGB(0, 0, 0), new RGB(255, 255, 255), new RGB(50, 100, 150)}; + RGB[] rgbs = { new RGB(0, 0, 0), new RGB(255, 255, 255), new RGB(50, 100, 150) }; PaletteData data = new PaletteData(rgbs); - try { - data.getPixel(null); - fail("No exception thrown for indexed palette with rgb == null"); - } - catch (IllegalArgumentException e) { - } + assertThrows(IllegalArgumentException.class, () -> data.getPixel(null), + "No exception thrown for indexed palette with rgb == null"); - try { - data.getPixel(new RGB(0, 0, 1)); - fail("No exception thrown for rgb not found"); - } - catch (IllegalArgumentException e) { - } + assertThrows(IllegalArgumentException.class, () -> data.getPixel(new RGB(0, 0, 1)), + "No exception thrown for rgb not found"); - assertEquals(":a:", rgbs.length-1, data.getPixel(rgbs[rgbs.length-1])); + assertEquals(rgbs.length - 1, data.getPixel(rgbs[rgbs.length - 1])); // direct palette tests - RGB rgb =new RGB(0x32, 0x64, 0x96); - data = new PaletteData(0xff0000, 0x00ff00, 0x0000ff); + RGB rgb = new RGB(0x32, 0x64, 0x96); + PaletteData data1 = new PaletteData(0xff0000, 0x00ff00, 0x0000ff); - try { - data.getPixel(null); - fail("No exception thrown for direct palette with rgb == null"); - } - catch (IllegalArgumentException e) { - } + assertThrows(IllegalArgumentException.class, () -> data.getPixel(null), + "No exception thrown for direct palette with rgb == null"); - assertEquals(":b:", 0x326496, data.getPixel(rgb)); + assertEquals(0x326496, data1.getPixel(rgb)); } @Test public void test_getRGBI() { // indexed palette tests - RGB[] rgbs = {new RGB(0, 0, 0), new RGB(255, 255, 255), new RGB(50, 100, 150)}; + RGB[] rgbs = { new RGB(0, 0, 0), new RGB(255, 255, 255), new RGB(50, 100, 150) }; PaletteData data = new PaletteData(rgbs); - try { - data.getRGB(rgbs.length); - fail("No exception thrown for nonexistent pixel"); - } - catch (IllegalArgumentException e) { - } + assertThrows(IllegalArgumentException.class, () -> data.getRGB(rgbs.length), + "No exception thrown for nonexistent pixel"); - assertEquals(":a:", rgbs[rgbs.length-1], data.getRGB(rgbs.length-1)); + assertEquals(rgbs[rgbs.length - 1], data.getRGB(rgbs.length - 1)); // direct palette tests - RGB rgb =new RGB(0x32, 0x64, 0x96); - data = new PaletteData(0xff0000, 0x00ff00, 0x0000ff); + RGB rgb = new RGB(0x32, 0x64, 0x96); + PaletteData data1 = new PaletteData(0xff0000, 0x00ff00, 0x0000ff); - assertEquals(":b:", rgb, data.getRGB(0x326496)); + assertEquals(rgb, data1.getRGB(0x326496)); } @Test @@ -128,12 +107,12 @@ public void test_getRGBs() { RGB[] rgbs = {new RGB(0, 0, 0), new RGB(255, 255, 255)}; PaletteData data = new PaletteData(rgbs); - assertArrayEquals(":a:", rgbs, data.getRGBs()); + assertArrayEquals(rgbs, data.getRGBs()); // direct palette tests data = new PaletteData(0xff0000, 0x00ff00, 0x0000ff); - assertNull(":b:", data.getRGBs()); + assertNull(data.getRGBs()); } } diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Path.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Path.java index 18e8ffdaaf1..1a88969fbbf 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Path.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Path.java @@ -13,15 +13,18 @@ *******************************************************************************/ package org.eclipse.swt.tests.junit; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeFalse; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import org.eclipse.swt.graphics.Path; import org.eclipse.swt.graphics.PathData; import org.eclipse.swt.widgets.Display; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Automated Test Suite for class org.eclipse.swt.graphics.Path @@ -32,7 +35,7 @@ public class Test_org_eclipse_swt_graphics_Path { private Display display; - @Before + @BeforeEach public void setUp() { display = Display.getDefault(); } @@ -40,15 +43,13 @@ public void setUp() { @Test public void createTransform() { Path path = new Path(display); - if (path.isDisposed()) { - fail("Constructor for Path didn't initialize"); - } + assertFalse(path.isDisposed(), "Constructor for Path didn't initialize"); path.dispose(); } @Test public void testClonePath() { - assumeFalse("Not currently working on macOS, cloning the path leads to not equal pathData.", SwtTestUtil.isCocoa); + assumeFalse(SwtTestUtil.isCocoa, "Not currently working on macOS, cloning the path leads to not equal pathData."); Display display = Display.getDefault(); @@ -77,16 +78,12 @@ public void testClonePath() { public void disposePath() { Path path = new Path(display); path.addArc(0, 0, 10, 10, 0, 90); - if (path.isDisposed()) { - fail("Path should not be in the disposed state"); - } + assertFalse(path.isDisposed(),"Path should not be in the disposed state"); // dispose twice as this is allowed for (int i = 0; i < 2; i++) { path.dispose(); - if (!path.isDisposed()) { - fail("Path should be in the disposed state"); - } + assertTrue(path.isDisposed(),"Path should be in the disposed state"); } } @@ -95,22 +92,19 @@ public void testToString() { Path path = new Path(display); String s = path.toString(); - if (s == null || s.length() == 0) { - fail("toString returns null or empty string"); - } + assertNotNull (s); + assertFalse(s.isEmpty()); path.addArc(0, 0, 10, 10, 0, 90); s = path.toString(); - if (s == null || s.length() == 0) { - fail("toString returns null or empty string"); - } + assertNotNull (s); + assertFalse(s.isEmpty()); path.dispose(); s = path.toString(); - if (s == null || s.length() == 0) { - fail("toString returns null or empty string"); - } + assertNotNull (s); + assertFalse(s.isEmpty()); } } diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Point.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Point.java index 0b251b56e82..7e37670338e 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Point.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Point.java @@ -14,14 +14,13 @@ *******************************************************************************/ package org.eclipse.swt.tests.junit; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.eclipse.swt.graphics.Point; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Automated Test Suite for class org.eclipse.swt.graphics.Point @@ -50,21 +49,21 @@ public void test_ConstructorII() { public void test_equalsLjava_lang_Object() { Point p1 = new Point(5, 5); Point p2 = new Point(5, 5); - assertTrue("Points should be equal", p1.equals(p2)); + assertTrue(p1.equals(p2), "Points should be equal"); p1 = new Point(-5, -5); p2 = new Point(-5, -5); - assertTrue("Points should be equal", p1.equals(p2)); + assertTrue(p1.equals(p2), "Points should be equal"); p2 = new Point(3, 4); - assertFalse("Points should not be equal", p1.equals(p2)); + assertFalse(p1.equals(p2), "Points should not be equal"); } @Test public void test_hashCode() { Point p1 = new Point(5, 5); Point p2 = new Point(5, 5); - assertEquals("Points should have the same hashCode", p2.hashCode(), p1.hashCode()); + assertEquals(p2.hashCode(), p1.hashCode(), "Points should have the same hashCode"); } @Test diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Rectangle.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Rectangle.java index 99496823e02..ccec7d47f91 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Rectangle.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Rectangle.java @@ -15,16 +15,16 @@ package org.eclipse.swt.tests.junit; import static org.eclipse.swt.tests.junit.SwtTestUtil.assertSWTProblem; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Automated Test Suite for class org.eclipse.swt.graphics.Rectangle @@ -69,27 +69,25 @@ public void test_addLorg_eclipse_swt_graphics_Rectangle() { Rectangle r1 = new Rectangle(1, 2, 3, 4); Rectangle r2 = new Rectangle(3, 3, 2, 2); r1.add(r2); - assertEquals("Rectangle add incorrect", new Rectangle(1, 2, 4, 4), r1); + assertEquals(new Rectangle(1, 2, 4, 4), r1, "Rectangle add incorrect"); r1.add(r2); - assertEquals("Rectangle add incorrect", new Rectangle(1, 2, 4, 4), r1); + assertEquals(new Rectangle(1, 2, 4, 4), r1, "Rectangle add incorrect"); r1 = new Rectangle(1, 2, 3, 4); r2 = new Rectangle(3, 3, 0, 0); r1.add(r2); - assertEquals("Rectangle add incorrect", new Rectangle(1, 2, 3, 4), r1); + assertEquals(new Rectangle(1, 2, 3, 4), r1, "Rectangle add incorrect"); r1 = new Rectangle(1, 2, 3, 4); r2 = new Rectangle(6, 6, 0, 0); r1.add(r2); - assertEquals("Rectangle add incorrect", new Rectangle(1, 2, 5, 4), r1); - - try { - r1.add(null); - fail("No exception thrown for rectangle == null"); - } catch (IllegalArgumentException e) { - assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); - } + assertEquals(new Rectangle(1, 2, 5, 4), r1, "Rectangle add incorrect"); + + Rectangle r = new Rectangle(1, 2, 3, 4); + IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> r.add(null), + "No exception thrown for rectangle == null"); + assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); } /** @@ -99,11 +97,11 @@ public void test_addLorg_eclipse_swt_graphics_Rectangle() { @Test public void test_containsII() { Rectangle r = new Rectangle(1, 2, 3, 4); - assertTrue("Rectangle should contain point (1, 2)", r.contains(1, 2)); + assertTrue(r.contains(1, 2), "Rectangle should contain point (1, 2)"); - assertTrue("Rectangle should contain point (3, 4)", r.contains(3, 4)); + assertTrue(r.contains(3, 4), "Rectangle should contain point (3, 4)"); - assertTrue("Rectangle should contain point (3, 5)", r.contains(3, 5)); + assertTrue(r.contains(3, 5), "Rectangle should contain point (3, 5)"); // assertTrue("Rectangle should contain point (3, 6)", r.contains(3, 6)); // @@ -111,9 +109,9 @@ public void test_containsII() { // // assertTrue("Rectangle should contain point (4, 6)", r.contains(4, 6)); - assertTrue("Rectangle should not contain point (9, 10)", !r.contains(9, 10)); + assertFalse(r.contains(9, 10), "Rectangle should not contain point (9, 10)"); - assertTrue("Rectangle should not contain point (-1, -1)", !r.contains(-1, -1)); + assertFalse(r.contains(-1, -1), "Rectangle should not contain point (-1, -1)"); } /** @@ -127,11 +125,11 @@ public void test_containsII() { @Test public void test_containsLorg_eclipse_swt_graphics_Point() { Rectangle r = new Rectangle(1, 2, 3, 4); - assertTrue("Rectangle should contain Point(1, 2)", r.contains(new Point(1, 2))); + assertTrue(r.contains(new Point(1, 2)), "Rectangle should contain Point(1, 2)"); - assertTrue("Rectangle should contain Point(3, 4)", r.contains(new Point(3, 4))); + assertTrue(r.contains(new Point(3, 4)), "Rectangle should contain Point(3, 4)"); - assertTrue("Rectangle should contain point (3, 5)", r.contains(new Point(3, 5))); + assertTrue(r.contains(new Point(3, 5)), "Rectangle should contain point (3, 5)"); // assertTrue("Rectangle should contain point (3, 6)", r.contains(new Point(3, 6))); // @@ -139,42 +137,39 @@ public void test_containsLorg_eclipse_swt_graphics_Point() { // // assertTrue("Rectangle should contain Point(4, 6)", r.contains(new Point(4, 6))); - assertFalse("Rectangle should not contain Point(9, 10)", r.contains(new Point(9, 10))); + assertFalse(r.contains(new Point(9, 10)), "Rectangle should not contain Point(9, 10)"); - assertFalse("Rectangle should not contain point (-1, -1)", r.contains(new Point(-1, -1))); + assertFalse(r.contains(new Point(-1, -1)), "Rectangle should not contain point (-1, -1)"); - try { - r.contains(null); - fail("No exception thrown for rectangle == null"); - } catch (IllegalArgumentException e) { - assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); - } + IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> r.contains(null), + "No exception thrown for rectangle == null"); + assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); } @Test public void test_equalsLjava_lang_Object() { Rectangle r1 = new Rectangle(5, 4, 3, 2); Rectangle r2 = new Rectangle(5, 4, 3, 2); - assertTrue("Rectangles should be equal", r1.equals(r2)); + assertTrue(r1.equals(r2), "Rectangles should be equal"); r2 = new Rectangle(3, 4, 5, 6); - assertFalse("Rectangles should not be equal", r1.equals(r2)); + assertFalse(r1.equals(r2), "Rectangles should not be equal"); r2 = new Rectangle(2, 3, 4, 5); - assertFalse("Rectangles should not be equal", r1.equals(r2)); + assertFalse(r1.equals(r2), "Rectangles should not be equal"); r2 = new Rectangle(5, 4, 2, 3); - assertFalse("Rectangles should not be equal", r1.equals(r2)); + assertFalse(r1.equals(r2), "Rectangles should not be equal"); r2 = new Rectangle(4, 5, 3, 2); - assertFalse("Rectangles should not be equal", r1.equals(r2)); + assertFalse(r1.equals(r2), "Rectangles should not be equal"); } @Test public void test_hashCode() { Rectangle r1 = new Rectangle(5, 4, 3, 2); Rectangle r2 = new Rectangle(5, 4, 3, 2); - assertEquals("Rectangles should have the same hashCode", r2.hashCode(), r1.hashCode()); + assertEquals(r2.hashCode(), r1.hashCode(), "Rectangles should have the same hashCode"); } @Test @@ -183,110 +178,99 @@ public void test_intersectLorg_eclipse_swt_graphics_Rectangle() { Rectangle r2 = new Rectangle(3, 3, 2, 2); r1.intersect(r2); - assertEquals("Rectangle intersect incorrect", new Rectangle(3, 3, 1, 2), r1); + assertEquals(new Rectangle(3, 3, 1, 2), r1, "Rectangle intersect incorrect"); r1 = new Rectangle(1, 2, 3, 4); r2 = new Rectangle(3, 3, 0, 0); r1.intersect(r2); - assertEquals("Rectangle intersect incorrect", new Rectangle(3, 3, 0, 0), r1); + assertEquals(new Rectangle(3, 3, 0, 0), r1, "Rectangle intersect incorrect"); r1 = new Rectangle(1, 2, 3, 4); r2 = new Rectangle(3, 3, -1, -1); r1.intersect(r2); - assertEquals("Rectangle intersect incorrect", new Rectangle(0, 0, 0, 0), r1); - - try { - r1.intersect(null); - fail("No exception thrown for rectangle == null"); - } catch (IllegalArgumentException e) { - assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); - } + assertEquals(new Rectangle(0, 0, 0, 0), r1, "Rectangle intersect incorrect"); + + Rectangle r = new Rectangle(1, 2, 3, 4); + IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> r.intersect(null), + "No exception thrown for rectangle == null"); + assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); } @Test public void test_intersectionLorg_eclipse_swt_graphics_Rectangle() { Rectangle r1 = new Rectangle(1, 2, 3, 4); Rectangle r2 = new Rectangle(3, 3, 2, 2); - assertEquals("Rectangle intersection incorrect", new Rectangle(3, 3, 1, 2), r1.intersection(r2)); + assertEquals(new Rectangle(3, 3, 1, 2), r1.intersection(r2), "Rectangle intersection incorrect"); r2 = new Rectangle(3, 3, 0, 0); - assertEquals("Rectangle intersection incorrect", new Rectangle(3, 3, 0, 0), r1.intersection(r2)); + assertEquals(new Rectangle(3, 3, 0, 0), r1.intersection(r2), "Rectangle intersection incorrect"); r2 = new Rectangle(3, 3, -1, -1); - assertEquals("Rectangle intersection incorrect", new Rectangle(0, 0, 0, 0), r1.intersection(r2)); - - try { - r1.intersection(null); - fail("No exception thrown for rectangle == null"); - } catch (IllegalArgumentException e) { - assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); - } + assertEquals(new Rectangle(0, 0, 0, 0), r1.intersection(r2), "Rectangle intersection incorrect"); + + IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> r1.intersection(null), + "No exception thrown for rectangle == null"); + assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); } @Test public void test_intersectsIIII() { Rectangle r1 = new Rectangle(1, 2, 3, 4); Rectangle r2 = new Rectangle(2, 3, 7, 8); - assertTrue("Rectangle(1, 2, 3, 4) should intersect Rectangle(2, 3, 7, 8)", r1.intersects(2, 3, 7, 8)); - assertTrue("Rectangle(2, 3, 7, 8) should intersect Rectangle(1, 2, 3, 4)", r2.intersects(1, 2, 3, 4)); + assertTrue(r1.intersects(2, 3, 7, 8), "Rectangle(1, 2, 3, 4) should intersect Rectangle(2, 3, 7, 8)"); + assertTrue(r2.intersects(1, 2, 3, 4), "Rectangle(2, 3, 7, 8) should intersect Rectangle(1, 2, 3, 4)"); r2 = new Rectangle(200, 300, 400, 500); - assertFalse("Rectangle(1, 2, 3, 4) should not intersect Rectangle(200, 300, 400, 500)", r1.intersects(200, 300, 400, 500)); - assertFalse("Rectangle(200, 300, 400, 500) should not intersect Rectangle(1, 2, 3, 4)", r2.intersects(1, 2, 3, 4)); + assertFalse(r1.intersects(200, 300, 400, 500), "Rectangle(1, 2, 3, 4) should not intersect Rectangle(200, 300, 400, 500)"); + assertFalse(r2.intersects(1, 2, 3, 4), "Rectangle(200, 300, 400, 500) should not intersect Rectangle(1, 2, 3, 4)"); r2 = new Rectangle(3, 3, 0, 0); - assertTrue("Rectangle(1, 2, 3, 4) should intersect Rectangle(3, 3, 0, 0)", r1.intersects(3, 3, 0, 0)); - assertTrue("Rectangle(3, 3, 0, 0) should intersect Rectangle(1, 2, 3, 4)", r2.intersects(1, 2, 3, 4)); + assertTrue(r1.intersects(3, 3, 0, 0), "Rectangle(1, 2, 3, 4) should intersect Rectangle(3, 3, 0, 0)"); + assertTrue(r2.intersects(1, 2, 3, 4), "Rectangle(3, 3, 0, 0) should intersect Rectangle(1, 2, 3, 4)"); r2 = new Rectangle(3, 3, -1, -1); - assertFalse("Rectangle(1, 2, 3, 4) should not intersect Rectangle(3, 3, -1, -1)", r1.intersects(3, 3, -1, -1)); - assertFalse("Rectangle(3, 3, -1, -1) should not intersect Rectangle(1, 2, 3, 4)", r2.intersects(1, 2, 3, 4)); - - try { - r1.intersects(null); - fail("No exception thrown for rectangle == null"); - } catch (IllegalArgumentException e) { - assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); - } + assertFalse(r1.intersects(3, 3, -1, -1), "Rectangle(1, 2, 3, 4) should not intersect Rectangle(3, 3, -1, -1)"); + assertFalse(r2.intersects(1, 2, 3, 4), "Rectangle(3, 3, -1, -1) should not intersect Rectangle(1, 2, 3, 4)"); + + IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> r1.intersects(null), + "No exception thrown for rectangle == null"); + assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); } @Test public void test_intersectsLorg_eclipse_swt_graphics_Rectangle() { Rectangle r1 = new Rectangle(1, 2, 3, 4); Rectangle r2 = new Rectangle(2, 3, 7, 8); - assertTrue("Rectangle(1, 2, 3, 4) should intersect Rectangle(2, 3, 7, 8)", r1.intersects(r2)); - assertTrue("Rectangle(2, 3, 7, 8) should intersect Rectangle(1, 2, 3, 4)", r2.intersects(r1)); + assertTrue(r1.intersects(r2), "Rectangle(1, 2, 3, 4) should intersect Rectangle(2, 3, 7, 8)"); + assertTrue(r2.intersects(r1), "Rectangle(2, 3, 7, 8) should intersect Rectangle(1, 2, 3, 4)"); r2 = new Rectangle(200, 300, 400, 500); - assertFalse("Rectangle(1, 2, 3, 4) should not intersect Rectangle(200, 300, 400, 500)", r1.intersects(r2)); - assertFalse("Rectangle(200, 300, 400, 500) should not intersect Rectangle(1, 2, 3, 4)", r2.intersects(r1)); + assertFalse(r1.intersects(r2), "Rectangle(1, 2, 3, 4) should not intersect Rectangle(200, 300, 400, 500)"); + assertFalse(r2.intersects(r1), "Rectangle(200, 300, 400, 500) should not intersect Rectangle(1, 2, 3, 4)"); r2 = new Rectangle(3, 3, 0, 0); - assertTrue("Rectangle(1, 2, 3, 4) should intersect Rectangle(3, 3, 0, 0)", r1.intersects(r2)); - assertTrue("Rectangle(3, 3, 0, 0) should intersect Rectangle(1, 2, 3, 4)", r2.intersects(r1)); + assertTrue(r1.intersects(r2), "Rectangle(1, 2, 3, 4) should intersect Rectangle(3, 3, 0, 0)"); + assertTrue(r2.intersects(r1), "Rectangle(3, 3, 0, 0) should intersect Rectangle(1, 2, 3, 4)"); r2 = new Rectangle(3, 3, -1, -1); - assertFalse("Rectangle(1, 2, 3, 4) should not intersect Rectangle(3, 3, -1, -1)", r1.intersects(r2)); - assertFalse("Rectangle(3, 3, -1, -1) should not intersect Rectangle(1, 2, 3, 4)", r2.intersects(r1)); - - try { - r1.intersects(null); - fail("No exception thrown for rectangle == null"); - } catch (IllegalArgumentException e) { - assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); - } + assertFalse(r1.intersects(r2), "Rectangle(1, 2, 3, 4) should not intersect Rectangle(3, 3, -1, -1)"); + assertFalse(r2.intersects(r1), "Rectangle(3, 3, -1, -1) should not intersect Rectangle(1, 2, 3, 4)"); + + IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> r1.intersects(null), + "No exception thrown for rectangle == null"); + assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); } @Test public void test_isEmpty() { Rectangle r = new Rectangle(1, 2, 0, 0); - assertTrue("Rectangle is empty", r.isEmpty()); + assertTrue(r.isEmpty(), "Rectangle is empty"); r = new Rectangle(1, 2, -3, -4); - assertTrue("Rectangle is empty", r.isEmpty()); + assertTrue(r.isEmpty(), "Rectangle is empty"); r = new Rectangle(1, 2, 3, 4); - assertFalse("Rectangle is not empty", r.isEmpty()); + assertFalse(r.isEmpty(), "Rectangle is not empty"); } @Test @@ -301,20 +285,17 @@ public void test_toString() { public void test_unionLorg_eclipse_swt_graphics_Rectangle() { Rectangle r1 = new Rectangle(1, 2, 3, 4); Rectangle r2 = new Rectangle(3, 3, 2, 2); - assertEquals("Rectangle union incorrect", new Rectangle(1, 2, 4, 4), r1.union(r2)); + assertEquals(new Rectangle(1, 2, 4, 4), r1.union(r2), "Rectangle union incorrect"); r2 = new Rectangle(3, 3, 0, 0); - assertEquals("Rectangle union incorrect", new Rectangle(1, 2, 3, 4), r1.union(r2)); + assertEquals(new Rectangle(1, 2, 3, 4), r1.union(r2), "Rectangle union incorrect"); r2 = new Rectangle(3, 3, -1, -1); - assertEquals("Rectangle union incorrect", new Rectangle(1, 2, 3, 4), r1.union(r2)); - - try { - r1.union(null); - fail("No exception thrown for rectangle == null"); - } catch (IllegalArgumentException e) { - assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); - } + assertEquals(new Rectangle(1, 2, 3, 4), r1.union(r2), "Rectangle union incorrect"); + + IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> r1.union(null), + "No exception thrown for rectangle == null"); + assertSWTProblem("Incorrect exception thrown for rectangle == null", SWT.ERROR_NULL_ARGUMENT, e); } }