> This PR converts all tests in `modules/javafx.graphics` to use JUnit5. > > ## Details > > Trivial changes resolved by first four commits: > - Import changes to use `org.junit.jupiter` package instead of `org.junit` or > `junit.framework` and all changes that follow it (ex. `@Before` -> > `@BeforeEach`) > - Message Strings in `assert*` calls moved to the end to follow 5's argument > order > - Some simple Parametrized tests (aka. those which only did a straightforward > assignment of test parameters) adjusted to use JUnit5's `@ParametrizedTest` > and `@MethodSource` annotations > - Some test formatting unification - keeping annotations on a separate line > from method definition > - Some tests used `@Rule` annotation which is missing from JUnit5. Luckily, > all those uses just set `ExpectedException thrown = ExpectedException.none()` > and then mid-test set it to some expected exception class. This was easily > replaceable with `assertThrows`. > > Non-trivial changes: > - Mutliple tests use common test bases and derive from it to check specific > behaviors. Those include: > - `DirtyRegionTestBase` > - `CssMethodsTestBase` > - `ObjectMethodsTestBase` > - `OnInvalidateMethodsTestBase` > - `PropertiesTestBase` > - `ServiceTestBase` & derivatives required some rework due to > `ServiceExceptionTest` being a derived parametrized class while other > `ServiceTestBase` were not parametrized > - `TransformOperationsTest` not only expanded 3 test parameters onto 6 > different test class members, but also exposed its `getParams()` call to > other testers - `AffineOperationsTest` and `TransformUtilsTest` > - Other classes used `@BeforeEach` annotation which accessed test parameters, > those setup methods were called manually in-test as per discussion in #1561 > > At the end I added a change converting `assertTimeout` uses I added to > `@Timeout` annotation, as recommended in other PRs. > > As for conversion practices and methods, most of these were discussed as part > of #1561 so I will skip them here. > > ## Results > > Below are results of the test conversion and runs of `gradle --info > :graphics:test` on my machine: > > | Category | JUnit4 ( 4647367ce ) | JUnit5 (this PR) | > | ------------ | ------ | ------ | > | Test count | 23272 | 23275 | > | Failures | 0 | 0 | > | Ignored | 99 | 102 | > | Successful % | 100% | 100% | > > The difference in test count and ignored comes from > `Popup_parentWindow_Test.java` where the entire test class was annotated as > `@Ignored`. After conversion, the `@Disabled` annotation applies to each test > individually rather than t...
Lukasz Kostyra has updated the pull request incrementally with one additional commit since the last revision: Review comments ------------- Changes: - all: https://git.openjdk.org/jfx/pull/1566/files - new: https://git.openjdk.org/jfx/pull/1566/files/7d7d95b6..adbdf9f1 Webrevs: - full: https://webrevs.openjdk.org/?repo=jfx&pr=1566&range=01 - incr: https://webrevs.openjdk.org/?repo=jfx&pr=1566&range=00-01 Stats: 480 lines in 19 files changed: 105 ins; 272 del; 103 mod Patch: https://git.openjdk.org/jfx/pull/1566.diff Fetch: git fetch https://git.openjdk.org/jfx.git pull/1566/head:pull/1566 PR: https://git.openjdk.org/jfx/pull/1566
