RFR: 8339512: [TestBug] Convert graphics tests to JUnit 5
Andy Goryachev
angorya at openjdk.org
Thu Sep 19 21:06:44 UTC 2024
On Fri, 13 Sep 2024 15:14:39 GMT, Lukasz Kostyra <lkostyra at openjdk.org> wrote:
> 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...
I looked at each line - this is one monumental piece of work, good job @lukostyra !
Areas that I checked explicitly:
- before -> beforeEach, etc.
- expected -> assertThrows, if same exception
- parameterized tests
I did not actually run the tests.
I left some minor comments, but overall this is good even as is. Will re-approve if you decide to make fixes.
should we set a minimum of two reviewers? please do not integrate just yet.
-------------
Marked as reviewed by angorya (Reviewer).
PR Review: https://git.openjdk.org/jfx/pull/1566#pullrequestreview-2316744667
PR Comment: https://git.openjdk.org/jfx/pull/1566#issuecomment-2362194729
More information about the openjfx-dev
mailing list